@getmonoceros/workbench 1.6.7 → 1.6.9

package/dist/bin.js

@@ -3,6 +3,54 @@
 // src/bin.ts
 import { runMain } from "citty";
 
+// src/devcontainer/docker-group-bootstrap.ts
+import { spawnSync } from "child_process";
+import { userInfo } from "os";
+var REEXEC_MARKER = "MONOCEROS_DOCKER_GROUP_REEXEC";
+function bootstrapDockerGroup(opts = {}) {
+  const platform = opts.platform ?? process.platform;
+  if (platform !== "linux") return;
+  const marker = opts.marker ?? process.env[REEXEC_MARKER];
+  if (marker === "1") return;
+  const probe = opts.runProbe ?? defaultProbe;
+  if (probe("docker", ["--version"]) !== 0) return;
+  if (probe("docker", ["info"]) === 0) return;
+  const username = opts.username ?? userInfo().username;
+  if (!isInDockerGroupViaEtcGroup(username, probe)) return;
+  const reexec = opts.reexec ?? defaultReexec;
+  const exitCode = reexec(process.argv);
+  process.exit(exitCode);
+}
+function isInDockerGroupViaEtcGroup(username, probe) {
+  const result = spawnSync("getent", ["group", "docker"], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "ignore"]
+  });
+  void probe;
+  if (result.status !== 0) return false;
+  const fields = result.stdout.split(":");
+  if (fields.length < 4) return false;
+  const members = (fields[3] ?? "").trim().split(",").map((m) => m.trim()).filter(Boolean);
+  return members.includes(username);
+}
+function defaultProbe(cmd, args) {
+  const result = spawnSync(cmd, [...args], { stdio: "ignore" });
+  return result.status ?? 1;
+}
+function defaultReexec(argv) {
+  const quoted = argv.map(shellQuote).join(" ");
+  const env = { ...process.env, [REEXEC_MARKER]: "1" };
+  const result = spawnSync("sg", ["docker", "-c", quoted], {
+    stdio: "inherit",
+    env
+  });
+  return result.status ?? 1;
+}
+function shellQuote(arg) {
+  if (/^[\w./@:=,+-]+$/.test(arg)) return arg;
+  return `'${arg.replace(/'/g, "'\\''")}'`;
+}
+
 // src/help.ts
 var ANSI_BOLD = "\x1B[1m";
 var ANSI_UNDERLINE = "\x1B[4m";
@@ -2804,17 +2852,22 @@ ${sectionLine(label)}
   );
   validateOptions(createOpts);
   logger.success(`yml validated ${dim(`(${prettyPath(ymlPath)})`)}`);
+  const hasRepos = (createOpts.repos ?? []).length > 0;
+  const hasContainerGitUser = parsed.config.git?.user !== void 0;
+  const hasDefaultGitUser = globalConfig?.defaults?.git?.user !== void 0;
   const idLogger = {
     info: logger.info,
     warn: logger.warn ?? logger.info
   };
-  await collectGitIdentity(targetDir, {
-    ...opts.identitySpawn ? { spawn: opts.identitySpawn } : {},
-    ...opts.identityPrompt ? { prompt: opts.identityPrompt } : {},
-    ...parsed.config.git?.user ? { containerOverride: parsed.config.git.user } : {},
-    ...globalConfig?.defaults?.git?.user ? { defaults: globalConfig.defaults.git.user } : {},
-    logger: idLogger
-  });
+  if (hasRepos || hasContainerGitUser || hasDefaultGitUser) {
+    await collectGitIdentity(targetDir, {
+      ...opts.identitySpawn ? { spawn: opts.identitySpawn } : {},
+      ...opts.identityPrompt ? { prompt: opts.identityPrompt } : {},
+      ...parsed.config.git?.user ? { containerOverride: parsed.config.git.user } : {},
+      ...globalConfig?.defaults?.git?.user ? { defaults: globalConfig.defaults.git.user } : {},
+      logger: idLogger
+    });
+  }
   const hostsToFetch = uniqueHttpsHosts(createOpts.repos ?? []);
   const unknownProviderHosts = hostsToFetch.filter((h) => h.provider === "unknown").map((h) => h.host);
   if (unknownProviderHosts.length > 0) {
@@ -2921,7 +2974,7 @@ function warnOnDeprecatedFeatureRefs(containerFeatures, globalConfig, logger) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "1.6.7" : "dev";
+var CLI_VERSION = true ? "1.6.9" : "dev";
 
 // src/commands/_dispatch.ts
 import { consola as consola11 } from "consola";
@@ -4718,6 +4771,7 @@ var main = defineCommand25({
 });
 
 // src/bin.ts
+bootstrapDockerGroup();
 consumeInnerArgsFromProcessArgv();
 async function entry() {
   if (await maybeRenderHelp(process.argv.slice(2), main)) {