@ogpoyraz/wtx 0.8.1 → 0.8.3

package/README.md

@@ -169,7 +169,7 @@ Config lives at `~/.config/wtx/config.json`.
 | `agents.<name>.command` | – | Shell command template for `--agent`; `{wt}`, `{branch}`, `{repo}` expanded |
 | `repos.<name>.main_branch` | `"auto"` | Auto-detects via `git symbolic-ref` |
 | `repos.<name>.fetch_main_on_create` | `true` | Fetch before creating so branches start fresh |
-| `repos.<name>.sync_files` | `[]` | Files copied from main checkout on create and sync |
+| `repos.<name>.sync_files` | `[]` | Files or folders copied from main checkout on create and sync — directories are copied recursively (`build/`) |
 | `repos.<name>.post_create` / `post_sync` | `[]` | Hook commands; failures fail the command with a rerun hint |
 | `repos.<name>.install_script` | `null` | Command run inside a worktree (or the main checkout via `wtx deps --install`) for dependency installs (`{wt}`, `{branch}`, `{main}` expanded); when unset, the detected package manager performs a real install |
 | `repos.<name>.deps.manager` | `"auto"` | Force a manager: `npm` `bun` `pnpm` `yarn` `go` `python` `cargo` |

package/dist/cli.mjs

@@ -26388,7 +26388,8 @@ var init_HelpOverlay = __esm(() => {
     ["e", "View data warnings (when count > 0)"],
     ["r", "Refresh data"],
     ["H", "Action history"],
-    ["cmd+c / ctrl+shift+c", "Copy selected text to clipboard"],
+    ["mouse drag", "Select text — copied to clipboard automatically"],
+    ["ctrl+shift+c", "Copy selection again (terminals reserve cmd+c)"],
     ["click PR #/URL", "Open pull request in browser"],
     ["?", "Toggle help"],
     ["q/esc", "Quit"]
@@ -26738,8 +26739,8 @@ var init_HistoryOverlay = __esm(() => {
 // src/tui/components/InputModal.tsx
 import { useState as useState3 } from "react";
 import { jsx as jsx9, jsxs as jsxs8 } from "@opentui/react/jsx-runtime";
-function InputModal({ title, placeholder, errorMessage, onSubmit }) {
-  const [value, setValue] = useState3("");
+function InputModal({ title, placeholder, initialValue, errorMessage, onSubmit }) {
+  const [value, setValue] = useState3(initialValue ?? "");
   return /* @__PURE__ */ jsx9(Overlay, {
     title,
     borderColor: tokens.accent,
@@ -26748,6 +26749,7 @@ function InputModal({ title, placeholder, errorMessage, onSubmit }) {
       children: [
         /* @__PURE__ */ jsx9("input", {
           focused: true,
+          value: initialValue ?? "",
           placeholder,
           onInput: (val) => setValue(val),
           onSubmit: () => onSubmit(value)
@@ -27195,7 +27197,8 @@ function ConfigOverlay({ onClose, onSaved, onError }) {
       }),
       editState.type === "input" && /* @__PURE__ */ jsx11(InputModal, {
         title: editState.title,
-        placeholder: editState.currentValue || "Enter value...",
+        initialValue: editState.currentValue,
+        placeholder: "Enter value...",
         errorMessage: editState.error,
         onSubmit: handleInputSubmit
       }),
@@ -27275,7 +27278,7 @@ var init_useSpinnerFrame = __esm(() => {
 
 // src/tui/components/App.tsx
 import { useState as useState7, useEffect as useEffect6, useMemo, useRef as useRef4, useCallback as useCallback3 } from "react";
-import { useKeyboard as useKeyboard3, useRenderer } from "@opentui/react";
+import { useKeyboard as useKeyboard3, useRenderer, useSelectionHandler } from "@opentui/react";
 import { jsx as jsx13, jsxs as jsxs12 } from "@opentui/react/jsx-runtime";
 function getWorktreePathFor(repoName, branch) {
   try {
@@ -27330,6 +27333,16 @@ function App({ opts }) {
     setActionMessage(message);
     messageTimer.current = setTimeout(() => setActionMessage(undefined), ms);
   }, []);
+  const copySelectedText = useCallback3((warnOnEmpty) => {
+    const text = renderer.getSelection()?.getSelectedText() ?? "";
+    if (!text) {
+      if (warnOnEmpty)
+        flash("Nothing selected to copy");
+      return;
+    }
+    copyTextToClipboard(renderer, text).then((ok) => flash(ok ? `Copied ${text.length} character${text.length !== 1 ? "s" : ""}` : "Copy failed"));
+  }, [renderer, flash]);
+  useSelectionHandler(() => copySelectedText(false));
   const busyRepos = useMemo(() => new Set(ops.flatMap((o2) => o2.repoNames)), [ops]);
   const busyRowPaths = useMemo(() => new Set(ops.map((o2) => o2.rowPath).filter((p) => p !== undefined)), [ops]);
   const anyRunning = ops.some((o2) => o2.status === "running");
@@ -27564,12 +27577,7 @@ function App({ opts }) {
       }
     }
     if ((key.super || key.meta || key.ctrl && key.shift) && key.name === "c") {
-      const text = renderer.getSelection()?.getSelectedText() ?? "";
-      if (!text) {
-        flash("Nothing selected to copy");
-        return;
-      }
-      copyTextToClipboard(renderer, text).then((ok) => flash(ok ? `Copied ${text.length} character${text.length !== 1 ? "s" : ""}` : "Copy failed"));
+      copySelectedText(true);
       return;
     }
     if (key.name === "q" || key.name === "escape" || key.name === "c" && key.ctrl) {
@@ -27932,7 +27940,8 @@ function App({ opts }) {
       }),
       renameModal && selectedRow && /* @__PURE__ */ jsx13(InputModal, {
         title: `Rename branch ${selectedRow.branch}`,
-        placeholder: `New branch name (${selectedRow.branch})`,
+        initialValue: selectedRow.branch,
+        placeholder: "New branch name",
         errorMessage: renameError,
         onSubmit: (value) => {
           const target = selectedRow;
@@ -27962,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(`
 `)
@@ -30315,20 +30324,29 @@ async function getWorktreePort(repoName, branch, config2, currentWtPath) {
 }
 
 // src/lib/worktree-setup.ts
+function syncEntry(mainPath, wtPath, entry) {
+  const src = path17.join(mainPath, entry);
+  const dest = path17.join(wtPath, entry);
+  if (!fs10.existsSync(src))
+    return false;
+  fs10.mkdirSync(path17.dirname(dest), { recursive: true });
+  if (fs10.statSync(src).isDirectory()) {
+    fs10.cpSync(src, dest, { recursive: true });
+  } else {
+    fs10.copyFileSync(src, dest);
+  }
+  return true;
+}
 async function runPostCreateSetup(params) {
   const { config: config2, repo, wtPath, branch, globalOpts } = params;
   let copiedFiles = [];
   let hooks = [];
   if (repo.config.sync_files && repo.config.sync_files.length > 0) {
     for (const file2 of repo.config.sync_files) {
-      const src = path17.join(repo.mainPath, file2);
-      const dest = path17.join(wtPath, file2);
-      if (fs10.existsSync(src)) {
-        if (!globalOpts.dryRun) {
-          fs10.mkdirSync(path17.dirname(dest), { recursive: true });
-          fs10.copyFileSync(src, dest);
-          copiedFiles.push(file2);
-        }
+      if (!globalOpts.dryRun && syncEntry(repo.mainPath, wtPath, file2)) {
+        copiedFiles.push(file2);
+      }
+      if (fs10.existsSync(path17.join(repo.mainPath, file2))) {
         stepSuccess(`Synced ${file2}`);
       } else {
         stepWarning(`Could not sync ${file2}`, "file not found in main checkout");
@@ -31709,12 +31727,9 @@ function registerSyncCommand(program2) {
       try {
         if (repo.config.sync_files) {
           for (const file2 of repo.config.sync_files) {
-            const src = path32.join(repo.mainPath, file2);
-            const dest = path32.join(wtPath, file2);
-            if (fs25.existsSync(src)) {
+            if (fs25.existsSync(path32.join(repo.mainPath, file2))) {
               if (!opts.dryRun) {
-                fs25.mkdirSync(path32.dirname(dest), { recursive: true });
-                fs25.copyFileSync(src, dest);
+                syncEntry(repo.mainPath, wtPath, file2);
               }
               stepSuccess(`Synced ${file2}`);
             }
@@ -31967,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);
@@ -31990,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,
@@ -31997,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);
@@ -32015,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
   };
 }
 
@@ -32067,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.1",
+  "version": "0.8.3",
   "description": "Multi-repo git worktree manager",
   "type": "module",
   "bin": {