worktree-flow 0.0.10 → 0.0.12

package/README.md

@@ -88,7 +88,7 @@ Remove workspaces interactively. Shows all workspaces with their status (similar
 
 ### `flow tmux resume`
 
-Create tmux sessions for all workspaces that don't already have one. Each session is created with split panes (one for the workspace root and one for each worktree) using a tiled layout. Skips workspaces that already have active sessions.
+Create tmux sessions for all workspaces that don't already have one. Each session is created with split panes (one for the workspace root and one for each worktree that matches a repo from source-path) using a tiled layout. Skips workspaces that already have active sessions.
 
 Requires `tmux` to be installed and the `tmux` config option to be enabled.
 

package/dist/lib/git.js

@@ -20,12 +20,20 @@ export class GitService {
         return output.length > 0;
     }
     async localRemoteBranchExists(repoPath, branch) {
+        // Check for local branch first
         try {
-            await this.exec(repoPath, ['rev-parse', '--verify', `origin/${branch}`]);
+            await this.exec(repoPath, ['rev-parse', '--verify', branch]);
             return true;
         }
         catch {
-            return false;
+            // Fall back to checking remote-tracking branch
+            try {
+                await this.exec(repoPath, ['rev-parse', '--verify', `origin/${branch}`]);
+                return true;
+            }
+            catch {
+                return false;
+            }
         }
     }
     async findFirstExistingBranch(repoPath, candidates) {

package/dist/lib/workspaceDirectory.js

@@ -44,7 +44,14 @@ export class WorkspaceDirectoryService {
     getWorktreeDirs(workspacePath) {
         const entries = this.fs.readdirSync(workspacePath, { withFileTypes: true });
         return entries
-            .filter((entry) => entry.isDirectory())
+            .filter((entry) => {
+            if (!entry.isDirectory()) {
+                return false;
+            }
+            // Only include directories that have a .git file or directory (git repos/worktrees)
+            const gitPath = path.join(workspacePath, entry.name, '.git');
+            return this.fs.existsSync(gitPath);
+        })
             .map((entry) => path.join(workspacePath, entry.name));
     }
     listWorkspaces(destPath) {

package/dist/usecases/resumeTmuxSessions.js

@@ -1,26 +1,50 @@
+import path from 'node:path';
 /**
  * Use case for resuming tmux sessions across all workspaces.
  * Creates sessions for workspaces that don't already have one.
+ * Only creates splits for directories that match repos from source-path.
  */
 export class ResumeTmuxSessionsUseCase {
     workspaceDir;
     tmux;
-    constructor(workspaceDir, tmux) {
+    repos;
+    config;
+    constructor(workspaceDir, tmux, repos, config) {
         this.workspaceDir = workspaceDir;
         this.tmux = tmux;
+        this.repos = repos;
+        this.config = config;
     }
     async execute(params) {
         // 1. List all workspaces
         const workspaces = this.workspaceDir.listWorkspaces(params.destPath);
+        // Early return if no workspaces
+        if (workspaces.length === 0) {
+            return {
+                totalWorkspaces: 0,
+                sessionsCreated: 0,
+                sessionsSkipped: 0,
+                errors: [],
+            };
+        }
+        // 2. Get valid repo names from source-path
+        const { sourcePath } = this.config.getRequired();
+        const repoPaths = this.repos.discoverRepos(sourcePath);
+        const validRepoNames = new Set(repoPaths.map(repoPath => path.basename(repoPath)));
         let sessionsCreated = 0;
         let sessionsSkipped = 0;
         const errors = [];
-        // 2. Try to create tmux session for each workspace
+        // 3. Try to create tmux session for each workspace
         for (const workspace of workspaces) {
             try {
-                const worktreeDirs = this.workspaceDir.getWorktreeDirs(workspace.path);
+                const allWorktreeDirs = this.workspaceDir.getWorktreeDirs(workspace.path);
+                // Filter to only include directories that match repo names from source-path
+                const filteredWorktreeDirs = allWorktreeDirs.filter(worktreeDir => {
+                    const dirName = path.basename(worktreeDir);
+                    return validRepoNames.has(dirName);
+                });
                 // Try to create session - will throw on duplicate session
-                await this.tmux.createSession(workspace.path, workspace.name, worktreeDirs);
+                await this.tmux.createSession(workspace.path, workspace.name, filteredWorktreeDirs);
                 sessionsCreated++;
             }
             catch (error) {

package/dist/usecases/usecases.js

@@ -27,6 +27,6 @@ export function createUseCases(services) {
         checkWorkspaceStatus: new CheckWorkspaceStatusUseCase(services.workspaceDir, services.workspaceConfig, services.status),
         discoverPrunableWorkspaces: new DiscoverPrunableWorkspacesUseCase(services.workspaceDir, services.workspaceConfig, services.status, services.git),
         listWorkspacesWithStatus: new ListWorkspacesWithStatusUseCase(services.workspaceDir, services.workspaceConfig, services.status),
-        resumeTmuxSessions: new ResumeTmuxSessionsUseCase(services.workspaceDir, services.tmux),
+        resumeTmuxSessions: new ResumeTmuxSessionsUseCase(services.workspaceDir, services.tmux, services.repos, services.config),
     };
 }

package/package.json

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