leglas 0.7.3 → 0.7.4

package/dist/bin.js

@@ -2745,6 +2745,84 @@ async function startAppProcess(options) {
   throw new Error(`${options.label} did not start within ${Math.round(readyTimeoutMs / 1e3)}s. Check that its dev command serves the port it is given.`);
 }
 
+// ../server/dist/branches.js
+function publicBranchState(state) {
+  if (state.status === "ready")
+    return { status: "ready" };
+  return state;
+}
+function createBranchRegistry(options) {
+  const states = new Map(options.previews.map((preview) => [preview.title, { status: "idle" }]));
+  const previews = new Map(options.previews.map((preview) => [preview.title, preview]));
+  const inflight = /* @__PURE__ */ new Map();
+  const boot = options.startWorktree ?? startWorktree;
+  let closed = false;
+  let stopPromise = null;
+  const transition = (title, state) => {
+    const previous = states.get(title);
+    if (previous?.status === "starting" && state.status === "starting" && previous.phase === state.phase) {
+      return previous;
+    }
+    states.set(title, state);
+    options.onChange?.(title, state);
+    return state;
+  };
+  const begin = (title) => {
+    const preview = previews.get(title);
+    const current = states.get(title);
+    if (preview === void 0 || current === void 0 || closed)
+      return void 0;
+    if (current.status === "starting")
+      return inflight.get(title);
+    if (current.status === "ready")
+      return Promise.resolve(current);
+    transition(title, { status: "starting", phase: "checking out" });
+    let checkout;
+    try {
+      checkout = Promise.resolve(boot({
+        cwd: options.cwd,
+        branch: preview.branch,
+        installCommand: options.installCommand,
+        devCommand: options.devCommand ?? "",
+        onLog: (line) => {
+          transition(title, {
+            status: "starting",
+            phase: line.startsWith("installing ") ? "installing" : "starting"
+          });
+        }
+      }));
+    } catch (error) {
+      checkout = Promise.reject(error);
+    }
+    const starting = checkout.then((worktree) => {
+      transition(title, { status: "starting", phase: "starting" });
+      return transition(title, { status: "ready", worktree });
+    }).catch((error) => transition(title, {
+      status: "failed",
+      reason: error instanceof Error ? error.message : String(error)
+    })).finally(() => {
+      inflight.delete(title);
+    });
+    inflight.set(title, starting);
+    return starting;
+  };
+  return {
+    state: (title) => states.get(title),
+    start: begin,
+    stop: () => {
+      if (stopPromise !== null)
+        return stopPromise;
+      closed = true;
+      stopPromise = Promise.allSettled([...inflight.values()]).then(async () => {
+        const worktrees = [...states.values()].filter((state) => state.status === "ready").map((state) => state.worktree);
+        await Promise.all(worktrees.map((worktree) => worktree.stop().catch(() => {
+        })));
+      });
+      return stopPromise;
+    }
+  };
+}
+
 // ../server/dist/failure.js
 var NEEDS_TRUST = /not inside a trusted directory|--skip-git-repo-check/i;
 var MISSING_BINARY = /\b(ENOENT|EACCES|ENOTDIR)\b/;
@@ -5292,6 +5370,32 @@ async function startServer(options) {
   const { config, configErrors = [], configWarnings = [], shellDir = null, project = "", cwd = process.cwd(), leglasCommand = "npx -y leglas", fileMounts = /* @__PURE__ */ new Map(), detect = () => detectAgents() } = options;
   const browserPool = options.pool ?? createBrowserPool();
   const live = options.live ?? createLiveHub();
+  const branches = createBranchRegistry({
+    cwd,
+    previews: (config?.previews ?? []).flatMap((preview) => preview.branch === void 0 ? [] : [{ title: preview.title, branch: preview.branch }]),
+    installCommand: config?.installCommand ?? DEFAULT_INSTALL_COMMAND,
+    devCommand: config?.devCommand,
+    onChange: () => live.nudge("config"),
+    ...options.startWorktree === void 0 ? {} : { startWorktree: options.startWorktree }
+  });
+  const previewForConfig = (preview) => {
+    if (preview.branch === void 0)
+      return preview;
+    const state = branches.state(preview.title) ?? { status: "idle" };
+    const { url: route, ...withoutUrl } = preview;
+    return state.status === "ready" ? {
+      ...withoutUrl,
+      url: `${state.worktree.url}${route}`,
+      state: publicBranchState(state)
+    } : { ...withoutUrl, state: publicBranchState(state) };
+  };
+  const previewsForConfig = (previews) => previews.map(previewForConfig);
+  const readyPreview = (preview) => {
+    if (preview.branch === void 0)
+      return preview;
+    const state = branches.state(preview.title);
+    return state?.status === "ready" ? { ...preview, url: `${state.worktree.url}${preview.url}` } : null;
+  };
   if (options.pool === void 0) {
     void reapOrphanedBrowsers().catch(() => {
     });
@@ -5325,7 +5429,7 @@ async function startServer(options) {
     }
     return Promise.resolve(agentsCache.agents);
   };
-  const livePreviews = async () => {
+  const livePreviewDefinitions = async () => {
     const localRead = await readLocalPreviews(cwd).catch(() => null);
     const local = localRead?.errors.length === 0 ? localRead.previews : [];
     const localTitles = new Set(local.map((entry) => entry.title));
@@ -5335,6 +5439,7 @@ async function startServer(options) {
     const fresh = local.filter((entry) => !known.has(entry.title) && entry.branch === void 0 && entry.file === void 0);
     return [...boot, ...fresh];
   };
+  const livePreviews = async () => (await livePreviewDefinitions()).map(readyPreview).filter((preview) => preview !== null);
   void probeAgents().catch(() => {
   });
   const server = http2.createServer((req, res) => {
@@ -5356,7 +5461,7 @@ async function startServer(options) {
             project,
             devServer: target,
             scanPreviews: config?.scanPreviews ?? true,
-            previews: boot,
+            previews: previewsForConfig(boot),
             errors,
             warnings: configWarnings
           });
@@ -5369,7 +5474,7 @@ async function startServer(options) {
           project,
           devServer: target,
           scanPreviews: config?.scanPreviews ?? true,
-          previews: [...currentBoot, ...fresh],
+          previews: previewsForConfig([...currentBoot, ...fresh]),
           errors,
           warnings: configWarnings
         });
@@ -5377,11 +5482,46 @@ async function startServer(options) {
         project,
         devServer: target,
         scanPreviews: config?.scanPreviews ?? true,
-        previews: boot,
+        previews: previewsForConfig(boot),
         errors,
         warnings: configWarnings
       }));
     }
+    if (path === `${LEGLAS_PREFIX}/api/previews/start` && req.method === "POST") {
+      let body = "";
+      req.on("data", (chunk) => body += chunk);
+      return void req.on("end", async () => {
+        const parsed2 = jsonBody(body);
+        if (parsed2 === null) {
+          return sendJson(res, 400, { ok: false, error: "Body must be JSON." });
+        }
+        if (typeof parsed2.title !== "string" || parsed2.title.trim() === "") {
+          return sendJson(res, 400, { ok: false, error: "Body needs a direction title." });
+        }
+        const preview = (await livePreviewDefinitions()).find((entry) => entry.title === parsed2.title);
+        if (preview === void 0) {
+          return sendJson(res, 404, { ok: false, error: "No such direction." });
+        }
+        if (preview.branch === void 0) {
+          return sendJson(res, 400, {
+            ok: false,
+            error: `"${preview.title}" is not a branch preview.`
+          });
+        }
+        if (config?.devCommand === void 0) {
+          return sendJson(res, 400, {
+            ok: false,
+            error: `"${preview.title}" cannot start because the config sets no devCommand.`
+          });
+        }
+        void branches.start(preview.title);
+        const state = branches.state(preview.title);
+        if (state === void 0) {
+          return sendJson(res, 404, { ok: false, error: "No such branch preview." });
+        }
+        return sendJson(res, 200, { ok: true, state: publicBranchState(state) });
+      });
+    }
     if (path === `${LEGLAS_PREFIX}/api/previews/delete` && req.method === "POST") {
       let body = "";
       req.on("data", (chunk) => body += chunk);
@@ -6076,7 +6216,12 @@ async function startServer(options) {
         return closePromise;
       liveFiles.close();
       liveHealth.close();
-      closePromise = Promise.all([runner.stop(), browserPool.close(), live.close()]).then(() => new Promise((done) => {
+      closePromise = Promise.all([
+        branches.stop(),
+        runner.stop(),
+        browserPool.close(),
+        live.close()
+      ]).then(() => new Promise((done) => {
         for (const socket of sockets)
           socket.destroy();
         sockets.clear();
@@ -7377,8 +7522,7 @@ async function run3(options, deps) {
   const local = await readLocalPreviews(options.cwd);
   let devServer = options.userPort === void 0 ? loaded.config?.devServer ?? "http://localhost:3000" : `http://localhost:${options.userPort}`;
   const merged = loaded.config === null ? null : { ...loaded.config, devServer, previews: [...loaded.config.previews, ...local.previews] };
-  const worktrees = [];
-  const worktreeErrors = [];
+  const previewErrors = [];
   const previews = [];
   let app = null;
   const needsApp = (merged?.previews ?? []).some(
@@ -7395,7 +7539,7 @@ async function run3(options, deps) {
       devServer = app.url;
       merged.devServer = app.url;
     } catch (error) {
-      worktreeErrors.push(error instanceof Error ? error.message : String(error));
+      previewErrors.push(error instanceof Error ? error.message : String(error));
     }
   }
   const fileMounts = /* @__PURE__ */ new Map();
@@ -7403,7 +7547,7 @@ async function run3(options, deps) {
     if (preview.file !== void 0) {
       const absolute = join19(options.cwd, preview.file);
       if (!existsSync6(absolute)) {
-        worktreeErrors.push(
+        previewErrors.push(
           `"${preview.title}" names file ${preview.file}, which does not exist. The preview is skipped.`
         );
         continue;
@@ -7419,29 +7563,7 @@ async function run3(options, deps) {
       });
       continue;
     }
-    if (preview.branch === void 0) {
-      previews.push(preview);
-      continue;
-    }
-    if (merged?.devCommand === void 0) {
-      worktreeErrors.push(
-        `"${preview.title}" names branch ${preview.branch}, but the config sets no devCommand, so Leglas cannot start that checkout. Add devCommand (with {port}) to the config.`
-      );
-      continue;
-    }
-    if (!options.json) deps.log(`  starting ${preview.branch}\u2026`);
-    try {
-      const worktree = await startWorktree({
-        cwd: options.cwd,
-        branch: preview.branch,
-        installCommand: merged.installCommand,
-        devCommand: merged.devCommand
-      });
-      worktrees.push(worktree);
-      previews.push({ ...preview, url: `${worktree.url}${preview.url}` });
-    } catch (error) {
-      worktreeErrors.push(error instanceof Error ? error.message : String(error));
-    }
+    previews.push(preview);
   }
   const config = merged === null ? null : { ...merged, previews };
   const configWarnings = [];
@@ -7451,7 +7573,7 @@ async function run3(options, deps) {
   const ownerWarning = needsApp && app === null ? inspectLocalDevServer(devServer).then((owners) => devServerOwnerWarning(devServer, projectRoot, owners)).catch(() => null) : Promise.resolve(null);
   const serverPromise = startServer({
     config,
-    configErrors: [...loaded.errors, ...local.errors, ...worktreeErrors],
+    configErrors: [...loaded.errors, ...local.errors, ...previewErrors],
     configWarnings,
     fileMounts,
     shellDir: findShellDir(),
@@ -7490,9 +7612,9 @@ async function run3(options, deps) {
     );
     deps.log(`config   ${configLabel}`);
     deps.log(`          ${previewCount} preview${previewCount === 1 ? "" : "s"}`);
-    if (loaded.errors.length + worktreeErrors.length > 0) {
+    if (loaded.errors.length + previewErrors.length > 0) {
       deps.log("");
-      for (const error of [...loaded.errors, ...worktreeErrors]) deps.log(`  ! ${error}`);
+      for (const error of [...loaded.errors, ...previewErrors]) deps.log(`  ! ${error}`);
       deps.log("  Fix the config and reload; Leglas will pick it up on restart.");
     }
     if (configWarnings.length > 0) {
@@ -7515,8 +7637,6 @@ async function run3(options, deps) {
     devServer,
     previewCount,
     stop: async () => {
-      await Promise.all(worktrees.map((worktree) => worktree.stop().catch(() => {
-      })));
       await app?.stop().catch(() => {
       });
       await server.close();

package/dist/index.js

@@ -3121,6 +3121,84 @@ async function startAppProcess(options) {
   throw new Error(`${options.label} did not start within ${Math.round(readyTimeoutMs / 1e3)}s. Check that its dev command serves the port it is given.`);
 }
 
+// ../server/dist/branches.js
+function publicBranchState(state) {
+  if (state.status === "ready")
+    return { status: "ready" };
+  return state;
+}
+function createBranchRegistry(options) {
+  const states = new Map(options.previews.map((preview) => [preview.title, { status: "idle" }]));
+  const previews = new Map(options.previews.map((preview) => [preview.title, preview]));
+  const inflight = /* @__PURE__ */ new Map();
+  const boot = options.startWorktree ?? startWorktree;
+  let closed = false;
+  let stopPromise = null;
+  const transition = (title, state) => {
+    const previous = states.get(title);
+    if (previous?.status === "starting" && state.status === "starting" && previous.phase === state.phase) {
+      return previous;
+    }
+    states.set(title, state);
+    options.onChange?.(title, state);
+    return state;
+  };
+  const begin = (title) => {
+    const preview = previews.get(title);
+    const current = states.get(title);
+    if (preview === void 0 || current === void 0 || closed)
+      return void 0;
+    if (current.status === "starting")
+      return inflight.get(title);
+    if (current.status === "ready")
+      return Promise.resolve(current);
+    transition(title, { status: "starting", phase: "checking out" });
+    let checkout;
+    try {
+      checkout = Promise.resolve(boot({
+        cwd: options.cwd,
+        branch: preview.branch,
+        installCommand: options.installCommand,
+        devCommand: options.devCommand ?? "",
+        onLog: (line) => {
+          transition(title, {
+            status: "starting",
+            phase: line.startsWith("installing ") ? "installing" : "starting"
+          });
+        }
+      }));
+    } catch (error) {
+      checkout = Promise.reject(error);
+    }
+    const starting = checkout.then((worktree) => {
+      transition(title, { status: "starting", phase: "starting" });
+      return transition(title, { status: "ready", worktree });
+    }).catch((error) => transition(title, {
+      status: "failed",
+      reason: error instanceof Error ? error.message : String(error)
+    })).finally(() => {
+      inflight.delete(title);
+    });
+    inflight.set(title, starting);
+    return starting;
+  };
+  return {
+    state: (title) => states.get(title),
+    start: begin,
+    stop: () => {
+      if (stopPromise !== null)
+        return stopPromise;
+      closed = true;
+      stopPromise = Promise.allSettled([...inflight.values()]).then(async () => {
+        const worktrees = [...states.values()].filter((state) => state.status === "ready").map((state) => state.worktree);
+        await Promise.all(worktrees.map((worktree) => worktree.stop().catch(() => {
+        })));
+      });
+      return stopPromise;
+    }
+  };
+}
+
 // ../server/dist/failure.js
 var NEEDS_TRUST = /not inside a trusted directory|--skip-git-repo-check/i;
 var MISSING_BINARY = /\b(ENOENT|EACCES|ENOTDIR)\b/;
@@ -5668,6 +5746,32 @@ async function startServer(options) {
   const { config, configErrors = [], configWarnings = [], shellDir = null, project = "", cwd = process.cwd(), leglasCommand = "npx -y leglas", fileMounts = /* @__PURE__ */ new Map(), detect = () => detectAgents() } = options;
   const browserPool = options.pool ?? createBrowserPool();
   const live = options.live ?? createLiveHub();
+  const branches = createBranchRegistry({
+    cwd,
+    previews: (config?.previews ?? []).flatMap((preview) => preview.branch === void 0 ? [] : [{ title: preview.title, branch: preview.branch }]),
+    installCommand: config?.installCommand ?? DEFAULT_INSTALL_COMMAND,
+    devCommand: config?.devCommand,
+    onChange: () => live.nudge("config"),
+    ...options.startWorktree === void 0 ? {} : { startWorktree: options.startWorktree }
+  });
+  const previewForConfig = (preview) => {
+    if (preview.branch === void 0)
+      return preview;
+    const state = branches.state(preview.title) ?? { status: "idle" };
+    const { url: route, ...withoutUrl } = preview;
+    return state.status === "ready" ? {
+      ...withoutUrl,
+      url: `${state.worktree.url}${route}`,
+      state: publicBranchState(state)
+    } : { ...withoutUrl, state: publicBranchState(state) };
+  };
+  const previewsForConfig = (previews) => previews.map(previewForConfig);
+  const readyPreview = (preview) => {
+    if (preview.branch === void 0)
+      return preview;
+    const state = branches.state(preview.title);
+    return state?.status === "ready" ? { ...preview, url: `${state.worktree.url}${preview.url}` } : null;
+  };
   if (options.pool === void 0) {
     void reapOrphanedBrowsers().catch(() => {
     });
@@ -5701,7 +5805,7 @@ async function startServer(options) {
     }
     return Promise.resolve(agentsCache.agents);
   };
-  const livePreviews = async () => {
+  const livePreviewDefinitions = async () => {
     const localRead = await readLocalPreviews(cwd).catch(() => null);
     const local = localRead?.errors.length === 0 ? localRead.previews : [];
     const localTitles = new Set(local.map((entry) => entry.title));
@@ -5711,6 +5815,7 @@ async function startServer(options) {
     const fresh = local.filter((entry) => !known.has(entry.title) && entry.branch === void 0 && entry.file === void 0);
     return [...boot, ...fresh];
   };
+  const livePreviews = async () => (await livePreviewDefinitions()).map(readyPreview).filter((preview) => preview !== null);
   void probeAgents().catch(() => {
   });
   const server = http2.createServer((req, res) => {
@@ -5732,7 +5837,7 @@ async function startServer(options) {
             project,
             devServer: target,
             scanPreviews: config?.scanPreviews ?? true,
-            previews: boot,
+            previews: previewsForConfig(boot),
             errors,
             warnings: configWarnings
           });
@@ -5745,7 +5850,7 @@ async function startServer(options) {
           project,
           devServer: target,
           scanPreviews: config?.scanPreviews ?? true,
-          previews: [...currentBoot, ...fresh],
+          previews: previewsForConfig([...currentBoot, ...fresh]),
           errors,
           warnings: configWarnings
         });
@@ -5753,11 +5858,46 @@ async function startServer(options) {
         project,
         devServer: target,
         scanPreviews: config?.scanPreviews ?? true,
-        previews: boot,
+        previews: previewsForConfig(boot),
         errors,
         warnings: configWarnings
       }));
     }
+    if (path === `${LEGLAS_PREFIX}/api/previews/start` && req.method === "POST") {
+      let body = "";
+      req.on("data", (chunk) => body += chunk);
+      return void req.on("end", async () => {
+        const parsed = jsonBody(body);
+        if (parsed === null) {
+          return sendJson(res, 400, { ok: false, error: "Body must be JSON." });
+        }
+        if (typeof parsed.title !== "string" || parsed.title.trim() === "") {
+          return sendJson(res, 400, { ok: false, error: "Body needs a direction title." });
+        }
+        const preview = (await livePreviewDefinitions()).find((entry) => entry.title === parsed.title);
+        if (preview === void 0) {
+          return sendJson(res, 404, { ok: false, error: "No such direction." });
+        }
+        if (preview.branch === void 0) {
+          return sendJson(res, 400, {
+            ok: false,
+            error: `"${preview.title}" is not a branch preview.`
+          });
+        }
+        if (config?.devCommand === void 0) {
+          return sendJson(res, 400, {
+            ok: false,
+            error: `"${preview.title}" cannot start because the config sets no devCommand.`
+          });
+        }
+        void branches.start(preview.title);
+        const state = branches.state(preview.title);
+        if (state === void 0) {
+          return sendJson(res, 404, { ok: false, error: "No such branch preview." });
+        }
+        return sendJson(res, 200, { ok: true, state: publicBranchState(state) });
+      });
+    }
     if (path === `${LEGLAS_PREFIX}/api/previews/delete` && req.method === "POST") {
       let body = "";
       req.on("data", (chunk) => body += chunk);
@@ -6452,7 +6592,12 @@ async function startServer(options) {
         return closePromise;
       liveFiles.close();
       liveHealth.close();
-      closePromise = Promise.all([runner.stop(), browserPool.close(), live.close()]).then(() => new Promise((done) => {
+      closePromise = Promise.all([
+        branches.stop(),
+        runner.stop(),
+        browserPool.close(),
+        live.close()
+      ]).then(() => new Promise((done) => {
         for (const socket of sockets)
           socket.destroy();
         sockets.clear();
@@ -7367,8 +7512,7 @@ async function run3(options, deps) {
   const local = await readLocalPreviews(options.cwd);
   let devServer = options.userPort === void 0 ? loaded.config?.devServer ?? "http://localhost:3000" : `http://localhost:${options.userPort}`;
   const merged = loaded.config === null ? null : { ...loaded.config, devServer, previews: [...loaded.config.previews, ...local.previews] };
-  const worktrees = [];
-  const worktreeErrors = [];
+  const previewErrors = [];
   const previews = [];
   let app = null;
   const needsApp = (merged?.previews ?? []).some(
@@ -7385,7 +7529,7 @@ async function run3(options, deps) {
       devServer = app.url;
       merged.devServer = app.url;
     } catch (error) {
-      worktreeErrors.push(error instanceof Error ? error.message : String(error));
+      previewErrors.push(error instanceof Error ? error.message : String(error));
     }
   }
   const fileMounts = /* @__PURE__ */ new Map();
@@ -7393,7 +7537,7 @@ async function run3(options, deps) {
     if (preview.file !== void 0) {
       const absolute = join19(options.cwd, preview.file);
       if (!existsSync6(absolute)) {
-        worktreeErrors.push(
+        previewErrors.push(
           `"${preview.title}" names file ${preview.file}, which does not exist. The preview is skipped.`
         );
         continue;
@@ -7409,29 +7553,7 @@ async function run3(options, deps) {
       });
       continue;
     }
-    if (preview.branch === void 0) {
-      previews.push(preview);
-      continue;
-    }
-    if (merged?.devCommand === void 0) {
-      worktreeErrors.push(
-        `"${preview.title}" names branch ${preview.branch}, but the config sets no devCommand, so Leglas cannot start that checkout. Add devCommand (with {port}) to the config.`
-      );
-      continue;
-    }
-    if (!options.json) deps.log(`  starting ${preview.branch}\u2026`);
-    try {
-      const worktree = await startWorktree({
-        cwd: options.cwd,
-        branch: preview.branch,
-        installCommand: merged.installCommand,
-        devCommand: merged.devCommand
-      });
-      worktrees.push(worktree);
-      previews.push({ ...preview, url: `${worktree.url}${preview.url}` });
-    } catch (error) {
-      worktreeErrors.push(error instanceof Error ? error.message : String(error));
-    }
+    previews.push(preview);
   }
   const config = merged === null ? null : { ...merged, previews };
   const configWarnings = [];
@@ -7441,7 +7563,7 @@ async function run3(options, deps) {
   const ownerWarning = needsApp && app === null ? inspectLocalDevServer(devServer).then((owners) => devServerOwnerWarning(devServer, projectRoot, owners)).catch(() => null) : Promise.resolve(null);
   const serverPromise = startServer({
     config,
-    configErrors: [...loaded.errors, ...local.errors, ...worktreeErrors],
+    configErrors: [...loaded.errors, ...local.errors, ...previewErrors],
     configWarnings,
     fileMounts,
     shellDir: findShellDir(),
@@ -7480,9 +7602,9 @@ async function run3(options, deps) {
     );
     deps.log(`config   ${configLabel}`);
     deps.log(`          ${previewCount} preview${previewCount === 1 ? "" : "s"}`);
-    if (loaded.errors.length + worktreeErrors.length > 0) {
+    if (loaded.errors.length + previewErrors.length > 0) {
       deps.log("");
-      for (const error of [...loaded.errors, ...worktreeErrors]) deps.log(`  ! ${error}`);
+      for (const error of [...loaded.errors, ...previewErrors]) deps.log(`  ! ${error}`);
       deps.log("  Fix the config and reload; Leglas will pick it up on restart.");
     }
     if (configWarnings.length > 0) {
@@ -7505,8 +7627,6 @@ async function run3(options, deps) {
     devServer,
     previewCount,
     stop: async () => {
-      await Promise.all(worktrees.map((worktree) => worktree.stop().catch(() => {
-      })));
       await app?.stop().catch(() => {
       });
       await server.close();