worktree-flow 0.0.18 → 0.0.19

package/README.md

@@ -87,7 +87,7 @@ Drop a workspace and all its worktrees. Fetches latest, checks for uncommitted c
 
 ### `flow prune`
 
-Remove workspaces interactively. Shows all workspaces with their status (similar to `flow list`) and lets you select which ones to prune. Only workspaces with no uncommitted changes can be successfully removed.
+Remove workspaces interactively. Displays full workspace status (identical to `flow list`), then excludes any workspaces with uncommitted changes or errors from the selection prompt. Resolve issues before pruning those workspaces.
 
 ### `flow fetch [name]`
 

package/dist/commands/drop.js

@@ -1,41 +1,46 @@
+import path from 'node:path';
 import chalk from 'chalk';
 import confirm from '@inquirer/confirm';
 import { createServices } from '../lib/services.js';
 import { createUseCases } from '../usecases/usecases.js';
-import { StatusService } from '../lib/status.js';
 import { resolveWorkspace } from '../lib/workspaceResolver.js';
+import { logStatusFetching, logStatus } from './helpers.js';
+import { StatusService } from '../lib/status.js';
+import { WorkspaceHasIssuesError } from '../lib/errors.js';
 export async function runDrop(branchName, useCases, services, deps) {
     const { sourcePath } = services.config.getRequired();
     const config = services.config.load();
     const { workspacePath, displayName: branchNameForDisplay } = resolveWorkspace(branchName, services.workspaceDir, services.config, services.process);
-    services.console.log(`Checking workspace: ${chalk.cyan(workspacePath)}`);
     // Get worktree dirs to show what will be removed
     const worktreeDirs = services.workspaceDir.getWorktreeDirs(workspacePath);
     // Display status check if worktrees exist
     if (worktreeDirs.length > 0) {
+        const workspaceName = path.basename(workspacePath);
+        const repoCount = worktreeDirs.length;
+        // Phase 1: Show header with fetching indicator
+        const loadingLines = logStatusFetching('Workspace:', [{ name: workspaceName, repoCount }], services.console);
+        // Fetch workspace repos (silently)
         await useCases.fetchWorkspaceRepos.execute({
             workspacePath,
             sourcePath,
             fetchCacheTtlSeconds: config.fetchCacheTtlSeconds,
+            silent: true,
+        });
+        const statusResult = await useCases.checkWorkspaceStatus.execute({
+            workspacePath,
         });
-        services.console.log(`\nChecking for uncommitted changes...`);
         // Load workspace config to get per-repo base branches
         const workspaceConfig = services.workspaceConfig.load(workspacePath);
-        const getBaseBranch = (repoName) => workspaceConfig.baseBranches[repoName] || 'master';
-        const results = await services.status.checkAllWorktrees(worktreeDirs, getBaseBranch);
-        for (const { repoName, status } of results) {
-            const baseBranch = getBaseBranch(repoName);
-            const message = StatusService.getStatusMessage(status, baseBranch);
-            if (StatusService.hasIssues(status)) {
-                services.console.log(`${repoName}... ${chalk.red(message)}`);
-            }
-            else {
-                services.console.log(`${repoName}... ${chalk.green(message)}`);
-            }
+        // Phase 2: Clear Phase 1 lines and re-render with full status
+        logStatus('Workspace:', [{ name: workspaceName, path: workspacePath, repoCount, isActive: false, statuses: statusResult.statuses }], loadingLines, (_, repoName) => workspaceConfig.baseBranches[repoName] || 'master', services.console);
+        // Block if any repos have uncommitted changes — user must resolve them first
+        const reposWithIssues = statusResult.statuses.filter(({ status }) => StatusService.hasIssues(status));
+        if (reposWithIssues.length > 0) {
+            throw new WorkspaceHasIssuesError(`${reposWithIssues.length} repo(s) have uncommitted changes or errors. Resolve them before dropping.`);
         }
     }
     else {
-        services.console.log('No worktrees found in workspace.');
+        services.console.log('\nNo worktrees found in workspace.');
     }
     // Show what will be removed
     services.console.log(`\n${chalk.yellow('This will remove:')}`);

package/dist/commands/helpers.js

@@ -71,34 +71,3 @@ export function buildRepoCheckboxChoices(repos, services, preSelected, createSep
     }
     return choices;
 }
-/**
- * Get a human-readable status indicator for a workspace based on its worktree statuses.
- */
-export function getStatusIndicator(workspace) {
-    const hasUncommitted = workspace.statuses.some(s => s.status.type === 'uncommitted');
-    const hasAhead = workspace.statuses.some(s => s.status.type === 'ahead');
-    const hasBehind = workspace.statuses.some(s => s.status.type === 'behind');
-    const hasDiverged = workspace.statuses.some(s => s.status.type === 'diverged');
-    const hasError = workspace.statuses.some(s => s.status.type === 'error');
-    if (hasUncommitted) {
-        return chalk.yellow('uncommitted');
-    }
-    else if (hasDiverged) {
-        return chalk.red('diverged');
-    }
-    else if (hasAhead && hasBehind) {
-        return chalk.yellow('ahead');
-    }
-    else if (hasAhead) {
-        return chalk.yellow('ahead');
-    }
-    else if (hasBehind) {
-        return chalk.blue('behind');
-    }
-    else if (hasError) {
-        return chalk.red('error');
-    }
-    else {
-        return chalk.green('clean');
-    }
-}

package/dist/commands/prune.js

@@ -3,7 +3,8 @@ import checkbox from '@inquirer/checkbox';
 import confirm from '@inquirer/confirm';
 import { createServices } from '../lib/services.js';
 import { createUseCases } from '../usecases/usecases.js';
-import { getStatusIndicator } from './helpers.js';
+import { logStatusFetching, logStatus } from './helpers.js';
+import { StatusService } from '../lib/status.js';
 export async function runPrune(useCases, services, deps) {
     const { sourcePath, destPath } = services.config.getRequired();
     const config = services.config.load();
@@ -14,11 +15,14 @@ export async function runPrune(useCases, services, deps) {
         services.console.log('No workspaces found.');
         services.process.exit(0);
     }
+    // Phase 1: Show basic list with fetching indicator
+    const loadingLines = logStatusFetching('Workspaces:', basicWorkspaces, services.console);
     // Fetch repos used across all workspaces
     await useCases.fetchUsedRepos.execute({
         destPath,
         sourcePath,
         fetchCacheTtlSeconds: config.fetchCacheTtlSeconds,
+        silent: true,
     });
     // Get full status for all workspaces
     const result = await useCases.listWorkspacesWithStatus.execute({
@@ -26,12 +30,31 @@ export async function runPrune(useCases, services, deps) {
         sourcePath,
         cwd,
     });
-    // Format choices for checkbox prompt
-    const choices = result.workspaces.map(workspace => {
-        const statusIndicator = getStatusIndicator(workspace);
+    // Phase 2: Clear Phase 1 and re-print with full status (same as `list` command)
+    logStatus('Workspaces:', result.workspaces, loadingLines, (wsPath, repoName) => services.workspaceConfig.load(wsPath).baseBranches[repoName] || 'master', services.console);
+    // Partition workspaces into prunable (no issues) and skipped (has issues)
+    const prunableWorkspaces = result.workspaces.filter(ws => !ws.statuses.some(({ status }) => StatusService.hasIssues(status)));
+    const skippedWorkspaces = result.workspaces.filter(ws => ws.statuses.some(({ status }) => StatusService.hasIssues(status)));
+    // Log skipped workspaces with reason
+    for (const ws of skippedWorkspaces) {
+        const hasUncommitted = ws.statuses.some(s => s.status.type === 'uncommitted');
+        const hasError = ws.statuses.some(s => s.status.type === 'error');
+        const reason = hasUncommitted ? 'uncommitted changes' : hasError ? 'errors' : 'issues';
+        services.console.log(`${chalk.yellow('⚠')} Skipping ${chalk.cyan(ws.name)} (${reason})`);
+    }
+    // Newline if there were skipped workspaces
+    if (skippedWorkspaces.length)
+        console.log('');
+    // If no prunable workspaces remain, exit
+    if (prunableWorkspaces.length === 0) {
+        services.console.log('\nAll workspaces have uncommitted changes or errors. Resolve them before pruning.');
+        services.process.exit(0);
+    }
+    // Format choices for checkbox prompt (only prunable workspaces)
+    const choices = prunableWorkspaces.map(workspace => {
         const repoCount = chalk.dim(`(${workspace.repoCount} repo${workspace.repoCount === 1 ? '' : 's'})`);
         return {
-            name: `${chalk.cyan(workspace.name)} ${repoCount} ${statusIndicator}`,
+            name: `${chalk.cyan(workspace.name)} ${repoCount}`,
             value: workspace.name,
         };
     });
@@ -46,7 +69,7 @@ export async function runPrune(useCases, services, deps) {
         services.process.exit(0);
     }
     // Get full workspace objects for selected items
-    const selectedWorkspaces = result.workspaces.filter(w => selected.includes(w.name));
+    const selectedWorkspaces = prunableWorkspaces.filter(w => selected.includes(w.name));
     // Confirm deletion
     const confirmed = await deps.confirm({
         message: `Are you sure you want to prune ${selected.length} workspace(s)?`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worktree-flow",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "Manage git worktrees across a poly-repo environment",
   "type": "module",
   "bin": {