fix: Make session creation faster

Didn't benchmark but it's noticeably faster.

Author: mufeez-amjad

main.go

@@ -18,7 +18,7 @@ import (
 )
 
 var (
-	version     = "1.0.11"
+	version     = "1.0.12"
 	programFlag string
 	autoYesFlag bool
 	daemonFlag  bool

session/git/worktree_ops.go

@@ -14,29 +14,52 @@ import (
 
 // Setup creates a new worktree for the session
 func (g *GitWorktree) Setup() error {
-	// Check if branch exists first
-	repo, err := git.PlainOpen(g.repoPath)
+	// Ensure worktrees directory exists early (can be done in parallel with branch check)
+	worktreesDir, err := getWorktreeDirectory()
 	if err != nil {
-		return fmt.Errorf("failed to open repository: %w", err)
+		return fmt.Errorf("failed to get worktree directory: %w", err)
 	}
 
-	branchRef := plumbing.NewBranchReferenceName(g.branchName)
-	if _, err := repo.Reference(branchRef, false); err == nil {
-		// Branch exists, use SetupFromExistingBranch
-		return g.SetupFromExistingBranch()
+	// Create directory and check branch existence in parallel
+	errChan := make(chan error, 2)
+	var branchExists bool
+
+	// Goroutine for directory creation
+	go func() {
+		errChan <- os.MkdirAll(worktreesDir, 0755)
+	}()
+
+	// Goroutine for branch check
+	go func() {
+		repo, err := git.PlainOpen(g.repoPath)
+		if err != nil {
+			errChan <- fmt.Errorf("failed to open repository: %w", err)
+			return
+		}
+
+		branchRef := plumbing.NewBranchReferenceName(g.branchName)
+		if _, err := repo.Reference(branchRef, false); err == nil {
+			branchExists = true
+		}
+		errChan <- nil
+	}()
+
+	// Wait for both operations
+	for i := 0; i < 2; i++ {
+		if err := <-errChan; err != nil {
+			return err
+		}
 	}
 
-	// Branch doesn't exist, create new worktree from HEAD
-	return g.SetupNewWorktree()
+	if branchExists {
+		return g.setupFromExistingBranch()
+	}
+	return g.setupNewWorktree()
 }
 
-// SetupFromExistingBranch creates a worktree from an existing branch
-func (g *GitWorktree) SetupFromExistingBranch() error {
-	// Ensure worktrees directory exists
-	worktreesDir := filepath.Join(g.repoPath, "worktrees")
-	if err := os.MkdirAll(worktreesDir, 0755); err != nil {
-		return fmt.Errorf("failed to create worktrees directory: %w", err)
-	}
+// setupFromExistingBranch creates a worktree from an existing branch
+func (g *GitWorktree) setupFromExistingBranch() error {
+	// Directory already created in Setup(), skip duplicate creation
 
 	// Clean up any existing worktree first
 	_, _ = g.runGitCommand(g.repoPath, "worktree", "remove", "-f", g.worktreePath) // Ignore error if worktree doesn't exist
@@ -49,8 +72,8 @@ func (g *GitWorktree) SetupFromExistingBranch() error {
 	return nil
 }
 
-// SetupNewWorktree creates a new worktree from HEAD
-func (g *GitWorktree) SetupNewWorktree() error {
+// setupNewWorktree creates a new worktree from HEAD
+func (g *GitWorktree) setupNewWorktree() error {
 	// Ensure worktrees directory exists
 	worktreesDir := filepath.Join(g.repoPath, "worktrees")
 	if err := os.MkdirAll(worktreesDir, 0755); err != nil {

session/tmux/tmux.go

@@ -109,19 +109,22 @@ func (t *TmuxSession) Start(workDir string) error {
 		return fmt.Errorf("error starting tmux session: %w", err)
 	}
 
-	// We need to close the ptmx, but we shouldn't close it before the command above finishes.
-	// So, we poll for completion before closing.
+	// Poll for session existence with exponential backoff
 	timeout := time.After(2 * time.Second)
+	sleepDuration := 5 * time.Millisecond
 	for !t.DoesSessionExist() {
 		select {
 		case <-timeout:
-			// Cleanup on window size update failure
 			if cleanupErr := t.Close(); cleanupErr != nil {
 				err = fmt.Errorf("%v (cleanup error: %v)", err, cleanupErr)
 			}
 			return fmt.Errorf("timed out waiting for tmux session %s: %v", t.sanitizedName, err)
 		default:
-			time.Sleep(time.Millisecond * 10)
+			time.Sleep(sleepDuration)
+			// Exponential backoff up to 50ms max
+			if sleepDuration < 50*time.Millisecond {
+				sleepDuration *= 2
+			}
 		}
 	}
 	ptmx.Close()