@desplega.ai/wts 0.1.3 → 0.1.6

package/dist/index.js

@@ -1877,7 +1877,7 @@ var {
 // package.json
 var package_default = {
   name: "@desplega.ai/wts",
-  version: "0.1.3",
+  version: "0.1.6",
   description: "Git worktree manager with tmux integration",
   type: "module",
   bin: {
@@ -2098,6 +2098,10 @@ async function removeWorktree(path, force = false, cwd) {
 async function pruneWorktrees(cwd) {
   await Bun.$`git worktree prune`.cwd(cwd ?? process.cwd());
 }
+async function deleteBranch(branch, force = false, cwd) {
+  const flag = force ? "-D" : "-d";
+  await Bun.$`git branch ${flag} ${branch}`.cwd(cwd ?? process.cwd());
+}
 function generateWorktreePath(baseDir, alias) {
   const dirName = generateWorktreeDirName(alias);
   return join(baseDir, dirName);
@@ -2799,7 +2803,7 @@ async function categorizeWorktrees(worktrees, gitRoot, options) {
   }
   return { merged, unmerged, stale, active };
 }
-var cleanupCommand = new Command2("cleanup").description("Remove merged or stale worktrees").option("--dry-run", "Show what would be removed without removing").option("-f, --force", "Force removal without confirmation").option("--older-than <days>", "Include worktrees older than N days").option("--unmerged", "Include all unmerged worktrees").action(async (options) => {
+var cleanupCommand = new Command2("cleanup").description("Remove merged or stale worktrees").option("--dry-run", "Show what would be removed without removing").option("-f, --force", "Force removal without confirmation").option("--older-than <days>", "Include worktrees older than N days").option("--unmerged", "Include all unmerged worktrees").option("--delete-branches", "Also delete the associated branches").action(async (options) => {
   const gitRoot = await getGitRoot();
   if (!gitRoot) {
     console.error(source_default.red("Error: Not in a git repository"));
@@ -2851,24 +2855,38 @@ var cleanupCommand = new Command2("cleanup").description("Remove merged or stale
     }
     console.log();
   }
+  if (options.deleteBranches) {
+    console.log(source_default.dim("(branches will also be deleted)"));
+  }
   if (options.dryRun) {
     console.log(source_default.dim("(dry run - no changes made)"));
     return;
   }
   if (!options.force) {
-    const shouldProceed = await confirm(`Remove ${toRemove.length} worktree(s)?`, false);
+    const message = options.deleteBranches ? `Remove ${toRemove.length} worktree(s) and their branches?` : `Remove ${toRemove.length} worktree(s)?`;
+    const shouldProceed = await confirm(message, false);
     if (!shouldProceed) {
       console.log(source_default.dim("Cancelled"));
       return;
     }
   }
-  let removed = 0;
+  let removedWorktrees = 0;
+  let removedBranches = 0;
   let failed = 0;
   for (const wt of toRemove) {
     try {
       console.log(source_default.dim(`Removing ${wt.alias ?? wt.branch}...`));
       await removeWorktree(wt.path, true, gitRoot);
-      removed++;
+      removedWorktrees++;
+      if (options.deleteBranches && wt.branch && wt.branch !== "detached") {
+        try {
+          await deleteBranch(wt.branch, true, gitRoot);
+          removedBranches++;
+        } catch (error) {
+          console.error(source_default.yellow(`  Warning: Could not delete branch ${wt.branch}:`));
+          console.error(source_default.dim(`  ${error instanceof Error ? error.message : String(error)}`));
+        }
+      }
     } catch (error) {
       console.error(source_default.red(`  Failed to remove ${wt.alias ?? wt.branch}:`));
       console.error(source_default.dim(`  ${error instanceof Error ? error.message : String(error)}`));
@@ -2876,8 +2894,11 @@ var cleanupCommand = new Command2("cleanup").description("Remove merged or stale
     }
   }
   console.log();
-  if (removed > 0) {
-    console.log(source_default.green(`Removed ${removed} worktree(s)`));
+  if (removedWorktrees > 0) {
+    console.log(source_default.green(`Removed ${removedWorktrees} worktree(s)`));
+  }
+  if (removedBranches > 0) {
+    console.log(source_default.green(`Deleted ${removedBranches} branch(es)`));
   }
   if (failed > 0) {
     console.log(source_default.red(`Failed to remove ${failed} worktree(s)`));
@@ -3046,14 +3067,19 @@ async function runSetupScript(worktreePath, scriptPath, gitRoot) {
   }
   const ext = scriptPath.split(".").pop()?.toLowerCase();
   try {
+    const env2 = {
+      ...process.env,
+      WTS_WORKTREE_PATH: worktreePath,
+      WTS_GIT_ROOT: gitRoot
+    };
     if (ext === "ts") {
-      await Bun.$`bun ${fullScriptPath}`.cwd(worktreePath).env({ ...process.env, WTS_WORKTREE_PATH: worktreePath });
+      await Bun.$`bun ${fullScriptPath}`.cwd(worktreePath).env(env2);
     } else if (ext === "sh") {
-      await Bun.$`bash ${fullScriptPath}`.cwd(worktreePath).env({ ...process.env, WTS_WORKTREE_PATH: worktreePath });
+      await Bun.$`bash ${fullScriptPath}`.cwd(worktreePath).env(env2);
     } else if (ext === "js" || ext === "mjs") {
-      await Bun.$`bun ${fullScriptPath}`.cwd(worktreePath).env({ ...process.env, WTS_WORKTREE_PATH: worktreePath });
+      await Bun.$`bun ${fullScriptPath}`.cwd(worktreePath).env(env2);
     } else {
-      await Bun.$`${fullScriptPath}`.cwd(worktreePath).env({ ...process.env, WTS_WORKTREE_PATH: worktreePath });
+      await Bun.$`${fullScriptPath}`.cwd(worktreePath).env(env2);
     }
     console.log(source_default.green("Setup script completed"));
   } catch (error) {
@@ -3287,7 +3313,7 @@ async function listAllProjects(jsonOutput) {
 }
 function printWorktreeTable(worktrees, projectName) {
   console.log(source_default.bold.blue(`${projectName}`));
-  console.log(source_default.dim("─".repeat(60)));
+  console.log(source_default.dim("-".repeat(60)));
   if (worktrees.length === 0) {
     console.log(source_default.dim("  No worktrees"));
     return;
@@ -3413,8 +3439,13 @@ import { access as access2, chmod } from "node:fs/promises";
 import { join as join5 } from "node:path";
 var SHELL_TEMPLATE = `#!/bin/bash
 # wts setup script - runs after worktree creation
-# Working directory: the new worktree
-# Environment: WTS_WORKTREE_PATH contains the worktree path
+#
+# Environment variables:
+#   WTS_WORKTREE_PATH - path to the new worktree (also the working directory)
+#   WTS_GIT_ROOT      - path to the main repository root
+#
+# Example: copy .env from main repo to worktree
+#   cp "$WTS_GIT_ROOT/.env" "$WTS_WORKTREE_PATH/.env"
 
 set -e
 
@@ -3424,20 +3455,21 @@ echo "Setting up worktree..."
 # npm install
 # bun install
 
-# Copy environment files
-# cp .env.example .env
-
-# Run any other setup tasks
-# ...
+# Copy files from main repo
+# cp "$WTS_GIT_ROOT/.env" .env
+# cp -r "$WTS_GIT_ROOT/node_modules" .
 
 echo "Setup complete!"
 `;
 var TS_TEMPLATE = `#!/usr/bin/env bun
 // wts setup script - runs after worktree creation
-// Working directory: the new worktree
-// Environment: WTS_WORKTREE_PATH contains the worktree path
+//
+// Environment variables:
+//   WTS_WORKTREE_PATH - path to the new worktree (also the working directory)
+//   WTS_GIT_ROOT      - path to the main repository root
 
-const worktreePath = process.env.WTS_WORKTREE_PATH;
+const worktreePath = process.env.WTS_WORKTREE_PATH!;
+const gitRoot = process.env.WTS_GIT_ROOT!;
 
 console.log("Setting up worktree...");
 
@@ -3445,11 +3477,9 @@ console.log("Setting up worktree...");
 // await Bun.$\`npm install\`;
 // await Bun.$\`bun install\`;
 
-// Copy environment files
-// await Bun.$\`cp .env.example .env\`;
-
-// Run any other setup tasks
-// ...
+// Copy files from main repo
+// await Bun.$\`cp \${gitRoot}/.env .env\`;
+// await Bun.$\`cp -r \${gitRoot}/node_modules .\`;
 
 console.log("Setup complete!");
 `;

package/package.json

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