@getmonoceros/workbench 1.10.1 → 1.11.1

package/dist/bin.js

@@ -51,23 +51,112 @@ function shellQuote(arg) {
   return `'${arg.replace(/'/g, "'\\''")}'`;
 }
 
+// src/devcontainer/wsl-backend-bootstrap.ts
+import { spawnSync as spawnSync2 } from "child_process";
+
+// src/util/format.ts
+var ESC = "\x1B[";
+var ANSI_BOLD = `${ESC}1m`;
+var ANSI_UNDERLINE = `${ESC}4m`;
+var ANSI_CYAN = `${ESC}36m`;
+var ANSI_GREY = `${ESC}90m`;
+var ANSI_RESET = `${ESC}0m`;
+function makeWrap(isTty2) {
+  return (s, ...codes) => isTty2 ? codes.join("") + s + ANSI_RESET : s;
+}
+function makePalette(isTty2) {
+  const wrap = makeWrap(isTty2);
+  return {
+    bold: (s) => wrap(s, ANSI_BOLD),
+    underline: (s) => wrap(s, ANSI_UNDERLINE),
+    cyan: (s) => wrap(s, ANSI_CYAN),
+    dim: (s) => wrap(s, ANSI_GREY),
+    sectionLine: (label) => wrap(`\u25B8 ${label}`, ANSI_BOLD, ANSI_UNDERLINE)
+  };
+}
+function colorsFor(stream) {
+  return makePalette(stream.isTTY ?? false);
+}
+var stderrPalette = makePalette(process.stderr.isTTY ?? false);
+var bold = stderrPalette.bold;
+var underline = stderrPalette.underline;
+var cyan = stderrPalette.cyan;
+var dim = stderrPalette.dim;
+var sectionLine = stderrPalette.sectionLine;
+
+// src/devcontainer/wsl-backend-bootstrap.ts
+function bootstrapWslBackend(opts = {}) {
+  const platform = opts.platform ?? process.platform;
+  if (platform !== "win32") return;
+  const listDistros = opts.wslDistros ?? defaultWslDistros;
+  const raw = listDistros();
+  if (raw !== null && hasWsl2Distro(raw)) return;
+  const probe = opts.probe ?? defaultProbe2;
+  if (probe("docker", ["--version"]) !== 0) return;
+  const warn = opts.warn ?? ((m) => process.stderr.write(`${m}
+`));
+  warn(formatWslBackendHint());
+}
+function hasWsl2Distro(raw) {
+  const text = raw.split(String.fromCharCode(0)).join("");
+  for (const line of text.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (!trimmed) continue;
+    if (/\bNAME\b/i.test(trimmed) && /\bVERSION\b/i.test(trimmed)) continue;
+    const tokens = trimmed.replace(/^\*\s*/, "").split(/\s+/);
+    if (tokens[tokens.length - 1] === "2") return true;
+  }
+  return false;
+}
+function formatWslBackendHint() {
+  return [
+    `Docker's daemon isn't reachable, and no WSL 2 distro is registered.`,
+    `Docker Desktop runs on the WSL 2 backend, so without a distro it`,
+    `can't start -- often shown as the misleading "Virtualization support`,
+    `not detected" (even with virtualization enabled in BIOS).`,
+    ``,
+    `Fix it in an elevated PowerShell:`,
+    ``,
+    cyan(`  wsl --set-default-version 2`),
+    cyan(`  wsl --update`),
+    cyan(`  wsl --install -d Ubuntu`),
+    ``,
+    `Then reboot and start Docker Desktop. Full walkthrough:`,
+    `docs/install-windows.md in the workbench repo.`
+  ].join("\n");
+}
+function defaultProbe2(cmd, args) {
+  const result = spawnSync2(cmd, [...args], { stdio: "ignore", timeout: 1e4 });
+  return result.status ?? 1;
+}
+function defaultWslDistros() {
+  const result = spawnSync2("wsl", ["-l", "-v"], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "ignore"],
+    env: { ...process.env, WSL_UTF8: "1" },
+    timeout: 5e3
+  });
+  if (result.status !== 0 || typeof result.stdout !== "string") return null;
+  return result.stdout;
+}
+
 // src/help.ts
-var ANSI_BOLD = "\x1B[1m";
-var ANSI_UNDERLINE = "\x1B[4m";
-var ANSI_CYAN = "\x1B[36m";
-var ANSI_GREY = "\x1B[90m";
-var ANSI_RESET = "\x1B[0m";
+var ANSI_BOLD2 = "\x1B[1m";
+var ANSI_UNDERLINE2 = "\x1B[4m";
+var ANSI_CYAN2 = "\x1B[36m";
+var ANSI_GREY2 = "\x1B[90m";
+var ANSI_RESET2 = "\x1B[0m";
 function isTty() {
   return process.stdout.isTTY ?? false;
 }
 function color(text, ...codes) {
   if (!isTty()) return text;
-  return codes.join("") + text + ANSI_RESET;
+  return codes.join("") + text + ANSI_RESET2;
 }
-var bold = (s) => color(s, ANSI_BOLD);
-var underline = (s) => color(s, ANSI_UNDERLINE);
-var cyan = (s) => color(s, ANSI_CYAN);
-var grey = (s) => color(s, ANSI_GREY);
+var bold2 = (s) => color(s, ANSI_BOLD2);
+var underline2 = (s) => color(s, ANSI_UNDERLINE2);
+var cyan2 = (s) => color(s, ANSI_CYAN2);
+var grey = (s) => color(s, ANSI_GREY2);
 var GROUPS = [
   { key: "lifecycle", label: "Container lifecycle" },
   { key: "run", label: "Run + inspect" },
@@ -160,7 +249,7 @@ function collectSubCommands(cmd) {
 function renderCommandsBlock(entries) {
   if (entries.length === 0) return [];
   const lines = [];
-  lines.push(underline(bold("COMMANDS")));
+  lines.push(underline2(bold2("COMMANDS")));
   const byGroup = /* @__PURE__ */ new Map();
   for (const entry2 of entries) {
     const arr = byGroup.get(entry2.group) ?? [];
@@ -170,10 +259,10 @@ function renderCommandsBlock(entries) {
   const renderSection = (label, items) => {
     if (items.length === 0) return;
     lines.push("");
-    lines.push(underline(grey(label)));
+    lines.push(underline2(grey(label)));
     lines.push("");
     const rows = items.map((e) => [
-      cyan(e.name),
+      cyan2(e.name),
       e.description
     ]);
     lines.push(alignTable(rows, ""));
@@ -210,27 +299,27 @@ function renderUsageBlock(cmd, commandPath) {
   lines.push(grey(wrapText(header, terminalWidth(), "")));
   lines.push("");
   lines.push(
-    `${underline(bold("USAGE"))} ${cyan([fullName, ...usageTokens].join(" "))}`
+    `${underline2(bold2("USAGE"))} ${cyan2([fullName, ...usageTokens].join(" "))}`
   );
   lines.push("");
   if (positionals.length > 0) {
-    lines.push(underline(bold("ARGUMENTS")));
+    lines.push(underline2(bold2("ARGUMENTS")));
     lines.push("");
     const rows = positionals.map((p) => {
       const isRequired = p.required !== false && p.default === void 0;
-      return [cyan(p.name.toUpperCase()), renderArgDescription(p, isRequired)];
+      return [cyan2(p.name.toUpperCase()), renderArgDescription(p, isRequired)];
     });
     lines.push(alignTable(rows, "  "));
     lines.push("");
   }
   if (flags.length > 0) {
-    lines.push(underline(bold("OPTIONS")));
+    lines.push(underline2(bold2("OPTIONS")));
     lines.push("");
     const rows = flags.map((f) => {
       const isRequired = f.required === true && f.default === void 0;
       const aliases = (Array.isArray(f.alias) ? f.alias : f.alias ? [f.alias] : []).map((a) => `-${a}`);
       const label = [...aliases, `--${f.name}`].join(", ") + renderValueHint(f);
-      return [cyan(label), renderArgDescription(f, isRequired)];
+      return [cyan2(label), renderArgDescription(f, isRequired)];
     });
     lines.push(alignTable(rows, "  "));
     lines.push("");
@@ -240,7 +329,7 @@ function renderUsageBlock(cmd, commandPath) {
       lines.push(line);
     }
     lines.push(
-      `Use ${cyan(`${fullName} <command> --help`)} for more information about a command.`
+      `Use ${cyan2(`${fullName} <command> --help`)} for more information about a command.`
     );
     lines.push("");
   }
@@ -573,38 +662,6 @@ function prettyPath(p) {
 import { spawn } from "child_process";
 import { promises as fs2 } from "fs";
 import path2 from "path";
-
-// src/util/format.ts
-var ESC = "\x1B[";
-var ANSI_BOLD2 = `${ESC}1m`;
-var ANSI_UNDERLINE2 = `${ESC}4m`;
-var ANSI_CYAN2 = `${ESC}36m`;
-var ANSI_GREY2 = `${ESC}90m`;
-var ANSI_RESET2 = `${ESC}0m`;
-function makeWrap(isTty2) {
-  return (s, ...codes) => isTty2 ? codes.join("") + s + ANSI_RESET2 : s;
-}
-function makePalette(isTty2) {
-  const wrap = makeWrap(isTty2);
-  return {
-    bold: (s) => wrap(s, ANSI_BOLD2),
-    underline: (s) => wrap(s, ANSI_UNDERLINE2),
-    cyan: (s) => wrap(s, ANSI_CYAN2),
-    dim: (s) => wrap(s, ANSI_GREY2),
-    sectionLine: (label) => wrap(`\u25B8 ${label}`, ANSI_BOLD2, ANSI_UNDERLINE2)
-  };
-}
-function colorsFor(stream) {
-  return makePalette(stream.isTTY ?? false);
-}
-var stderrPalette = makePalette(process.stderr.isTTY ?? false);
-var bold2 = stderrPalette.bold;
-var underline2 = stderrPalette.underline;
-var cyan2 = stderrPalette.cyan;
-var dim = stderrPalette.dim;
-var sectionLine = stderrPalette.sectionLine;
-
-// src/devcontainer/credentials.ts
 var realGitCredentialFill = (input) => {
   return new Promise((resolve, reject) => {
     const child = spawn("git", ["credential", "fill"], {
@@ -649,11 +706,11 @@ function uniqueHttpsHosts(repos) {
 function installCommandForOS(opts) {
   switch (process.platform) {
     case "darwin":
-      return cyan2(opts.brew);
+      return cyan(opts.brew);
     case "win32":
-      return cyan2(opts.winget);
+      return cyan(opts.winget);
     default:
-      if (opts.linuxBrew) return cyan2(opts.linuxBrew);
+      if (opts.linuxBrew) return cyan(opts.linuxBrew);
       return `See ${opts.linuxDocsUrl} for package instructions.`;
   }
 }
@@ -674,8 +731,8 @@ function providerSetupHint(host, provider) {
         install,
         "",
         "Then run once:",
-        cyan2(`gh auth login${hostArg}`),
-        cyan2(`gh auth setup-git${hostArg}`),
+        cyan(`gh auth login${hostArg}`),
+        cyan(`gh auth setup-git${hostArg}`),
         "",
         "`gh auth login` walks through OAuth in your browser.",
         "`gh auth setup-git` wires gh into git as a credential helper."
@@ -698,7 +755,7 @@ function providerSetupHint(host, provider) {
         install,
         "",
         "Then run once:",
-        cyan2(`glab auth login${hostArg}`),
+        cyan(`glab auth login${hostArg}`),
         "",
         "Choose `HTTPS` when asked for git-protocol, then accept",
         '"Authenticate Git with your GitLab credentials" \u2014 glab',
@@ -717,7 +774,7 @@ function providerSetupHint(host, provider) {
           "https://id.atlassian.com/manage-profile/security/api-tokens",
           "",
           "Then store it via your OS credential helper:",
-          cyan2(
+          cyan(
             `git credential approve <<< $'protocol=https\\nhost=${host}\\nusername=<your-atlassian-email>\\npassword=<token>\\n'`
           )
         ].join("\n")
@@ -733,7 +790,7 @@ function providerSetupHint(host, provider) {
         "at least repo-read + repo-write scopes for the repos you need.",
         "",
         "Then store it via your OS credential helper:",
-        cyan2(
+        cyan(
           `git credential approve <<< $'protocol=https\\nhost=${host}\\nusername=<your-bitbucket-username>\\npassword=<token>\\n'`
         )
       ].join("\n")
@@ -751,7 +808,7 @@ function providerSetupHint(host, provider) {
       "need push from the container).",
       "",
       "Then store it via your OS credential helper:",
-      cyan2(
+      cyan(
         `git credential approve <<< $'protocol=https\\nhost=${host}\\nusername=<your-gitea-username>\\npassword=<token>\\n'`
       )
     ].join("\n")
@@ -853,7 +910,7 @@ function formatMissingCredentialsError(missing) {
       "",
       hint.body,
       "",
-      `Then re-run ${cyan2("monoceros apply")}.`
+      `Then re-run ${cyan("monoceros apply")}.`
     ].join("\n");
   }
   const lines = [
@@ -867,7 +924,7 @@ function formatMissingCredentialsError(missing) {
     lines.push(hint.body);
     lines.push("");
   }
-  lines.push(`Then re-run ${cyan2("monoceros apply")}.`);
+  lines.push(`Then re-run ${cyan("monoceros apply")}.`);
   return lines.join("\n");
 }
 function formatUnknownProviderError(hosts) {
@@ -879,11 +936,11 @@ function formatUnknownProviderError(hosts) {
     "For any other host (self-hosted GitLab, Gitea, Bitbucket Server, \u2026)",
     "declare the provider explicitly in the yml. Edit the repo entry:",
     "",
-    cyan2("  repos:"),
-    cyan2(`    - url: https://${sorted[0]}/\u2026`),
-    cyan2("      provider: gitlab   # or: github, bitbucket, gitea"),
+    cyan("  repos:"),
+    cyan(`    - url: https://${sorted[0]}/\u2026`),
+    cyan("      provider: gitlab   # or: github, bitbucket, gitea"),
     "",
-    `Or re-add with ${cyan2("monoceros add-repo <name> <url> --provider=<github|gitlab|bitbucket|gitea>")}.`
+    `Or re-add with ${cyan("monoceros add-repo <name> <url> --provider=<github|gitlab|bitbucket|gitea>")}.`
   ];
   return lines.join("\n");
 }
@@ -3787,6 +3844,46 @@ import { spawn as spawn4 } from "child_process";
 import { readFileSync as readFileSync3 } from "fs";
 import { createRequire } from "module";
 import path10 from "path";
+
+// src/devcontainer/runtime-pull-hint.ts
+import { Transform as Transform2 } from "stream";
+var RUNTIME_PULL_MARKER = "No manifest found for ghcr.io/getmonoceros/monoceros-runtime";
+var RUNTIME_PULL_HINT = 'Downloading the Monoceros runtime image now -- expected on first apply, takes ~1-2 min (Docker pulls the multi-arch base with no progress output). The "No manifest found" line above is harmless. Please wait...';
+function createRuntimePullHintStream(state) {
+  let buffer = "";
+  const appendHintIfMarker = (block) => {
+    if (state.hinted || !block.includes(RUNTIME_PULL_MARKER)) return block;
+    state.hinted = true;
+    return `${block}${dim(`(i) ${RUNTIME_PULL_HINT}`)}
+`;
+  };
+  return new Transform2({
+    decodeStrings: true,
+    transform(chunk, _enc, cb) {
+      const text = typeof chunk === "string" ? chunk : chunk.toString("utf8");
+      buffer += text;
+      const lastNewline = buffer.lastIndexOf("\n");
+      if (lastNewline === -1) {
+        cb(null);
+        return;
+      }
+      const flushable = buffer.slice(0, lastNewline + 1);
+      buffer = buffer.slice(lastNewline + 1);
+      cb(null, appendHintIfMarker(flushable));
+    },
+    flush(cb) {
+      if (buffer.length === 0) {
+        cb(null);
+        return;
+      }
+      const tail = buffer;
+      buffer = "";
+      cb(null, appendHintIfMarker(tail));
+    }
+  });
+}
+
+// src/devcontainer/cli.ts
 var require_ = createRequire(import.meta.url);
 var cachedBinaryPath = null;
 function devcontainerCliPath() {
@@ -3836,8 +3933,9 @@ var spawnDevcontainer = (args, cwd, options = {}) => {
       });
       return;
     }
-    child.stdout?.pipe(createSecretMaskStream()).pipe(process.stdout);
-    child.stderr?.pipe(createSecretMaskStream()).pipe(process.stderr);
+    const pullHint = { hinted: false };
+    child.stdout?.pipe(createSecretMaskStream()).pipe(createRuntimePullHintStream(pullHint)).pipe(process.stdout);
+    child.stderr?.pipe(createSecretMaskStream()).pipe(createRuntimePullHintStream(pullHint)).pipe(process.stderr);
     child.on("error", reject);
     child.on("exit", (code) => resolve(code ?? 0));
   });
@@ -4068,7 +4166,7 @@ function formatUnreachableReposError(failures) {
     }
     lines.push("");
   }
-  lines.push(`Then re-run ${cyan2("monoceros apply")}.`);
+  lines.push(`Then re-run ${cyan("monoceros apply")}.`);
   return lines.join("\n");
 }
 function headerForKind(kind) {
@@ -4151,14 +4249,14 @@ function formatRootlessNotSupportedError() {
     ``,
     `To fix, switch back to standard rootful Docker:`,
     ``,
-    cyan2(
+    cyan(
       `  systemctl --user stop docker.service docker.socket 2>/dev/null || true`
     ),
-    cyan2(`  dockerd-rootless-setuptool.sh uninstall`),
-    cyan2(`  rootlesskit rm -rf ~/.local/share/docker`),
-    cyan2(`  unset DOCKER_HOST DOCKER_CONTEXT`),
-    cyan2(`  sudo systemctl enable --now docker`),
-    cyan2(`  sudo usermod -aG docker $USER`),
+    cyan(`  dockerd-rootless-setuptool.sh uninstall`),
+    cyan(`  rootlesskit rm -rf ~/.local/share/docker`),
+    cyan(`  unset DOCKER_HOST DOCKER_CONTEXT`),
+    cyan(`  sudo systemctl enable --now docker`),
+    cyan(`  sudo usermod -aG docker $USER`),
     ``,
     `If you added DOCKER_HOST or DOCKER_CONTEXT to ~/.bashrc /`,
     `~/.profile (the rootless setup may have suggested it), remove`,
@@ -4463,7 +4561,7 @@ ${sectionLine(label)}
   section("Container");
   const featureRefs = parsed.config.features.map((f) => f.ref);
   if (featureRefs.length > 0) {
-    logger.info(`Features: ${featureRefs.map((r) => cyan2(r)).join(", ")}`);
+    logger.info(`Features: ${featureRefs.map((r) => cyan(r)).join(", ")}`);
   }
   logger.info(
     dim(
@@ -4502,7 +4600,7 @@ ${sectionLine(label)}
   });
   if (exitCode === 0) {
     section("Next steps");
-    logger.info(`  ${cyan2(`monoceros shell ${opts.name}`)}`);
+    logger.info(`  ${cyan(`monoceros shell ${opts.name}`)}`);
   }
   return { targetDir, configPath: ymlPath, containerExitCode: exitCode };
 }
@@ -4600,7 +4698,7 @@ async function persistPromptedIdentity(prompted, ymlPath, home, logger) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "1.10.1" : "dev";
+var CLI_VERSION = true ? "1.11.1" : "dev";
 
 // src/commands/_dispatch.ts
 import { consola as consola12 } from "consola";
@@ -7196,6 +7294,7 @@ var main = defineCommand30({
 
 // src/bin.ts
 bootstrapDockerGroup();
+bootstrapWslBackend();
 consumeInnerArgsFromProcessArgv();
 async function entry() {
   if (await maybeRenderHelp(process.argv.slice(2), main)) {