git-smart-flow 0.3.0

package/dist/commands/log.js

@@ -0,0 +1,101 @@
+import { spawnSync } from 'child_process';
+import { ensureGitRepo } from '../git/ensure-repo.js';
+import { getConfig } from '../config/config.js';
+import { section, info, blank } from '../ux/display.js';
+import { selectPrompt, inputPrompt } from '../ux/prompt.js';
+import { isCI } from '../ux/renderer.js';
+async function runInkLog(cwd, logLimit) {
+    const React = (await import('react')).default;
+    const { Box, Text } = await import('ink');
+    const { render } = await import('ink');
+    const { BranchTree } = await import('../ux/components/BranchTree.js');
+    const { getCurrentBranch, getRepoName } = await import('../git/repo.js');
+    const { theme } = await import('../ux/theme.js');
+    const branch = getCurrentBranch(cwd);
+    const repoName = getRepoName(cwd);
+    function LogView() {
+        const width = Math.min(process.stdout.columns ?? 80, 78);
+        return React.createElement(Box, { flexDirection: 'column', paddingX: 1, width }, React.createElement(Box, { marginBottom: 1 }, React.createElement(Text, { bold: true, color: 'white' }, repoName), React.createElement(Text, { color: theme.muted }, '  ·  '), React.createElement(Text, { color: theme.info }, branch), React.createElement(Text, { color: theme.muted }, '  ·  commit history')), React.createElement(BranchTree, { cwd, limit: logLimit, showMeta: true }));
+    }
+    const { unmount } = render(React.createElement(LogView, null));
+    await new Promise((r) => setTimeout(() => {
+        unmount();
+        r();
+    }, 80));
+    console.log('');
+}
+function runPlainLog(cwd, logLimit) {
+    spawnSync('git', ['log', '--graph', '--oneline', '--all', `-${logLimit}`], {
+        cwd,
+        stdio: 'inherit',
+    });
+}
+async function runFilteredLog(cwd) {
+    section('Filtrar historial de commits');
+    blank();
+    const author = await inputPrompt('Autor (Enter para omitir)');
+    const since = await inputPrompt('Desde fecha (ej: "2024-01-01", "1 week ago", Enter para omitir)');
+    const until = await inputPrompt('Hasta fecha (ej: "2024-12-31", Enter para omitir)');
+    const path = await inputPrompt('Fichero/directorio (Enter para omitir)');
+    const grep = await inputPrompt('Buscar en mensaje (Enter para omitir)');
+    const args = ['log', '--oneline', '--graph', '-50'];
+    if (author.trim())
+        args.push(`--author=${author.trim()}`);
+    if (since.trim())
+        args.push(`--since=${since.trim()}`);
+    if (until.trim())
+        args.push(`--until=${until.trim()}`);
+    if (grep.trim())
+        args.push(`--grep=${grep.trim()}`);
+    if (path.trim())
+        args.push('--', path.trim());
+    blank();
+    section('Resultados');
+    const result = spawnSync('git', args, { cwd, encoding: 'utf-8', stdio: 'pipe' });
+    if (!result.stdout?.trim()) {
+        info('No se encontraron commits con los filtros aplicados.');
+        return;
+    }
+    const filters = [];
+    if (author.trim())
+        filters.push(`autor: ${author}`);
+    if (since.trim())
+        filters.push(`desde: ${since}`);
+    if (until.trim())
+        filters.push(`hasta: ${until}`);
+    if (path.trim())
+        filters.push(`path: ${path}`);
+    if (grep.trim())
+        filters.push(`mensaje: ${grep}`);
+    if (filters.length > 0) {
+        info('Filtros: ' + filters.join(' · '));
+        blank();
+    }
+    const lines = result.stdout.split('\n').filter(Boolean);
+    lines.forEach((line) => console.log(line));
+    blank();
+    info(`${lines.length} resultado(s)`);
+}
+export async function runLog() {
+    const cwd = process.cwd();
+    if (!(await ensureGitRepo(cwd)))
+        return;
+    const config = getConfig();
+    const logLimit = config.ui?.logLimit ?? 25;
+    if (isCI()) {
+        runPlainLog(cwd, logLimit);
+        return;
+    }
+    const choice = await selectPrompt('¿Qué quieres ver?', [
+        'Ver historial completo',
+        'Filtrar historial',
+        'Salir',
+    ]);
+    if (choice === 'Ver historial completo') {
+        await runInkLog(cwd, logLimit);
+    }
+    else if (choice === 'Filtrar historial') {
+        await runFilteredLog(cwd);
+    }
+}
+//# sourceMappingURL=log.js.map

package/dist/commands/log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/commands/log.ts"],"names":[],"mappings":"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"}

package/dist/commands/menu.d.ts

@@ -0,0 +1,2 @@
+export declare function runMenu(): Promise<void>;
+//# sourceMappingURL=menu.d.ts.map

package/dist/commands/menu.js

@@ -0,0 +1,297 @@
+import { readFileSync } from 'fs';
+import { fileURLToPath } from 'url';
+import { dirname, join } from 'path';
+import { getConfig } from '../config/config.js';
+import { detectConvention } from '../git/convention-detector.js';
+import { getAheadBehindCount, buildRepoContext, getCurrentBranch, getLastCommit, getLastFetchTime, getRepoName, getStagedFiles, getUnstagedFiles, getUntrackedFiles, getUpstream, hasMergeConflicts, isGitRepo, } from '../git/repo.js';
+import { isCI } from '../ux/renderer.js';
+import { blank, error, header, info, keyValue, section, success, warning } from '../ux/display.js';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+// ── Relative time helper ───────────────────────────────────────────────────
+function relativeTime(d) {
+    const s = Math.floor((Date.now() - d.getTime()) / 1000);
+    if (s < 60)
+        return `${s}s ago`;
+    if (s < 3600)
+        return `${Math.floor(s / 60)}m ago`;
+    if (s < 86400)
+        return `${Math.floor(s / 3600)}h ago`;
+    return `${Math.floor(s / 86400)}d ago`;
+}
+// ── Status panel ───────────────────────────────────────────────────────────
+async function printStatus(cwd) {
+    const config = getConfig();
+    const convention = await detectConvention(cwd);
+    const branch = getCurrentBranch(cwd);
+    const repoName = getRepoName(cwd);
+    const upstream = getUpstream(cwd);
+    const lastCommit = getLastCommit(cwd);
+    const staged = getStagedFiles(cwd);
+    const modified = getUnstagedFiles(cwd);
+    const untracked = getUntrackedFiles(cwd);
+    const conflicts = hasMergeConflicts(cwd);
+    const lastFetch = getLastFetchTime(cwd);
+    const { ahead, behind } = upstream ? getAheadBehindCount(upstream, cwd) : { ahead: 0, behind: 0 };
+    section('Context');
+    keyValue('Repository', repoName);
+    keyValue('Branch', branch);
+    keyValue('Convention', convention.type);
+    keyValue('Commitlint', convention.hasCommitlint ? 'detected' : 'not detected');
+    keyValue('AI Provider', config.ai.provider);
+    blank();
+    section('Status');
+    if (lastCommit) {
+        const msg = lastCommit.message.length > 50 ? lastCommit.message.slice(0, 48) + '…' : lastCommit.message;
+        keyValue('Last commit', `${lastCommit.shortSha}  "${msg}"  (${lastCommit.ago})`);
+    }
+    if (upstream) {
+        const parts = [];
+        if (ahead > 0)
+            parts.push(`↑ ${ahead} to push`);
+        if (behind > 0)
+            parts.push(`↓ ${behind} to pull`);
+        if (parts.length === 0)
+            parts.push('in sync ✔');
+        const fetchNote = lastFetch ? `fetched ${relativeTime(lastFetch)}` : 'never fetched';
+        const syncStr = `${upstream}  ·  ${parts.join('  ')}  ·  ${fetchNote}`;
+        if (behind > 0 || conflicts)
+            warning(`Remote: ${syncStr}`);
+        else if (ahead > 0)
+            keyValue('Remote', syncStr);
+        else
+            success(`Remote: ${syncStr}`);
+    }
+    else {
+        info('Remote: no upstream configured  →  option r');
+    }
+    const hasChanges = staged.length > 0 || modified.length > 0 || untracked.length > 0 || conflicts;
+    if (hasChanges) {
+        const parts = [];
+        if (staged.length > 0)
+            parts.push(`● ${staged.length} staged`);
+        if (modified.length > 0)
+            parts.push(`△ ${modified.length} modified`);
+        if (untracked.length > 0)
+            parts.push(`○ ${untracked.length} untracked`);
+        if (conflicts)
+            parts.push('✖ CONFLICTS');
+        const line = parts.join('  ·  ');
+        if (conflicts)
+            error(`Working tree: ${line}`);
+        else if (staged.length > 0 || modified.length > 0)
+            warning(`Working tree: ${line}`);
+        else
+            keyValue('Working tree', line);
+    }
+    else {
+        success('Working tree: clean');
+    }
+    const hints = [];
+    if (conflicts)
+        hints.push('✖ Conflicts detected → option 7 (merge) or u (undo)');
+    if (staged.length > 0)
+        hints.push(`● ${staged.length} staged → option 2 to commit`);
+    else if (modified.length > 0 || untracked.length > 0)
+        hints.push(`△ ${modified.length + untracked.length} file(s) changed → option 2 to commit`);
+    if (ahead > 0)
+        hints.push(`↑ ${ahead} commit(s) to push → option 6`);
+    if (behind > 0)
+        hints.push(`↓ ${behind} commit(s) from remote → option s to sync`);
+    if (hints.length > 0) {
+        blank();
+        hints.forEach((h) => console.log(`  ${h}`));
+    }
+    blank();
+}
+// ── Ink-based interactive menu (TTY) ──────────────────────────────────────
+async function runInkMenu(pkg) {
+    const { renderInteractive } = await import('../ux/renderer.js');
+    const React = (await import('react')).default;
+    const { useState, useEffect } = await import('react');
+    const { Select } = await import('@inkjs/ui');
+    const { Box, Text } = await import('ink');
+    const { theme } = await import('../ux/theme.js');
+    const { StatusDashboard } = await import('../ux/components/StatusDashboard.js');
+    const cwd = process.cwd();
+    const config = getConfig();
+    const convention = await detectConvention(cwd);
+    const ctx = buildRepoContext(config.git.protectedBranches, config.commit.ticketPattern, convention, cwd);
+    const lastCommit = getLastCommit(cwd);
+    const lastFetch = getLastFetchTime(cwd);
+    const options = [
+        { label: '📌  Branch manager (create, switch, delete…)', value: '1' },
+        { label: '✏️   Crear commit asistido', value: '2' },
+        { label: '💬  Generar mensaje de commit (sin commit)', value: '3' },
+        { label: '📋  Generar descripción de PR', value: '4' },
+        { label: '🔍  Validar repositorio', value: '5' },
+        { label: '🚀  Push validado', value: '6' },
+        { label: '🔄  Sync con remote', value: 's' },
+        { label: '🔀  Merge asistido', value: '7' },
+        { label: '↩️   Undo / revert wizard', value: 'u' },
+        { label: '📈  Ver historial de commits', value: 'l' },
+        { label: '⚙️   Configuración', value: '8' },
+        { label: '🔗  Aliases & hooks', value: '9' },
+        { label: '📁  Repository setup wizard', value: 'r' },
+        { label: '🩺  Diagnóstico (doctor)', value: 'd' },
+        { label: '❌  Salir', value: '0' },
+    ];
+    function MenuApp({ onSelect }) {
+        const [active, setActive] = useState(false);
+        useEffect(() => {
+            const t = setTimeout(() => setActive(true), 120);
+            return () => clearTimeout(t);
+        }, []);
+        return React.createElement(Box, { flexDirection: 'column', paddingX: 1 }, React.createElement(StatusDashboard, {
+            ctx,
+            lastCommit,
+            lastFetch,
+            version: pkg.version,
+            provider: config.ai.provider,
+            cwd,
+            graphLimit: 3,
+        }), React.createElement(Box, {
+            flexDirection: 'column',
+            borderStyle: 'round',
+            borderColor: theme.border,
+            paddingX: 1,
+            marginBottom: 1,
+        }, React.createElement(Text, { bold: true, color: theme.muted }, '¿Qué quieres hacer?'), React.createElement(Text, { color: theme.muted }, ''), React.createElement(Select, { isDisabled: !active, options, onChange: onSelect })), React.createElement(Text, { color: theme.muted }, '  ↑↓ navegar   Enter seleccionar'));
+    }
+    const choice = await renderInteractive((resolve) => React.createElement(MenuApp, { onSelect: resolve }));
+    await handleChoice(choice);
+}
+async function handleChoice(choice) {
+    switch (choice) {
+        case '1': {
+            const { runBranch } = await import('./branch.js');
+            await runBranch();
+            break;
+        }
+        case '2': {
+            const { runCommit } = await import('./commit.js');
+            await runCommit();
+            break;
+        }
+        case '3': {
+            const { runCommitMessage } = await import('./commit-message.js');
+            await runCommitMessage({});
+            break;
+        }
+        case '4': {
+            const { runPR } = await import('./pr.js');
+            await runPR();
+            break;
+        }
+        case '5': {
+            const { runValidate } = await import('./validate.js');
+            await runValidate();
+            break;
+        }
+        case '6': {
+            const { runPush } = await import('./push.js');
+            await runPush();
+            break;
+        }
+        case 's': {
+            const { runSync } = await import('./sync.js');
+            await runSync();
+            break;
+        }
+        case '7': {
+            const { runMerge } = await import('./merge.js');
+            await runMerge();
+            break;
+        }
+        case 'u': {
+            const { runRevert } = await import('./revert.js');
+            await runRevert();
+            break;
+        }
+        case 'l': {
+            const { runLog } = await import('./log.js');
+            await runLog();
+            break;
+        }
+        case '8': {
+            const { runConfig } = await import('./config.js');
+            await runConfig();
+            break;
+        }
+        case '9': {
+            const { runAliases } = await import('./aliases.js');
+            await runAliases();
+            break;
+        }
+        case 'r': {
+            const { runRepoInit } = await import('./repo-init.js');
+            await runRepoInit();
+            break;
+        }
+        case 'd': {
+            const { runDoctor } = await import('./doctor.js');
+            await runDoctor();
+            break;
+        }
+        case '0':
+            process.exit(0);
+            break;
+        default:
+            info('Unknown option.');
+            break;
+    }
+}
+// ── Help screen ────────────────────────────────────────────────────────────
+function showHelp() {
+    blank();
+    section('Available Commands');
+    const commands = [
+        ['gsf', 'Open interactive menu (default)'],
+        ['gsf setup', 'Interactive setup wizard'],
+        ['gsf branch', 'Branch manager: create, switch, list, delete, rename'],
+        ['gsf commit', 'Guided commit assistant'],
+        ['gsf commit-message', 'Generate commit message without committing'],
+        ['gsf pr', 'Generate PR title and description'],
+        ['gsf validate', 'Validate repository state'],
+        ['gsf push', 'Validated push with confirmation'],
+        ['gsf sync', 'Fetch + sync status + pull/merge/conflict guide'],
+        ['gsf merge', 'Assisted merge with conflict handling'],
+        ['gsf revert', 'Undo / revert wizard (remove files, reset commits…)'],
+        ['gsf config', 'Edit global and local configuration'],
+        ['gsf aliases', 'Manage optional command aliases and hooks'],
+        ['gsf install-hooks', 'Install Git hooks in .git/hooks/'],
+        ['gsf repo-init', 'Repository setup wizard (branch, identity, .gitignore, remote, hooks)'],
+        ['gsf info', 'Show current repository context'],
+        ['gsf doctor', 'Full environment diagnostic'],
+    ];
+    for (const [cmd, desc] of commands) {
+        console.log(`  ${cmd.padEnd(24)}  ${desc}`);
+    }
+    blank();
+}
+// ── CI / plain menu ────────────────────────────────────────────────────────
+async function runPlainMenu(pkg) {
+    header('', pkg.version);
+    const cwd = process.cwd();
+    if (isGitRepo(cwd)) {
+        await printStatus(cwd);
+    }
+    else {
+        info('Not a Git repository.');
+        blank();
+    }
+    showHelp();
+}
+// ── Entry point ────────────────────────────────────────────────────────────
+export async function runMenu() {
+    const pkg = JSON.parse(readFileSync(join(__dirname, '../../package.json'), 'utf-8'));
+    if (isCI()) {
+        await runPlainMenu(pkg);
+        return;
+    }
+    // Loop: after each action the menu re-renders with fresh repo data
+    while (true) {
+        await runInkMenu(pkg);
+    }
+}
+//# sourceMappingURL=menu.js.map

package/dist/commands/menu.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"menu.js","sourceRoot":"","sources":["../../src/commands/menu.ts"],"names":[],"mappings":"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"}

package/dist/commands/merge.d.ts

@@ -0,0 +1,6 @@
+export interface RunOptions {
+    dryRun?: boolean;
+    yes?: boolean;
+}
+export declare function runMerge(opts?: RunOptions): Promise<void>;
+//# sourceMappingURL=merge.d.ts.map

package/dist/commands/merge.js

@@ -0,0 +1,128 @@
+import { spawnSync } from 'child_process';
+import { getCurrentBranch, hasUncommittedChanges, hasMergeConflicts } from '../git/repo.js';
+import { validateRef } from '../git/validate.js';
+import { getConfig } from '../config/config.js';
+import { ensureGitRepo } from '../git/ensure-repo.js';
+import { blank, error, info, keyValue, section, success, warning } from '../ux/display.js';
+import { confirmPrompt, inputPrompt, selectPrompt } from '../ux/prompt.js';
+import { startSpinner, succeedSpinner, failSpinner } from '../ux/spinner.js';
+export async function runMerge(opts = {}) {
+    const cwd = process.cwd();
+    if (opts.dryRun)
+        info('[DRY RUN] No changes will be made.\n');
+    if (!(await ensureGitRepo(cwd)))
+        return;
+    if (hasUncommittedChanges(cwd)) {
+        error('You have uncommitted changes. Commit or stash them before merging.');
+        return;
+    }
+    const config = getConfig();
+    const currentBranch = getCurrentBranch(cwd);
+    // List branches
+    const branchResult = spawnSync('git', ['branch', '-a', '--format=%(refname:short)'], {
+        cwd,
+        encoding: 'utf-8',
+    });
+    const _allBranches = (branchResult.stdout ?? '')
+        .split('\n')
+        .map((b) => b.trim())
+        .filter((b) => b && b !== currentBranch && !b.includes('HEAD'));
+    section('Merge Assistant');
+    keyValue('Current branch', currentBranch);
+    blank();
+    const sourceBranch = await inputPrompt(`Branch to merge INTO "${currentBranch}"`, config.git.defaultBaseBranches[0]);
+    const refCheck = validateRef(sourceBranch);
+    if (!refCheck.valid) {
+        error(`Invalid ref "${sourceBranch}": ${refCheck.reason}`);
+        return;
+    }
+    // Fetch
+    startSpinner('Fetching from remote...');
+    const fetchResult = spawnSync('git', ['fetch'], { cwd, stdio: 'pipe' });
+    if (fetchResult.status === 0) {
+        succeedSpinner('Fetched.');
+    }
+    else {
+        failSpinner('Fetch failed — continuing with local state.');
+    }
+    // Show commits that will be merged
+    const logResult = spawnSync('git', ['log', `${currentBranch}..${sourceBranch}`, '--oneline'], {
+        cwd,
+        encoding: 'utf-8',
+    });
+    const commits = (logResult.stdout ?? '').split('\n').filter(Boolean);
+    section(`Commits to merge from "${sourceBranch}"`);
+    if (commits.length === 0) {
+        info('No new commits to merge.');
+        return;
+    }
+    commits.forEach((c) => console.log('  ' + c));
+    blank();
+    const confirmed = opts.yes || opts.dryRun
+        ? true
+        : await confirmPrompt(`Merge "${sourceBranch}" into "${currentBranch}"?`);
+    if (!confirmed) {
+        info('Merge cancelled.');
+        return;
+    }
+    const strategy = opts.yes
+        ? 'Merge commit    — preserva toda la historia'
+        : await selectPrompt('¿Estrategia de merge?', [
+            'Merge commit    — preserva toda la historia',
+            'Squash merge    — aplasta los commits en uno',
+            'Rebase          — reaplica commits sobre la base',
+        ]);
+    if (opts.dryRun) {
+        info(`[DRY RUN] Would run: git merge ${sourceBranch}`);
+        info(`[DRY RUN] ${commits.length} commit(s) would be merged into "${currentBranch}".`);
+        info(`[DRY RUN] Strategy: ${strategy}`);
+        return;
+    }
+    if (strategy.startsWith('Squash')) {
+        const squashResult = spawnSync('git', ['merge', '--squash', sourceBranch], {
+            cwd,
+            stdio: 'inherit',
+        });
+        if (squashResult.status === 0) {
+            info('Cambios staged. Escribe el mensaje del commit de squash:');
+            const { guidedMessageBuilder } = await import('./commit.js');
+            const msg = await guidedMessageBuilder();
+            if (!msg) {
+                info('Merge squash cancelado.');
+                return;
+            }
+            spawnSync('git', ['commit', '-m', msg], { cwd, stdio: 'inherit' });
+            success(`Squash merge de "${sourceBranch}" completado.`);
+        }
+    }
+    else if (strategy.startsWith('Rebase')) {
+        const rebaseResult = spawnSync('git', ['rebase', sourceBranch], { cwd, stdio: 'inherit' });
+        if (rebaseResult.status !== 0) {
+            warning('Rebase en conflicto. Resuelve los conflictos y ejecuta "git rebase --continue".');
+            warning('Para abortar: git rebase --abort');
+        }
+        else {
+            success(`Rebase sobre "${sourceBranch}" completado.`);
+        }
+    }
+    else {
+        const mergeResult = spawnSync('git', ['merge', sourceBranch], { cwd, stdio: 'inherit' });
+        if (hasMergeConflicts(cwd)) {
+            warning('Merge conflicts detected. Resolve them and run "git commit" to finish.');
+            const conflictResult = spawnSync('git', ['diff', '--name-only', '--diff-filter=U'], {
+                cwd,
+                encoding: 'utf-8',
+            });
+            const conflicted = (conflictResult.stdout ?? '').split('\n').filter(Boolean);
+            section('Conflicted files');
+            conflicted.forEach((f) => console.log('  ' + f));
+        }
+        else if (mergeResult.status === 0) {
+            success(`Merge of "${sourceBranch}" completed.`);
+        }
+        else {
+            error('git merge failed.');
+        }
+    }
+}
+//# sourceMappingURL=merge.js.map

package/dist/commands/merge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/commands/merge.ts"],"names":[],"mappings":"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"}

package/dist/commands/pr.d.ts

@@ -0,0 +1,2 @@
+export declare function runPR(): Promise<void>;
+//# sourceMappingURL=pr.d.ts.map