worktree-launcher 1.4.0 → 1.4.2

package/dist/index.js

@@ -627,7 +627,10 @@ async function interactiveCommand() {
   const repoName = path8.basename(mainRepoPath);
   screen = blessed.screen({
     smartCSR: true,
-    title: `wt - ${repoName}`
+    fullUnicode: true,
+    title: `wt - ${repoName}`,
+    terminal: "xterm-256color",
+    warnings: false
   });
   headerBox = blessed.box({
     parent: screen,
@@ -637,9 +640,8 @@ async function interactiveCommand() {
     height: 1,
     content: ` ${repoName} (${currentBranch})`,
     style: {
-      fg: "white",
-      bg: "blue",
-      bold: true
+      fg: "black",
+      bg: "cyan"
     }
   });
   worktreeList = blessed.list({
@@ -653,16 +655,16 @@ async function interactiveCommand() {
     mouse: true,
     style: {
       selected: {
-        bg: "blue",
-        fg: "white"
+        bg: "cyan",
+        fg: "black"
       },
       item: {
-        fg: "white"
+        fg: "default"
       }
     },
     scrollbar: {
       ch: " ",
-      style: { bg: "grey" }
+      style: { bg: "cyan" }
     }
   });
   statusBar = blessed.box({
@@ -673,8 +675,7 @@ async function interactiveCommand() {
     height: 1,
     content: "",
     style: {
-      fg: "yellow",
-      bg: "black"
+      fg: "green"
     }
   });
   helpBar = blessed.box({
@@ -686,7 +687,7 @@ async function interactiveCommand() {
     content: " [n]ew  [d]elete  [c]laude  [x]codex  [Enter]cd  [q]uit",
     style: {
       fg: "black",
-      bg: "white"
+      bg: "cyan"
     }
   });
   await refreshWorktrees();
@@ -695,8 +696,7 @@ async function interactiveCommand() {
     showPath();
   });
   screen.key(["q", "C-c"], () => {
-    screen.destroy();
-    process.exit(0);
+    cleanExit();
   });
   screen.key(["n"], () => {
     startCreationWizard();
@@ -713,11 +713,9 @@ async function interactiveCommand() {
   screen.key(["enter"], () => {
     const wt = worktrees[selectedIndex];
     if (wt) {
-      screen.destroy();
-      console.log(`
+      cleanExit(`
 cd "${wt.path}"
 `);
-      process.exit(0);
     }
   });
   screen.key(["r"], async () => {
@@ -753,6 +751,17 @@ function setStatus(msg) {
   statusBar.setContent(` ${msg}`);
   screen.render();
 }
+function cleanExit(message) {
+  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: "",
@@ -772,9 +781,8 @@ function askBranchName(state) {
     height: 12,
     border: { type: "line" },
     style: {
-      fg: "white",
-      bg: "black",
-      border: { fg: "blue" }
+      fg: "default",
+      border: { fg: "cyan" }
     },
     label: " New Worktree "
   });
@@ -790,14 +798,14 @@ function askBranchName(state) {
     top: 2,
     left: 2,
     content: `Current branch: ${currentBranch}`,
-    style: { fg: "grey" }
+    style: { fg: "default" }
   });
   blessed.text({
     parent: form,
     top: 4,
     left: 2,
     content: "Branch name:",
-    style: { fg: "white" }
+    style: { fg: "default" }
   });
   const input = blessed.textbox({
     parent: form,
@@ -806,8 +814,8 @@ function askBranchName(state) {
     width: 54,
     height: 1,
     style: {
-      fg: "white",
-      bg: "grey"
+      fg: "black",
+      bg: "white"
     },
     inputOnFocus: true
   });
@@ -816,23 +824,27 @@ function askBranchName(state) {
     top: 7,
     left: 2,
     content: "[Enter] next  [Esc] cancel",
-    style: { fg: "grey" }
+    style: { fg: "cyan" }
   });
   input.focus();
   screen.render();
-  input.on("submit", (value) => {
+  input.on("submit", () => {
+    const value = input.getValue();
     if (!value || !value.trim()) {
       form.destroy();
       screen.render();
+      worktreeList.focus();
       return;
     }
     try {
       validateBranchName(value.trim());
       state.branchName = value.trim();
       form.destroy();
+      screen.render();
       askBaseBranch(state);
     } catch (e) {
       setStatus(`Error: ${e.message}`);
+      input.clearValue();
       input.focus();
       screen.render();
     }
@@ -840,6 +852,7 @@ function askBranchName(state) {
   input.on("cancel", () => {
     form.destroy();
     screen.render();
+    worktreeList.focus();
   });
   input.readInput();
 }
@@ -852,9 +865,8 @@ function askBaseBranch(state) {
     height: 10,
     border: { type: "line" },
     style: {
-      fg: "white",
-      bg: "black",
-      border: { fg: "blue" }
+      fg: "default",
+      border: { fg: "cyan" }
     },
     label: " Base Branch "
   });
@@ -863,7 +875,7 @@ function askBaseBranch(state) {
     top: 1,
     left: 2,
     content: "Create worktree from:",
-    style: { fg: "white" }
+    style: { fg: "default" }
   });
   const list = blessed.list({
     parent: form,
@@ -874,8 +886,8 @@ function askBaseBranch(state) {
     keys: true,
     vi: true,
     style: {
-      selected: { bg: "blue", fg: "white" },
-      item: { fg: "white" }
+      selected: { bg: "cyan", fg: "black" },
+      item: { fg: "default" }
     },
     items: [
       ` Current branch (${currentBranch})`,
@@ -887,18 +899,20 @@ function askBaseBranch(state) {
     top: 7,
     left: 2,
     content: "[Enter] select  [Esc] cancel",
-    style: { fg: "grey" }
+    style: { fg: "cyan" }
   });
   list.focus();
   screen.render();
   list.on("select", (_item, index) => {
     state.baseBranch = index === 0 ? "current" : "default";
     form.destroy();
+    screen.render();
     askCopyEnv(state);
   });
   list.key(["escape"], () => {
     form.destroy();
     screen.render();
+    worktreeList.focus();
   });
 }
 function askCopyEnv(state) {
@@ -910,9 +924,8 @@ function askCopyEnv(state) {
     height: 8,
     border: { type: "line" },
     style: {
-      fg: "white",
-      bg: "black",
-      border: { fg: "blue" }
+      fg: "default",
+      border: { fg: "cyan" }
     },
     label: " Environment Files "
   });
@@ -921,7 +934,7 @@ function askCopyEnv(state) {
     top: 1,
     left: 2,
     content: "Copy .env files to worktree?",
-    style: { fg: "white" }
+    style: { fg: "default" }
   });
   const list = blessed.list({
     parent: form,
@@ -932,8 +945,8 @@ function askCopyEnv(state) {
     keys: true,
     vi: true,
     style: {
-      selected: { bg: "blue", fg: "white" },
-      item: { fg: "white" }
+      selected: { bg: "cyan", fg: "black" },
+      item: { fg: "default" }
     },
     items: [" Yes (recommended)", " No"]
   });
@@ -942,11 +955,13 @@ function askCopyEnv(state) {
   list.on("select", (_item, index) => {
     state.copyEnv = index === 0;
     form.destroy();
+    screen.render();
     askPushToRemote(state);
   });
   list.key(["escape"], () => {
     form.destroy();
     screen.render();
+    worktreeList.focus();
   });
 }
 function askPushToRemote(state) {
@@ -958,9 +973,8 @@ function askPushToRemote(state) {
     height: 8,
     border: { type: "line" },
     style: {
-      fg: "white",
-      bg: "black",
-      border: { fg: "blue" }
+      fg: "default",
+      border: { fg: "cyan" }
     },
     label: " Push to Remote "
   });
@@ -969,7 +983,7 @@ function askPushToRemote(state) {
     top: 1,
     left: 2,
     content: "Push branch to GitHub immediately?",
-    style: { fg: "white" }
+    style: { fg: "default" }
   });
   const list = blessed.list({
     parent: form,
@@ -980,8 +994,8 @@ function askPushToRemote(state) {
     keys: true,
     vi: true,
     style: {
-      selected: { bg: "blue", fg: "white" },
-      item: { fg: "white" }
+      selected: { bg: "cyan", fg: "black" },
+      item: { fg: "default" }
     },
     items: [" No (push later)", " Yes (visible on GitHub now)"]
   });
@@ -990,11 +1004,13 @@ function askPushToRemote(state) {
   list.on("select", (_item, index) => {
     state.pushToRemote = index === 1;
     form.destroy();
+    screen.render();
     askAITool(state);
   });
   list.key(["escape"], () => {
     form.destroy();
     screen.render();
+    worktreeList.focus();
   });
 }
 function askAITool(state) {
@@ -1006,9 +1022,8 @@ function askAITool(state) {
     height: 10,
     border: { type: "line" },
     style: {
-      fg: "white",
-      bg: "black",
-      border: { fg: "blue" }
+      fg: "default",
+      border: { fg: "cyan" }
     },
     label: " Launch AI Tool "
   });
@@ -1017,7 +1032,7 @@ function askAITool(state) {
     top: 1,
     left: 2,
     content: "Which AI assistant to launch?",
-    style: { fg: "white" }
+    style: { fg: "default" }
   });
   const list = blessed.list({
     parent: form,
@@ -1028,8 +1043,8 @@ function askAITool(state) {
     keys: true,
     vi: true,
     style: {
-      selected: { bg: "blue", fg: "white" },
-      item: { fg: "white" }
+      selected: { bg: "cyan", fg: "black" },
+      item: { fg: "default" }
     },
     items: [" Claude Code", " Codex", " Skip (just create worktree)"]
   });
@@ -1038,11 +1053,13 @@ function askAITool(state) {
   list.on("select", (_item, index) => {
     state.aiTool = index === 0 ? "claude" : index === 1 ? "codex" : "skip";
     form.destroy();
+    screen.render();
     executeCreation(state);
   });
   list.key(["escape"], () => {
     form.destroy();
     screen.render();
+    worktreeList.focus();
   });
 }
 async function executeCreation(state) {
@@ -1064,6 +1081,7 @@ async function executeCreation(state) {
       }
       await refreshWorktrees();
       setStatus(`Created ${branchName}`);
+      worktreeList.focus();
       if (aiTool !== "skip") {
         await launchInWorktree(worktreePath, aiTool);
       }
@@ -1079,12 +1097,15 @@ async function executeCreation(state) {
       }
       await refreshWorktrees();
       setStatus(`Created ${branchName}`);
+      worktreeList.focus();
       if (aiTool !== "skip") {
         await launchInWorktree(worktreePath, aiTool);
       }
     }
   } catch (e) {
     setStatus(`Error: ${e.message}`);
+    worktreeList.focus();
+    screen.render();
   }
 }
 async function launchInWorktree(worktreePath, tool) {
@@ -1094,6 +1115,10 @@ async function launchInWorktree(worktreePath, tool) {
     return;
   }
   setStatus(`Launching ${tool}...`);
+  screen.program.clear();
+  screen.program.disableMouse();
+  screen.program.showCursor();
+  screen.program.normalBuffer();
   screen.destroy();
   launchAITool({ cwd: worktreePath, tool });
   console.log(`
@@ -1117,8 +1142,7 @@ async function deleteSelected() {
     height: 5,
     border: { type: "line" },
     style: {
-      fg: "white",
-      bg: "black",
+      fg: "default",
       border: { fg: "red" }
     }
   });
@@ -1153,6 +1177,10 @@ async function launchAI(tool) {
     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(`
@@ -1163,7 +1191,7 @@ ${tool} launched in: ${path8.basename(wt.path)}
 
 // src/index.ts
 var program = new Command();
-program.name("wt").description("CLI tool to streamline git worktrees with AI coding assistants").version("1.4.0").action(async () => {
+program.name("wt").description("CLI tool to streamline git worktrees with AI coding assistants").version("1.4.2").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.0",
+  "version": "1.4.2",
   "description": "CLI tool for managing git worktrees with AI coding assistants",
   "type": "module",
   "main": "./dist/index.js",