webmux 0.12.0 → 0.14.0

package/backend/dist/server.js

@@ -8092,7 +8092,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}"]);
@@ -8190,15 +8189,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}`;
   }
@@ -8281,6 +8287,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)) {
@@ -8421,6 +8428,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);
@@ -8462,13 +8474,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) {
@@ -8547,10 +8567,12 @@ function rollbackManagedWorktreeCreation(opts, sessionLayoutPlan, git, deps) {
   } 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;
 }
@@ -8600,6 +8622,7 @@ async function createManagedWorktree(opts, deps = {}) {
       repoRoot: opts.repoRoot,
       worktreePath: opts.worktreePath,
       branch: opts.branch,
+      mode: opts.mode,
       baseBranch: opts.baseBranch
     });
     worktreeCreated = true;
@@ -8679,11 +8702,13 @@ class LifecycleService {
     this.deps = deps;
   }
   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({
@@ -8698,7 +8723,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,
@@ -8706,7 +8732,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
       });
@@ -8752,7 +8779,8 @@ class LifecycleService {
         agent,
         initialized,
         worktreePath,
-        prompt: input.prompt
+        prompt: input.prompt,
+        launchMode: "fresh"
       });
       await this.reportCreateProgress({
         branch,
@@ -8768,7 +8796,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}`));
         }
@@ -8781,6 +8809,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({
@@ -8792,7 +8821,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 {
@@ -8820,6 +8850,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);
@@ -8838,9 +8882,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);
     }
@@ -8852,10 +8904,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) {
@@ -8894,6 +8955,12 @@ class LifecycleService {
   resolveWorktreePath(branch) {
     return resolve3(this.deps.projectRoot, this.deps.config.workspace.worktreeRoot, branch);
   }
+  listLocalBranches() {
+    return this.deps.git.listLocalBranches(resolve3(this.deps.projectRoot));
+  }
+  listCheckedOutBranches() {
+    return new Set(this.deps.git.listWorktrees(resolve3(this.deps.projectRoot)).filter((entry) => !entry.bare && entry.branch !== null).map((entry) => entry.branch));
+  }
   listProjectWorktrees() {
     const projectRoot = resolve3(this.deps.projectRoot);
     return this.deps.git.listWorktrees(projectRoot).filter((entry) => !entry.bare && resolve3(entry.path) !== projectRoot);
@@ -8914,6 +8981,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);
@@ -8979,6 +9054,7 @@ class LifecycleService {
         initialized: input.initialized,
         worktreePath: input.worktreePath,
         prompt: input.prompt,
+        launchMode: input.launchMode,
         containerName
       }));
       return;
@@ -8989,11 +9065,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 containerName = input.containerName;
     return planSessionLayout(this.deps.projectRoot, input.branch, input.profile.panes, {
       repoRoot: this.deps.projectRoot,
@@ -9006,7 +9083,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(containerName, input.worktreePath, input.initialized.paths.runtimeEnvPath)
       } : {
@@ -9015,7 +9093,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)
       }
@@ -9027,7 +9106,7 @@ class LifecycleService {
     }
     return profile;
   }
-  async cleanupFailedCreate(branch, worktreePath, runtime) {
+  async cleanupFailedCreate(branch, worktreePath, runtime, deleteBranch) {
     const cleanupErrors = [];
     if (runtime === "docker") {
       try {
@@ -9047,8 +9126,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)}`);
@@ -10743,6 +10822,11 @@ async function apiRuntimeEvent(req) {
     ...notification ? { notification } : {}
   });
 }
+async function apiListBranches() {
+  return jsonResponse({
+    branches: lifecycleService.listAvailableBranches()
+  });
+}
 async function apiCreateWorktree(req) {
   const raw = await req.json();
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
@@ -10764,11 +10848,16 @@ async function apiCreateWorktree(req) {
   const prompt = typeof body.prompt === "string" ? body.prompt : undefined;
   const profile = typeof body.profile === "string" ? body.profile : undefined;
   const agent = body.agent === "claude" || body.agent === "codex" ? body.agent : undefined;
+  const mode = body.mode;
+  if (mode !== undefined && mode !== "new" && mode !== "existing") {
+    return errorResponse("Invalid worktree create mode", 400);
+  }
   if (branch) {
     ensureBranchNotCreating(branch);
   }
-  log.info(`[worktree:add]${branch ? ` branch=${branch}` : ""}${profile ? ` profile=${profile}` : ""}${agent ? ` agent=${agent}` : ""}${prompt ? ` prompt="${prompt.slice(0, 80)}"` : ""}`);
+  log.info(`[worktree:add] mode=${mode ?? "new"}${branch ? ` branch=${branch}` : ""}${profile ? ` profile=${profile}` : ""}${agent ? ` agent=${agent}` : ""}${prompt ? ` prompt="${prompt.slice(0, 80)}"` : ""}`);
   const result = await lifecycleService.createWorktree({
+    mode,
     branch,
     prompt,
     profile,
@@ -10857,6 +10946,9 @@ Bun.serve({
     "/api/config": {
       GET: () => jsonResponse(getFrontendConfig())
     },
+    "/api/branches": {
+      GET: () => catching("GET /api/branches", () => apiListBranches())
+    },
     "/api/project": {
       GET: () => catching("GET /api/project", () => apiGetProject())
     },