worktree-launcher 1.3.0 → 1.4.0

package/README.md

@@ -38,26 +38,35 @@ Requires Node.js 18+ and git.
 
 ## Interactive Mode (TUI)
 
-Run `wt` with no arguments to open a terminal UI similar to lazygit:
+Run `wt` with no arguments to open a terminal UI:
 
 ```bash
 wt
 ```
 
-The TUI displays all worktrees in a navigable list with keyboard shortcuts:
+The TUI shows your repo name, current branch, and all existing worktrees. Use keyboard shortcuts to manage them:
 
 | Key | Action |
 |-----|--------|
-| `n` | Create new worktree |
+| `n` | Create new worktree (guided wizard) |
 | `d` | Delete selected worktree |
 | `c` | Launch Claude Code in selected worktree |
 | `x` | Launch Codex in selected worktree |
-| `p` | Push branch to remote |
 | `Enter` | Print cd command for selected worktree |
 | `r` | Refresh worktree list |
 | `q` | Quit |
 
-Navigate with arrow keys or vim-style `j`/`k`. The status bar shows the full path of the selected worktree.
+Navigate with arrow keys or vim-style `j`/`k`.
+
+### Creating a New Worktree
+
+Press `n` to start the guided creation wizard:
+
+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
 
 ## Commands
 

package/dist/index.js

@@ -44,6 +44,14 @@ async function remoteBranchExists(branchName) {
     return false;
   }
 }
+async function getCurrentBranch() {
+  try {
+    const { stdout } = await execFileAsync("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
+    return stdout.trim();
+  } catch {
+    return "HEAD";
+  }
+}
 async function getDefaultBranch() {
   try {
     const { stdout } = await execFileAsync("git", ["symbolic-ref", "refs/remotes/origin/HEAD"]);
@@ -103,8 +111,8 @@ async function pruneWorktrees() {
 }
 async function isBranchMerged(branchName) {
   try {
-    const defaultBranch = await getDefaultBranch();
-    const { stdout } = await execFileAsync("git", ["branch", "--merged", defaultBranch]);
+    const defaultBranch2 = await getDefaultBranch();
+    const { stdout } = await execFileAsync("git", ["branch", "--merged", defaultBranch2]);
     const mergedBranches = stdout.split("\n").map((b) => b.trim().replace("* ", ""));
     return mergedBranches.includes(branchName);
   } catch {
@@ -602,7 +610,10 @@ var screen;
 var worktreeList;
 var statusBar;
 var helpBar;
+var headerBox;
 var mainRepoPath;
+var currentBranch;
+var defaultBranch;
 var worktrees = [];
 var selectedIndex = 0;
 async function interactiveCommand() {
@@ -611,18 +622,20 @@ async function interactiveCommand() {
     process.exit(1);
   }
   mainRepoPath = await getGitRoot();
+  currentBranch = await getCurrentBranch();
+  defaultBranch = await getDefaultBranch();
   const repoName = path8.basename(mainRepoPath);
   screen = blessed.screen({
     smartCSR: true,
     title: `wt - ${repoName}`
   });
-  blessed.box({
+  headerBox = blessed.box({
     parent: screen,
     top: 0,
     left: 0,
     width: "100%",
     height: 1,
-    content: ` Worktrees: ${repoName}`,
+    content: ` ${repoName} (${currentBranch})`,
     style: {
       fg: "white",
       bg: "blue",
@@ -670,7 +683,7 @@ async function interactiveCommand() {
     left: 0,
     width: "100%",
     height: 1,
-    content: " [n]ew  [d]elete  [c]laude  [x]codex  [p]ush  [Enter]cd  [q]uit",
+    content: " [n]ew  [d]elete  [c]laude  [x]codex  [Enter]cd  [q]uit",
     style: {
       fg: "black",
       bg: "white"
@@ -685,8 +698,8 @@ async function interactiveCommand() {
     screen.destroy();
     process.exit(0);
   });
-  screen.key(["n"], async () => {
-    await createNewWorktree();
+  screen.key(["n"], () => {
+    startCreationWizard();
   });
   screen.key(["d"], async () => {
     await deleteSelected();
@@ -697,9 +710,6 @@ async function interactiveCommand() {
   screen.key(["x"], async () => {
     await launchAI("codex");
   });
-  screen.key(["p"], async () => {
-    await pushSelected();
-  });
   screen.key(["enter"], () => {
     const wt = worktrees[selectedIndex];
     if (wt) {
@@ -743,54 +753,354 @@ function setStatus(msg) {
   statusBar.setContent(` ${msg}`);
   screen.render();
 }
-async function createNewWorktree() {
-  const input = blessed.textbox({
+function startCreationWizard() {
+  const state = {
+    branchName: "",
+    baseBranch: "current",
+    copyEnv: true,
+    pushToRemote: false,
+    aiTool: "claude"
+  };
+  askBranchName(state);
+}
+function askBranchName(state) {
+  const form = blessed.box({
     parent: screen,
     top: "center",
     left: "center",
-    width: 50,
-    height: 3,
+    width: 60,
+    height: 12,
     border: { type: "line" },
     style: {
       fg: "white",
       bg: "black",
       border: { fg: "blue" }
     },
-    label: " Branch name ",
+    label: " New Worktree "
+  });
+  blessed.text({
+    parent: form,
+    top: 1,
+    left: 2,
+    content: `Repository: ${path8.basename(mainRepoPath)}`,
+    style: { fg: "cyan" }
+  });
+  blessed.text({
+    parent: form,
+    top: 2,
+    left: 2,
+    content: `Current branch: ${currentBranch}`,
+    style: { fg: "grey" }
+  });
+  blessed.text({
+    parent: form,
+    top: 4,
+    left: 2,
+    content: "Branch name:",
+    style: { fg: "white" }
+  });
+  const input = blessed.textbox({
+    parent: form,
+    top: 5,
+    left: 2,
+    width: 54,
+    height: 1,
+    style: {
+      fg: "white",
+      bg: "grey"
+    },
     inputOnFocus: true
   });
+  blessed.text({
+    parent: form,
+    top: 7,
+    left: 2,
+    content: "[Enter] next  [Esc] cancel",
+    style: { fg: "grey" }
+  });
   input.focus();
   screen.render();
-  input.on("submit", async (value) => {
-    input.destroy();
+  input.on("submit", (value) => {
     if (!value || !value.trim()) {
-      await refreshWorktrees();
-      return;
-    }
-    const branchName = value.trim();
-    try {
-      validateBranchName(branchName);
-    } catch (e) {
-      setStatus(`Error: ${e.message}`);
+      form.destroy();
+      screen.render();
       return;
     }
-    setStatus(`Creating ${branchName}...`);
     try {
-      const worktreePath = getWorktreePath(mainRepoPath, branchName);
-      await createWorktree(worktreePath, branchName);
-      await copyEnvFiles(mainRepoPath, worktreePath);
-      setStatus(`Created ${branchName}`);
-      await refreshWorktrees();
+      validateBranchName(value.trim());
+      state.branchName = value.trim();
+      form.destroy();
+      askBaseBranch(state);
     } catch (e) {
       setStatus(`Error: ${e.message}`);
+      input.focus();
+      screen.render();
     }
   });
   input.on("cancel", () => {
-    input.destroy();
-    refreshWorktrees();
+    form.destroy();
+    screen.render();
   });
   input.readInput();
 }
+function askBaseBranch(state) {
+  const form = blessed.box({
+    parent: screen,
+    top: "center",
+    left: "center",
+    width: 50,
+    height: 10,
+    border: { type: "line" },
+    style: {
+      fg: "white",
+      bg: "black",
+      border: { fg: "blue" }
+    },
+    label: " Base Branch "
+  });
+  blessed.text({
+    parent: form,
+    top: 1,
+    left: 2,
+    content: "Create worktree from:",
+    style: { fg: "white" }
+  });
+  const list = blessed.list({
+    parent: form,
+    top: 3,
+    left: 2,
+    width: 44,
+    height: 3,
+    keys: true,
+    vi: true,
+    style: {
+      selected: { bg: "blue", fg: "white" },
+      item: { fg: "white" }
+    },
+    items: [
+      ` Current branch (${currentBranch})`,
+      ` Default branch (${defaultBranch})`
+    ]
+  });
+  blessed.text({
+    parent: form,
+    top: 7,
+    left: 2,
+    content: "[Enter] select  [Esc] cancel",
+    style: { fg: "grey" }
+  });
+  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: "white",
+      bg: "black",
+      border: { fg: "blue" }
+    },
+    label: " Environment Files "
+  });
+  blessed.text({
+    parent: form,
+    top: 1,
+    left: 2,
+    content: "Copy .env files to worktree?",
+    style: { fg: "white" }
+  });
+  const list = blessed.list({
+    parent: form,
+    top: 3,
+    left: 2,
+    width: 34,
+    height: 2,
+    keys: true,
+    vi: true,
+    style: {
+      selected: { bg: "blue", fg: "white" },
+      item: { fg: "white" }
+    },
+    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: "white",
+      bg: "black",
+      border: { fg: "blue" }
+    },
+    label: " Push to Remote "
+  });
+  blessed.text({
+    parent: form,
+    top: 1,
+    left: 2,
+    content: "Push branch to GitHub immediately?",
+    style: { fg: "white" }
+  });
+  const list = blessed.list({
+    parent: form,
+    top: 3,
+    left: 2,
+    width: 39,
+    height: 2,
+    keys: true,
+    vi: true,
+    style: {
+      selected: { bg: "blue", fg: "white" },
+      item: { fg: "white" }
+    },
+    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) {
+  const form = blessed.box({
+    parent: screen,
+    top: "center",
+    left: "center",
+    width: 40,
+    height: 10,
+    border: { type: "line" },
+    style: {
+      fg: "white",
+      bg: "black",
+      border: { fg: "blue" }
+    },
+    label: " Launch AI Tool "
+  });
+  blessed.text({
+    parent: form,
+    top: 1,
+    left: 2,
+    content: "Which AI assistant to launch?",
+    style: { fg: "white" }
+  });
+  const list = blessed.list({
+    parent: form,
+    top: 3,
+    left: 2,
+    width: 34,
+    height: 3,
+    keys: true,
+    vi: true,
+    style: {
+      selected: { bg: "blue", fg: "white" },
+      item: { fg: "white" }
+    },
+    items: [" Claude Code", " Codex", " Skip (just create worktree)"]
+  });
+  list.focus();
+  screen.render();
+  list.on("select", (_item, index) => {
+    state.aiTool = index === 0 ? "claude" : index === 1 ? "codex" : "skip";
+    form.destroy();
+    executeCreation(state);
+  });
+  list.key(["escape"], () => {
+    form.destroy();
+    screen.render();
+  });
+}
+async function executeCreation(state) {
+  const { branchName, baseBranch, copyEnv, pushToRemote, aiTool } = state;
+  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);
+      }
+    }
+  } catch (e) {
+    setStatus(`Error: ${e.message}`);
+  }
+}
+async function launchInWorktree(worktreePath, tool) {
+  const available = await isToolAvailable(tool);
+  if (!available) {
+    setStatus(`${tool} is not installed`);
+    return;
+  }
+  setStatus(`Launching ${tool}...`);
+  screen.destroy();
+  launchAITool({ cwd: worktreePath, tool });
+  console.log(`
+${tool} launched in: ${worktreePath}
+`);
+  process.exit(0);
+}
 async function deleteSelected() {
   const wt = worktrees[selectedIndex];
   if (!wt) return;
@@ -843,27 +1153,17 @@ async function launchAI(tool) {
     return;
   }
   setStatus(`Launching ${tool}...`);
+  screen.destroy();
   launchAITool({ cwd: wt.path, tool });
-  setStatus(`${tool} launched in ${path8.basename(wt.path)}`);
-}
-async function pushSelected() {
-  const wt = worktrees[selectedIndex];
-  if (!wt || !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}`);
-  }
+  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.3.0").action(async () => {
+program.name("wt").description("CLI tool to streamline git worktrees with AI coding assistants").version("1.4.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.3.0",
+  "version": "1.4.0",
   "description": "CLI tool for managing git worktrees with AI coding assistants",
   "type": "module",
   "main": "./dist/index.js",