webmux 0.11.0 → 0.12.0

package/README.md

@@ -89,7 +89,7 @@ workspace:
 
 services:
   - name: BE
-    portEnv: BACKEND_PORT
+    portEnv: PORT
     portStart: 5111
     portStep: 10
   - name: FE
@@ -124,7 +124,7 @@ profiles:
         writable: true
     systemPrompt: >
       You are running inside a sandboxed container.
-      Backend port: ${BACKEND_PORT}. Frontend port: ${FRONTEND_PORT}.
+      Backend port: ${PORT}. Frontend port: ${FRONTEND_PORT}.
 
 linkedRepos:
   - repo: myorg/related-service

package/backend/dist/server.js

@@ -6932,7 +6932,7 @@ var log = {
 // backend/src/adapters/terminal.ts
 var textDecoder = new TextDecoder;
 var textEncoder = new TextEncoder;
-var DASH_PORT = Bun.env.BACKEND_PORT || "5111";
+var DASH_PORT = Bun.env.PORT || "5111";
 var SESSION_PREFIX = `wm-dash-${DASH_PORT}-`;
 var MAX_SCROLLBACK_BYTES = 1 * 1024 * 1024;
 var TMUX_TIMEOUT_MS = 5000;
@@ -7413,7 +7413,8 @@ function parseLinkedRepos(raw) {
     return [];
   return raw.filter(isRecord).filter((entry) => typeof entry.repo === "string").map((entry) => ({
     repo: entry.repo,
-    alias: typeof entry.alias === "string" ? entry.alias : entry.repo.split("/").pop() ?? "repo"
+    alias: typeof entry.alias === "string" ? entry.alias : entry.repo.split("/").pop() ?? "repo",
+    ...typeof entry.dir === "string" && entry.dir.trim() ? { dir: entry.dir.trim() } : {}
   }));
 }
 function isDockerProfile(profile) {
@@ -7453,7 +7454,7 @@ function loadConfig(dir) {
       startupEnvs: parseStartupEnvs(parsed.startupEnvs),
       integrations: {
         github: {
-          linkedRepos: isRecord(parsed.integrations) && isRecord(parsed.integrations.github) ? parseLinkedRepos(parsed.integrations.github.linkedRepos) : []
+          linkedRepos: isRecord(parsed.integrations) && isRecord(parsed.integrations.github) ? parseLinkedRepos(parsed.integrations.github.linkedRepos) : isRecord(parsed.integrations) && Array.isArray(parsed.integrations.github) ? parseLinkedRepos(parsed.integrations.github) : []
         },
         linear: {
           enabled: isRecord(parsed.integrations) && isRecord(parsed.integrations.linear) && typeof parsed.integrations.linear.enabled === "boolean" ? parsed.integrations.linear.enabled : DEFAULT_CONFIG.integrations.linear.enabled
@@ -8088,9 +8089,10 @@ class BunTmuxGateway {
   }
   ensureSession(sessionName, cwd) {
     const check = runTmux(["has-session", "-t", sessionName]);
-    if (check.exitCode === 0)
-      return;
-    assertTmuxOk(["new-session", "-d", "-s", sessionName, "-c", cwd], `create tmux session ${sessionName}`);
+    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}"]);
@@ -8684,6 +8686,13 @@ class LifecycleService {
     const worktreePath = this.resolveWorktreePath(branch);
     let initialized = null;
     try {
+      await this.reportCreateProgress({
+        branch,
+        path: worktreePath,
+        profile: profileName,
+        agent,
+        phase: "creating_worktree"
+      });
       await mkdir4(dirname3(worktreePath), { recursive: true });
       initialized = await createManagedWorktree({
         repoRoot: this.deps.projectRoot,
@@ -8701,9 +8710,12 @@ class LifecycleService {
       }, {
         git: this.deps.git
       });
-      await ensureAgentRuntimeArtifacts({
-        gitDir: initialized.paths.gitDir,
-        worktreePath
+      await this.reportCreateProgress({
+        branch,
+        path: worktreePath,
+        profile: profileName,
+        agent,
+        phase: "running_post_create_hook"
       });
       await this.runLifecycleHook({
         name: "postCreate",
@@ -8711,6 +8723,29 @@ class LifecycleService {
         meta: initialized.meta,
         worktreePath
       });
+      initialized = await this.refreshManagedArtifactsFromMeta({
+        gitDir: initialized.paths.gitDir,
+        meta: initialized.meta,
+        worktreePath
+      });
+      await this.reportCreateProgress({
+        branch,
+        path: worktreePath,
+        profile: profileName,
+        agent,
+        phase: "preparing_runtime"
+      });
+      await ensureAgentRuntimeArtifacts({
+        gitDir: initialized.paths.gitDir,
+        worktreePath
+      });
+      await this.reportCreateProgress({
+        branch,
+        path: worktreePath,
+        profile: profileName,
+        agent,
+        phase: "starting_session"
+      });
       await this.materializeRuntimeSession({
         branch,
         profile,
@@ -8719,6 +8754,13 @@ class LifecycleService {
         worktreePath,
         prompt: input.prompt
       });
+      await this.reportCreateProgress({
+        branch,
+        path: worktreePath,
+        profile: profileName,
+        agent,
+        phase: "reconciling"
+      });
       await this.deps.reconciliation.reconcile(this.deps.projectRoot);
       return {
         branch,
@@ -8732,6 +8774,8 @@ class LifecycleService {
         }
       }
       throw this.wrapOperationError(error);
+    } finally {
+      await this.finishCreateProgress(branch);
     }
   }
   async openWorktree(branch) {
@@ -8891,21 +8935,28 @@ class LifecycleService {
     if (!resolved.meta) {
       throw new Error("Missing managed metadata");
     }
-    const dotenvValues = await loadDotenvLocal(resolved.entry.path);
-    const runtimeEnv = buildRuntimeEnvMap(resolved.meta, {
-      WEBMUX_WORKTREE_PATH: resolved.entry.path
+    return await this.refreshManagedArtifactsFromMeta({
+      gitDir: resolved.gitDir,
+      meta: resolved.meta,
+      worktreePath: resolved.entry.path
+    });
+  }
+  async refreshManagedArtifactsFromMeta(input) {
+    const dotenvValues = await loadDotenvLocal(input.worktreePath);
+    const runtimeEnv = buildRuntimeEnvMap(input.meta, {
+      WEBMUX_WORKTREE_PATH: input.worktreePath
     }, dotenvValues);
-    await writeRuntimeEnv(resolved.gitDir, runtimeEnv);
+    await writeRuntimeEnv(input.gitDir, runtimeEnv);
     const controlEnv = buildControlEnvMap({
       controlUrl: this.controlUrl(),
       controlToken: await this.deps.getControlToken(),
-      worktreeId: resolved.meta.worktreeId,
-      branch: resolved.meta.branch
+      worktreeId: input.meta.worktreeId,
+      branch: input.meta.branch
     });
-    await writeControlEnv(resolved.gitDir, controlEnv);
+    await writeControlEnv(input.gitDir, controlEnv);
     return {
-      meta: resolved.meta,
-      paths: getWorktreeStoragePaths(resolved.gitDir),
+      meta: input.meta,
+      paths: getWorktreeStoragePaths(input.gitDir),
       runtimeEnv,
       controlEnv
     };
@@ -9053,6 +9104,12 @@ class LifecycleService {
     });
     console.debug(`[lifecycle-hook] COMPLETED ${input.name}`);
   }
+  async reportCreateProgress(progress) {
+    await this.deps.onCreateProgress?.(progress);
+  }
+  async finishCreateProgress(branch) {
+    await this.deps.onCreateFinished?.(branch);
+  }
   wrapOperationError(error) {
     if (error instanceof LifecycleError) {
       return error;
@@ -9420,7 +9477,12 @@ function clonePrEntry(pr) {
     comments: pr.comments.map((comment) => ({ ...comment }))
   };
 }
-function mapWorktreeSnapshot(state, now, findLinearIssue) {
+function mapCreationSnapshot(creating) {
+  return creating ? {
+    phase: creating.phase
+  } : null;
+}
+function mapWorktreeSnapshot(state, now, creating, findLinearIssue) {
   return {
     branch: state.branch,
     path: state.path,
@@ -9430,21 +9492,51 @@ function mapWorktreeSnapshot(state, now, findLinearIssue) {
     mux: state.session.exists,
     dirty: state.git.dirty || state.git.aheadCount > 0,
     paneCount: state.session.paneCount,
-    status: state.agent.lifecycle,
+    status: creating ? "creating" : state.agent.lifecycle,
     elapsed: formatElapsedSince(state.agent.lastStartedAt, now),
     services: state.services.map((service) => ({ ...service })),
     prs: state.prs.map((pr) => clonePrEntry(pr)),
-    linearIssue: findLinearIssue ? findLinearIssue(state.branch) : null
+    linearIssue: findLinearIssue ? findLinearIssue(state.branch) : null,
+    creation: mapCreationSnapshot(creating)
+  };
+}
+function mapCreatingWorktreeSnapshot(creating, findLinearIssue) {
+  return {
+    branch: creating.branch,
+    path: creating.path,
+    dir: creating.path,
+    profile: creating.profile,
+    agentName: creating.agentName,
+    mux: false,
+    dirty: false,
+    paneCount: 0,
+    status: "creating",
+    elapsed: "",
+    services: [],
+    prs: [],
+    linearIssue: findLinearIssue ? findLinearIssue(creating.branch) : null,
+    creation: mapCreationSnapshot(creating)
   };
 }
 function buildProjectSnapshot(input) {
   const now = input.now ?? (() => new Date);
+  const creatingWorktrees = input.creatingWorktrees ?? [];
+  const creatingByBranch = new Map(creatingWorktrees.map((worktree) => [worktree.branch, worktree]));
+  const runtimeWorktrees = input.runtime.listWorktrees();
+  const runtimeBranches = new Set(runtimeWorktrees.map((worktree) => worktree.branch));
+  const worktrees = runtimeWorktrees.map((state) => mapWorktreeSnapshot(state, now, creatingByBranch.get(state.branch) ?? null, input.findLinearIssue));
+  for (const creating of creatingWorktrees) {
+    if (!runtimeBranches.has(creating.branch)) {
+      worktrees.push(mapCreatingWorktreeSnapshot(creating, input.findLinearIssue));
+    }
+  }
+  worktrees.sort((left, right) => left.branch.localeCompare(right.branch));
   return {
     project: {
       name: input.projectName,
       mainBranch: input.mainBranch
     },
-    worktrees: input.runtime.listWorktrees().map((state) => mapWorktreeSnapshot(state, now, input.findLinearIssue)),
+    worktrees,
     notifications: input.notifications.map((notification) => ({ ...notification }))
   };
 }
@@ -9859,16 +9951,14 @@ class BunPortProbe {
 }
 
 // backend/src/services/auto-name-service.ts
+var MAX_BRANCH_LENGTH = 40;
 var DEFAULT_SYSTEM_PROMPT = [
   "Generate a concise git branch name from the task description.",
   "Return only the branch name.",
   "Use lowercase kebab-case.",
+  `Maximum ${MAX_BRANCH_LENGTH} characters.`,
   "Do not include quotes, code fences, or prefixes like feature/ or fix/."
 ].join(" ");
-function buildPrompt(task) {
-  return `Task description:
-${task.trim()}`;
-}
 function normalizeGeneratedBranchName(raw) {
   let branch = raw.trim();
   branch = branch.replace(/^```[\w-]*\s*/, "").replace(/\s*```$/, "");
@@ -9880,6 +9970,7 @@ function normalizeGeneratedBranchName(raw) {
   branch = branch.replace(/[/.]+/g, "-");
   branch = branch.replace(/-+/g, "-");
   branch = branch.replace(/^-+|-+$/g, "");
+  branch = branch.slice(0, MAX_BRANCH_LENGTH).replace(/-+$/, "");
   if (!branch) {
     throw new Error("Auto-name model returned an empty branch name");
   }
@@ -9922,6 +10013,9 @@ function buildClaudeArgs(model, systemPrompt, prompt) {
 function escapeTomlString(s) {
   return s.replace(/\\/g, "\\\\").replace(/"/g, "\\\"").replace(/\n/g, "\\n");
 }
+function buildPrompt(prompt) {
+  return `Here is the task description: ${prompt}. You MUST return the branch name only, no other text or comments. Be fast, make it simple, and concise.`;
+}
 function buildCodexArgs(model, systemPrompt, prompt) {
   const args = [
     "codex",
@@ -10348,9 +10442,33 @@ class ReconciliationService {
   }
 }
 
+// backend/src/services/worktree-creation-service.ts
+class WorktreeCreationTracker {
+  worktrees = new Map;
+  set(progress) {
+    const next = {
+      branch: progress.branch,
+      path: progress.path,
+      profile: progress.profile,
+      agentName: progress.agent,
+      phase: progress.phase
+    };
+    this.worktrees.set(progress.branch, next);
+  }
+  clear(branch) {
+    return this.worktrees.delete(branch);
+  }
+  has(branch) {
+    return this.worktrees.has(branch);
+  }
+  list() {
+    return [...this.worktrees.values()].sort((left, right) => left.branch.localeCompare(right.branch)).map((state) => ({ ...state }));
+  }
+}
+
 // backend/src/runtime.ts
 function createWebmuxRuntime(options = {}) {
-  const port = options.port ?? parseInt(Bun.env.BACKEND_PORT || "5111", 10);
+  const port = options.port ?? parseInt(Bun.env.PORT || "5111", 10);
   const projectDir = gitRoot(options.projectDir ?? Bun.env.WEBMUX_PROJECT_DIR ?? process.cwd());
   const config = loadConfig(projectDir);
   const git = new BunGitGateway;
@@ -10360,6 +10478,7 @@ function createWebmuxRuntime(options = {}) {
   const hooks = new BunLifecycleHookRunner;
   const autoName = new AutoNameService;
   const projectRuntime = new ProjectRuntime;
+  const worktreeCreationTracker = new WorktreeCreationTracker;
   const runtimeNotifications = new NotificationService;
   const reconciliationService = new ReconciliationService({
     config,
@@ -10378,7 +10497,13 @@ function createWebmuxRuntime(options = {}) {
     docker,
     reconciliation: reconciliationService,
     hooks,
-    autoName
+    autoName,
+    onCreateProgress: (progress) => {
+      worktreeCreationTracker.set(progress);
+    },
+    onCreateFinished: (branch) => {
+      worktreeCreationTracker.clear(branch);
+    }
   });
   return {
     port,
@@ -10391,6 +10516,7 @@ function createWebmuxRuntime(options = {}) {
     hooks,
     autoName,
     projectRuntime,
+    worktreeCreationTracker,
     runtimeNotifications,
     reconciliationService,
     lifecycleService
@@ -10398,7 +10524,7 @@ function createWebmuxRuntime(options = {}) {
 }
 
 // backend/src/server.ts
-var PORT = parseInt(Bun.env.BACKEND_PORT || "5111", 10);
+var PORT = parseInt(Bun.env.PORT || "5111", 10);
 var STATIC_DIR = Bun.env.WEBMUX_STATIC_DIR || "";
 var runtime = createWebmuxRuntime({
   port: PORT,
@@ -10409,6 +10535,7 @@ var config = runtime.config;
 var git = runtime.git;
 var tmux = runtime.tmux;
 var projectRuntime = runtime.projectRuntime;
+var worktreeCreationTracker = runtime.worktreeCreationTracker;
 var runtimeNotifications = runtime.runtimeNotifications;
 var reconciliationService = runtime.reconciliationService;
 var removingBranches = new Set;
@@ -10431,7 +10558,11 @@ function getFrontendConfig() {
     })),
     defaultProfileName,
     autoName: config.autoName !== null,
-    startupEnvs: config.startupEnvs
+    startupEnvs: config.startupEnvs,
+    linkedRepos: config.integrations.github.linkedRepos.map((lr) => ({
+      alias: lr.alias,
+      ...lr.dir ? { dir: resolve5(PROJECT_DIR, lr.dir) } : {}
+    }))
   };
 }
 function parseWsMessage(raw) {
@@ -10489,8 +10620,17 @@ function ensureBranchNotRemoving(branch) {
     throw new LifecycleError(`Worktree is being removed: ${branch}`, 409);
   }
 }
-async function withRemovingBranch(branch, fn) {
+function ensureBranchNotCreating(branch) {
+  if (worktreeCreationTracker.has(branch)) {
+    throw new LifecycleError(`Worktree is being created: ${branch}`, 409);
+  }
+}
+function ensureBranchNotBusy(branch) {
   ensureBranchNotRemoving(branch);
+  ensureBranchNotCreating(branch);
+}
+async function withRemovingBranch(branch, fn) {
+  ensureBranchNotBusy(branch);
   removingBranches.add(branch);
   try {
     return await fn();
@@ -10499,7 +10639,7 @@ async function withRemovingBranch(branch, fn) {
   }
 }
 async function resolveTerminalWorktree(branch) {
-  ensureBranchNotRemoving(branch);
+  ensureBranchNotBusy(branch);
   await reconciliationService.reconcile(PROJECT_DIR);
   const state = projectRuntime.getWorktreeByBranch(branch);
   if (!state) {
@@ -10562,6 +10702,7 @@ async function apiGetProject() {
     projectName: config.name,
     mainBranch: config.workspace.mainBranch,
     runtime: projectRuntime,
+    creatingWorktrees: worktreeCreationTracker.list(),
     notifications: runtimeNotifications.list(),
     findLinearIssue: (branch) => {
       const match = linearIssues.find((issue) => branchMatchesIssue(branch, issue.branchName));
@@ -10623,6 +10764,9 @@ 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;
+  if (branch) {
+    ensureBranchNotCreating(branch);
+  }
   log.info(`[worktree:add]${branch ? ` branch=${branch}` : ""}${profile ? ` profile=${profile}` : ""}${agent ? ` agent=${agent}` : ""}${prompt ? ` prompt="${prompt.slice(0, 80)}"` : ""}`);
   const result = await lifecycleService.createWorktree({
     branch,
@@ -10643,19 +10787,21 @@ async function apiDeleteWorktree(name) {
   });
 }
 async function apiOpenWorktree(name) {
-  ensureBranchNotRemoving(name);
+  ensureBranchNotBusy(name);
   log.info(`[worktree:open] name=${name}`);
   const result = await lifecycleService.openWorktree(name);
   log.debug(`[worktree:open] done name=${name} worktreeId=${result.worktreeId}`);
   return jsonResponse({ ok: true });
 }
 async function apiCloseWorktree(name) {
+  ensureBranchNotBusy(name);
   log.info(`[worktree:close] name=${name}`);
   await lifecycleService.closeWorktree(name);
   log.debug(`[worktree:close] done name=${name}`);
   return jsonResponse({ ok: true });
 }
 async function apiSendPrompt(name, req) {
+  ensureBranchNotBusy(name);
   const raw = await req.json();
   if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
     return errorResponse("Invalid request body", 400);
@@ -10673,6 +10819,7 @@ async function apiSendPrompt(name, req) {
   return jsonResponse({ ok: true });
 }
 async function apiMergeWorktree(name) {
+  ensureBranchNotBusy(name);
   log.info(`[worktree:merge] name=${name}`);
   await lifecycleService.mergeWorktree(name);
   log.debug(`[worktree:merge] done name=${name}`);