webmux 0.22.0 → 0.23.0

package/backend/dist/server.js

@@ -6919,7 +6919,7 @@ var require_public_api = __commonJS((exports) => {
 
 // backend/src/server.ts
 import { randomUUID as randomUUID3 } from "crypto";
-import { join as join6, resolve as resolve7 } from "path";
+import { join as join7, resolve as resolve7 } from "path";
 import { mkdirSync } from "fs";
 import { networkInterfaces } from "os";
 
@@ -8630,7 +8630,7 @@ function buildAgentInvocation(input) {
     if (input.launchMode === "resume") {
       return `codex${yoloFlag2} resume --last`;
     }
-    const promptSuffix2 = input.prompt ? ` ${quoteShell(input.prompt)}` : "";
+    const promptSuffix2 = input.prompt ? ` -- ${quoteShell(input.prompt)}` : "";
     if (input.systemPrompt) {
       return `codex${yoloFlag2} -c ${quoteShell(`developer_instructions=${input.systemPrompt}`)}${promptSuffix2}`;
     }
@@ -8640,7 +8640,7 @@ function buildAgentInvocation(input) {
   if (input.launchMode === "resume") {
     return `claude${yoloFlag} --continue`;
   }
-  const promptSuffix = input.prompt ? ` ${quoteShell(input.prompt)}` : "";
+  const promptSuffix = input.prompt ? ` -- ${quoteShell(input.prompt)}` : "";
   if (input.systemPrompt) {
     return `claude${yoloFlag} --append-system-prompt ${quoteShell(input.systemPrompt)}${promptSuffix}`;
   }
@@ -8759,8 +8759,8 @@ function ensureSessionLayout(tmux, plan) {
 import { randomUUID } from "crypto";
 
 // backend/src/adapters/git.ts
-import { rmSync } from "fs";
-import { resolve as resolve4 } from "path";
+import { readdirSync, rmSync, statSync } from "fs";
+import { resolve as resolve4, join as join4 } from "path";
 function runGit(args, cwd) {
   const result = Bun.spawnSync(["git", ...args], {
     cwd,
@@ -8816,6 +8816,30 @@ function currentCheckoutRef(cwd) {
     branch: null
   };
 }
+function resolveRepoRoot(dir) {
+  const direct = tryRunGit(["rev-parse", "--show-toplevel"], dir);
+  if (direct.ok)
+    return resolve4(dir, direct.stdout);
+  let entries;
+  try {
+    entries = readdirSync(dir);
+  } catch {
+    return null;
+  }
+  for (const entry of entries) {
+    const child = join4(dir, entry);
+    try {
+      if (!statSync(child).isDirectory())
+        continue;
+    } catch {
+      continue;
+    }
+    const childResult = tryRunGit(["rev-parse", "--show-toplevel"], child);
+    if (childResult.ok)
+      return resolve4(child, childResult.stdout);
+  }
+  return null;
+}
 function resolveWorktreeRoot(cwd) {
   const output = runGit(["rev-parse", "--show-toplevel"], cwd);
   return resolve4(cwd, output);
@@ -8923,6 +8947,9 @@ function removeGitWorktree(opts, deps = {}) {
 }
 
 class BunGitGateway {
+  resolveRepoRoot(dir) {
+    return resolveRepoRoot(dir);
+  }
   resolveWorktreeRoot(cwd) {
     return resolveWorktreeRoot(cwd);
   }
@@ -10706,7 +10733,7 @@ async function removeContainer(branch) {
 }
 
 // backend/src/adapters/hooks.ts
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 function buildErrorMessage(name, exitCode, stdout, stderr) {
   const output = stderr.trim() || stdout.trim();
   if (output) {
@@ -10731,7 +10758,7 @@ class BunLifecycleHookRunner {
     return this.direnvAvailable;
   }
   async buildCommand(cwd, command) {
-    if (this.checkDirenv() && await Bun.file(join5(cwd, ".envrc")).exists()) {
+    if (this.checkDirenv() && await Bun.file(join6(cwd, ".envrc")).exists()) {
       Bun.spawnSync(["direnv", "allow"], { cwd, stdout: "pipe", stderr: "pipe" });
       return ["direnv", "exec", cwd, "bash", "-c", command];
     }
@@ -11406,6 +11433,7 @@ function createWebmuxRuntime(options = {}) {
     autoName,
     onCreateProgress: (progress) => {
       worktreeCreationTracker.set(progress);
+      options.onCreateProgress?.(progress);
     },
     onCreateFinished: (branch) => {
       worktreeCreationTracker.clear(branch);
@@ -11901,10 +11929,11 @@ async function apiPullMain(req) {
       return errorResponse(`Unknown linked repo: ${repo}`, 404);
     if (!linkedRepo.dir)
       return errorResponse(`Linked repo "${repo}" has no dir configured`, 400);
-    projectRoot2 = resolve7(PROJECT_DIR, linkedRepo.dir);
-    if (!projectRoot2.startsWith(PROJECT_DIR)) {
-      return errorResponse("Invalid linked repo directory", 400);
-    }
+    const resolvedDir = resolve7(PROJECT_DIR, linkedRepo.dir);
+    const repoRoot = git.resolveRepoRoot(resolvedDir);
+    if (!repoRoot)
+      return errorResponse(`Linked repo "${repo}" dir is not a git repository: ${resolvedDir}`, 400);
+    projectRoot2 = repoRoot;
   }
   const deps = { git, projectRoot: projectRoot2, mainBranch: config.workspace.mainBranch };
   const result = force ? forcePullMainBranch(deps) : pullMainBranch(deps);
@@ -11990,7 +12019,7 @@ async function apiUploadFiles(name, req) {
       return errorResponse(`File too large: ${entry.name} (max 10MB)`, 400);
     }
     const safeName = `${Date.now()}_${sanitizeFilename(entry.name)}`;
-    const destPath = join6(uploadDir, safeName);
+    const destPath = join7(uploadDir, safeName);
     if (!resolve7(destPath).startsWith(uploadDir + "/")) {
       return errorResponse("Invalid filename", 400);
     }
@@ -12123,7 +12152,7 @@ Bun.serve({
     if (STATIC_DIR) {
       const url = new URL(req.url);
       const rawPath = url.pathname === "/" ? "index.html" : url.pathname;
-      const filePath = join6(STATIC_DIR, rawPath);
+      const filePath = join7(STATIC_DIR, rawPath);
       const staticRoot = resolve7(STATIC_DIR);
       if (!resolve7(filePath).startsWith(staticRoot + "/")) {
         return new Response("Forbidden", { status: 403 });
@@ -12133,7 +12162,7 @@ Bun.serve({
         const headers = rawPath.startsWith("/assets/") ? { "Cache-Control": "public, max-age=31536000, immutable" } : {};
         return new Response(file, { headers });
       }
-      return new Response(Bun.file(join6(STATIC_DIR, "index.html")), {
+      return new Response(Bun.file(join7(STATIC_DIR, "index.html")), {
         headers: { "Cache-Control": "no-cache" }
       });
     }

package/bin/webmux.js

@@ -48,8 +48,8 @@ var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = import.meta.require;
 
 // backend/src/adapters/git.ts
-import { rmSync } from "fs";
-import { resolve } from "path";
+import { readdirSync, rmSync, statSync } from "fs";
+import { resolve, join } from "path";
 function runGit(args, cwd) {
   const result = Bun.spawnSync(["git", ...args], {
     cwd,
@@ -105,6 +105,30 @@ function currentCheckoutRef(cwd) {
     branch: null
   };
 }
+function resolveRepoRoot(dir) {
+  const direct = tryRunGit(["rev-parse", "--show-toplevel"], dir);
+  if (direct.ok)
+    return resolve(dir, direct.stdout);
+  let entries;
+  try {
+    entries = readdirSync(dir);
+  } catch {
+    return null;
+  }
+  for (const entry of entries) {
+    const child = join(dir, entry);
+    try {
+      if (!statSync(child).isDirectory())
+        continue;
+    } catch {
+      continue;
+    }
+    const childResult = tryRunGit(["rev-parse", "--show-toplevel"], child);
+    if (childResult.ok)
+      return resolve(child, childResult.stdout);
+  }
+  return null;
+}
 function resolveWorktreeRoot(cwd) {
   const output = runGit(["rev-parse", "--show-toplevel"], cwd);
   return resolve(cwd, output);
@@ -212,6 +236,9 @@ function removeGitWorktree(opts, deps = {}) {
 }
 
 class BunGitGateway {
+  resolveRepoRoot(dir) {
+    return resolveRepoRoot(dir);
+  }
   resolveWorktreeRoot(cwd) {
     return resolveWorktreeRoot(cwd);
   }
@@ -1436,7 +1463,7 @@ var init_dist2 = __esm(() => {
 
 // bin/src/shared.ts
 import { existsSync, readFileSync } from "fs";
-import { basename as basename2, join } from "path";
+import { basename as basename2, join as join2 } from "path";
 function run(cmd, args, opts) {
   const result = Bun.spawnSync([cmd, ...args], { stdout: "pipe", stderr: "pipe", ...opts });
   return {
@@ -1455,7 +1482,7 @@ function getGitRoot() {
   return result.stdout.toString().trim();
 }
 function detectProjectName(gitRoot) {
-  const pkgPath = join(gitRoot, "package.json");
+  const pkgPath = join2(gitRoot, "package.json");
   if (existsSync(pkgPath)) {
     try {
       const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
@@ -1470,7 +1497,7 @@ var init_shared = () => {};
 // bin/src/init-helpers.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2, rmSync as rmSync2 } from "fs";
 import { tmpdir } from "os";
-import { join as join2 } from "path";
+import { join as join3 } from "path";
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -1478,11 +1505,11 @@ function readString(value) {
   return typeof value === "string" && value.trim().length > 0 ? value : null;
 }
 function detectPackageManager(gitRoot) {
-  if (existsSync2(join2(gitRoot, "bun.lock")) || existsSync2(join2(gitRoot, "bun.lockb")))
+  if (existsSync2(join3(gitRoot, "bun.lock")) || existsSync2(join3(gitRoot, "bun.lockb")))
     return "bun";
-  if (existsSync2(join2(gitRoot, "pnpm-lock.yaml")))
+  if (existsSync2(join3(gitRoot, "pnpm-lock.yaml")))
     return "pnpm";
-  if (existsSync2(join2(gitRoot, "yarn.lock")))
+  if (existsSync2(join3(gitRoot, "yarn.lock")))
     return "yarn";
   return "npm";
 }
@@ -1582,7 +1609,7 @@ function buildInitAgentCommand(agent, prompt, outputPrefix = "webmux-init") {
       ]
     };
   }
-  const summaryPath = join2(tmpdir(), `${outputPrefix}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.txt`);
+  const summaryPath = join3(tmpdir(), `${outputPrefix}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.txt`);
   return {
     agent,
     cmd: "codex",
@@ -2065,7 +2092,7 @@ var init_init_helpers = __esm(() => {
 // bin/src/init.ts
 var exports_init = {};
 import { existsSync as existsSync3 } from "fs";
-import { join as join3 } from "path";
+import { join as join4 } from "path";
 function checkDeps() {
   const missing = [];
   for (const dep of deps) {
@@ -2193,7 +2220,7 @@ var init_init = __esm(async () => {
     }
   }
   R2.step("Checking config files...");
-  webmuxYaml = join3(gitRoot, ".webmux.yaml");
+  webmuxYaml = join4(gitRoot, ".webmux.yaml");
   if (existsSync3(webmuxYaml)) {
     R2.info(".webmux.yaml already exists, skipping");
   } else {
@@ -2304,7 +2331,7 @@ __export(exports_service, {
   default: () => service
 });
 import { existsSync as existsSync4, mkdirSync, unlinkSync } from "fs";
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 import { homedir } from "os";
 function getPlatform() {
   const plat = process.platform;
@@ -2334,10 +2361,10 @@ function printRunResult(result) {
     console.error(err);
 }
 function systemdUnitPath(serviceName) {
-  return join4(homedir(), ".config", "systemd", "user", `${serviceName}.service`);
+  return join5(homedir(), ".config", "systemd", "user", `${serviceName}.service`);
 }
 function launchdPlistPath(serviceName) {
-  return join4(homedir(), "Library", "LaunchAgents", `com.webmux.${serviceName}.plist`);
+  return join5(homedir(), "Library", "LaunchAgents", `com.webmux.${serviceName}.plist`);
 }
 function serviceFilePath(config) {
   if (config.platform === "linux")
@@ -2363,7 +2390,7 @@ WantedBy=default.target
 `;
 }
 function generateLaunchdPlist(config) {
-  const logPath = join4(homedir(), "Library", "Logs", `webmux-${config.serviceName}.log`);
+  const logPath = join5(homedir(), "Library", "Logs", `webmux-${config.serviceName}.log`);
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -2535,7 +2562,7 @@ function logs(config) {
   if (config.platform === "linux") {
     proc = Bun.spawn(["journalctl", "--user", "-u", config.serviceName, "-f", "--no-pager"], { stdout: "inherit", stderr: "inherit" });
   } else {
-    const logPath = join4(homedir(), "Library", "Logs", `webmux-${config.serviceName}.log`);
+    const logPath = join5(homedir(), "Library", "Logs", `webmux-${config.serviceName}.log`);
     if (!existsSync4(logPath)) {
       R2.error(`Log file not found: ${logPath}`);
       return;
@@ -2634,7 +2661,7 @@ var init_service = __esm(() => {
 
 // backend/src/adapters/fs.ts
 import { mkdir } from "fs/promises";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 function stringifyAllocatedPorts(ports) {
   const entries = Object.entries(ports).map(([key, value]) => [key, String(value)]);
   return Object.fromEntries(entries);
@@ -2666,21 +2693,21 @@ function parseDotenv(content) {
 }
 async function loadDotenvLocal(worktreePath) {
   try {
-    const content = await Bun.file(join5(worktreePath, ".env.local")).text();
+    const content = await Bun.file(join6(worktreePath, ".env.local")).text();
     return parseDotenv(content);
   } catch {
     return {};
   }
 }
 function getWorktreeStoragePaths(gitDir) {
-  const webmuxDir = join5(gitDir, "webmux");
+  const webmuxDir = join6(gitDir, "webmux");
   return {
     gitDir,
     webmuxDir,
-    metaPath: join5(webmuxDir, "meta.json"),
-    runtimeEnvPath: join5(webmuxDir, "runtime.env"),
-    controlEnvPath: join5(webmuxDir, "control.env"),
-    prsPath: join5(webmuxDir, "prs.json")
+    metaPath: join6(webmuxDir, "meta.json"),
+    runtimeEnvPath: join6(webmuxDir, "runtime.env"),
+    controlEnvPath: join6(webmuxDir, "control.env"),
+    prsPath: join6(webmuxDir, "prs.json")
   };
 }
 async function ensureWorktreeStorageDirs(gitDir) {
@@ -9889,7 +9916,7 @@ var init_dist3 = __esm(() => {
 
 // backend/src/adapters/config.ts
 import { readFileSync as readFileSync3 } from "fs";
-import { dirname as dirname2, join as join6, resolve as resolve4 } from "path";
+import { dirname as dirname2, join as join7, resolve as resolve4 } from "path";
 function clonePanes(panes) {
   return panes.map((pane) => ({ ...pane }));
 }
@@ -10071,10 +10098,10 @@ function getDefaultProfileName(config) {
   return Object.keys(config.profiles)[0] ?? "default";
 }
 function readConfigFile(root) {
-  return readFileSync3(join6(root, ".webmux.yaml"), "utf8");
+  return readFileSync3(join7(root, ".webmux.yaml"), "utf8");
 }
 function readLocalConfigFile(root) {
-  return readFileSync3(join6(root, ".webmux.local.yaml"), "utf8");
+  return readFileSync3(join7(root, ".webmux.local.yaml"), "utf8");
 }
 function parseConfigDocument(text) {
   const parsed = $parse(text);
@@ -10574,7 +10601,7 @@ var init_docker = __esm(() => {
 });
 
 // backend/src/adapters/hooks.ts
-import { join as join7 } from "path";
+import { join as join8 } from "path";
 function buildErrorMessage(name, exitCode, stdout, stderr) {
   const output = stderr.trim() || stdout.trim();
   if (output) {
@@ -10599,7 +10626,7 @@ class BunLifecycleHookRunner {
     return this.direnvAvailable;
   }
   async buildCommand(cwd, command) {
-    if (this.checkDirenv() && await Bun.file(join7(cwd, ".envrc")).exists()) {
+    if (this.checkDirenv() && await Bun.file(join8(cwd, ".envrc")).exists()) {
       Bun.spawnSync(["direnv", "allow"], { cwd, stdout: "pipe", stderr: "pipe" });
       return ["direnv", "exec", cwd, "bash", "-c", command];
     }
@@ -10809,7 +10836,7 @@ var init_auto_name_service = __esm(() => {
 
 // backend/src/adapters/agent-runtime.ts
 import { chmod as chmod2, mkdir as mkdir3 } from "fs/promises";
-import { dirname as dirname4, join as join8 } from "path";
+import { dirname as dirname4, join as join9 } from "path";
 function shellQuote(value) {
   return `'${value.replaceAll("'", "'\\''")}'`;
 }
@@ -11073,8 +11100,8 @@ async function mergeClaudeSettings(settingsPath, hookSettings) {
 async function ensureAgentRuntimeArtifacts(input) {
   const storagePaths = getWorktreeStoragePaths(input.gitDir);
   const artifacts = {
-    agentCtlPath: join8(storagePaths.webmuxDir, "webmux-agentctl"),
-    claudeSettingsPath: join8(input.worktreePath, ".claude", "settings.local.json")
+    agentCtlPath: join9(storagePaths.webmuxDir, "webmux-agentctl"),
+    claudeSettingsPath: join9(input.worktreePath, ".claude", "settings.local.json")
   };
   await mkdir3(dirname4(artifacts.claudeSettingsPath), { recursive: true });
   await Bun.write(artifacts.agentCtlPath, buildAgentCtlScript());
@@ -11104,7 +11131,7 @@ function buildAgentInvocation(input) {
     if (input.launchMode === "resume") {
       return `codex${yoloFlag2} resume --last`;
     }
-    const promptSuffix2 = input.prompt ? ` ${quoteShell(input.prompt)}` : "";
+    const promptSuffix2 = input.prompt ? ` -- ${quoteShell(input.prompt)}` : "";
     if (input.systemPrompt) {
       return `codex${yoloFlag2} -c ${quoteShell(`developer_instructions=${input.systemPrompt}`)}${promptSuffix2}`;
     }
@@ -11114,7 +11141,7 @@ function buildAgentInvocation(input) {
   if (input.launchMode === "resume") {
     return `claude${yoloFlag} --continue`;
   }
-  const promptSuffix = input.prompt ? ` ${quoteShell(input.prompt)}` : "";
+  const promptSuffix = input.prompt ? ` -- ${quoteShell(input.prompt)}` : "";
   if (input.systemPrompt) {
     return `claude${yoloFlag} --append-system-prompt ${quoteShell(input.systemPrompt)}${promptSuffix}`;
   }
@@ -12434,6 +12461,7 @@ function createWebmuxRuntime(options = {}) {
     autoName,
     onCreateProgress: (progress) => {
       worktreeCreationTracker.set(progress);
+      options.onCreateProgress?.(progress);
     },
     onCreateFinished: (branch) => {
       worktreeCreationTracker.clear(branch);
@@ -12784,7 +12812,10 @@ async function runWorktreeCommand(context, deps2 = {}) {
       }
       const runtime2 = createRuntime({
         projectDir: context.projectDir,
-        port: context.port
+        port: context.port,
+        onCreateProgress: (progress) => {
+          stdout(PHASE_LABELS[progress.phase] ?? progress.phase);
+        }
       });
       const result = await runtime2.lifecycleService.createWorktree(parsed.input);
       stdout(`Created worktree ${result.branch}`);
@@ -12898,25 +12929,32 @@ async function runWorktreeCommand(context, deps2 = {}) {
     return 1;
   }
 }
-var CommandUsageError;
+var PHASE_LABELS, CommandUsageError;
 var init_worktree_commands = __esm(() => {
   init_dist2();
   init_fs();
   init_tmux();
   init_policies();
   init_runtime();
+  PHASE_LABELS = {
+    creating_worktree: "Creating worktree",
+    running_post_create_hook: "Running post-create hook",
+    preparing_runtime: "Preparing runtime",
+    starting_session: "Starting session",
+    reconciling: "Reconciling"
+  };
   CommandUsageError = class CommandUsageError extends Error {
   };
 });
 
 // bin/src/webmux.ts
-import { resolve as resolve9, dirname as dirname6, join as join10 } from "path";
+import { resolve as resolve9, dirname as dirname6, join as join11 } from "path";
 import { existsSync as existsSync5 } from "fs";
 import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "webmux",
-  version: "0.22.0",
+  version: "0.23.0",
   description: "Web dashboard for workmux \u2014 browser UI with embedded terminals, PR monitoring, and CI integration",
   type: "module",
   repository: {
@@ -13231,8 +13269,8 @@ async function main(args = process.argv.slice(2)) {
   }
   process.on("SIGINT", cleanup);
   process.on("SIGTERM", cleanup);
-  const backendEntry = join10(PKG_ROOT, "backend", "dist", "server.js");
-  const staticDir = join10(PKG_ROOT, "frontend", "dist");
+  const backendEntry = join11(PKG_ROOT, "backend", "dist", "server.js");
+  const staticDir = join11(PKG_ROOT, "frontend", "dist");
   if (!existsSync5(staticDir)) {
     console.error(`Error: frontend/dist/ not found. Run 'bun run build' first.`);
     process.exit(1);