worktree-flow 0.0.15 → 0.0.16

package/dist/commands/helpers.js

@@ -13,6 +13,40 @@ export function formatRepoStatusLine(repoName, status, baseBranch) {
         : chalk.dim(' (no upstream)');
     return `    ${indicator} ${chalk.yellow(repoName)}: ${message}${trackingInfo}`;
 }
+/**
+ * Render Phase 1: print a header and workspace rows with a "fetching..." indicator.
+ * Returns the number of lines printed so the caller can clear them later.
+ */
+export function logStatusFetching(header, workspaces, console) {
+    console.log(chalk.bold(`\n${header}`));
+    for (const ws of workspaces) {
+        const repoCount = chalk.dim(`(${ws.repoCount} repo${ws.repoCount === 1 ? '' : 's'})`);
+        console.log(`  ${chalk.cyan(ws.name)} ${repoCount} ${chalk.dim('fetching...')}`);
+    }
+    console.log('');
+    // blank line + header + N workspace lines + trailing blank
+    return workspaces.length + 3;
+}
+/**
+ * Render Phase 2: clear the Phase 1 lines then print the header and full workspace status.
+ */
+export function logStatus(header, workspaces, linesToClear, getBaseBranch, console) {
+    for (let i = 0; i < linesToClear; i++) {
+        console.write('\x1b[1A'); // Move cursor up one line
+        console.write('\x1b[2K'); // Clear entire line
+    }
+    console.log(chalk.bold(`\n${header}`));
+    for (const workspace of workspaces) {
+        const activeIndicator = workspace.isActive ? chalk.green('* ') : '  ';
+        const repoCount = chalk.dim(`(${workspace.repoCount} repo${workspace.repoCount === 1 ? '' : 's'})`);
+        console.log(`${activeIndicator}${chalk.cyan(workspace.name)} ${repoCount}`);
+        for (const { repoName, status } of workspace.statuses) {
+            const baseBranch = getBaseBranch(workspace.path, repoName);
+            console.log(formatRepoStatusLine(repoName, status, baseBranch));
+        }
+        console.log('');
+    }
+}
 /**
  * Get a human-readable status indicator for a workspace based on its worktree statuses.
  */

package/dist/commands/list.js

@@ -1,7 +1,6 @@
-import chalk from 'chalk';
 import { createServices } from '../lib/services.js';
 import { createUseCases } from '../usecases/usecases.js';
-import { formatRepoStatusLine } from './helpers.js';
+import { logStatusFetching, logStatus } from './helpers.js';
 export async function runList(useCases, services) {
     const { destPath, sourcePath } = services.config.getRequired();
     const config = services.config.load();
@@ -13,12 +12,7 @@ export async function runList(useCases, services) {
         return;
     }
     // Phase 1: Show basic list immediately
-    services.console.log(chalk.bold('\nWorkspaces:'));
-    for (const workspace of basicWorkspaces) {
-        const repoCount = chalk.dim(`(${workspace.repoCount} repo${workspace.repoCount === 1 ? '' : 's'})`);
-        services.console.log(`  ${chalk.cyan(workspace.name)} ${repoCount} ${chalk.dim('fetching...')}`);
-    }
-    services.console.log('');
+    const loadingLines = logStatusFetching('Workspaces:', basicWorkspaces, services.console);
     // Phase 2: Fetch repos used across all workspaces
     await useCases.fetchUsedRepos.execute({
         destPath,
@@ -32,32 +26,8 @@ export async function runList(useCases, services) {
         sourcePath,
         cwd,
     });
-    // Phase 4: Clear previous output and re-print with status
-    // Lines to clear:
-    // - 2 lines from '\nWorkspaces:' (blank line + header)
-    // - N workspace lines
-    // - 1 empty line after workspaces
-    const linesToClear = 2 + basicWorkspaces.length + 1;
-    for (let i = 0; i < linesToClear; i++) {
-        services.console.write('\x1b[1A'); // Move cursor up one line
-        services.console.write('\x1b[2K'); // Clear entire line
-    }
-    // Re-print with full status information
-    services.console.log(chalk.bold('\nWorkspaces:'));
-    for (const workspace of result.workspaces) {
-        const activeIndicator = workspace.isActive ? chalk.green('* ') : '  ';
-        const repoCount = chalk.dim(`(${workspace.repoCount} repo${workspace.repoCount === 1 ? '' : 's'})`);
-        services.console.log(`${activeIndicator}${chalk.cyan(workspace.name)} ${repoCount}`);
-        // Load workspace config to get per-repo base branches
-        const workspaceConfig = services.workspaceConfig.load(workspace.path);
-        const getBaseBranch = (repoName) => workspaceConfig.baseBranches[repoName] || 'master';
-        // Display each repo with its status and tracking branch
-        for (const { repoName, status } of workspace.statuses) {
-            const baseBranch = getBaseBranch(repoName);
-            services.console.log(formatRepoStatusLine(repoName, status, baseBranch));
-        }
-        services.console.log(''); // Blank line between workspaces
-    }
+    // Phase 4: Clear previous output and re-print with full status
+    logStatus('Workspaces:', result.workspaces, loadingLines, (wsPath, repoName) => services.workspaceConfig.load(wsPath).baseBranches[repoName] || 'master', services.console);
 }
 export function registerListCommand(program) {
     program

package/dist/commands/status.js

@@ -1,47 +1,35 @@
-import chalk from 'chalk';
+import path from 'node:path';
 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 { formatRepoStatusLine } from './helpers.js';
+import { logStatusFetching, logStatus } from './helpers.js';
 export async function runStatus(branchName, useCases, services) {
     const { sourcePath } = services.config.getRequired();
     const config = services.config.load();
     const { workspacePath } = resolveWorkspace(branchName, services.workspaceDir, services.config, services.process);
-    services.console.log(`Workspace: ${chalk.cyan(workspacePath)}`);
     const worktreeDirs = services.workspaceDir.getWorktreeDirs(workspacePath);
     if (worktreeDirs.length === 0) {
         services.console.log('\nNo worktrees found in workspace.');
         return;
     }
+    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
     await useCases.fetchWorkspaceRepos.execute({
         workspacePath,
         sourcePath,
         fetchCacheTtlSeconds: config.fetchCacheTtlSeconds,
+        silent: true,
     });
-    services.console.log('');
-    services.console.log(`\nStatus:\n`);
     const result = await useCases.checkWorkspaceStatus.execute({
         workspacePath,
     });
     // Load workspace config to get per-repo base branches
     const workspaceConfig = services.workspaceConfig.load(workspacePath);
-    const getBaseBranch = (repoName) => workspaceConfig.baseBranches[repoName] || 'master';
-    let cleanCount = 0;
-    let issuesCount = 0;
-    for (const { repoName, status } of result.statuses) {
-        const baseBranch = getBaseBranch(repoName);
-        services.console.log(formatRepoStatusLine(repoName, status, baseBranch));
-        if (StatusService.hasIssues(status)) {
-            issuesCount++;
-        }
-        else {
-            cleanCount++;
-        }
-    }
-    services.console.log('');
-    services.console.log(`Summary: ${chalk.green(`${cleanCount} up to date`)}, ${issuesCount > 0 ? chalk.red(`${issuesCount} with issues`) : chalk.green('0 with issues')}`);
+    // Phase 2: Clear Phase 1 lines and re-render with full status
+    logStatus('Workspace:', [{ name: workspaceName, path: workspacePath, repoCount, isActive: false, statuses: result.statuses }], loadingLines, (_, repoName) => workspaceConfig.baseBranches[repoName] || 'master', services.console);
 }
 export function registerStatusCommand(program) {
     program

package/package.json

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