geeto 0.4.3 → 0.6.0

package/lib/workflows/pull.js

@@ -0,0 +1,281 @@
+/**
+ * Pull workflow
+ * Interactive git pull with strategy selection and remote awareness
+ */
+import { confirm } from '../cli/input.js';
+import { select } from '../cli/menu.js';
+import { colors } from '../utils/colors.js';
+import { exec, execAsync, execSilent } from '../utils/exec.js';
+import { getCurrentBranch } from '../utils/git.js';
+import { log } from '../utils/logging.js';
+import { ScrambleProgress } from '../utils/scramble.js';
+/**
+ * Get list of configured remotes
+ */
+const getRemotes = () => {
+    try {
+        return execSilent('git remote').trim().split('\n').filter(Boolean);
+    }
+    catch {
+        return [];
+    }
+};
+/**
+ * Get tracking info for current branch
+ */
+const getTrackingInfo = () => {
+    try {
+        const upstream = execSilent('git rev-parse --abbrev-ref @{upstream}').trim();
+        if (!upstream)
+            return null;
+        const [remote, ...branchParts] = upstream.split('/');
+        return { remote: remote ?? 'origin', branch: branchParts.join('/') };
+    }
+    catch {
+        return null;
+    }
+};
+/**
+ * Get ahead/behind count relative to upstream
+ */
+const getAheadBehind = () => {
+    try {
+        const output = execSilent('git rev-list --left-right --count HEAD...@{upstream}').trim();
+        const [ahead, behind] = output.split('\t').map(Number);
+        return { ahead: ahead ?? 0, behind: behind ?? 0 };
+    }
+    catch {
+        return null;
+    }
+};
+/**
+ * Check if working tree is dirty
+ */
+const hasUncommittedChanges = () => {
+    try {
+        const status = execSilent('git status --porcelain').trim();
+        return status.length > 0;
+    }
+    catch {
+        return false;
+    }
+};
+/**
+ * Handle the pull workflow
+ */
+export const handlePull = async () => {
+    const C = colors.cyan;
+    const R = colors.reset;
+    const G = colors.green;
+    const Y = colors.yellow;
+    const GR = colors.gray;
+    const RED = colors.red;
+    console.log('');
+    console.log(`  ${C}⬇ Git Pull${R}`);
+    console.log(`  ${GR}${'─'.repeat(35)}${R}`);
+    console.log('');
+    const currentBranch = getCurrentBranch();
+    const remotes = getRemotes();
+    if (remotes.length === 0) {
+        log.error('No remotes configured.');
+        console.log(`  ${GR}Add a remote: git remote add origin <url>${R}`);
+        console.log('');
+        return;
+    }
+    // Show current state
+    console.log(`  ${GR}Branch:${R}  ${G}${currentBranch}${R}`);
+    const tracking = getTrackingInfo();
+    if (tracking) {
+        console.log(`  ${GR}Tracks:${R}  ${C}${tracking.remote}/${tracking.branch}${R}`);
+    }
+    else {
+        console.log(`  ${GR}Tracks:${R}  ${Y}(no upstream)${R}`);
+    }
+    // Fetch to get latest state
+    console.log('');
+    const fetchProgress = new ScrambleProgress();
+    fetchProgress.start(['fetching latest from remote...']);
+    try {
+        const fetchRemote = tracking?.remote ?? 'origin';
+        await execAsync(`git fetch ${fetchRemote} --quiet`, true);
+        fetchProgress.succeed('Fetched latest from remote');
+    }
+    catch {
+        fetchProgress.fail('Could not fetch from remote');
+        log.warn('Continuing with local info...');
+    }
+    const counts = getAheadBehind();
+    if (counts) {
+        const { ahead, behind } = counts;
+        if (behind === 0 && ahead === 0) {
+            console.log('');
+            log.success('Already up to date.');
+            console.log('');
+            return;
+        }
+        if (behind === 0) {
+            console.log('');
+            log.info(`Already up to date (${ahead} commit${ahead === 1 ? '' : 's'} ahead).`);
+            console.log('');
+            return;
+        }
+        console.log(`  ${GR}Status:${R}  ${behind > 0 ? `${RED}${behind} behind${R}` : ''}` +
+            `${ahead > 0 && behind > 0 ? '  ' : ''}` +
+            `${ahead > 0 ? `${G}${ahead} ahead${R}` : ''}`);
+    }
+    // Warn about uncommitted changes
+    const dirty = hasUncommittedChanges();
+    if (dirty) {
+        console.log('');
+        console.log(`  ${Y}⚠ You have uncommitted changes.${R}`);
+        console.log(`  ${GR}Pull may fail if there are conflicts with local changes.${R}`);
+    }
+    console.log('');
+    // Choose remote (if multiple)
+    let remote = tracking?.remote ?? 'origin';
+    if (remotes.length > 1) {
+        remote = await select('Pull from which remote?', remotes.map((r) => ({
+            label: `${r}${r === tracking?.remote ? `  ${GR}(tracking)${R}` : ''}`,
+            value: r,
+        })));
+    }
+    // Choose strategy
+    const strategy = await select('Pull strategy:', [
+        {
+            label: `Merge  ${GR}(default — preserves history)${R}`,
+            value: 'merge',
+        },
+        {
+            label: `Rebase  ${GR}(linear history — replays commits on top)${R}`,
+            value: 'rebase',
+        },
+        {
+            label: `Fast-forward only  ${GR}(fails if diverged)${R}`,
+            value: 'ff-only',
+        },
+    ]);
+    // Build the pull command
+    let pullCmd = `git pull ${remote} ${currentBranch}`;
+    switch (strategy) {
+        case 'rebase': {
+            pullCmd = `git pull --rebase ${remote} ${currentBranch}`;
+            break;
+        }
+        case 'ff-only': {
+            pullCmd = `git pull --ff-only ${remote} ${currentBranch}`;
+            break;
+        }
+    }
+    // Stash if dirty and user wants
+    let stashed = false;
+    if (dirty) {
+        const useStash = confirm('Stash uncommitted changes before pull?', true);
+        if (useStash) {
+            try {
+                exec('git stash push -m "geeto: auto-stash before pull"', true);
+                stashed = true;
+                log.info('Changes stashed.');
+            }
+            catch {
+                log.warn('Failed to stash changes. Proceeding anyway...');
+            }
+        }
+    }
+    // Execute pull — count objects before animation (sync, but local = fast)
+    let pullObjectCount = 0;
+    let pullDeltaCount = 0;
+    try {
+        const objCount = Number(exec(`git rev-list --objects ${remote}/${currentBranch} ^HEAD 2>/dev/null | wc -l`, true).trim()) || 0;
+        if (objCount > 0)
+            pullObjectCount = objCount;
+        if (counts?.behind)
+            pullDeltaCount = counts.behind;
+    }
+    catch {
+        /* ignore */
+    }
+    console.log('');
+    const pullProgress = new ScrambleProgress();
+    pullProgress.start([
+        'fetching remote refs...',
+        pullObjectCount > 0
+            ? { text: 'downloading objects', countTo: pullObjectCount }
+            : 'downloading objects...',
+        pullDeltaCount > 0
+            ? { text: 'resolving deltas', countTo: pullDeltaCount }
+            : 'resolving deltas...',
+        `merging ${remote}/${currentBranch} → ${currentBranch}...`,
+    ]);
+    try {
+        const result = await execAsync(pullCmd, true);
+        pullProgress.succeed('Pull completed successfully');
+        if (result.stdout.trim()) {
+            console.log(result.stdout);
+        }
+    }
+    catch (error) {
+        pullProgress.fail('Pull failed');
+        const msg = error instanceof Error ? error.message : String(error);
+        if (msg.includes('CONFLICT') || msg.includes('conflict')) {
+            console.log('');
+            log.error('Merge conflicts detected!');
+            console.log(`  ${GR}Resolve conflicts, then:${R}`);
+            if (strategy === 'rebase') {
+                console.log(`    ${C}git rebase --continue${R}  ${GR}(after resolving)${R}`);
+                console.log(`    ${C}git rebase --abort${R}     ${GR}(to cancel)${R}`);
+            }
+            else {
+                console.log(`    ${C}git add <files>${R}        ${GR}(mark resolved)${R}`);
+                console.log(`    ${C}git commit${R}             ${GR}(complete merge)${R}`);
+                console.log(`    ${C}git merge --abort${R}      ${GR}(to cancel)${R}`);
+            }
+            console.log('');
+            console.log(`  ${GR}Or use: ${C}geeto --abort${R}`);
+        }
+        else {
+            log.error(`Pull failed: ${msg}`);
+        }
+        // Restore stash if we stashed
+        if (stashed) {
+            console.log('');
+            const restore = confirm('Restore stashed changes?', true);
+            if (restore) {
+                try {
+                    exec('git stash pop', true);
+                    log.info('Stashed changes restored.');
+                }
+                catch {
+                    log.warn('Could not auto-restore stash. Run: git stash pop');
+                }
+            }
+        }
+        console.log('');
+        return;
+    }
+    // Restore stash after successful pull
+    if (stashed) {
+        try {
+            exec('git stash pop', true);
+            log.info('Stashed changes restored.');
+        }
+        catch {
+            log.warn('Could not auto-restore stash (may have conflicts). Run: git stash pop');
+        }
+    }
+    // Show summary
+    console.log('');
+    try {
+        const logOutput = execSilent('git log --oneline -3').trim();
+        if (logOutput) {
+            console.log(`  ${GR}Latest commits:${R}`);
+            for (const line of logOutput.split('\n')) {
+                console.log(`    ${GR}${line}${R}`);
+            }
+        }
+    }
+    catch {
+        // Non-critical
+    }
+    console.log('');
+};
+//# sourceMappingURL=pull.js.map

package/lib/workflows/pull.js.map

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

package/lib/workflows/release.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../../src/workflows/release.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAm0BH,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,IAAI,CA6kBlD,CAAA"}
+{"version":3,"file":"release.d.ts","sourceRoot":"","sources":["../../src/workflows/release.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAw0BH,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,IAAI,CAglBlD,CAAA"}

package/lib/workflows/release.js

@@ -4,12 +4,13 @@
  * RELEASE.MD (user-friendly) and CHANGELOG.md (developer-facing)
  */
 import { readFileSync, writeFileSync } from 'node:fs';
-import { askQuestion, confirm, editInline, ProgressBar } from '../cli/input.js';
+import { askQuestion, confirm, editInline } from '../cli/input.js';
 import { select } from '../cli/menu.js';
 import { colors } from '../utils/colors.js';
 import { exec, execAsync, execSilent } from '../utils/exec.js';
 import { chooseModelForProvider, generateReleaseNotesWithProvider, getAIProviderShortName, getModelValue, } from '../utils/git-ai.js';
 import { log } from '../utils/logging.js';
+import { ScrambleProgress } from '../utils/scramble.js';
 import { loadState } from '../utils/state.js';
 // ─── Helpers ───
 /**
@@ -271,8 +272,8 @@ const handleSyncReleases = async () => {
         return;
     }
     console.log('');
-    const spinner = log.spinner();
-    spinner.start('Checking GitHub releases...');
+    const spinner = new ScrambleProgress();
+    spinner.start(['connecting to github...', 'fetching releases...', 'comparing tags...']);
     const localTags = getExistingTags();
     const ghReleases = getExistingGithubReleases();
     const missingTags = localTags.filter((t) => !ghReleases.includes(t));
@@ -338,7 +339,7 @@ const handleSyncReleases = async () => {
             let providerChosen = false;
             while (!providerChosen) {
                 aiProvider = (await select('Choose AI Provider:', [
-                    { label: 'GitHub Copilot (Recommended)', value: 'copilot' },
+                    { label: 'GitHub (Recommended)', value: 'copilot' },
                     { label: 'Gemini', value: 'gemini' },
                     { label: 'OpenRouter', value: 'openrouter' },
                 ]));
@@ -390,11 +391,13 @@ const handleSyncReleases = async () => {
         let releaseBody;
         if (useAI && commits.length > 0) {
             console.log('');
-            const aiSpinner = log.spinner();
+            const aiSpinner = new ScrambleProgress();
             const modelDisplay = getModelValue(copilotModel ?? openrouterModel ?? geminiModel ?? '');
-            aiSpinner.start(`Generating notes for ${tag} with ${getAIProviderShortName(aiProvider)}` +
-                (modelDisplay ? ` (${modelDisplay})` : '') +
-                '...');
+            aiSpinner.start([
+                'preparing release context...',
+                `generating notes with ${getAIProviderShortName(aiProvider)}${modelDisplay ? ` (${modelDisplay})` : ''}...`,
+                'processing results...',
+            ]);
             const aiResult = await generateReleaseNotesWithProvider(aiProvider, commitList, language, undefined, copilotModel, openrouterModel, geminiModel);
             if (aiResult) {
                 aiSpinner.succeed(`Notes generated for ${tag}`);
@@ -432,9 +435,9 @@ const handleSyncReleases = async () => {
                 .trim();
         }
         console.log('');
-        const releaseSpinner = log.spinner();
+        const releaseSpinner = new ScrambleProgress();
         // Ensure tag exists on remote before creating GitHub Release
-        releaseSpinner.start(`Pushing tag ${colors.yellow}${tag}${colors.reset} to remote...`);
+        releaseSpinner.start(['connecting to remote...', 'pushing tag...', 'verifying remote refs...']);
         try {
             await execAsync(`git push origin ${tag} --no-verify`, true);
             releaseSpinner.succeed(`Tag ${tag} pushed to remote`);
@@ -443,8 +446,12 @@ const handleSyncReleases = async () => {
             // Tag might already exist on remote — that's fine, continue
         }
         console.log('');
-        const createSpinner = log.spinner();
-        createSpinner.start(`Creating release ${colors.yellow}${tag}${colors.reset}...`);
+        const createSpinner = new ScrambleProgress();
+        createSpinner.start([
+            'preparing release data...',
+            'creating github release...',
+            'confirming creation...',
+        ]);
         const os = await import('node:os');
         const tempFile = `${os.tmpdir()}/geeto-sync-${Date.now()}.md`;
         writeFileSync(tempFile, releaseBody, 'utf8');
@@ -487,8 +494,8 @@ const handleDeleteReleases = async () => {
         return;
     }
     console.log('');
-    const spinner = log.spinner();
-    spinner.start('Fetching GitHub releases...');
+    const spinner = new ScrambleProgress();
+    spinner.start(['connecting to github...', 'fetching releases...', 'processing results...']);
     const ghReleases = getExistingGithubReleases();
     spinner.succeed(`Found ${ghReleases.length} GitHub releases`);
     if (ghReleases.length === 0) {
@@ -513,8 +520,8 @@ const handleDeleteReleases = async () => {
     let successCount = 0;
     for (const release of selected) {
         console.log('');
-        const releaseSpinner = log.spinner();
-        releaseSpinner.start(`Deleting release ${colors.yellow}${release}${colors.reset}...`);
+        const releaseSpinner = new ScrambleProgress();
+        releaseSpinner.start(['connecting to github...', 'deleting release...', 'cleaning up...']);
         try {
             await execAsync(`gh release delete ${release} --yes`, true);
             if (alsoDeleteTag) {
@@ -654,8 +661,8 @@ const handleRecoverTags = async () => {
         const pushTags = confirm('Push recovered tags to remote?');
         if (pushTags) {
             console.log('');
-            const pushSpinner = log.spinner();
-            pushSpinner.start('Pushing tags to remote...');
+            const pushSpinner = new ScrambleProgress();
+            pushSpinner.start(['connecting to remote...', 'pushing tags...', 'verifying remote refs...']);
             try {
                 await execAsync('git push --tags --no-verify', true);
                 pushSpinner.succeed('Tags pushed to remote');
@@ -837,7 +844,7 @@ export const handleRelease = async () => {
             let providerChosen = false;
             while (!providerChosen) {
                 aiProvider = (await select('Choose AI Provider:', [
-                    { label: 'GitHub Copilot (Recommended)', value: 'copilot' },
+                    { label: 'GitHub (Recommended)', value: 'copilot' },
                     { label: 'Gemini', value: 'gemini' },
                     { label: 'OpenRouter', value: 'openrouter' },
                 ]));
@@ -865,11 +872,13 @@ export const handleRelease = async () => {
         let correction;
         let accepted = false;
         while (!accepted) {
-            const spinner = log.spinner();
+            const spinner = new ScrambleProgress();
             const modelDisplay = getModelValue(copilotModel ?? openrouterModel ?? geminiModel ?? '');
-            spinner.start(`Generating release notes with ${getAIProviderShortName(aiProvider)}` +
-                (modelDisplay ? ` (${modelDisplay})` : '') +
-                '...');
+            spinner.start([
+                'preparing release context...',
+                `generating notes with ${getAIProviderShortName(aiProvider)}${modelDisplay ? ` (${modelDisplay})` : ''}...`,
+                'processing results...',
+            ]);
             const result = await generateReleaseNotesWithProvider(aiProvider, commitList, language, correction, copilotModel, openrouterModel, geminiModel);
             spinner.succeed('Release notes generated');
             console.log('');
@@ -942,7 +951,7 @@ export const handleRelease = async () => {
                 }
                 case 'change-provider': {
                     const prov = (await select('Choose AI provider:', [
-                        { label: 'GitHub Copilot', value: 'copilot' },
+                        { label: 'Copilot', value: 'copilot' },
                         { label: 'Gemini', value: 'gemini' },
                         { label: 'OpenRouter', value: 'openrouter' },
                     ]));
@@ -1099,27 +1108,26 @@ export const handleRelease = async () => {
         { label: 'Skip pushing', value: 'skip' },
     ]);
     if (pushChoice === 'both' || pushChoice === 'commit') {
-        const progressBar = new ProgressBar(100, 'Pushing to remote');
-        let progress = 0;
-        const interval = setInterval(() => {
-            progress = Math.min(95, progress + Math.max(1, Math.floor(Math.random() * 6)));
-            progressBar.update(progress);
-        }, 250);
+        console.log('');
+        const pushProgress = new ScrambleProgress();
+        pushProgress.start([
+            'initializing push...',
+            'collecting objects...',
+            { text: 'compressing deltas', countTo: 100, suffix: '%' },
+            'uploading to remote...',
+            'verifying remote refs...',
+        ]);
         try {
             await execAsync(`git push`, true);
             if (pushChoice === 'both') {
                 await execAsync(`git push origin v${newVersion} --no-verify`, true);
             }
-            clearInterval(interval);
-            progressBar.update(100);
-            progressBar.complete();
+            pushProgress.stop();
             console.log('');
             log.success(pushChoice === 'both' ? 'Pushed release + tag' : 'Pushed release');
         }
         catch {
-            clearInterval(interval);
-            progressBar.complete();
-            console.log('');
+            pushProgress.fail('Push failed');
             log.error('Failed to push');
         }
     }
@@ -1140,8 +1148,12 @@ export const handleRelease = async () => {
             const os = await import('node:os');
             const tempFile = `${os.tmpdir()}/geeto-release-${Date.now()}.md`;
             writeFileSync(tempFile, releaseBody, 'utf8');
-            const releaseSpinner = log.spinner();
-            releaseSpinner.start('Creating GitHub Release...');
+            const releaseSpinner = new ScrambleProgress();
+            releaseSpinner.start([
+                'preparing release data...',
+                'creating github release...',
+                'confirming creation...',
+            ]);
             try {
                 await execAsync(`gh release create v${newVersion} --title "v${newVersion}" --notes-file "${tempFile}"`, true);
                 releaseSpinner.succeed('GitHub Release created');