worktree-launcher 1.4.1 → 1.5.0

package/README.md

@@ -44,14 +44,15 @@ Run `wt` with no arguments to open a terminal UI:
 wt
 ```
 
-The TUI shows your repo name, current branch, and all existing worktrees. Use keyboard shortcuts to manage them:
+The TUI shows your repo name, current branch, and all existing worktrees.
 
 | Key | Action |
 |-----|--------|
-| `n` | Create new worktree (guided wizard) |
+| `n` | Create new worktree |
 | `d` | Delete selected worktree |
 | `c` | Launch Claude Code in selected worktree |
 | `x` | Launch Codex in selected worktree |
+| `p` | Push selected branch to remote |
 | `Enter` | Print cd command for selected worktree |
 | `r` | Refresh worktree list |
 | `q` | Quit |
@@ -60,13 +61,12 @@ Navigate with arrow keys or vim-style `j`/`k`.
 
 ### Creating a New Worktree
 
-Press `n` to start the guided creation wizard:
+Press `n` to create a new worktree:
 
-1. **Branch name** - Enter the name for your new branch
-2. **Base branch** - Create from current branch or default branch (main/master)
-3. **Copy .env files** - Copy environment files to the new worktree
-4. **Push to remote** - Push branch to GitHub immediately
-5. **Launch AI tool** - Choose Claude Code, Codex, or skip
+1. Enter the branch name
+2. Choose AI tool to launch (Claude Code, Codex, or Skip)
+
+The worktree is created from your current branch, .env files are copied automatically.
 
 ## Commands
 

package/dist/index.js

@@ -62,11 +62,13 @@ async function getDefaultBranch() {
     return "main";
   }
 }
-async function createWorktree(worktreePath, branchName) {
+async function createWorktree(worktreePath, branchName, startPoint) {
   validateBranchName(branchName);
   const exists = await branchExists(branchName);
   if (exists) {
     await execFileAsync("git", ["worktree", "add", "--", worktreePath, branchName]);
+  } else if (startPoint) {
+    await execFileAsync("git", ["worktree", "add", "-b", branchName, "--", worktreePath, startPoint]);
   } else {
     await execFileAsync("git", ["worktree", "add", "-b", branchName, "--", worktreePath]);
   }
@@ -111,8 +113,8 @@ async function pruneWorktrees() {
 }
 async function isBranchMerged(branchName) {
   try {
-    const defaultBranch2 = await getDefaultBranch();
-    const { stdout } = await execFileAsync("git", ["branch", "--merged", defaultBranch2]);
+    const defaultBranch = await getDefaultBranch();
+    const { stdout } = await execFileAsync("git", ["branch", "--merged", defaultBranch]);
     const mergedBranches = stdout.split("\n").map((b) => b.trim().replace("* ", ""));
     return mergedBranches.includes(branchName);
   } catch {
@@ -609,11 +611,8 @@ import path8 from "path";
 var screen;
 var worktreeList;
 var statusBar;
-var helpBar;
-var headerBox;
 var mainRepoPath;
 var currentBranch;
-var defaultBranch;
 var worktrees = [];
 var selectedIndex = 0;
 async function interactiveCommand() {
@@ -623,7 +622,6 @@ async function interactiveCommand() {
   }
   mainRepoPath = await getGitRoot();
   currentBranch = await getCurrentBranch();
-  defaultBranch = await getDefaultBranch();
   const repoName = path8.basename(mainRepoPath);
   screen = blessed.screen({
     smartCSR: true,
@@ -632,17 +630,14 @@ async function interactiveCommand() {
     terminal: "xterm-256color",
     warnings: false
   });
-  headerBox = blessed.box({
+  blessed.box({
     parent: screen,
     top: 0,
     left: 0,
     width: "100%",
     height: 1,
     content: ` ${repoName} (${currentBranch})`,
-    style: {
-      fg: "black",
-      bg: "cyan"
-    }
+    style: { fg: "black", bg: "cyan" }
   });
   worktreeList = blessed.list({
     parent: screen,
@@ -654,18 +649,10 @@ async function interactiveCommand() {
     vi: true,
     mouse: true,
     style: {
-      selected: {
-        bg: "cyan",
-        fg: "black"
-      },
-      item: {
-        fg: "default"
-      }
+      selected: { bg: "cyan", fg: "black" },
+      item: { fg: "default" }
     },
-    scrollbar: {
-      ch: " ",
-      style: { bg: "cyan" }
-    }
+    scrollbar: { ch: " ", style: { bg: "cyan" } }
   });
   statusBar = blessed.box({
     parent: screen,
@@ -674,52 +661,34 @@ async function interactiveCommand() {
     width: "100%",
     height: 1,
     content: "",
-    style: {
-      fg: "green"
-    }
+    style: { fg: "green" }
   });
-  helpBar = blessed.box({
+  blessed.box({
     parent: screen,
     bottom: 0,
     left: 0,
     width: "100%",
     height: 1,
-    content: " [n]ew  [d]elete  [c]laude  [x]codex  [Enter]cd  [q]uit",
-    style: {
-      fg: "black",
-      bg: "cyan"
-    }
+    content: " [n]ew  [d]elete  [c]laude  [x]codex  [p]ush  [Enter]cd  [q]uit",
+    style: { fg: "black", bg: "cyan" }
   });
   await refreshWorktrees();
   worktreeList.on("select", (_item, index) => {
     selectedIndex = index;
     showPath();
   });
-  screen.key(["q", "C-c"], () => {
-    cleanExit();
-  });
-  screen.key(["n"], () => {
-    startCreationWizard();
-  });
-  screen.key(["d"], async () => {
-    await deleteSelected();
-  });
-  screen.key(["c"], async () => {
-    await launchAI("claude");
-  });
-  screen.key(["x"], async () => {
-    await launchAI("codex");
-  });
+  screen.key(["q", "C-c"], () => exitScreen());
+  screen.key(["n"], () => showNewWorktreeForm());
+  screen.key(["d"], () => deleteSelected());
+  screen.key(["c"], () => launchTool("claude"));
+  screen.key(["x"], () => launchTool("codex"));
+  screen.key(["p"], () => pushSelected());
+  screen.key(["r"], () => refreshWorktrees());
   screen.key(["enter"], () => {
     const wt = worktrees[selectedIndex];
-    if (wt) {
-      cleanExit(`
+    if (wt) exitScreen(`
 cd "${wt.path}"
 `);
-    }
-  });
-  screen.key(["r"], async () => {
-    await refreshWorktrees();
   });
   worktreeList.focus();
   screen.render();
@@ -731,116 +700,92 @@ async function refreshWorktrees() {
     const isMain = wt.path === mainRepoPath;
     const dirName = path8.basename(wt.path);
     const branch = wt.branch || "(detached)";
-    const status = isMain ? "[main]" : "";
-    return ` ${dirName.padEnd(40)} ${branch.padEnd(25)} ${status}`;
+    const tag = isMain ? "[main]" : "";
+    return ` ${dirName.padEnd(40)} ${branch.padEnd(25)} ${tag}`;
   });
   worktreeList.setItems(items);
   worktreeList.select(selectedIndex);
   showPath();
-  screen.render();
 }
 function showPath() {
   const wt = worktrees[selectedIndex];
-  if (wt) {
-    setStatus(wt.path);
-  } else {
-    setStatus("");
-  }
+  setStatus(wt ? wt.path : "");
 }
 function setStatus(msg) {
   statusBar.setContent(` ${msg}`);
   screen.render();
 }
-function cleanExit(message) {
+function cleanupScreen() {
   screen.program.clear();
   screen.program.disableMouse();
   screen.program.showCursor();
   screen.program.normalBuffer();
   screen.destroy();
-  if (message) {
-    console.log(message);
-  }
-  process.exit(0);
 }
-function startCreationWizard() {
-  const state = {
-    branchName: "",
-    baseBranch: "current",
-    copyEnv: true,
-    pushToRemote: false,
-    aiTool: "claude"
-  };
-  askBranchName(state);
+function exitScreen(message) {
+  cleanupScreen();
+  if (message) console.log(message);
+  process.exit(0);
 }
-function askBranchName(state) {
+function showNewWorktreeForm() {
   const form = blessed.box({
     parent: screen,
     top: "center",
     left: "center",
     width: 60,
-    height: 12,
+    height: 10,
     border: { type: "line" },
-    style: {
-      fg: "default",
-      border: { fg: "cyan" }
-    },
+    style: { fg: "default", border: { fg: "cyan" } },
     label: " New Worktree "
   });
   blessed.text({
     parent: form,
     top: 1,
     left: 2,
-    content: `Repository: ${path8.basename(mainRepoPath)}`,
+    content: `Repository: ${path8.basename(mainRepoPath)} (from ${currentBranch})`,
     style: { fg: "cyan" }
   });
   blessed.text({
     parent: form,
-    top: 2,
-    left: 2,
-    content: `Current branch: ${currentBranch}`,
-    style: { fg: "default" }
-  });
-  blessed.text({
-    parent: form,
-    top: 4,
+    top: 3,
     left: 2,
     content: "Branch name:",
     style: { fg: "default" }
   });
   const input = blessed.textbox({
     parent: form,
-    top: 5,
+    top: 4,
     left: 2,
     width: 54,
     height: 1,
-    style: {
-      fg: "black",
-      bg: "white"
-    },
+    style: { fg: "black", bg: "white" },
     inputOnFocus: true
   });
   blessed.text({
     parent: form,
-    top: 7,
+    top: 6,
     left: 2,
     content: "[Enter] next  [Esc] cancel",
     style: { fg: "cyan" }
   });
   input.focus();
   screen.render();
-  input.on("submit", (value) => {
-    if (!value || !value.trim()) {
+  input.on("submit", () => {
+    const value = input.getValue()?.trim();
+    if (!value) {
       form.destroy();
       screen.render();
+      worktreeList.focus();
       return;
     }
     try {
-      validateBranchName(value.trim());
-      state.branchName = value.trim();
+      validateBranchName(value);
       form.destroy();
-      askBaseBranch(state);
+      screen.render();
+      showAIToolSelector(value);
     } catch (e) {
       setStatus(`Error: ${e.message}`);
+      input.clearValue();
       input.focus();
       screen.render();
     }
@@ -848,172 +793,19 @@ function askBranchName(state) {
   input.on("cancel", () => {
     form.destroy();
     screen.render();
+    worktreeList.focus();
   });
   input.readInput();
 }
-function askBaseBranch(state) {
-  const form = blessed.box({
-    parent: screen,
-    top: "center",
-    left: "center",
-    width: 50,
-    height: 10,
-    border: { type: "line" },
-    style: {
-      fg: "default",
-      border: { fg: "cyan" }
-    },
-    label: " Base Branch "
-  });
-  blessed.text({
-    parent: form,
-    top: 1,
-    left: 2,
-    content: "Create worktree from:",
-    style: { fg: "default" }
-  });
-  const list = blessed.list({
-    parent: form,
-    top: 3,
-    left: 2,
-    width: 44,
-    height: 3,
-    keys: true,
-    vi: true,
-    style: {
-      selected: { bg: "cyan", fg: "black" },
-      item: { fg: "default" }
-    },
-    items: [
-      ` Current branch (${currentBranch})`,
-      ` Default branch (${defaultBranch})`
-    ]
-  });
-  blessed.text({
-    parent: form,
-    top: 7,
-    left: 2,
-    content: "[Enter] select  [Esc] cancel",
-    style: { fg: "cyan" }
-  });
-  list.focus();
-  screen.render();
-  list.on("select", (_item, index) => {
-    state.baseBranch = index === 0 ? "current" : "default";
-    form.destroy();
-    askCopyEnv(state);
-  });
-  list.key(["escape"], () => {
-    form.destroy();
-    screen.render();
-  });
-}
-function askCopyEnv(state) {
-  const form = blessed.box({
-    parent: screen,
-    top: "center",
-    left: "center",
-    width: 40,
-    height: 8,
-    border: { type: "line" },
-    style: {
-      fg: "default",
-      border: { fg: "cyan" }
-    },
-    label: " Environment Files "
-  });
-  blessed.text({
-    parent: form,
-    top: 1,
-    left: 2,
-    content: "Copy .env files to worktree?",
-    style: { fg: "default" }
-  });
-  const list = blessed.list({
-    parent: form,
-    top: 3,
-    left: 2,
-    width: 34,
-    height: 2,
-    keys: true,
-    vi: true,
-    style: {
-      selected: { bg: "cyan", fg: "black" },
-      item: { fg: "default" }
-    },
-    items: [" Yes (recommended)", " No"]
-  });
-  list.focus();
-  screen.render();
-  list.on("select", (_item, index) => {
-    state.copyEnv = index === 0;
-    form.destroy();
-    askPushToRemote(state);
-  });
-  list.key(["escape"], () => {
-    form.destroy();
-    screen.render();
-  });
-}
-function askPushToRemote(state) {
-  const form = blessed.box({
-    parent: screen,
-    top: "center",
-    left: "center",
-    width: 45,
-    height: 8,
-    border: { type: "line" },
-    style: {
-      fg: "default",
-      border: { fg: "cyan" }
-    },
-    label: " Push to Remote "
-  });
-  blessed.text({
-    parent: form,
-    top: 1,
-    left: 2,
-    content: "Push branch to GitHub immediately?",
-    style: { fg: "default" }
-  });
-  const list = blessed.list({
-    parent: form,
-    top: 3,
-    left: 2,
-    width: 39,
-    height: 2,
-    keys: true,
-    vi: true,
-    style: {
-      selected: { bg: "cyan", fg: "black" },
-      item: { fg: "default" }
-    },
-    items: [" No (push later)", " Yes (visible on GitHub now)"]
-  });
-  list.focus();
-  screen.render();
-  list.on("select", (_item, index) => {
-    state.pushToRemote = index === 1;
-    form.destroy();
-    askAITool(state);
-  });
-  list.key(["escape"], () => {
-    form.destroy();
-    screen.render();
-  });
-}
-function askAITool(state) {
+function showAIToolSelector(branchName) {
   const form = blessed.box({
     parent: screen,
     top: "center",
     left: "center",
     width: 40,
-    height: 10,
+    height: 9,
     border: { type: "line" },
-    style: {
-      fg: "default",
-      border: { fg: "cyan" }
-    },
+    style: { fg: "default", border: { fg: "cyan" } },
     label: " Launch AI Tool "
   });
   blessed.text({
@@ -1035,60 +827,38 @@ function askAITool(state) {
       selected: { bg: "cyan", fg: "black" },
       item: { fg: "default" }
     },
-    items: [" Claude Code", " Codex", " Skip (just create worktree)"]
+    items: [" Claude Code", " Codex", " Skip"]
   });
   list.focus();
   screen.render();
   list.on("select", (_item, index) => {
-    state.aiTool = index === 0 ? "claude" : index === 1 ? "codex" : "skip";
+    const tool = index === 0 ? "claude" : index === 1 ? "codex" : null;
     form.destroy();
-    executeCreation(state);
+    screen.render();
+    createNewWorktree(branchName, tool);
   });
   list.key(["escape"], () => {
     form.destroy();
     screen.render();
+    worktreeList.focus();
   });
 }
-async function executeCreation(state) {
-  const { branchName, baseBranch, copyEnv, pushToRemote, aiTool } = state;
+async function createNewWorktree(branchName, tool) {
   setStatus(`Creating ${branchName}...`);
   try {
-    if (baseBranch === "default" && currentBranch !== defaultBranch) {
-      const worktreePath = getWorktreePath(mainRepoPath, branchName);
-      const { execFile: execFile2 } = await import("child_process");
-      const { promisify: promisify2 } = await import("util");
-      const execFileAsync2 = promisify2(execFile2);
-      await execFileAsync2("git", ["worktree", "add", "-b", branchName, "--", worktreePath, defaultBranch]);
-      if (copyEnv) {
-        await copyEnvFiles(mainRepoPath, worktreePath);
-      }
-      if (pushToRemote) {
-        setStatus(`Pushing ${branchName}...`);
-        await pushBranch(branchName, worktreePath);
-      }
-      await refreshWorktrees();
-      setStatus(`Created ${branchName}`);
-      if (aiTool !== "skip") {
-        await launchInWorktree(worktreePath, aiTool);
-      }
-    } else {
-      const worktreePath = getWorktreePath(mainRepoPath, branchName);
-      await createWorktree(worktreePath, branchName);
-      if (copyEnv) {
-        await copyEnvFiles(mainRepoPath, worktreePath);
-      }
-      if (pushToRemote) {
-        setStatus(`Pushing ${branchName}...`);
-        await pushBranch(branchName, worktreePath);
-      }
-      await refreshWorktrees();
-      setStatus(`Created ${branchName}`);
-      if (aiTool !== "skip") {
-        await launchInWorktree(worktreePath, aiTool);
-      }
+    const worktreePath = getWorktreePath(mainRepoPath, branchName);
+    await createWorktree(worktreePath, branchName);
+    await copyEnvFiles(mainRepoPath, worktreePath);
+    await refreshWorktrees();
+    setStatus(`Created ${branchName}`);
+    worktreeList.focus();
+    if (tool) {
+      await launchInWorktree(worktreePath, tool);
     }
   } catch (e) {
     setStatus(`Error: ${e.message}`);
+    worktreeList.focus();
+    screen.render();
   }
 }
 async function launchInWorktree(worktreePath, tool) {
@@ -1097,18 +867,42 @@ async function launchInWorktree(worktreePath, tool) {
     setStatus(`${tool} is not installed`);
     return;
   }
-  setStatus(`Launching ${tool}...`);
-  screen.program.clear();
-  screen.program.disableMouse();
-  screen.program.showCursor();
-  screen.program.normalBuffer();
-  screen.destroy();
+  cleanupScreen();
   launchAITool({ cwd: worktreePath, tool });
   console.log(`
 ${tool} launched in: ${worktreePath}
 `);
   process.exit(0);
 }
+async function launchTool(tool) {
+  const wt = worktrees[selectedIndex];
+  if (!wt) return;
+  const available = await isToolAvailable(tool);
+  if (!available) {
+    setStatus(`${tool} is not installed`);
+    return;
+  }
+  cleanupScreen();
+  launchAITool({ cwd: wt.path, tool });
+  console.log(`
+${tool} launched in: ${path8.basename(wt.path)}
+`);
+  process.exit(0);
+}
+async function pushSelected() {
+  const wt = worktrees[selectedIndex];
+  if (!wt?.branch) {
+    setStatus("No branch to push");
+    return;
+  }
+  setStatus(`Pushing ${wt.branch}...`);
+  try {
+    await pushBranch(wt.branch, wt.path);
+    setStatus(`Pushed ${wt.branch} to origin`);
+  } catch (e) {
+    setStatus(`Error: ${e.message}`);
+  }
+}
 async function deleteSelected() {
   const wt = worktrees[selectedIndex];
   if (!wt) return;
@@ -1117,20 +911,17 @@ async function deleteSelected() {
     return;
   }
   const dirName = path8.basename(wt.path);
-  const confirm2 = blessed.question({
+  const dialog = blessed.question({
     parent: screen,
     top: "center",
     left: "center",
     width: 40,
     height: 5,
     border: { type: "line" },
-    style: {
-      fg: "default",
-      border: { fg: "red" }
-    }
+    style: { fg: "default", border: { fg: "red" } }
   });
-  confirm2.ask(`Delete ${dirName}?`, async (err, yes) => {
-    confirm2.destroy();
+  dialog.ask(`Delete ${dirName}?`, async (_err, yes) => {
+    dialog.destroy();
     if (yes) {
       setStatus(`Deleting ${dirName}...`);
       try {
@@ -1147,34 +938,15 @@ async function deleteSelected() {
       if (selectedIndex > 0) selectedIndex--;
       await refreshWorktrees();
     } else {
-      await refreshWorktrees();
+      screen.render();
+      worktreeList.focus();
     }
   });
 }
-async function launchAI(tool) {
-  const wt = worktrees[selectedIndex];
-  if (!wt) return;
-  const available = await isToolAvailable(tool);
-  if (!available) {
-    setStatus(`${tool} is not installed`);
-    return;
-  }
-  setStatus(`Launching ${tool}...`);
-  screen.program.clear();
-  screen.program.disableMouse();
-  screen.program.showCursor();
-  screen.program.normalBuffer();
-  screen.destroy();
-  launchAITool({ cwd: wt.path, tool });
-  console.log(`
-${tool} launched in: ${path8.basename(wt.path)}
-`);
-  process.exit(0);
-}
 
 // src/index.ts
 var program = new Command();
-program.name("wt").description("CLI tool to streamline git worktrees with AI coding assistants").version("1.4.1").action(async () => {
+program.name("wt").description("CLI tool to streamline git worktrees with AI coding assistants").version("1.5.0").action(async () => {
   await interactiveCommand();
 });
 program.command("new <branch-name>").description("Create a new worktree and launch AI assistant").option("-i, --install", "Run package manager install after creating worktree").option("-s, --skip-launch", "Create worktree without launching AI assistant").option("-p, --push", "Push branch to remote (visible on GitHub)").action(async (branchName, options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worktree-launcher",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "CLI tool for managing git worktrees with AI coding assistants",
   "type": "module",
   "main": "./dist/index.js",