worktree-flow 0.0.13 → 0.0.14

package/dist/commands/list.js

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { createServices } from '../lib/services.js';
 import { createUseCases } from '../usecases/usecases.js';
-import { getStatusIndicator } from './helpers.js';
+import { StatusService } from '../lib/status.js';
 export async function runList(useCases, services) {
     const { destPath, sourcePath } = services.config.getRequired();
     const config = services.config.load();
@@ -45,10 +45,25 @@ export async function runList(useCases, services) {
     // Re-print with full status information
     services.console.log(chalk.bold('\nWorkspaces:'));
     for (const workspace of result.workspaces) {
-        const statusIndicator = getStatusIndicator(workspace);
         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} ${statusIndicator}`);
+        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);
+            const statusMessage = StatusService.getStatusMessage(status, baseBranch);
+            const hasIssues = StatusService.hasIssues(status);
+            const indicator = hasIssues ? chalk.red('✗') : chalk.green('✓');
+            const message = hasIssues ? chalk.red(statusMessage) : chalk.green(statusMessage);
+            const trackingInfo = status.upstreamBranch
+                ? chalk.dim(` → ${status.upstreamBranch}`)
+                : chalk.dim(' (no upstream)');
+            services.console.log(`    ${indicator} ${chalk.yellow(repoName)}: ${message}${trackingInfo}`);
+        }
+        services.console.log(''); // Blank line between workspaces
     }
 }
 export function registerListCommand(program) {

package/dist/lib/git.js

@@ -45,7 +45,7 @@ export class GitService {
         return null;
     }
     async addWorktreeNewBranch(repoPath, worktreePath, branch, sourceBranch) {
-        const args = ['worktree', 'add', '-b', branch, worktreePath];
+        const args = ['worktree', 'add', '--no-track', '-b', branch, worktreePath];
         if (sourceBranch) {
             args.push(sourceBranch);
         }
@@ -67,6 +67,15 @@ export class GitService {
         const output = await this.exec(worktreePath, ['rev-parse', '--abbrev-ref', 'HEAD']);
         return output.trim();
     }
+    async getUpstreamBranch(worktreePath) {
+        try {
+            const output = await this.exec(worktreePath, ['rev-parse', '--abbrev-ref', '@{u}']);
+            return output.trim();
+        }
+        catch {
+            return null;
+        }
+    }
     async hasUncommittedChanges(repoPath) {
         const output = await this.exec(repoPath, ['status', '--porcelain']);
         return output.length > 0;

package/dist/lib/status.js

@@ -8,17 +8,20 @@ export class StatusService {
     }
     async getWorktreeStatus(worktreePath, baseBranch) {
         try {
+            // Get branch information
+            const currentBranch = await this.git.getCurrentBranch(worktreePath);
+            const upstreamBranch = await this.git.getUpstreamBranch(worktreePath);
             // Check for uncommitted changes first
             const hasUncommitted = await this.git.hasUncommittedChanges(worktreePath);
             if (hasUncommitted) {
-                return { type: 'uncommitted' };
+                return { type: 'uncommitted', currentBranch, upstreamBranch };
             }
             // Compare against base branch using git cherry (handles squash merges)
             const isAhead = await this.git.isAheadOfMain(worktreePath, baseBranch);
             if (isAhead) {
-                return { type: 'ahead', comparedTo: 'main' };
+                return { type: 'ahead', comparedTo: 'main', currentBranch, upstreamBranch };
             }
-            return { type: 'clean', comparedTo: 'main' };
+            return { type: 'clean', comparedTo: 'main', currentBranch, upstreamBranch };
         }
         catch (err) {
             return {

package/package.json

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