From 4672f0fcaa4cb5d9f6f4c031ecd305c25e692607 Mon Sep 17 00:00:00 2001
From: dal <dallin@buster.so>
Date: Fri, 25 Jul 2025 19:38:21 -0600
Subject: [PATCH] Enhance move-env-to-worktree script to respect gitignore for
 non-.env files and always include .env files (excluding .env.example). This
 improves file handling during environment setup in worktrees.

---
 scripts/move-env-to-worktree.ts | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/scripts/move-env-to-worktree.ts b/scripts/move-env-to-worktree.ts
index f73fee82f..ba8780779 100755
--- a/scripts/move-env-to-worktree.ts
+++ b/scripts/move-env-to-worktree.ts
@@ -95,17 +95,22 @@ async function findEnvFiles(dir: string, baseDir: string = dir): Promise<string[
         const fullPath = join(currentDir, entry.name);
         const relativePath = relative(baseDir, fullPath);
         
-        // Check if this path is ignored
-        if (isIgnored(fullPath, gitignoreStack)) {
-          continue;
-        }
-        
         if (entry.isDirectory()) {
           // Always skip .git directory
           if (entry.name === '.git') continue;
+          // Check if directory is ignored
+          if (isIgnored(fullPath, gitignoreStack)) {
+            continue;
+          }
           await walkDir(fullPath, gitignoreStack);
-        } else if (entry.name.startsWith('.env')) {
+        } else if (entry.name.startsWith('.env') && !entry.name.endsWith('.example')) {
+          // Always include .env files (but not .env.example), regardless of gitignore rules
           envFiles.push(relativePath);
+        } else {
+          // For non-.env files, check if they're ignored
+          if (isIgnored(fullPath, gitignoreStack)) {
+            continue;
+          }
         }
       }
     } catch (error) {