@desplega.ai/wts 0.1.6 → 0.2.0

package/dist/index.js

@@ -1877,7 +1877,7 @@ var {
 // package.json
 var package_default = {
   name: "@desplega.ai/wts",
-  version: "0.1.6",
+  version: "0.2.0",
   description: "Git worktree manager with tmux integration",
   type: "module",
   bin: {
@@ -2614,7 +2614,8 @@ var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
 var source_default = chalk;
 
 // src/config/local.ts
-import { join as join3 } from "node:path";
+import { homedir as homedir3 } from "node:os";
+import { isAbsolute, join as join3 } from "node:path";
 
 // src/config/global.ts
 import { homedir as homedir2 } from "node:os";
@@ -2624,7 +2625,7 @@ import { join as join2 } from "node:path";
 var DEFAULT_GLOBAL_CONFIG = {
   projects: {},
   defaults: {
-    worktreeDir: ".worktrees",
+    worktreeDir: "~/.worktrees",
     tmuxWindowTemplate: "{project}-{alias}",
     autoTmux: false,
     autoClaude: false
@@ -2708,7 +2709,14 @@ async function resolveConfig(gitRoot) {
   };
 }
 function getWorktreeBaseDir(config) {
-  return join3(config.gitRoot, config.worktreeDir, config.projectName);
+  let baseDir = config.worktreeDir;
+  if (baseDir.startsWith("~")) {
+    baseDir = join3(homedir3(), baseDir.slice(1));
+  }
+  if (isAbsolute(baseDir)) {
+    return join3(baseDir, config.projectName);
+  }
+  return join3(config.gitRoot, baseDir, config.projectName);
 }
 
 // src/utils/prompts.ts
@@ -3234,8 +3242,8 @@ Next steps:`));
 });
 async function promptForConfig(existing) {
   const config = {};
-  const worktreeDir = await prompt("Worktree directory", existing?.worktreeDir ?? ".worktrees");
-  if (worktreeDir !== ".worktrees") {
+  const worktreeDir = await prompt("Worktree directory", existing?.worktreeDir ?? "~/.worktrees");
+  if (worktreeDir !== "~/.worktrees") {
     config.worktreeDir = worktreeDir;
   }
   const autoTmux = await confirm("Auto-open tmux window on create?", existing?.autoTmux ?? false);
@@ -3328,6 +3336,97 @@ function printWorktreeTable(worktrees, projectName) {
   }
 }
 
+// src/commands/merge.ts
+var mergeCommand = new Command2("merge").description("Merge a worktree branch into main").argument("[alias]", "Alias of the worktree to merge").option("--no-cleanup", "Skip cleanup prompt").option("-f, --force", "Skip confirmations (except cleanup)").action(async (alias, options) => {
+  const gitRoot = await getGitRoot();
+  if (!gitRoot) {
+    console.error(source_default.red("Error: Not in a git repository"));
+    process.exit(1);
+  }
+  const config = await resolveConfig(gitRoot);
+  const worktrees = await listWorktrees(gitRoot, config.projectName);
+  let worktree;
+  if (alias) {
+    worktree = await findWorktreeByAlias(alias, gitRoot);
+    if (!worktree) {
+      console.error(source_default.red(`Error: No worktree found with alias "${alias}"`));
+      process.exit(1);
+    }
+  } else {
+    const nonMain = worktrees.filter((wt) => !wt.isMain);
+    if (nonMain.length === 0) {
+      console.error(source_default.yellow("No worktrees to merge"));
+      process.exit(1);
+    }
+    worktree = await selectWorktree(worktrees, { excludeMain: true });
+    if (!worktree) {
+      console.log(source_default.dim("Cancelled"));
+      return;
+    }
+  }
+  if (worktree.isMain) {
+    console.error(source_default.red("Error: Cannot merge the main worktree"));
+    process.exit(1);
+  }
+  const defaultBranch = await getDefaultBranch(gitRoot);
+  const branchToMerge = worktree.branch;
+  console.log(source_default.bold(`
+Merging ${source_default.cyan(branchToMerge)} into ${source_default.cyan(defaultBranch)}
+`));
+  if (!options.force) {
+    const proceed = await confirm(`Switch to ${defaultBranch}?`, true);
+    if (!proceed) {
+      console.log(source_default.dim("Cancelled"));
+      return;
+    }
+  }
+  console.log(source_default.dim(`Switching to ${defaultBranch}...`));
+  await Bun.$`git checkout ${defaultBranch}`.cwd(gitRoot);
+  if (!options.force) {
+    const proceed = await confirm(`Pull latest ${defaultBranch}?`, true);
+    if (!proceed) {
+      console.log(source_default.dim("Cancelled"));
+      return;
+    }
+  }
+  console.log(source_default.dim(`Pulling latest...`));
+  await Bun.$`git pull`.cwd(gitRoot);
+  if (!options.force) {
+    const proceed = await confirm(`Merge ${branchToMerge}?`, true);
+    if (!proceed) {
+      console.log(source_default.dim("Cancelled"));
+      return;
+    }
+  }
+  console.log(source_default.dim(`Merging ${branchToMerge}...`));
+  await Bun.$`git merge ${branchToMerge}`.cwd(gitRoot);
+  if (!options.force) {
+    const proceed = await confirm(`Push to origin?`, true);
+    if (!proceed) {
+      console.log(source_default.dim("Skipped push"));
+    } else {
+      console.log(source_default.dim(`Pushing...`));
+      await Bun.$`git push`.cwd(gitRoot);
+    }
+  } else {
+    console.log(source_default.dim(`Pushing...`));
+    await Bun.$`git push`.cwd(gitRoot);
+  }
+  console.log(source_default.green(`
+✓ Merged ${branchToMerge} into ${defaultBranch}`));
+  if (options.cleanup !== false) {
+    const cleanup = await confirm(`
+Clean up worktree and branch?`, false);
+    if (cleanup) {
+      console.log(source_default.dim(`Removing worktree...`));
+      await removeWorktree(worktree.path, true, gitRoot);
+      console.log(source_default.dim(`Deleting branch ${branchToMerge}...`));
+      await deleteBranch(branchToMerge, true, gitRoot);
+      console.log(source_default.green(`✓ Cleaned up`));
+    }
+  }
+});
+
 // src/commands/pr.ts
 async function isGhAvailable() {
   try {
@@ -3606,6 +3705,7 @@ program3.addCommand(initCommand);
 program3.addCommand(listCommand);
 program3.addCommand(createCommand3);
 program3.addCommand(deleteCommand);
+program3.addCommand(mergeCommand);
 program3.addCommand(cdCommand);
 program3.addCommand(switchCommand);
 program3.addCommand(prCommand);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@desplega.ai/wts",
-  "version": "0.1.6",
+  "version": "0.2.0",
   "description": "Git worktree manager with tmux integration",
   "type": "module",
   "bin": {