@desplega.ai/wts 0.2.0 → 0.2.2

package/dist/index.js

@@ -1877,7 +1877,7 @@ var {
 // package.json
 var package_default = {
   name: "@desplega.ai/wts",
-  version: "0.2.0",
+  version: "0.2.2",
   description: "Git worktree manager with tmux integration",
   type: "module",
   bin: {
@@ -3337,7 +3337,12 @@ 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) => {
+async function getCommitsToMerge(branch, baseBranch, cwd) {
+  const result = await Bun.$`git log ${baseBranch}..${branch} --oneline`.cwd(cwd).quiet();
+  return result.stdout.toString().trim().split(`
+`).filter(Boolean);
+}
+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("--no-pull", "Skip pulling latest main").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"));
@@ -3345,6 +3350,12 @@ var mergeCommand = new Command2("merge").description("Merge a worktree branch in
   }
   const config = await resolveConfig(gitRoot);
   const worktrees = await listWorktrees(gitRoot, config.projectName);
+  const mainWorktree = worktrees.find((wt) => wt.isMain);
+  if (!mainWorktree) {
+    console.error(source_default.red("Error: Could not find main worktree"));
+    process.exit(1);
+  }
+  const mainPath = mainWorktree.path;
   let worktree;
   if (alias) {
     worktree = await findWorktreeByAlias(alias, gitRoot);
@@ -3381,16 +3392,37 @@ Merging ${source_default.cyan(branchToMerge)} into ${source_default.cyan(default
     }
   }
   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;
+  await Bun.$`git checkout ${defaultBranch}`.cwd(mainPath);
+  if (options.pull !== false) {
+    if (!options.force) {
+      const proceed = await confirm(`Pull latest ${defaultBranch}?`, true);
+      if (!proceed) {
+        console.log(source_default.dim("Skipped pull"));
+      } else {
+        console.log(source_default.dim(`Pulling latest...`));
+        await Bun.$`git pull`.cwd(mainPath);
+      }
+    } else {
+      console.log(source_default.dim(`Pulling latest...`));
+      await Bun.$`git pull`.cwd(mainPath);
     }
   }
-  console.log(source_default.dim(`Pulling latest...`));
-  await Bun.$`git pull`.cwd(gitRoot);
+  const commitsToMerge = await getCommitsToMerge(branchToMerge, defaultBranch, mainPath);
+  if (commitsToMerge.length === 0) {
+    console.log(source_default.yellow(`
+No commits to merge - ${branchToMerge} has no new commits compared to ${defaultBranch}`));
+    console.log(source_default.dim("The branch may need to be rebased on latest main first."));
+    console.log(source_default.dim("Aborting to prevent accidental data loss."));
+    process.exit(1);
+  }
+  console.log(source_default.dim(`
+Commits to merge (${commitsToMerge.length}):`));
+  for (const commit of commitsToMerge.slice(0, 5)) {
+    console.log(source_default.dim(`  ${commit}`));
+  }
+  if (commitsToMerge.length > 5) {
+    console.log(source_default.dim(`  ... and ${commitsToMerge.length - 5} more`));
+  }
   if (!options.force) {
     const proceed = await confirm(`Merge ${branchToMerge}?`, true);
     if (!proceed) {
@@ -3399,18 +3431,26 @@ Merging ${source_default.cyan(branchToMerge)} into ${source_default.cyan(default
     }
   }
   console.log(source_default.dim(`Merging ${branchToMerge}...`));
-  await Bun.$`git merge ${branchToMerge}`.cwd(gitRoot);
+  const mergeResult = await Bun.$`git merge ${branchToMerge}`.cwd(mainPath).quiet();
+  const mergeOutput = mergeResult.stdout.toString();
+  console.log(source_default.dim(mergeOutput.trim()));
+  if (mergeOutput.includes("Already up to date")) {
+    console.log(source_default.yellow(`
+Merge reported 'Already up to date' - no changes were made`));
+    console.log(source_default.red("Aborting cleanup to prevent data loss"));
+    process.exit(1);
+  }
   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);
+      await Bun.$`git push`.cwd(mainPath);
     }
   } else {
     console.log(source_default.dim(`Pushing...`));
-    await Bun.$`git push`.cwd(gitRoot);
+    await Bun.$`git push`.cwd(mainPath);
   }
   console.log(source_default.green(`
 ✓ Merged ${branchToMerge} into ${defaultBranch}`));
@@ -3419,9 +3459,14 @@ Merging ${source_default.cyan(branchToMerge)} into ${source_default.cyan(default
 Clean up worktree and branch?`, false);
     if (cleanup) {
       console.log(source_default.dim(`Removing worktree...`));
-      await removeWorktree(worktree.path, true, gitRoot);
+      await removeWorktree(worktree.path, true, mainPath);
       console.log(source_default.dim(`Deleting branch ${branchToMerge}...`));
-      await deleteBranch(branchToMerge, true, gitRoot);
+      try {
+        await deleteBranch(branchToMerge, false, mainPath);
+      } catch {
+        console.error(source_default.red("Branch not fully merged - keeping branch for safety"));
+        console.log(source_default.dim("Use 'git branch -D <branch>' to force delete if intended"));
+      }
       console.log(source_default.green(`✓ Cleaned up`));
     }
   }

package/package.json

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