@getmonoceros/workbench 1.38.9 → 1.38.12

package/dist/bin.js

@@ -7290,7 +7290,8 @@ async function runContainerCycle(root, opts) {
     );
     const filters = [
       `label=com.docker.compose.project=${projectName}`,
-      `name=^${projectName}-`
+      `name=^${projectName}-`,
+      `name=^monoceros-${path18.basename(root)}$`
     ];
     const { exitCode: rmExit } = await cleanupDockerObjects({
       projectName,
@@ -9005,7 +9006,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.38.9" : "dev";
+    CLI_VERSION = true ? "1.38.12" : "dev";
   }
 });
 
@@ -11373,6 +11374,8 @@ async function runRemove(opts) {
       if (code !== "EACCES" && code !== "EPERM") {
         throw err;
       }
+      const parentDir = path29.dirname(containerPath);
+      const childName = path29.basename(containerPath);
       logger.info(
         `[remove] host-side rm hit ${code} on ${prettyPath(containerPath)}; using a throw-away alpine container to clean root-owned files\u2026`
       );
@@ -11380,20 +11383,18 @@ async function runRemove(opts) {
         "run",
         "--rm",
         "-v",
-        `${containerPath}:/target`,
+        `${parentDir}:/parent`,
         "alpine:3.21",
-        "find",
-        "/target",
-        "-mindepth",
-        "1",
-        "-delete"
+        "rm",
+        "-rf",
+        `/parent/${childName}`
       ]);
       try {
         await fs19.rm(containerPath, { recursive: true, force: true });
       } catch (err2) {
         const code2 = err2.code;
         throw new Error(
-          `docker-based cleanup of ${containerPath} did not fully clear it (alpine find exit ${exit}${stderr.trim() ? `: ${stderr.trim()}` : ""}; host rm: ${code2}). Inspect with \`sudo ls -la ${containerPath}\` and clean manually.`
+          `docker-based cleanup of ${containerPath} did not fully clear it (alpine rm exit ${exit}${stderr.trim() ? `: ${stderr.trim()}` : ""}; host rm: ${code2}). Inspect with \`sudo ls -la ${containerPath}\` and clean manually.`
         );
       }
     }
@@ -12623,65 +12624,15 @@ var init_caddy = __esm({
   }
 });
 
-// src/devcontainer/wsl-networking.ts
-import { spawn as spawn14 } from "child_process";
-import os4 from "os";
-function capture(cmd, args) {
-  return new Promise((resolve) => {
-    let stdout = "";
-    const child = spawn14(cmd, args, {
-      stdio: ["ignore", "pipe", "ignore"]
-    });
-    child.stdout.on("data", (c) => stdout += c.toString());
-    child.on("error", () => resolve({ stdout: "", code: -1 }));
-    child.on("exit", (code) => resolve({ stdout, code: code ?? -1 }));
-  });
-}
-async function windowsLanIpv4() {
-  if (!isWsl()) return null;
-  const psScript = "(Get-NetIPConfiguration | Where-Object { $_.IPv4DefaultGateway -ne $null -and $_.NetAdapter.Status -eq 'Up' } | Select-Object -First 1 -ExpandProperty IPv4Address).IPAddress";
-  const r = await capture("powershell.exe", [
-    "-NoProfile",
-    "-NonInteractive",
-    "-Command",
-    psScript
-  ]);
-  const ip = r.stdout.replace(/\r/g, "").trim().split(/\s+/)[0] ?? "";
-  return IPV4_RE3.test(ip) ? ip : null;
-}
-function localInterfacesInclude(ip) {
-  for (const list of Object.values(os4.networkInterfaces())) {
-    for (const addr of list ?? []) {
-      if (addr.family === "IPv4" && addr.address === ip) return true;
-    }
-  }
-  return false;
-}
-async function wslLanTarget() {
-  const lanIp = await windowsLanIpv4();
-  return {
-    lanIp,
-    mirrored: lanIp !== null && localInterfacesInclude(lanIp)
-  };
-}
-var IPV4_RE3;
-var init_wsl_networking = __esm({
-  "src/devcontainer/wsl-networking.ts"() {
-    "use strict";
-    init_ssh_attach();
-    IPV4_RE3 = /^(\d{1,3}\.){3}\d{1,3}$/;
-  }
-});
-
 // src/share/run.ts
-import os5 from "os";
-import { spawn as spawn15, spawnSync as spawnSync2 } from "child_process";
+import os4 from "os";
+import { spawn as spawn14, spawnSync as spawnSync2 } from "child_process";
 import { consola as consola35 } from "consola";
 import { promises as fs22 } from "fs";
 import path34 from "path";
 function realHostAddresses() {
   let ip;
-  for (const list of Object.values(os5.networkInterfaces())) {
+  for (const list of Object.values(os4.networkInterfaces())) {
     for (const addr of list ?? []) {
       if (addr.family === "IPv4" && !addr.internal) {
         ip = addr.address;
@@ -12700,19 +12651,19 @@ function mdnsHostName() {
     const name = res.status === 0 ? res.stdout.trim() : "";
     if (name) return `${name}.local`;
   }
-  const hn = os5.hostname();
+  const hn = os4.hostname();
   return hn.endsWith(".local") ? hn : `${hn}.local`;
 }
 async function defaultEnsureImage(image, log) {
   const present = await new Promise((resolve) => {
-    const c = spawn15("docker", ["image", "inspect", image], { stdio: "ignore" });
+    const c = spawn14("docker", ["image", "inspect", image], { stdio: "ignore" });
     c.on("error", () => resolve(false));
     c.on("exit", (code) => resolve(code === 0));
   });
   if (present) return;
   log.info(dim(`Pulling ${image} (first run, one-time)\u2026`));
   await new Promise((resolve, reject) => {
-    const c = spawn15("docker", ["pull", "-q", image], {
+    const c = spawn14("docker", ["pull", "-q", image], {
       stdio: ["ignore", "ignore", "pipe"]
     });
     let err = "";
@@ -12765,14 +12716,7 @@ async function runShare(opts) {
   for (const port of ports) {
     await preflight({ port, address: SHARE_ADDRESS });
   }
-  const { ip: rawIp, mdnsName } = (opts.hostAddresses ?? realHostAddresses)();
-  let ip = rawIp;
-  let wslNatUnreachable = false;
-  if (isWsl()) {
-    const t = await wslLanTarget();
-    if (t.lanIp) ip = t.lanIp;
-    wslNatUnreachable = t.lanIp !== null && !t.mirrored;
-  }
+  const { ip, mdnsName } = (opts.hostAddresses ?? realHostAddresses)();
   const sans = [mdnsName, ip, "localhost", "127.0.0.1"].filter(
     (s) => typeof s === "string" && s.length > 0
   );
@@ -12819,17 +12763,6 @@ async function runShare(opts) {
       `  First device? Trust the local CA once so HTTPS is warning-free: ${caPath}`
     )
   );
-  if (wslNatUnreachable) {
-    const warn = log.warn ?? log.info;
-    warn(
-      "WSL is in NAT mode, so the URL above is not reachable from other devices yet."
-    );
-    warn("Enable mirrored networking once, then re-run this command:");
-    warn("  1. add to %USERPROFILE%\\.wslconfig:");
-    warn("       [wsl2]");
-    warn("       networkingMode=mirrored");
-    warn("  2. run  wsl --shutdown  in PowerShell (closes your WSL sessions)");
-  }
   const dockerSpawn = opts.dockerSpawn ?? defaultDockerSpawn;
   const handles = [
     dockerSpawn(
@@ -12869,7 +12802,6 @@ var init_run4 = __esm({
     init_caddy();
     init_paths();
     init_ssh_attach();
-    init_wsl_networking();
     init_format();
     SHARE_ADDRESS = "0.0.0.0";
   }
@@ -13996,6 +13928,7 @@ var init_main = __esm({
 
 // src/bin.ts
 import { runMain } from "citty";
+import { consola as consola42 } from "consola";
 
 // src/devcontainer/docker-group-bootstrap.ts
 import { spawnSync } from "child_process";
@@ -14281,6 +14214,7 @@ init_main();
 init_notifier();
 init_version();
 bootstrapDockerGroup();
+consola42.options.formatOptions.date = false;
 consumeInnerArgsFromProcessArgv();
 async function entry() {
   scheduleUpdateNotice({