webmux 0.12.0 → 0.13.0

package/bin/webmux.js

@@ -164,6 +164,11 @@ function listGitWorktrees(cwd) {
   const output = runGit(["worktree", "list", "--porcelain"], cwd);
   return parseGitWorktreePorcelain(output);
 }
+function listLocalGitBranches(cwd) {
+  const output = runGit(["for-each-ref", "--format=%(refname:short)", "refs/heads"], cwd);
+  return output.split(`
+`).map((line) => line.trim()).filter((line) => line.length > 0);
+}
 function readGitWorktreeStatus(cwd) {
   const dirtyOutput = runGit(["status", "--porcelain"], cwd);
   const commit = tryRunGit(["rev-parse", "HEAD"], cwd);
@@ -205,13 +210,21 @@ class BunGitGateway {
   listWorktrees(cwd) {
     return listGitWorktrees(cwd);
   }
+  listLocalBranches(cwd) {
+    return listLocalGitBranches(cwd);
+  }
   readWorktreeStatus(cwd) {
     return readGitWorktreeStatus(cwd);
   }
   createWorktree(opts) {
-    const args = ["worktree", "add", "-b", opts.branch, opts.worktreePath];
-    if (opts.baseBranch)
-      args.push(opts.baseBranch);
+    const args = ["worktree", "add"];
+    if (opts.mode === "new") {
+      args.push("-b", opts.branch, opts.worktreePath);
+      if (opts.baseBranch)
+        args.push(opts.baseBranch);
+    } else {
+      args.push(opts.worktreePath, opts.branch);
+    }
     runGit(args, opts.repoRoot);
   }
   removeWorktree(opts) {
@@ -350,6 +363,7 @@ _webmux() {
     'close:Close a worktree session'
     'remove:Remove a worktree'
     'merge:Merge a worktree into main'
+    'prune:Remove all worktrees in the current project'
     'completion:Generate shell completion script'
   )
 
@@ -397,7 +411,7 @@ compdef _webmux webmux`, BASH_SCRIPT = `_webmux() {
   prev="\${COMP_WORDS[COMP_CWORD-1]}"
 
   if [[ \${COMP_CWORD} -eq 1 ]]; then
-    COMPREPLY=($(compgen -W "serve init service update add list open close remove merge completion" -- "\${cur}"))
+    COMPREPLY=($(compgen -W "serve init service update add list open close remove merge prune completion" -- "\${cur}"))
     return
   fi
 
@@ -2625,7 +2639,6 @@ class BunTmuxGateway {
     if (check.exitCode !== 0) {
       assertTmuxOk(["new-session", "-d", "-s", sessionName, "-c", cwd], `create tmux session ${sessionName}`);
     }
-    assertTmuxOk(["set-option", "-t", sessionName, "pane-base-index", "0"], `set pane-base-index on ${sessionName}`);
   }
   hasWindow(sessionName, windowName) {
     const result = runTmux(["list-windows", "-t", sessionName, "-F", "#{window_name}"]);
@@ -10730,15 +10743,22 @@ function buildRuntimeBootstrap(runtimeEnvPath) {
   return `set -a; . ${quoteShell(runtimeEnvPath)}; set +a`;
 }
 function buildAgentInvocation(input) {
-  const promptSuffix = input.prompt ? ` ${quoteShell(input.prompt)}` : "";
   if (input.agent === "codex") {
     const yoloFlag2 = input.yolo ? " --yolo" : "";
+    if (input.launchMode === "resume") {
+      return `codex${yoloFlag2} resume --last`;
+    }
+    const promptSuffix2 = input.prompt ? ` ${quoteShell(input.prompt)}` : "";
     if (input.systemPrompt) {
-      return `codex${yoloFlag2} -c ${quoteShell(`developer_instructions=${input.systemPrompt}`)}${promptSuffix}`;
+      return `codex${yoloFlag2} -c ${quoteShell(`developer_instructions=${input.systemPrompt}`)}${promptSuffix2}`;
     }
-    return `codex${yoloFlag2}${promptSuffix}`;
+    return `codex${yoloFlag2}${promptSuffix2}`;
   }
   const yoloFlag = input.yolo ? " --dangerously-skip-permissions" : "";
+  if (input.launchMode === "resume") {
+    return `claude${yoloFlag} --continue`;
+  }
+  const promptSuffix = input.prompt ? ` ${quoteShell(input.prompt)}` : "";
   if (input.systemPrompt) {
     return `claude${yoloFlag} --append-system-prompt ${quoteShell(input.systemPrompt)}${promptSuffix}`;
   }
@@ -10821,6 +10841,7 @@ function ensureSessionLayout(tmux, plan) {
     cwd: rootPane.cwd,
     command: plan.shellCommand
   });
+  tmux.setWindowOption(plan.sessionName, plan.windowName, "pane-base-index", "0");
   tmux.setWindowOption(plan.sessionName, plan.windowName, "automatic-rename", "off");
   tmux.setWindowOption(plan.sessionName, plan.windowName, "allow-rename", "off");
   for (const pane of plan.panes.slice(1)) {
@@ -10879,10 +10900,12 @@ function rollbackManagedWorktreeCreation(opts, sessionLayoutPlan, git, deps2) {
   } catch (error) {
     cleanupErrors.push(`worktree rollback failed: ${toErrorMessage(error)}`);
   }
-  try {
-    git.deleteBranch(opts.repoRoot, opts.branch, true);
-  } catch (error) {
-    cleanupErrors.push(`branch rollback failed: ${toErrorMessage(error)}`);
+  if (opts.deleteBranchOnRollback ?? true) {
+    try {
+      git.deleteBranch(opts.repoRoot, opts.branch, true);
+    } catch (error) {
+      cleanupErrors.push(`branch rollback failed: ${toErrorMessage(error)}`);
+    }
   }
   return cleanupErrors.length > 0 ? joinErrorMessages(cleanupErrors) : null;
 }
@@ -10932,6 +10955,7 @@ async function createManagedWorktree(opts, deps2 = {}) {
       repoRoot: opts.repoRoot,
       worktreePath: opts.worktreePath,
       branch: opts.branch,
+      mode: opts.mode,
       baseBranch: opts.baseBranch
     });
     worktreeCreated = true;
@@ -11011,11 +11035,13 @@ class LifecycleService {
     this.deps = deps2;
   }
   async createWorktree(input) {
-    const branch = await this.resolveBranch(input.branch, input.prompt);
-    this.ensureBranchAvailable(branch);
+    const mode = input.mode ?? "new";
+    const branch = await this.resolveBranch(input.branch, input.prompt, mode);
+    this.ensureBranchAvailable(branch, mode);
     const { profileName, profile } = this.resolveProfile(input.profile);
     const agent = this.resolveAgent(input.agent);
     const worktreePath = this.resolveWorktreePath(branch);
+    const deleteBranchOnRollback = mode === "new";
     let initialized = null;
     try {
       await this.reportCreateProgress({
@@ -11030,7 +11056,8 @@ class LifecycleService {
         repoRoot: this.deps.projectRoot,
         worktreePath,
         branch,
-        baseBranch: this.deps.config.workspace.mainBranch,
+        mode,
+        ...mode === "new" ? { baseBranch: this.deps.config.workspace.mainBranch } : {},
         profile: profileName,
         agent,
         runtime: profile.runtime,
@@ -11038,7 +11065,8 @@ class LifecycleService {
         allocatedPorts: await this.allocatePorts(),
         runtimeEnvExtras: { WEBMUX_WORKTREE_PATH: worktreePath },
         controlUrl: this.controlUrl(),
-        controlToken: await this.deps.getControlToken()
+        controlToken: await this.deps.getControlToken(),
+        deleteBranchOnRollback
       }, {
         git: this.deps.git
       });
@@ -11084,7 +11112,8 @@ class LifecycleService {
         agent,
         initialized,
         worktreePath,
-        prompt: input.prompt
+        prompt: input.prompt,
+        launchMode: "fresh"
       });
       await this.reportCreateProgress({
         branch,
@@ -11100,7 +11129,7 @@ class LifecycleService {
       };
     } catch (error) {
       if (initialized) {
-        const cleanupError = await this.cleanupFailedCreate(branch, worktreePath, profile.runtime);
+        const cleanupError = await this.cleanupFailedCreate(branch, worktreePath, profile.runtime, deleteBranchOnRollback);
         if (cleanupError) {
           throw this.wrapOperationError(new Error(`${toErrorMessage2(error)}; ${cleanupError}`));
         }
@@ -11113,6 +11142,7 @@ class LifecycleService {
   async openWorktree(branch) {
     try {
       const resolved = await this.resolveExistingWorktree(branch);
+      const launchMode = resolved.meta ? "resume" : "fresh";
       const initialized = resolved.meta ? await this.refreshManagedArtifacts(resolved) : await this.initializeUnmanagedWorktree(resolved);
       const { profile } = this.resolveProfile(initialized.meta.profile);
       await ensureAgentRuntimeArtifacts({
@@ -11124,7 +11154,8 @@ class LifecycleService {
         profile,
         agent: initialized.meta.agent,
         initialized,
-        worktreePath: resolved.entry.path
+        worktreePath: resolved.entry.path,
+        launchMode
       });
       await this.deps.reconciliation.reconcile(this.deps.projectRoot);
       return {
@@ -11152,6 +11183,20 @@ class LifecycleService {
       throw this.wrapOperationError(error);
     }
   }
+  async pruneWorktrees() {
+    try {
+      const resolvedWorktrees = await this.resolveAllWorktrees();
+      const removedBranches = [];
+      for (const resolved of resolvedWorktrees) {
+        const branch = resolved.entry.branch ?? resolved.entry.path;
+        await this.removeResolvedWorktree(resolved);
+        removedBranches.push(branch);
+      }
+      return { removedBranches };
+    } catch (error) {
+      throw this.wrapOperationError(error);
+    }
+  }
   async mergeWorktree(branch) {
     try {
       const resolved = await this.resolveExistingWorktree(branch);
@@ -11170,9 +11215,17 @@ class LifecycleService {
       throw this.wrapOperationError(error);
     }
   }
-  async resolveBranch(rawBranch, prompt) {
+  listAvailableBranches() {
+    const localBranches = this.listLocalBranches().filter((branch) => isValidBranchName(branch));
+    const checkedOutBranches = this.listCheckedOutBranches();
+    return localBranches.filter((branch) => !checkedOutBranches.has(branch)).sort((left, right) => left.localeCompare(right)).map((name) => ({ name }));
+  }
+  async resolveBranch(rawBranch, prompt, mode) {
     const explicitBranch = rawBranch?.trim();
-    const branch = explicitBranch || await this.generateAutoName(prompt) || generateBranchName();
+    const branch = mode === "existing" ? explicitBranch : explicitBranch || await this.generateAutoName(prompt) || generateBranchName();
+    if (!branch) {
+      throw new LifecycleError("Existing branch is required", 400);
+    }
     if (!isValidBranchName(branch)) {
       throw new LifecycleError(`Invalid branch name: ${branch}`, 400);
     }
@@ -11184,10 +11237,19 @@ class LifecycleService {
     }
     return await this.deps.autoName.generateBranchName(this.deps.config.autoName, prompt);
   }
-  ensureBranchAvailable(branch) {
-    const exists = this.listProjectWorktrees().some((entry) => entry.branch === branch);
-    if (exists) {
-      throw new LifecycleError(`Worktree already exists: ${branch}`, 409);
+  ensureBranchAvailable(branch, mode) {
+    const localBranches = new Set(this.listLocalBranches());
+    if (mode === "new") {
+      if (localBranches.has(branch)) {
+        throw new LifecycleError(`Branch already exists: ${branch}`, 409);
+      }
+      return;
+    }
+    if (!localBranches.has(branch)) {
+      throw new LifecycleError(`Branch not found: ${branch}`, 404);
+    }
+    if (this.listCheckedOutBranches().has(branch)) {
+      throw new LifecycleError(`Branch already has a worktree: ${branch}`, 409);
     }
   }
   resolveProfile(profileName) {
@@ -11226,6 +11288,12 @@ class LifecycleService {
   resolveWorktreePath(branch) {
     return resolve4(this.deps.projectRoot, this.deps.config.workspace.worktreeRoot, branch);
   }
+  listLocalBranches() {
+    return this.deps.git.listLocalBranches(resolve4(this.deps.projectRoot));
+  }
+  listCheckedOutBranches() {
+    return new Set(this.deps.git.listWorktrees(resolve4(this.deps.projectRoot)).filter((entry) => !entry.bare && entry.branch !== null).map((entry) => entry.branch));
+  }
   listProjectWorktrees() {
     const projectRoot = resolve4(this.deps.projectRoot);
     return this.deps.git.listWorktrees(projectRoot).filter((entry) => !entry.bare && resolve4(entry.path) !== projectRoot);
@@ -11246,6 +11314,14 @@ class LifecycleService {
     const meta = await readWorktreeMeta(gitDir);
     return { entry, gitDir, meta };
   }
+  async resolveAllWorktrees() {
+    const entries = this.listProjectWorktrees().sort((left, right) => (left.branch ?? left.path).localeCompare(right.branch ?? right.path));
+    return await Promise.all(entries.map(async (entry) => {
+      const gitDir = this.deps.git.resolveWorktreeGitDir(entry.path);
+      const meta = await readWorktreeMeta(gitDir);
+      return { entry, gitDir, meta };
+    }));
+  }
   async initializeUnmanagedWorktree(resolved) {
     const { profileName, profile } = this.resolveProfile(undefined);
     const dotenvValues = await loadDotenvLocal(resolved.entry.path);
@@ -11311,6 +11387,7 @@ class LifecycleService {
         initialized: input.initialized,
         worktreePath: input.worktreePath,
         prompt: input.prompt,
+        launchMode: input.launchMode,
         containerName: containerName2
       }));
       return;
@@ -11321,11 +11398,12 @@ class LifecycleService {
       agent: input.agent,
       initialized: input.initialized,
       worktreePath: input.worktreePath,
-      prompt: input.prompt
+      prompt: input.prompt,
+      launchMode: input.launchMode
     }));
   }
   buildSessionLayout(input) {
-    const systemPrompt = input.profile.systemPrompt ? expandTemplate(input.profile.systemPrompt, input.initialized.runtimeEnv) : undefined;
+    const systemPrompt = input.launchMode === "fresh" && input.profile.systemPrompt ? expandTemplate(input.profile.systemPrompt, input.initialized.runtimeEnv) : undefined;
     const containerName2 = input.containerName;
     return planSessionLayout(this.deps.projectRoot, input.branch, input.profile.panes, {
       repoRoot: this.deps.projectRoot,
@@ -11338,7 +11416,8 @@ class LifecycleService {
           runtimeEnvPath: input.initialized.paths.runtimeEnvPath,
           yolo: input.profile.yolo === true,
           systemPrompt,
-          prompt: input.prompt
+          prompt: input.launchMode === "fresh" ? input.prompt : undefined,
+          launchMode: input.launchMode
         }),
         shell: buildDockerShellCommand(containerName2, input.worktreePath, input.initialized.paths.runtimeEnvPath)
       } : {
@@ -11347,7 +11426,8 @@ class LifecycleService {
           runtimeEnvPath: input.initialized.paths.runtimeEnvPath,
           yolo: input.profile.yolo === true,
           systemPrompt,
-          prompt: input.prompt
+          prompt: input.launchMode === "fresh" ? input.prompt : undefined,
+          launchMode: input.launchMode
         }),
         shell: buildManagedShellCommand(input.initialized.paths.runtimeEnvPath)
       }
@@ -11359,7 +11439,7 @@ class LifecycleService {
     }
     return profile;
   }
-  async cleanupFailedCreate(branch, worktreePath, runtime) {
+  async cleanupFailedCreate(branch, worktreePath, runtime, deleteBranch) {
     const cleanupErrors = [];
     if (runtime === "docker") {
       try {
@@ -11379,8 +11459,8 @@ class LifecycleService {
         worktreePath,
         branch,
         force: true,
-        deleteBranch: true,
-        deleteBranchForce: true
+        deleteBranch,
+        deleteBranchForce: deleteBranch
       }, this.deps.git);
     } catch (error) {
       cleanupErrors.push(`worktree cleanup failed: ${toErrorMessage2(error)}`);
@@ -11986,6 +12066,9 @@ function getWorktreeCommandUsage(command) {
     case "merge":
       return `Usage:
   webmux merge <branch>`;
+    case "prune":
+      return `Usage:
+  webmux prune`;
   }
 }
 function readOptionValue(args, index, flag) {
@@ -12088,6 +12171,29 @@ function parseBranchCommandArgs(args) {
   }
   return branch;
 }
+function parsePruneCommandArgs(args) {
+  for (const arg of args) {
+    if (arg === "--help" || arg === "-h") {
+      return false;
+    }
+    if (arg.startsWith("-")) {
+      throw new CommandUsageError(`Unknown option: ${arg}`);
+    }
+    throw new CommandUsageError(`Unexpected argument: ${arg}`);
+  }
+  return true;
+}
+function listProjectWorktrees(runtime) {
+  const projectDir = resolve6(runtime.projectDir);
+  return runtime.git.listWorktrees(projectDir).filter((entry) => !entry.bare && resolve6(entry.path) !== projectDir);
+}
+async function defaultConfirmPrune(worktreeCount) {
+  const response = await Rt({
+    message: `Prune all ${worktreeCount} worktree${worktreeCount === 1 ? "" : "s"}? This action cannot be undone.`,
+    initialValue: false
+  });
+  return !Ct(response) && response;
+}
 function defaultSwitchToTmuxWindow(projectDir, branch) {
   const sessionName = buildProjectSessionName(resolve6(projectDir));
   const windowName = buildWorktreeWindowName(branch);
@@ -12119,7 +12225,7 @@ function defaultSwitchToTmuxWindow(projectDir, branch) {
 }
 async function listWorktrees(runtime, stdout) {
   const projectDir = resolve6(runtime.projectDir);
-  const entries = runtime.git.listWorktrees(projectDir).filter((entry) => !entry.bare && resolve6(entry.path) !== projectDir);
+  const entries = listProjectWorktrees(runtime);
   if (entries.length === 0) {
     stdout("No worktrees found.");
     return;
@@ -12152,6 +12258,7 @@ async function runWorktreeCommand(context, deps2 = {}) {
   const stdout = deps2.stdout ?? ((message) => console.log(message));
   const stderr = deps2.stderr ?? ((message) => console.error(message));
   const switchToTmuxWindow = deps2.switchToTmuxWindow ?? defaultSwitchToTmuxWindow;
+  const confirmPrune = deps2.confirmPrune ?? defaultConfirmPrune;
   try {
     if (context.command === "add") {
       const input = parseAddCommandArgs(context.args);
@@ -12180,6 +12287,32 @@ async function runWorktreeCommand(context, deps2 = {}) {
       await listWorktrees(runtime2, stdout);
       return 0;
     }
+    if (context.command === "prune") {
+      if (!parsePruneCommandArgs(context.args)) {
+        stdout(getWorktreeCommandUsage("prune"));
+        return 0;
+      }
+      const runtime2 = createRuntime({
+        projectDir: context.projectDir,
+        port: context.port
+      });
+      const worktrees = listProjectWorktrees(runtime2);
+      if (worktrees.length === 0) {
+        stdout("No worktrees found.");
+        return 0;
+      }
+      if (!await confirmPrune(worktrees.length)) {
+        stdout("Aborted.");
+        return 0;
+      }
+      const result = await runtime2.lifecycleService.pruneWorktrees();
+      if (result.removedBranches.length === 0) {
+        stdout("No worktrees found.");
+        return 0;
+      }
+      stdout(`Pruned ${result.removedBranches.length} worktree${result.removedBranches.length === 1 ? "" : "s"}: ${result.removedBranches.join(", ")}`);
+      return 0;
+    }
     const command = context.command;
     const branch = parseBranchCommandArgs(context.args);
     if (!branch) {
@@ -12215,6 +12348,7 @@ async function runWorktreeCommand(context, deps2 = {}) {
 }
 var CommandUsageError;
 var init_worktree_commands = __esm(() => {
+  init_dist2();
   init_fs();
   init_tmux();
   init_policies();
@@ -12230,7 +12364,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "webmux",
-  version: "0.12.0",
+  version: "0.13.0",
   description: "Web dashboard for workmux \u2014 browser UI with embedded terminals, PR monitoring, and CI integration",
   type: "module",
   repository: {
@@ -12300,6 +12434,7 @@ Usage:
   webmux close        Close a worktree session without removing it
   webmux remove       Remove a worktree
   webmux merge        Merge a worktree into the main branch and remove it
+  webmux prune        Remove all worktrees in the current project
   webmux completion   Generate shell completion script (bash, zsh)
 
 Options:
@@ -12313,7 +12448,7 @@ Environment:
 `);
 }
 function isRootCommand(value) {
-  return value === "serve" || value === "init" || value === "service" || value === "update" || value === "add" || value === "list" || value === "open" || value === "close" || value === "remove" || value === "merge" || value === "completion";
+  return value === "serve" || value === "init" || value === "service" || value === "update" || value === "add" || value === "list" || value === "open" || value === "close" || value === "remove" || value === "merge" || value === "prune" || value === "completion";
 }
 function isServeRootOption(value) {
   return value === "--port" || value === "--debug" || value === "--help" || value === "-h" || value === "--version" || value === "-V";
@@ -12372,7 +12507,7 @@ Run webmux --help for usage.`);
   };
 }
 function isWorktreeCommand(command) {
-  return command === "add" || command === "list" || command === "open" || command === "close" || command === "remove" || command === "merge";
+  return command === "add" || command === "list" || command === "open" || command === "close" || command === "remove" || command === "merge" || command === "prune";
 }
 async function loadEnvFile(path) {
   if (!existsSync5(path))