@ogpoyraz/wtx 0.8.2 → 0.8.3

package/dist/cli.mjs

@@ -27971,7 +27971,7 @@ function App({ opts }) {
           `Branch will be renamed and the checkout moved to:`,
           getWorktreePathFor(modal.row.repoName, modal.to),
           "",
-          "The old directory will be removed.",
+          "Uncommitted changes and synced files move with it.",
           "Proceed?"
         ].join(`
 `)
@@ -31982,6 +31982,27 @@ async function getUpstream(wtPath) {
     return null;
   }
 }
+async function getDirtyEntries(wtPath) {
+  try {
+    const out = await gitExec(["-C", wtPath, "status", "--porcelain"], {});
+    return out.split(`
+`).map((line) => line.trimEnd()).filter((line) => line.length > 0);
+  } catch {
+    return [];
+  }
+}
+function touchesEntry(porcelainLine, entry) {
+  const entryPath = porcelainLine.slice(3);
+  return entryPath === entry || entryPath.startsWith(`${entry}/`);
+}
+async function isTrackedInWorktree(wtPath, entry) {
+  try {
+    await gitExec(["-C", wtPath, "ls-files", "--error-unmatch", "--", entry], {});
+    return true;
+  } catch {
+    return false;
+  }
+}
 async function planRename(repo, oldBranch, newBranch, opts) {
   const list = await getWorktreeList(repo.mainPath);
   const candidatePath = getWorktreePath(repo, oldBranch);
@@ -32005,6 +32026,7 @@ async function renameWorktree(params) {
   const { repo, oldBranch, newBranch, opts } = params;
   const planned = await planRename(repo, oldBranch, newBranch, opts);
   const cleanedDirs = [];
+  const dirtyBefore = await getDirtyEntries(planned.worktreePath);
   if (opts.dryRun) {
     return {
       oldBranch,
@@ -32012,7 +32034,11 @@ async function renameWorktree(params) {
       oldPath: planned.worktreePath,
       newPath: planned.newPath,
       upstream: planned.upstream,
-      cleanedDirs
+      cleanedDirs,
+      dirtyFiles: dirtyBefore,
+      lostDirtyFiles: [],
+      resyncedFiles: [],
+      keptLocalSyncFiles: []
     };
   }
   await gitExec(["-C", planned.worktreePath, "branch", "-m", oldBranch, newBranch], opts);
@@ -32030,13 +32056,40 @@ async function renameWorktree(params) {
   for (const dir of cleanupEmptyParents(repo.wtRoot, repo.mainPath, planned.worktreePath)) {
     cleanedDirs.push(dir);
   }
+  const dirtyAfter = await getDirtyEntries(planned.newPath);
+  const lostDirtyFiles = dirtyBefore.filter((line) => !dirtyAfter.includes(line));
+  const resyncedFiles = [];
+  const keptLocalSyncFiles = [];
+  for (const entry of repo.config.sync_files ?? []) {
+    if (!fs28.existsSync(path33.join(repo.mainPath, entry)))
+      continue;
+    const destPath = path33.join(planned.newPath, entry);
+    if (!fs28.existsSync(destPath)) {
+      if (syncEntry(repo.mainPath, planned.newPath, entry)) {
+        resyncedFiles.push(entry);
+      }
+      continue;
+    }
+    const tracked = await isTrackedInWorktree(planned.newPath, entry);
+    if (tracked && !dirtyAfter.some((line) => touchesEntry(line, entry))) {
+      if (syncEntry(repo.mainPath, planned.newPath, entry)) {
+        resyncedFiles.push(entry);
+      }
+      continue;
+    }
+    keptLocalSyncFiles.push(entry);
+  }
   return {
     oldBranch,
     newBranch,
     oldPath: planned.worktreePath,
     newPath: planned.newPath,
     upstream: planned.upstream,
-    cleanedDirs
+    cleanedDirs,
+    dirtyFiles: dirtyAfter,
+    lostDirtyFiles,
+    resyncedFiles,
+    keptLocalSyncFiles
   };
 }
 
@@ -32082,6 +32135,18 @@ function registerRenameCommand(program2) {
         stepSuccess("Cleaned up empty directory", path34.relative(repo.wtRoot, dir) + "/");
       }
       stepSuccess("Renamed", `${outcome.oldPath} → ${outcome.newPath}`);
+      if (outcome.dirtyFiles.length > 0) {
+        stepSuccess("Carried uncommitted files", `${outcome.dirtyFiles.length} entr${outcome.dirtyFiles.length === 1 ? "y" : "ies"} moved with the checkout`);
+      }
+      if (outcome.lostDirtyFiles.length > 0) {
+        stepError("Uncommitted changes missing after rename", outcome.lostDirtyFiles.join(", "));
+      }
+      if (outcome.resyncedFiles.length > 0) {
+        stepSuccess("Synced files", outcome.resyncedFiles.join(", "));
+      }
+      for (const entry of outcome.keptLocalSyncFiles) {
+        indented(`Kept local version of ${entry} — it has uncommitted edits`);
+      }
       if (outcome.upstream) {
         indented(`Upstream still tracks '${outcome.upstream}' — after pushing run: git push -u origin ${newBranch}`);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ogpoyraz/wtx",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "description": "Multi-repo git worktree manager",
   "type": "module",
   "bin": {