@mrpatronz/nexusflow 0.2.19 → 1.3.1

package/src/utils/multi-git.ts

@@ -1,405 +0,0 @@
-/**
- * @module utils/multi-git
- * Shared utility functions for multi-repo git operations.
- *
- * Provides helpers for querying repo status, rebasing, committing, pushing,
- * and generating diff summaries across all repos in a NexusFlow workspace.
- */
-
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { execa } from 'execa';
-
-import type { Feature, SyncStatus } from '../types.js';
-import { detectDefaultBranch } from './git.js';
-
-export type { SyncStatus };
-
-// ─── Types ────────────────────────────────────────────────────────────────────
-
-/** Metadata about a single repo within a workspace. */
-export interface WorkspaceRepo {
-  /** Directory name of the repo (e.g. 'api-gateway'). */
-  name: string;
-  /** Absolute path to the repo worktree inside the workspace. */
-  path: string;
-  /** Feature branch name shared across the workspace. */
-  branchName: string;
-  /** Default branch of the repo (e.g. 'main' or 'master'). */
-  defaultBranch: string;
-}
-
-/** Result of inspecting the working-tree status of a repo. */
-export interface RepoStatus {
-  /** Whether any tracked or untracked files have been modified. */
-  hasChanges: boolean;
-  /** List of changed file paths (relative to repo root). */
-  changedFiles: string[];
-  /** Human-readable summary, e.g. '3 files changed'. */
-  summary: string;
-}
-
-/**
- * Result of a rebase operation.
- *
- * The classified {@link SyncStatus} values mean:
- * - `up-to-date`     — branch already contained the latest base commits.
- * - `rebased`        — new base commits were applied cleanly.
- * - `conflict`       — a genuine merge conflict; the rebase was aborted.
- * - `stash-conflict` — the rebase succeeded but re-applying auto-stashed local
- *                      changes conflicted; the stash is preserved for manual merge.
- * - `error`          — an infrastructure failure (network/auth on fetch, etc.) that
- *                      is *not* a merge conflict.
- */
-export interface RebaseResult {
-  /**
-   * Whether the rebase itself completed. True for `up-to-date`, `rebased`, and
-   * `stash-conflict` (the rebase landed; only the stash pop needs attention).
-   */
-  success: boolean;
-  /** Classified outcome. */
-  status: SyncStatus;
-  /** Human-readable outcome message. */
-  message: string;
-  /** Stderr output — populated only for `status === 'conflict'`. */
-  conflict?: string;
-  /** Whether dirty working-tree changes were auto-stashed during the operation. */
-  stashed?: boolean;
-}
-
-/** Result of a commit-and-push operation. */
-export interface CommitResult {
-  /** Whether the commit (and optional push) succeeded. */
-  success: boolean;
-  /** Short commit hash, e.g. 'a1b2c3d'. */
-  commitHash: string;
-  /** Number of files included in the commit. */
-  filesChanged: number;
-  /** Human-readable outcome message. */
-  message: string;
-}
-
-/** Result of a diff summary. */
-export interface DiffSummary {
-  /** Combined human-readable diff stat output. */
-  summary: string;
-  /** Total number of added lines. */
-  additions: number;
-  /** Total number of deleted lines. */
-  deletions: number;
-}
-
-// ─── Helpers ──────────────────────────────────────────────────────────────────
-
-/**
- * Parses the shortstat line produced by `git diff --stat` to extract
- * insertions and deletions counts.
- *
- * @param statOutput - Raw stdout from `git diff --stat`.
- * @returns A tuple of [additions, deletions].
- */
-function parseStatCounts(statOutput: string): [number, number] {
-  let additions = 0;
-  let deletions = 0;
-
-  // The last line of --stat output looks like:
-  //   3 files changed, 12 insertions(+), 4 deletions(-)
-  const summaryLine = statOutput.trim().split('\n').pop() ?? '';
-
-  const insertMatch = summaryLine.match(/(\d+)\s+insertion/);
-  if (insertMatch) additions = parseInt(insertMatch[1], 10);
-
-  const deleteMatch = summaryLine.match(/(\d+)\s+deletion/);
-  if (deleteMatch) deletions = parseInt(deleteMatch[1], 10);
-
-  return [additions, deletions];
-}
-
-// ─── Public API ───────────────────────────────────────────────────────────────
-
-/**
- * Reads the `nexusflow.json` manifest from a workspace directory and returns
- * metadata for each repo contained in the workspace.
- *
- * @param workspacePath - Absolute path to the workspace directory.
- * @returns Array of repo metadata objects.
- * @throws If `nexusflow.json` cannot be read or parsed.
- */
-export async function getWorkspaceRepos(
-  workspacePath: string,
-): Promise<WorkspaceRepo[]> {
-  const manifestPath = path.join(workspacePath, 'nexusflow.json');
-  const raw = await fs.readFile(manifestPath, 'utf-8');
-  const feature = JSON.parse(raw) as Feature;
-
-  return Promise.all(
-    feature.repos.map(async (repoPath) => {
-      const name = path.basename(repoPath);
-      const absolutePath = path.resolve(workspacePath, name);
-      const defaultBranch = await detectDefaultBranch(absolutePath);
-      return {
-        name,
-        path: absolutePath,
-        branchName: feature.branchName,
-        defaultBranch,
-      };
-    })
-  );
-}
-
-/**
- * Inspects the working-tree status of a git repository.
- *
- * Runs `git status --porcelain` and parses the output to determine which
- * files have been modified, added, or deleted.
- *
- * @param repoPath - Absolute path to the repo root.
- * @returns Status information including changed file list and summary string.
- */
-export async function getRepoStatus(repoPath: string): Promise<RepoStatus> {
-  try {
-    const { stdout } = await execa('git', ['status', '--porcelain'], {
-      cwd: repoPath,
-    });
-
-    const lines = stdout.trim().split('\n').filter(Boolean);
-    const changedFiles = lines.map((line) => line.slice(3).trim());
-
-    return {
-      hasChanges: changedFiles.length > 0,
-      changedFiles,
-      summary:
-        changedFiles.length === 0
-          ? 'Clean'
-          : `${changedFiles.length} file${changedFiles.length === 1 ? '' : 's'} changed`,
-    };
-  } catch (error) {
-    return {
-      hasChanges: false,
-      changedFiles: [],
-      summary: `Error: ${error instanceof Error ? error.message : String(error)}`,
-    };
-  }
-}
-
-/**
- * Extracts the stderr (falling back to the message) from a thrown execa error.
- */
-function errText(error: unknown): string {
-  if (error instanceof Error && 'stderr' in error) {
-    const stderr = String((error as { stderr: unknown }).stderr).trim();
-    if (stderr) return stderr;
-  }
-  return error instanceof Error ? error.message : String(error);
-}
-
-/**
- * Rebases the current branch on top of the latest upstream base branch, while
- * safely preserving any uncommitted local changes.
- *
- * Unlike a bare `git rebase`, this is safe to call from non-interactive agents
- * against a *dirty* working tree: dirty changes are stashed first and restored
- * afterwards. The outcome is classified (see {@link SyncStatus}) so that a dirty
- * tree or a network failure is never mis-reported as a merge conflict.
- *
- * Sequence: `git fetch` → (stash if dirty) → `git rebase origin/{base}` →
- * (pop the stash if one was made).
- *
- * @param repoPath   - Absolute path to the repo root.
- * @param baseBranch - The upstream branch to rebase onto (e.g. 'main').
- * @returns Classified result; `conflict` text is set only for real merge conflicts.
- */
-export async function rebaseRepo(
-  repoPath: string,
-  baseBranch: string,
-): Promise<RebaseResult> {
-  // 1. Fetch latest from origin. A failure here is infrastructure (network/auth),
-  //    not a conflict.
-  try {
-    await execa('git', ['fetch', 'origin'], { cwd: repoPath });
-  } catch (error) {
-    return {
-      success: false,
-      status: 'error',
-      message: `Fetch failed: ${errText(error).split('\n')[0]}`,
-    };
-  }
-
-  // 2. Stash dirty changes (including untracked) so the rebase has a clean tree.
-  let stashed = false;
-  const status = await getRepoStatus(repoPath);
-  if (status.hasChanges) {
-    try {
-      await execa(
-        'git',
-        ['stash', 'push', '-u', '-m', 'nexusflow-autostash'],
-        { cwd: repoPath },
-      );
-      stashed = true;
-    } catch (error) {
-      return {
-        success: false,
-        status: 'error',
-        message: `Failed to stash local changes: ${errText(error).split('\n')[0]}`,
-      };
-    }
-  }
-
-  // 3. Attempt the rebase.
-  let rebaseStatus: SyncStatus;
-  let rebaseMessage: string;
-  try {
-    const { stdout } = await execa(
-      'git',
-      ['rebase', `origin/${baseBranch}`],
-      { cwd: repoPath },
-    );
-
-    if (stdout.includes('up to date') || stdout.includes('up-to-date')) {
-      rebaseStatus = 'up-to-date';
-      rebaseMessage = 'Up to date';
-    } else {
-      rebaseStatus = 'rebased';
-      rebaseMessage = 'Rebased onto latest base';
-    }
-  } catch (error) {
-    // Genuine merge conflict (or other rebase failure). Abort so the repo is
-    // never left mid-rebase, then restore the user's stashed work.
-    try {
-      await execa('git', ['rebase', '--abort'], { cwd: repoPath });
-    } catch {
-      // Best-effort abort; ignore if it fails.
-    }
-
-    if (stashed) {
-      try {
-        await execa('git', ['stash', 'pop'], { cwd: repoPath });
-      } catch {
-        // Stash pop after an abort should normally succeed (tree is unchanged);
-        // if it doesn't, the stash is preserved for manual recovery.
-      }
-    }
-
-    return {
-      success: false,
-      status: 'conflict',
-      message: 'Conflict during rebase',
-      conflict: errText(error),
-      stashed,
-    };
-  }
-
-  // 4. Restore stashed local changes, if any.
-  if (stashed) {
-    try {
-      await execa('git', ['stash', 'pop'], { cwd: repoPath });
-    } catch (error) {
-      // The rebase landed, but re-applying local changes conflicts. `git stash
-      // pop` leaves the stash in place on conflict, so the work is not lost.
-      return {
-        success: true,
-        status: 'stash-conflict',
-        message: 'Rebased; local changes need manual merge — stash preserved',
-        conflict: errText(error),
-        stashed,
-      };
-    }
-  }
-
-  return { success: true, status: rebaseStatus, message: rebaseMessage, stashed };
-}
-
-/**
- * Stages all changes, commits with the given message, and pushes to origin.
- *
- * @param repoPath   - Absolute path to the repo root.
- * @param message    - Commit message.
- * @param branchName - Branch to push to on origin.
- * @param options    - Optional flags to skip the push step.
- * @returns Result with commit hash, file count, and outcome message.
- */
-export async function commitAndPush(
-  repoPath: string,
-  message: string,
-  branchName: string,
-  options?: { noPush?: boolean },
-): Promise<CommitResult> {
-  try {
-    // Stage everything.
-    await execa('git', ['add', '.'], { cwd: repoPath });
-
-    // Commit.
-    const { stdout: commitOutput } = await execa(
-      'git',
-      ['commit', '-m', message],
-      { cwd: repoPath },
-    );
-
-    // Parse short hash — git outputs something like "[branch abc1234] message"
-    const hashMatch = commitOutput.match(/\[[\w/.-]+\s+([a-f0-9]+)\]/);
-    const commitHash = hashMatch ? hashMatch[1] : '';
-
-    // Parse file count — e.g. "3 files changed"
-    const fileMatch = commitOutput.match(/(\d+)\s+file/);
-    const filesChanged = fileMatch ? parseInt(fileMatch[1], 10) : 0;
-
-    // Push unless opted out.
-    if (!options?.noPush) {
-      await execa('git', ['push', 'origin', branchName], { cwd: repoPath });
-    }
-
-    const action = options?.noPush ? 'Committed' : 'Committed and pushed';
-    return { success: true, commitHash, filesChanged, message: action };
-  } catch (error) {
-    return {
-      success: false,
-      commitHash: '',
-      filesChanged: 0,
-      message: error instanceof Error ? error.message : String(error),
-    };
-  }
-}
-
-/**
- * Generates a combined diff summary (staged + unstaged) for a repository.
- *
- * Runs `git diff --stat` for working-tree changes and
- * `git diff --cached --stat` for staged changes, then merges the results.
- *
- * @param repoPath - Absolute path to the repo root.
- * @returns Combined summary string with total additions and deletions.
- */
-export async function getDiffSummary(repoPath: string): Promise<DiffSummary> {
-  try {
-    const { stdout: unstaged } = await execa('git', ['diff', '--stat'], {
-      cwd: repoPath,
-    });
-    const { stdout: staged } = await execa(
-      'git',
-      ['diff', '--cached', '--stat'],
-      { cwd: repoPath },
-    );
-
-    const [unstagedAdd, unstagedDel] = parseStatCounts(unstaged);
-    const [stagedAdd, stagedDel] = parseStatCounts(staged);
-
-    const additions = unstagedAdd + stagedAdd;
-    const deletions = unstagedDel + stagedDel;
-
-    const parts: string[] = [];
-    if (unstaged.trim()) parts.push(unstaged.trim());
-    if (staged.trim()) parts.push(staged.trim());
-
-    return {
-      summary: parts.join('\n') || 'No changes',
-      additions,
-      deletions,
-    };
-  } catch (error) {
-    return {
-      summary: `Error: ${error instanceof Error ? error.message : String(error)}`,
-      additions: 0,
-      deletions: 0,
-    };
-  }
-}

package/src/utils/prompts.ts

@@ -1,209 +0,0 @@
-/**
- * @module utils/prompts
- * Interactive CLI prompts for NexusFlow using @inquirer/prompts.
- */
-
-import { input, checkbox, confirm, select, search } from '@inquirer/prompts';
-import chalk from 'chalk';
-
-import type { AIAssistant, DetectedAI, DetectedEditor, RepoInfo } from '../types.js';
-
-/**
- * Prompts the user for a feature branch name.
- */
-export async function promptBranchName(): Promise<string> {
-  const branchName = await input({
-    message: 'Feature branch name:',
-    validate: (value: string) => {
-      if (!value.trim()) return 'Branch name cannot be empty';
-      if (/\s/.test(value)) return 'Branch name cannot contain spaces';
-      return true;
-    },
-  });
-  return branchName.trim();
-}
-
-/**
- * Prompts the user for a feature description.
- * Accepts plain text or a path to a file.
- */
-export async function promptDescription(): Promise<string> {
-  const { readFile } = await import('node:fs/promises');
-  const { existsSync } = await import('node:fs');
-
-  const descInput = await input({
-    message: 'Describe the feature (or paste a path to a .md/.txt file):',
-    validate: (value: string) => {
-      if (!value.trim()) return 'Description cannot be empty';
-      return true;
-    },
-  });
-
-  const trimmed = descInput.trim();
-
-  // Check if it's a file path
-  if (existsSync(trimmed)) {
-    try {
-      const content = await readFile(trimmed, 'utf-8');
-      console.log(chalk.dim(`  Read description from ${trimmed}`));
-      return content;
-    } catch {
-      // Fall through to use as plain text
-    }
-  }
-
-  return trimmed;
-}
-
-/**
- * Prompts the user to select repos from a list of discovered repos.
- * Supports searching/filtering by term, viewing all, and incremental selection.
- */
-export async function promptSelectRepos(repos: RepoInfo[]): Promise<RepoInfo[]> {
-  if (repos.length === 0) {
-    return [];
-  }
-
-  const selectedPaths = new Set<string>();
-
-  // If there are only a few repos (e.g. <= 10), we can just show a checkbox prompt directly to save time
-  if (repos.length <= 10) {
-    const toggled = await checkbox({
-      message: 'Select repositories to include in workspace:',
-      choices: repos.map((repo) => ({
-        name: `${repo.name} ${chalk.dim(`(${repo.path})`)}`,
-        value: repo.path,
-        checked: false,
-      })),
-    });
-    return repos.filter((r) => toggled.includes(r.path));
-  }
-
-  // Otherwise, use a loop with the search prompt to make it extremely easy to filter and toggle selection
-  while (true) {
-    console.log(chalk.bold(`\n📁 Selected Repositories (${selectedPaths.size}/${repos.length}):`));
-    if (selectedPaths.size === 0) {
-      console.log(chalk.dim('  (None selected yet)'));
-    } else {
-      repos.forEach((r) => {
-        if (selectedPaths.has(r.path)) {
-          console.log(`  ${chalk.green('✓')} ${r.name} ${chalk.dim(`(${r.path})`)}`);
-        }
-      });
-    }
-    console.log();
-
-    const result = await search({
-      message: 'Search and select repositories (type to filter, select to toggle, choose Done to finish):',
-      source: async (input) => {
-        const query = (input || '').toLowerCase();
-        const filtered = repos.filter(
-          (r) =>
-            r.name.toLowerCase().includes(query) ||
-            r.path.toLowerCase().includes(query)
-        );
-
-        const choices = [
-          {
-            name: chalk.green(`✅ Done selecting (${selectedPaths.size} repo(s) selected)`),
-            value: 'done',
-          },
-        ];
-
-        if (selectedPaths.size > 0) {
-          choices.push({
-            name: chalk.yellow('🧹 Clear all selections'),
-            value: 'clear',
-          });
-        }
-
-        filtered.forEach((r) => {
-          const isSelected = selectedPaths.has(r.path);
-          choices.push({
-            name: `${isSelected ? chalk.green('✓') : ' '} ${r.name} ${chalk.dim(`(${r.path})`)}`,
-            value: r.path,
-          });
-        });
-
-        return choices;
-      },
-    });
-
-    if (result === 'done') {
-      if (selectedPaths.size === 0) {
-        console.log(chalk.red('  Please select at least one repository.'));
-        continue;
-      }
-      break;
-    }
-
-    if (result === 'clear') {
-      selectedPaths.clear();
-      continue;
-    }
-
-    // Toggle selected state
-    if (selectedPaths.has(result)) {
-      selectedPaths.delete(result);
-    } else {
-      selectedPaths.add(result);
-    }
-  }
-
-  return repos.filter((r) => selectedPaths.has(r.path));
-}
-
-/**
- * Prompts the user to select AI assistants to generate context for.
- */
-export async function promptSelectAI(
-  detected: DetectedAI[],
-): Promise<AIAssistant[]> {
-  const selected = await checkbox({
-    message: 'Select AI assistant(s) to generate context for:',
-    choices: detected.map((ai) => ({
-      name: `${ai.displayName} ${ai.detected ? chalk.green('✓ detected') : chalk.dim('not found')}`,
-      value: ai.name,
-      checked: ai.detected,
-    })),
-    validate: (items) => {
-      if (items.length === 0) return 'Please select at least one AI assistant';
-      return true;
-    },
-  });
-
-  return selected as AIAssistant[];
-}
-
-/**
- * Prompts the user to select an editor to open the workspace in.
- */
-export async function promptSelectEditor(
-  detected: DetectedEditor[],
-): Promise<DetectedEditor | null> {
-  const shouldOpen = await confirm({
-    message: 'Open workspace in an editor?',
-    default: true,
-  });
-
-  if (!shouldOpen) return null;
-
-  const available = detected.filter((e) => e.detected);
-
-  if (available.length === 0) {
-    console.log(chalk.yellow('  No editors detected in PATH.'));
-    return null;
-  }
-
-  const selected = await checkbox({
-    message: 'Select editor:',
-    choices: available.map((editor) => ({
-      name: editor.name,
-      value: editor.command,
-    })),
-  });
-
-  if (selected.length === 0) return null;
-
-  return available.find((e) => e.command === selected[0]) ?? null;
-}