webmux 0.9.0 → 0.10.0

package/backend/dist/server.js

@@ -7253,7 +7253,7 @@ var DEFAULT_CONFIG = {
   name: "Webmux",
   workspace: {
     mainBranch: "main",
-    worktreeRoot: "__worktrees",
+    worktreeRoot: "../worktrees",
     defaultAgent: "claude"
   },
   profiles: {
@@ -7619,6 +7619,7 @@ import { dirname as dirname2, join as join3 } from "path";
 import { mkdir as mkdir2 } from "fs/promises";
 import { join as join2 } from "path";
 var SAFE_ENV_VALUE_RE = /^[A-Za-z0-9_./:@%+=,-]+$/;
+var DOTENV_LINE_RE = /^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)/;
 function stringifyAllocatedPorts(ports) {
   const entries = Object.entries(ports).map(([key, value]) => [key, String(value)]);
   return Object.fromEntries(entries);
@@ -7628,6 +7629,34 @@ function quoteEnvValue(value) {
     return value;
   return `'${value.replaceAll("'", "'\\''")}'`;
 }
+function parseDotenv(content) {
+  const env = {};
+  for (const line of content.split(`
+`)) {
+    if (line.trimStart().startsWith("#"))
+      continue;
+    const match = DOTENV_LINE_RE.exec(line);
+    if (!match)
+      continue;
+    const key = match[1];
+    let value = match[2];
+    if (value.length >= 2 && (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'"))) {
+      value = value.slice(1, -1);
+    } else {
+      value = value.trimEnd();
+    }
+    env[key] = value;
+  }
+  return env;
+}
+async function loadDotenvLocal(worktreePath) {
+  try {
+    const content = await Bun.file(join2(worktreePath, ".env.local")).text();
+    return parseDotenv(content);
+  } catch {
+    return {};
+  }
+}
 function getWorktreeStoragePaths(gitDir) {
   const webmuxDir = join2(gitDir, "webmux");
   return {
@@ -7657,8 +7686,9 @@ async function writeWorktreeMeta(gitDir, meta) {
   await Bun.write(metaPath, JSON.stringify(meta, null, 2) + `
 `);
 }
-function buildRuntimeEnvMap(meta, extraEnv = {}) {
+function buildRuntimeEnvMap(meta, extraEnv = {}, dotenvValues = {}) {
   return {
+    ...dotenvValues,
     ...meta.startupEnvValues,
     ...stringifyAllocatedPorts(meta.allocatedPorts),
     ...extraEnv,
@@ -8538,7 +8568,7 @@ async function initializeManagedWorktree(opts) {
   };
   const paths = await ensureWorktreeStorageDirs(opts.gitDir);
   await writeWorktreeMeta(opts.gitDir, meta);
-  const runtimeEnv = buildRuntimeEnvMap(meta, opts.runtimeEnvExtras);
+  const runtimeEnv = buildRuntimeEnvMap(meta, opts.runtimeEnvExtras, opts.dotenvValues);
   await writeRuntimeEnv(opts.gitDir, runtimeEnv);
   let controlEnv = null;
   if (opts.controlUrl && opts.controlToken) {
@@ -8570,6 +8600,7 @@ async function createManagedWorktree(opts, deps = {}) {
     });
     worktreeCreated = true;
     const gitDir = git.resolveWorktreeGitDir(opts.worktreePath);
+    const dotenvValues = await loadDotenvLocal(opts.worktreePath);
     const initialized = await initializeManagedWorktree({
       gitDir,
       branch: opts.branch,
@@ -8579,6 +8610,7 @@ async function createManagedWorktree(opts, deps = {}) {
       startupEnvValues: opts.startupEnvValues,
       allocatedPorts: opts.allocatedPorts,
       runtimeEnvExtras: opts.runtimeEnvExtras,
+      dotenvValues,
       controlUrl: opts.controlUrl,
       controlToken: opts.controlToken,
       now: opts.now,
@@ -8838,6 +8870,7 @@ class LifecycleService {
   }
   async initializeUnmanagedWorktree(resolved) {
     const { profileName, profile } = this.resolveProfile(undefined);
+    const dotenvValues = await loadDotenvLocal(resolved.entry.path);
     return initializeManagedWorktree({
       gitDir: resolved.gitDir,
       branch: resolved.entry.branch ?? resolved.entry.path,
@@ -8847,6 +8880,7 @@ class LifecycleService {
       startupEnvValues: await this.buildStartupEnvValues(undefined),
       allocatedPorts: await this.allocatePorts(),
       runtimeEnvExtras: { WEBMUX_WORKTREE_PATH: resolved.entry.path },
+      dotenvValues,
       controlUrl: this.controlUrl(),
       controlToken: await this.deps.getControlToken()
     });
@@ -8855,9 +8889,10 @@ 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
-    });
+    }, dotenvValues);
     await writeRuntimeEnv(resolved.gitDir, runtimeEnv);
     const controlEnv = buildControlEnvMap({
       controlUrl: this.controlUrl(),
@@ -9005,13 +9040,14 @@ class LifecycleService {
       return;
     }
     console.debug(`[lifecycle-hook] RUNNING ${input.name}: ${input.command} in ${input.worktreePath}`);
+    const dotenvValues = await loadDotenvLocal(input.worktreePath);
     await this.deps.hooks.run({
       name: input.name,
       command: input.command,
       cwd: input.worktreePath,
       env: buildRuntimeEnvMap(input.meta, {
         WEBMUX_WORKTREE_PATH: input.worktreePath
-      })
+      }, dotenvValues)
     });
     console.debug(`[lifecycle-hook] COMPLETED ${input.name}`);
   }
@@ -9765,36 +9801,53 @@ class BunLifecycleHookRunner {
 // backend/src/adapters/port-probe.ts
 class BunPortProbe {
   timeoutMs;
-  hostname;
-  constructor(timeoutMs = 300, hostname = "127.0.0.1") {
+  hostnames;
+  constructor(timeoutMs = 300, hostnames = ["127.0.0.1", "::1"]) {
     this.timeoutMs = timeoutMs;
-    this.hostname = hostname;
+    this.hostnames = hostnames;
   }
   isListening(port) {
     return new Promise((resolve4) => {
       let settled = false;
+      let pending = this.hostnames.length;
       const settle = (result) => {
         if (settled)
           return;
-        settled = true;
-        clearTimeout(timer);
-        resolve4(result);
+        if (result) {
+          settled = true;
+          clearTimeout(timer);
+          resolve4(true);
+          return;
+        }
+        pending--;
+        if (pending === 0) {
+          settled = true;
+          clearTimeout(timer);
+          resolve4(false);
+        }
       };
-      const timer = setTimeout(() => settle(false), this.timeoutMs);
-      Bun.connect({
-        hostname: this.hostname,
-        port,
-        socket: {
-          open(socket) {
-            socket.end();
-            settle(true);
-          },
-          error() {
-            settle(false);
-          },
-          data() {}
+      const timer = setTimeout(() => {
+        if (!settled) {
+          settled = true;
+          resolve4(false);
         }
-      }).catch(() => settle(false));
+      }, this.timeoutMs);
+      for (const hostname of this.hostnames) {
+        Bun.connect({
+          hostname,
+          port,
+          socket: {
+            open(socket) {
+              socket.end();
+              settle(true);
+            },
+            error() {
+              settle(false);
+            },
+            data() {}
+          }
+        }).catch(() => settle(false));
+      }
     });
   }
 }

package/bin/webmux.js

@@ -1095,7 +1095,7 @@ function buildInitPromptSpec(context) {
     "Use this config shape:",
     "name: infer from the repository",
     "workspace.mainBranch: infer from git",
-    "workspace.worktreeRoot: keep __worktrees unless there is clear evidence of an existing alternative",
+    "workspace.worktreeRoot: keep ../worktrees unless there is clear evidence of an existing alternative",
     "services: one entry per real dev service with name, portEnv, and portStart when a default port is clear",
     "profiles.default.runtime: host",
     "profiles.default.envPassthrough: []",
@@ -1441,7 +1441,7 @@ name: ${input.projectName}
 
 workspace:
   mainBranch: ${input.mainBranch}
-  worktreeRoot: __worktrees
+  worktreeRoot: ../worktrees
   defaultAgent: ${defaultAgent}
 
 # Each service defines a port env var that webmux injects into pane and agent
@@ -2061,6 +2061,34 @@ function quoteEnvValue(value) {
     return value;
   return `'${value.replaceAll("'", "'\\''")}'`;
 }
+function parseDotenv(content) {
+  const env = {};
+  for (const line of content.split(`
+`)) {
+    if (line.trimStart().startsWith("#"))
+      continue;
+    const match = DOTENV_LINE_RE.exec(line);
+    if (!match)
+      continue;
+    const key = match[1];
+    let value = match[2];
+    if (value.length >= 2 && (value.startsWith('"') && value.endsWith('"') || value.startsWith("'") && value.endsWith("'"))) {
+      value = value.slice(1, -1);
+    } else {
+      value = value.trimEnd();
+    }
+    env[key] = value;
+  }
+  return env;
+}
+async function loadDotenvLocal(worktreePath) {
+  try {
+    const content = await Bun.file(join5(worktreePath, ".env.local")).text();
+    return parseDotenv(content);
+  } catch {
+    return {};
+  }
+}
 function getWorktreeStoragePaths(gitDir) {
   const webmuxDir = join5(gitDir, "webmux");
   return {
@@ -2090,8 +2118,9 @@ async function writeWorktreeMeta(gitDir, meta) {
   await Bun.write(metaPath, JSON.stringify(meta, null, 2) + `
 `);
 }
-function buildRuntimeEnvMap(meta, extraEnv = {}) {
+function buildRuntimeEnvMap(meta, extraEnv = {}, dotenvValues = {}) {
   return {
+    ...dotenvValues,
     ...meta.startupEnvValues,
     ...stringifyAllocatedPorts(meta.allocatedPorts),
     ...extraEnv,
@@ -2151,9 +2180,10 @@ async function readWorktreePrs(gitDir) {
     return [];
   }
 }
-var SAFE_ENV_VALUE_RE;
+var SAFE_ENV_VALUE_RE, DOTENV_LINE_RE;
 var init_fs = __esm(() => {
   SAFE_ENV_VALUE_RE = /^[A-Za-z0-9_./:@%+=,-]+$/;
+  DOTENV_LINE_RE = /^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)/;
 });
 
 // backend/src/adapters/tmux.ts
@@ -9465,7 +9495,7 @@ var init_config = __esm(() => {
     name: "Webmux",
     workspace: {
       mainBranch: "main",
-      worktreeRoot: "__worktrees",
+      worktreeRoot: "../worktrees",
       defaultAgent: "claude"
     },
     profiles: {
@@ -10060,36 +10090,53 @@ var init_hooks = () => {};
 // backend/src/adapters/port-probe.ts
 class BunPortProbe {
   timeoutMs;
-  hostname;
-  constructor(timeoutMs = 300, hostname = "127.0.0.1") {
+  hostnames;
+  constructor(timeoutMs = 300, hostnames = ["127.0.0.1", "::1"]) {
     this.timeoutMs = timeoutMs;
-    this.hostname = hostname;
+    this.hostnames = hostnames;
   }
   isListening(port) {
     return new Promise((resolve3) => {
       let settled = false;
+      let pending = this.hostnames.length;
       const settle = (result) => {
         if (settled)
           return;
-        settled = true;
-        clearTimeout(timer);
-        resolve3(result);
+        if (result) {
+          settled = true;
+          clearTimeout(timer);
+          resolve3(true);
+          return;
+        }
+        pending--;
+        if (pending === 0) {
+          settled = true;
+          clearTimeout(timer);
+          resolve3(false);
+        }
       };
-      const timer = setTimeout(() => settle(false), this.timeoutMs);
-      Bun.connect({
-        hostname: this.hostname,
-        port,
-        socket: {
-          open(socket) {
-            socket.end();
-            settle(true);
-          },
-          error() {
-            settle(false);
-          },
-          data() {}
-        }
-      }).catch(() => settle(false));
+      const timer = setTimeout(() => {
+        if (!settled) {
+          settled = true;
+          resolve3(false);
+        }
+      }, this.timeoutMs);
+      for (const hostname of this.hostnames) {
+        Bun.connect({
+          hostname,
+          port,
+          socket: {
+            open(socket) {
+              socket.end();
+              settle(true);
+            },
+            error() {
+              settle(false);
+            },
+            data() {}
+          }
+        }).catch(() => settle(false));
+      }
     });
   }
 }
@@ -10853,7 +10900,7 @@ async function initializeManagedWorktree(opts) {
   };
   const paths = await ensureWorktreeStorageDirs(opts.gitDir);
   await writeWorktreeMeta(opts.gitDir, meta);
-  const runtimeEnv = buildRuntimeEnvMap(meta, opts.runtimeEnvExtras);
+  const runtimeEnv = buildRuntimeEnvMap(meta, opts.runtimeEnvExtras, opts.dotenvValues);
   await writeRuntimeEnv(opts.gitDir, runtimeEnv);
   let controlEnv = null;
   if (opts.controlUrl && opts.controlToken) {
@@ -10885,6 +10932,7 @@ async function createManagedWorktree(opts, deps2 = {}) {
     });
     worktreeCreated = true;
     const gitDir = git.resolveWorktreeGitDir(opts.worktreePath);
+    const dotenvValues = await loadDotenvLocal(opts.worktreePath);
     const initialized = await initializeManagedWorktree({
       gitDir,
       branch: opts.branch,
@@ -10894,6 +10942,7 @@ async function createManagedWorktree(opts, deps2 = {}) {
       startupEnvValues: opts.startupEnvValues,
       allocatedPorts: opts.allocatedPorts,
       runtimeEnvExtras: opts.runtimeEnvExtras,
+      dotenvValues,
       controlUrl: opts.controlUrl,
       controlToken: opts.controlToken,
       now: opts.now,
@@ -11153,6 +11202,7 @@ class LifecycleService {
   }
   async initializeUnmanagedWorktree(resolved) {
     const { profileName, profile } = this.resolveProfile(undefined);
+    const dotenvValues = await loadDotenvLocal(resolved.entry.path);
     return initializeManagedWorktree({
       gitDir: resolved.gitDir,
       branch: resolved.entry.branch ?? resolved.entry.path,
@@ -11162,6 +11212,7 @@ class LifecycleService {
       startupEnvValues: await this.buildStartupEnvValues(undefined),
       allocatedPorts: await this.allocatePorts(),
       runtimeEnvExtras: { WEBMUX_WORKTREE_PATH: resolved.entry.path },
+      dotenvValues,
       controlUrl: this.controlUrl(),
       controlToken: await this.deps.getControlToken()
     });
@@ -11170,9 +11221,10 @@ 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
-    });
+    }, dotenvValues);
     await writeRuntimeEnv(resolved.gitDir, runtimeEnv);
     const controlEnv = buildControlEnvMap({
       controlUrl: this.controlUrl(),
@@ -11320,13 +11372,14 @@ class LifecycleService {
       return;
     }
     console.debug(`[lifecycle-hook] RUNNING ${input.name}: ${input.command} in ${input.worktreePath}`);
+    const dotenvValues = await loadDotenvLocal(input.worktreePath);
     await this.deps.hooks.run({
       name: input.name,
       command: input.command,
       cwd: input.worktreePath,
       env: buildRuntimeEnvMap(input.meta, {
         WEBMUX_WORKTREE_PATH: input.worktreePath
-      })
+      }, dotenvValues)
     });
     console.debug(`[lifecycle-hook] COMPLETED ${input.name}`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webmux",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Web dashboard for workmux — browser UI with embedded terminals, PR monitoring, and CI integration",
   "type": "module",
   "repository": {