@getmonoceros/workbench 1.36.4 → 1.36.6

package/dist/bin.js

@@ -2154,67 +2154,59 @@ async function containersPublishing(docker, hostPort) {
   if (ps.exitCode !== 0) return [];
   return ps.stdout.split("\n").map((l) => l.trim()).filter((l) => l.length > 0);
 }
+function hostPortFallbackLines(hostPort) {
+  return [
+    dim("Or set a different proxy port in ") + cyan2("~/.monoceros/monoceros-config.yml") + dim(":"),
+    "    " + cyan2("schemaVersion: 1"),
+    "    " + cyan2("routing:"),
+    "    " + cyan2("  hostPort: 8080"),
+    "",
+    dim(
+      `Aborting. Re-run once port ${hostPort} is free or a different port is set.`
+    )
+  ];
+}
 function formatLiveContainerError(hostPort, containers) {
   const firstName = containers[0].split(" ")[0];
   return [
     `Host port ${hostPort} is in use: it is published by a running container.`,
     "",
-    `Monoceros needs that port for its Traefik proxy. The container(s) holding it:`,
-    ...containers.map((c) => `  - ${c}`),
+    dim("Held by:"),
+    ...containers.map((c) => "    " + cyan2(c)),
     "",
-    `Stop or re-map it, then re-run, e.g.:`,
+    dim("Stop or re-map it, then re-run:"),
+    "    " + cyan2(`docker stop ${firstName}`),
     "",
-    `    docker stop ${firstName}`,
-    "",
-    `Or move Monoceros off the port: set \`routing.hostPort\` in`,
-    `~/.monoceros/monoceros-config.yml.`,
-    "",
-    `Aborting. Re-run after the conflict is resolved.`
+    ...hostPortFallbackLines(hostPort)
   ].join("\n");
 }
 function formatLeftoverHolderError(hostPort) {
   return [
-    `Host port ${hostPort} is in use, but no Docker container in the active`,
-    `engine publishes it.`,
-    "",
-    `This is almost always a leftover Docker port-forwarder (docker-proxy)`,
-    `whose container is already gone. It is left behind when a native Docker`,
-    `daemon is restarted while a container held the port, which is common with`,
-    `dockerd-via-systemd inside WSL (WSL restarts it on every shutdown). The`,
-    `forwarder keeps the port bound with nothing behind it. Two ways out:`,
-    "",
-    `  1) Recommended: reap the leftover by restarting the Docker daemon`,
-    `     (harmless, it just clears stale forwarders):`,
-    `        WSL / native dockerd:  sudo systemctl restart docker`,
-    `        Docker Desktop:        restart it from its menu`,
-    `     Then re-run.`,
+    `Host port ${hostPort} is in use, but no running container publishes it.`,
     "",
-    `  2) Or move Monoceros off port ${hostPort}. Edit (or create)`,
-    `     ~/.monoceros/monoceros-config.yml and add:`,
+    dim("Most likely a leftover docker-proxy whose container is already gone"),
+    dim("(a native dockerd in WSL strands these on restart), or a holder in"),
+    dim("another Docker engine. Fix it one of two ways, then re-run:"),
     "",
-    `        schemaVersion: 1`,
-    `        routing:`,
-    `          hostPort: 8080      # any free port`,
+    dim("Reap the leftover by restarting the Docker daemon (harmless):"),
+    "    " + cyan2("sudo systemctl restart docker"),
     "",
-    `     URLs then become http://<name>.localhost:8080/.`,
-    "",
-    `Aborting. Re-run after the conflict is resolved.`
+    ...hostPortFallbackLines(hostPort)
   ].join("\n");
 }
 function formatHostPortHeldError(hostPort, _code, systemMessage) {
   return [
     `Cannot reach host port ${hostPort}: ${systemMessage}`,
     "",
-    `This is not the typical "port already in use" case.`,
-    `Monoceros's pre-flight uses a TCP-connect probe (not a bind), so`,
-    `EACCES / privileged-port errors normally don't appear here. Most`,
-    `likely something on your host network stack (firewall, network`,
-    `namespace, \u2026) is interfering with loopback connects.`,
+    dim('This is not the typical "port already in use" case. The pre-flight'),
+    dim("uses a TCP-connect probe (not a bind), so EACCES / privileged-port"),
+    dim("errors normally do not appear here. Most likely something on your"),
+    dim("host network stack (firewall, network namespace) is interfering with"),
+    dim("loopback connects."),
     "",
-    "Workaround: move Monoceros off this port by setting",
-    "`routing.hostPort` in ~/.monoceros/monoceros-config.yml.",
+    dim("Workaround: move Monoceros off this port by setting ") + cyan2("routing.hostPort") + dim(" in ") + cyan2("~/.monoceros/monoceros-config.yml") + dim("."),
     "",
-    `Aborting. Re-run after the issue is resolved.`
+    dim("Aborting. Re-run after the issue is resolved.")
   ].join("\n");
 }
 var CONNECT_TIMEOUT_MS, realPortProbe;
@@ -2222,6 +2214,7 @@ var init_port_check = __esm({
   "src/proxy/port-check.ts"() {
     "use strict";
     init_proxy();
+    init_format();
     CONNECT_TIMEOUT_MS = 750;
     realPortProbe = (port) => {
       return new Promise((resolve) => {
@@ -3762,6 +3755,25 @@ function composeVolumeSource(spec, serviceName) {
   const relative = src.startsWith("./") ? src.slice(2) : src;
   return `../${relative}:${rest}`;
 }
+function serviceVolumeHostDirs(services, repos = []) {
+  const cloneTargets = repos.map((r) => `projects/${r.path}`);
+  const dirs = /* @__PURE__ */ new Set();
+  for (const svc of services) {
+    for (const vol of svc.volumes) {
+      const src = vol.split(":")[0];
+      if (src === "data") continue;
+      const rel = src.startsWith("./") ? src.slice(2) : src;
+      if (cloneTargets.some((t) => rel === t || rel.startsWith(`${t}/`))) {
+        continue;
+      }
+      const slash = rel.lastIndexOf("/");
+      const lastSeg = slash === -1 ? rel : rel.slice(slash + 1);
+      const dir = lastSeg.includes(".") ? slash === -1 ? "" : rel.slice(0, slash) : rel;
+      if (dir) dirs.add(dir);
+    }
+  }
+  return [...dirs];
+}
 function buildComposeYaml(opts, dockerMode = "rootful") {
   void dockerMode;
   const hasPorts = (opts.ports?.length ?? 0) > 0;
@@ -4115,6 +4127,9 @@ async function writeScaffold(opts, targetDir, scaffoldOpts = {}) {
         await fs8.mkdir(path11.join(dataDir, svc.name), { recursive: true });
       }
     }
+    for (const dir of serviceVolumeHostDirs(opts.services, opts.repos)) {
+      await fs8.mkdir(path11.join(targetDir, dir), { recursive: true });
+    }
   }
   const containerGitignore = path11.join(targetDir, ".gitignore");
   await fs8.writeFile(
@@ -8857,7 +8872,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.36.4" : "dev";
+    CLI_VERSION = true ? "1.36.6" : "dev";
   }
 });