@mrpatronz/nexusflow 0.2.17 → 0.2.19

package/src/commands/sync.ts

@@ -1,151 +1,125 @@
-/**
- * @module commands/sync
- * Syncs the active workspace by fetching and rebasing all repos onto their base branch.
- */
-
-import chalk from 'chalk';
-import { select, search } from '@inquirer/prompts';
-import * as path from 'node:path';
-import * as fs from 'node:fs/promises';
-
-import { loadConfig } from '../core/config.js';
-import { listWorkspaces, loadFeatureConfig } from '../core/workspace.js';
-import { getWorkspaceRepos, rebaseRepo } from '../utils/multi-git.js';
-import { analyzeAllRepos } from '../analyzers/index.js';
-import { generateContextFiles } from '../generators/index.js';
-import type { WorkspaceContext } from '../types.js';
-
-/**
- * Executes the sync command.
- *
- * @param workspaceArg - Optional workspace path from CLI.
- */
-export async function syncCommand(workspaceArg?: string): Promise<void> {
-  console.log(chalk.bold.cyan('\n🔄 NexusFlow — Syncing Workspace\n'));
-
-  const workspacePath = await resolveWorkspace(workspaceArg);
-  if (!workspacePath) return;
-
-  const feature = await loadFeatureConfig(workspacePath);
-  if (!feature) {
-    console.error(chalk.red('✖ Failed to load workspace configuration. Ensure nexusflow.json exists.'));
-    return;
-  }
-
-  console.log(chalk.bold(`Syncing workspace: ${chalk.cyan(feature.branchName)}`));
-  console.log(chalk.dim(`Path: ${workspacePath}\n`));
-
-  let repos;
-  try {
-    repos = await getWorkspaceRepos(workspacePath);
-  } catch (error) {
-    console.error(chalk.red(`✖ Failed to retrieve repos: ${error instanceof Error ? error.message : String(error)}`));
-    return;
-  }
-
-  let syncedCount = 0;
-  let conflictCount = 0;
-
-  for (const repo of repos) {
-    console.log(`Repository: ${chalk.bold(repo.name)}`);
-    const defaultBranch = repo.defaultBranch || 'main';
-
-    const spinner = chalk.dim('  Rebasing...');
-    process.stdout.write(spinner);
-
-    const result = await rebaseRepo(repo.path, defaultBranch);
-
-    // Clear rebase message line
-    process.stdout.write('\r' + ' '.repeat(spinner.length) + '\r');
-
-    if (result.success) {
-      console.log(`  ${chalk.green('✅')} Synced (${result.message})`);
-      syncedCount++;
-    } else {
-      console.log(`  ${chalk.red('⚠️')} Conflict: ${result.message}`);
-      if (result.conflict) {
-        console.log(chalk.dim(result.conflict.split('\n').map(l => `    ${l}`).slice(0, 5).join('\n')));
-      }
-      conflictCount++;
-    }
-  }
-
-  console.log(`\n📊 ${chalk.bold('Summary:')} ${syncedCount} synced, ${conflictCount} conflict(s)\n`);
-
-  if (syncedCount > 0) {
-    console.log(chalk.cyan('Regenerating architecture maps and context...'));
-    try {
-      const allRepos = await Promise.all(feature.repos.map(r => {
-        const repoName = path.basename(r);
-        return {
-          name: repoName,
-          path: r,
-          defaultBranch: 'main',
-        };
-      }));
-
-      const analysis = await analyzeAllRepos(allRepos);
-      const ctx: WorkspaceContext = {
-        feature,
-        repos: allRepos,
-        analysis,
-      };
-
-      await generateContextFiles(ctx, feature.assistants, workspacePath);
-
-      const config = await loadConfig();
-      if (config.packContextXml) {
-        const { packWorkspace } = await import('../core/packer.js');
-        await packWorkspace(workspacePath);
-      }
-      console.log(chalk.green('✅ Workspace maps and contexts successfully updated.\n'));
-    } catch (error) {
-      console.error(chalk.red(`✖ Failed to regenerate maps: ${error instanceof Error ? error.message : String(error)}\n`));
-    }
-  }
-}
-
-/**
- * Resolves a workspace path from argument, cwd, or user prompt.
- */
-async function resolveWorkspace(workspaceArg?: string): Promise<string | null> {
-  if (workspaceArg) {
-    const absolutePath = path.resolve(workspaceArg);
-    try {
-      await fs.access(path.join(absolutePath, 'nexusflow.json'));
-      return absolutePath;
-    } catch {
-      console.error(chalk.red(`✖ Invalid workspace: No nexusflow.json found at ${absolutePath}`));
-      return null;
-    }
-  }
-
-  const cwdFeature = await loadFeatureConfig(process.cwd());
-  if (cwdFeature) return cwdFeature.workspacePath;
-
-  const config = await loadConfig();
-  const workspaces = await listWorkspaces(config.workspacesDir);
-
-  if (workspaces.length === 0) {
-    console.log(chalk.yellow('No workspaces found.\n'));
-    return null;
-  }
-
-  const selected = await search({
-    message: 'Search and select a workspace to sync:',
-    source: async (input) => {
-      const query = (input || '').toLowerCase();
-      const filtered = workspaces.filter(
-        (ws) =>
-          ws.branchName.toLowerCase().includes(query) ||
-          ws.workspacePath.toLowerCase().includes(query)
-      );
-      return filtered.map((ws) => ({
-        name: `${ws.branchName} ${chalk.dim(`(${ws.repos.length} repos)`)}`,
-        value: ws.workspacePath,
-      }));
-    },
-  });
-
-  return selected;
-}
+/**
+ * @module commands/sync
+ * Syncs the active workspace by fetching and rebasing all repos onto their base branch.
+ */
+
+import chalk from 'chalk';
+import { search } from '@inquirer/prompts';
+import * as path from 'node:path';
+import * as fs from 'node:fs/promises';
+
+import { loadConfig } from '../core/config.js';
+import { listWorkspaces, loadFeatureConfig } from '../core/workspace.js';
+import { syncWorkspace, type RepoSyncReport } from '../core/sync.js';
+
+/**
+ * Executes the sync command.
+ *
+ * @param workspaceArg - Optional workspace path from CLI.
+ */
+export async function syncCommand(workspaceArg?: string): Promise<void> {
+  console.log(chalk.bold.cyan('\n🔄 NexusFlow — Syncing Workspace\n'));
+
+  const workspacePath = await resolveWorkspace(workspaceArg);
+  if (!workspacePath) return;
+
+  const feature = await loadFeatureConfig(workspacePath);
+  if (!feature) {
+    console.error(chalk.red('✖ Failed to load workspace configuration. Ensure nexusflow.json exists.'));
+    return;
+  }
+
+  console.log(chalk.bold(`Syncing workspace: ${chalk.cyan(feature.branchName)}`));
+  console.log(chalk.dim(`Path: ${workspacePath}\n`));
+
+  let report;
+  try {
+    report = await syncWorkspace(workspacePath);
+  } catch (error) {
+    console.error(chalk.red(`✖ Failed to sync: ${error instanceof Error ? error.message : String(error)}`));
+    return;
+  }
+
+  for (const repo of report.repos) {
+    console.log(`Repository: ${chalk.bold(repo.name)}`);
+    renderRepoResult(repo);
+  }
+
+  const parts = [`${report.syncedCount} synced`];
+  if (report.conflictCount > 0) parts.push(`${report.conflictCount} conflict(s)`);
+  if (report.errorCount > 0) parts.push(`${report.errorCount} error(s)`);
+  console.log(`\n📊 ${chalk.bold('Summary:')} ${parts.join(', ')}\n`);
+
+  if (report.syncedCount > 0) {
+    console.log(chalk.green('✅ Workspace maps and contexts updated.\n'));
+  }
+}
+
+/**
+ * Prints a single repo's sync outcome with status-appropriate styling.
+ */
+function renderRepoResult(repo: RepoSyncReport): void {
+  switch (repo.status) {
+    case 'up-to-date':
+    case 'rebased':
+      console.log(`  ${chalk.green('✅')} Synced (${repo.message})`);
+      break;
+    case 'stash-conflict':
+      console.log(`  ${chalk.yellow('⚠️')} ${repo.message}`);
+      break;
+    case 'conflict':
+      console.log(`  ${chalk.red('❌')} Conflict: ${repo.message}`);
+      if (repo.conflict) {
+        console.log(chalk.dim(repo.conflict.split('\n').map(l => `    ${l}`).slice(0, 5).join('\n')));
+      }
+      break;
+    case 'error':
+      console.log(`  ${chalk.red('🔌')} ${repo.message}`);
+      break;
+  }
+}
+
+/**
+ * Resolves a workspace path from argument, cwd, or user prompt.
+ */
+async function resolveWorkspace(workspaceArg?: string): Promise<string | null> {
+  if (workspaceArg) {
+    const absolutePath = path.resolve(workspaceArg);
+    try {
+      await fs.access(path.join(absolutePath, 'nexusflow.json'));
+      return absolutePath;
+    } catch {
+      console.error(chalk.red(`✖ Invalid workspace: No nexusflow.json found at ${absolutePath}`));
+      return null;
+    }
+  }
+
+  const cwdFeature = await loadFeatureConfig(process.cwd());
+  if (cwdFeature) return cwdFeature.workspacePath;
+
+  const config = await loadConfig();
+  const workspaces = await listWorkspaces(config.workspacesDir);
+
+  if (workspaces.length === 0) {
+    console.log(chalk.yellow('No workspaces found.\n'));
+    return null;
+  }
+
+  const selected = await search({
+    message: 'Search and select a workspace to sync:',
+    source: async (input) => {
+      const query = (input || '').toLowerCase();
+      const filtered = workspaces.filter(
+        (ws) =>
+          ws.branchName.toLowerCase().includes(query) ||
+          ws.workspacePath.toLowerCase().includes(query)
+      );
+      return filtered.map((ws) => ({
+        name: `${ws.branchName} ${chalk.dim(`(${ws.repos.length} repos)`)}`,
+        value: ws.workspacePath,
+      }));
+    },
+  });
+
+  return selected;
+}