@harryisfish/gitt 1.4.0 → 1.4.1

package/dist/commands/clean.js

@@ -16,7 +16,12 @@ const git = (0, simple_git_1.simpleGit)();
  */
 async function cleanDeletedBranches(options = {}) {
     try {
-        const tasks = new listr2_1.Listr([
+        const state = {
+            mainBranch: '',
+            deletedBranches: []
+        };
+        // Phase 1: Discovery
+        const discoveryTasks = new listr2_1.Listr([
             {
                 title: 'Fetch main from remote',
                 task: async (ctx) => {
@@ -57,62 +62,42 @@ async function cleanDeletedBranches(options = {}) {
                     }
                     ctx.deletedBranches = deletedBranches;
                 }
-            },
-            {
-                title: 'Select branches to delete',
-                enabled: (ctx) => !!options.interactive && Array.isArray(ctx.deletedBranches) && ctx.deletedBranches.length > 0,
-                task: async (ctx, task) => {
-                    const branches = ctx.deletedBranches;
-                    // Pause the listr task to show prompt
-                    // We need to stop the spinner to show the prompt clearly
-                    // But listr2 doesn't make it easy to pause/resume in the middle of a task flow easily without custom renderers
-                    // So we will do the prompt and then update the context
-                    // Actually, listr2 supports prompts but it's complex. 
-                    // Let's try to use the prompt directly.
-                    // We might need to handle the UI interference.
-                    // For now, let's just run the prompt.
-                    // In a real TTY, listr2 might fight for control.
-                    // A common pattern is to run the prompt outside listr or use listr's prompt adapter.
-                    // But here we are inside a task.
-                    // Let's try to use the prompt.
-                    try {
-                        const selected = await (0, prompts_1.checkbox)({
-                            message: 'Select branches to delete:',
-                            choices: branches.map(b => ({ name: b, value: b, checked: true })),
-                        });
-                        ctx.deletedBranches = selected;
-                    }
-                    catch (e) {
-                        // If user cancels, we might want to abort or just delete nothing
-                        ctx.deletedBranches = [];
-                    }
-                }
-            },
-            {
-                title: 'Dry Run: List branches to be deleted',
-                enabled: (ctx) => !!options.dryRun && Array.isArray(ctx.deletedBranches) && ctx.deletedBranches.length > 0,
-                task: (ctx, task) => {
-                    const branches = ctx.deletedBranches;
-                    task.output = `The following branches would be deleted:\n${branches.map(b => `  - ${b}`).join('\n')}`;
-                    // We don't want to fail, just show info. 
-                    // But listr output is transient.
-                    // We will print it at the end or use a separate log.
-                    console.log('\nDry Run: The following branches would be deleted:');
-                    branches.forEach(b => console.log(`  - ${b}`));
-                    ctx.deletedBranches = []; // Clear so next step does nothing
-                }
-            },
+            }
+        ]);
+        await discoveryTasks.run(state);
+        // Phase 2: Interaction / Filtering
+        if (state.deletedBranches.length === 0) {
+            (0, errors_2.printSuccess)('No branches need to be cleaned up');
+            return;
+        }
+        if (options.interactive) {
+            try {
+                const selected = await (0, prompts_1.checkbox)({
+                    message: 'Select branches to delete:',
+                    choices: state.deletedBranches.map(b => ({ name: b, value: b, checked: true })),
+                });
+                state.deletedBranches = selected;
+            }
+            catch (e) {
+                // User cancelled
+                throw new Error('Operation cancelled');
+            }
+        }
+        if (state.deletedBranches.length === 0) {
+            (0, errors_2.printSuccess)('No branches selected for deletion');
+            return;
+        }
+        if (options.dryRun) {
+            console.log('\nDry Run: The following branches would be deleted:');
+            state.deletedBranches.forEach(b => console.log(`  - ${b}`));
+            return;
+        }
+        // Phase 3: Execution
+        const deleteTasks = new listr2_1.Listr([
             {
                 title: 'Delete branches removed on remote',
-                enabled: (ctx) => Array.isArray(ctx.deletedBranches),
-                skip: (ctx) => {
-                    if (!ctx.deletedBranches || ctx.deletedBranches.length === 0) {
-                        return 'No branches need to be cleaned up';
-                    }
-                    return false;
-                },
                 task: (ctx) => {
-                    return new listr2_1.Listr((ctx.deletedBranches || []).map(branch => ({
+                    return new listr2_1.Listr(state.deletedBranches.map(branch => ({
                         title: `Delete ${branch}`,
                         task: async () => {
                             await git.branch(['-D', branch]);
@@ -121,7 +106,7 @@ async function cleanDeletedBranches(options = {}) {
                 }
             }
         ]);
-        await tasks.run();
+        await deleteTasks.run(state);
         (0, errors_2.printSuccess)('Branch cleanup completed');
     }
     catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harryisfish/gitt",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "A command-line tool to help you manage Git repositories and remote repositories, such as keeping in sync, pushing, pulling, etc.",
   "main": "dist/index.js",
   "bin": {