@getmonoceros/workbench 1.13.0 → 1.13.2

package/dist/bin.js

@@ -356,13 +356,12 @@ var FeatureEntrySchema = z.object({
   options: z.record(z.string(), FeatureOptionValueSchema).optional()
 });
 var EMAIL_RE = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+function isValidEmail(value) {
+  return EMAIL_RE.test(value);
+}
 var GitUserSchema = z.object({
   name: z.union([z.literal(""), z.null(), z.string().min(1)]).nullish().transform((v) => typeof v === "string" && v.length > 0 ? v : void 0),
-  email: z.union([
-    z.literal(""),
-    z.null(),
-    z.string().regex(EMAIL_RE, "Invalid email")
-  ]).nullish().transform((v) => typeof v === "string" && v.length > 0 ? v : void 0)
+  email: z.union([z.literal(""), z.null(), z.string().min(1)]).nullish().transform((v) => typeof v === "string" && v.length > 0 ? v : void 0)
 });
 var RepoEntrySchema = z.object({
   url: z.string().regex(
@@ -717,6 +716,23 @@ function interpolateServices(services, vars) {
   });
   return { services: resolved, missing };
 }
+var GIT_IDENTITY_VAR = {
+  name: "GIT_USER_NAME",
+  email: "GIT_USER_EMAIL"
+};
+function hasVarPlaceholder(value) {
+  return /\$\{[A-Za-z_][A-Za-z0-9_]*\}/.test(value);
+}
+function resolveGitUserFields(user, vars) {
+  const resolve = (raw) => {
+    if (raw === void 0) return {};
+    const r = interpolate(raw, vars);
+    if (r.missing.length > 0) return {};
+    const trimmed = r.value.trim();
+    return trimmed.length > 0 ? { value: trimmed } : {};
+  };
+  return { name: resolve(user.name), email: resolve(user.email) };
+}
 function interpolateFeatures(features, vars) {
   const missing = [];
   const out = {};
@@ -742,13 +758,20 @@ function buildEnvStub(name) {
 `;
 }
 async function ensureEnvVars(envPath, name, vars) {
+  const entries = Array.isArray(vars) ? vars.map((v) => [v, ""]) : Object.entries(vars);
   const exists = existsSync2(envPath);
   let content = exists ? readFileSync(envPath, "utf8") : buildEnvStub(name);
   const present = new Set(Object.keys(parseEnvFile(content)));
-  const added = [...new Set(vars)].filter((v) => !present.has(v));
+  const seen = /* @__PURE__ */ new Set();
+  const toAdd = entries.filter(([k]) => {
+    if (present.has(k) || seen.has(k)) return false;
+    seen.add(k);
+    return true;
+  });
+  const added = toAdd.map(([k]) => k);
   if (!exists || added.length > 0) {
     if (content.length > 0 && !content.endsWith("\n")) content += "\n";
-    for (const v of added) content += `${v}=
+    for (const [k, v] of toAdd) content += `${k}=${v}
 `;
     await fsp.mkdir(path2.dirname(envPath), { recursive: true });
     await fsp.writeFile(envPath, content);
@@ -1355,7 +1378,15 @@ var MonocerosConfigSchema = z2.object({
     // `git: null` for an empty mapping, which zod's plain
     // `.optional()` would reject.
     git: z2.object({
-      user: GitUserSchema.optional()
+      // Strict email here: monoceros-config defaults are not tied to
+      // any container `<name>.env`, so `${VAR}` placeholders make no
+      // sense and the format can (and should) be validated at load
+      // time — unlike the container/repo `git.user`, which defers to
+      // apply after interpolation.
+      user: GitUserSchema.optional().refine(
+        (u) => u?.email === void 0 || isValidEmail(u.email),
+        { message: "Invalid email in defaults.git.user", path: ["email"] }
+      )
     }).nullish(),
     // .nullish() for the same reason as `git` — the sample keeps
     // `features:` uncommented as a category marker.
@@ -1972,6 +2003,19 @@ var SERVICE_CATALOG = {
       POSTGRES_PASSWORD: "monoceros",
       POSTGRES_DB: "monoceros"
     },
+    healthcheck: {
+      test: [
+        "CMD",
+        "pg_isready",
+        "-U",
+        "${POSTGRES_USER}",
+        "-d",
+        "${POSTGRES_DB}"
+      ],
+      interval: "10s",
+      timeout: "5s",
+      retries: 5
+    },
     // Postgres 18+ stores data under /var/lib/postgresql/<major>/, so
     // the recommended mount is the parent directory; pre-18 used
     // /var/lib/postgresql/data directly. See
@@ -1986,12 +2030,33 @@ var SERVICE_CATALOG = {
       MYSQL_ROOT_PASSWORD: "monoceros",
       MYSQL_DATABASE: "monoceros"
     },
+    healthcheck: {
+      test: [
+        "CMD",
+        "mysqladmin",
+        "ping",
+        "-h",
+        "127.0.0.1",
+        "-u",
+        "root",
+        "-p${MYSQL_ROOT_PASSWORD}"
+      ],
+      interval: "10s",
+      timeout: "5s",
+      retries: 5
+    },
     dataMount: "/var/lib/mysql",
     defaultPort: 3306
   },
   redis: {
     id: "redis",
     image: "redis:8",
+    healthcheck: {
+      test: ["CMD", "redis-cli", "ping"],
+      interval: "10s",
+      timeout: "5s",
+      retries: 5
+    },
     dataMount: "/data",
     defaultPort: 6379
   }
@@ -2028,10 +2093,20 @@ function expandCuratedService(name) {
     name: def.id,
     image: def.image,
     port: def.defaultPort,
-    ...def.env ? { env: { ...def.env } } : {},
-    ...def.dataMount ? { volumes: [`data:${def.dataMount}`] } : {}
+    ...def.env ? {
+      env: Object.fromEntries(
+        Object.keys(def.env).map((k) => [k, `\${${k}}`])
+      )
+    } : {},
+    ...def.dataMount ? { volumes: [`data:${def.dataMount}`] } : {},
+    ...def.healthcheck ? { healthcheck: def.healthcheck } : {},
+    restart: "unless-stopped"
   };
 }
+function curatedServiceEnvDefaults(name) {
+  const def = SERVICE_CATALOG[name];
+  return def?.env ? { ...def.env } : {};
+}
 function deriveServiceName(image) {
   const lastSegment = image.split("/").pop() ?? image;
   const noTag = lastSegment.split("@")[0].split(":")[0];
@@ -2772,6 +2847,17 @@ function setContainerGitUserInDoc(doc, user) {
   relocateLeakedSectionComments(doc);
   return true;
 }
+function ensureContainerGitUserPlaceholder(doc) {
+  const gitNode = doc.get("git", true);
+  if (gitNode && isMap2(gitNode)) {
+    const userNode = gitNode.get("user", true);
+    if (userNode && isMap2(userNode)) return false;
+  }
+  return setContainerGitUserInDoc(doc, {
+    name: `\${${GIT_IDENTITY_VAR.name}}`,
+    email: `\${${GIT_IDENTITY_VAR.email}}`
+  });
+}
 function relocateLeakedSectionComments(doc) {
   const root = doc.contents;
   if (!root || !isMap2(root)) return;
@@ -3137,8 +3223,26 @@ async function runAddService(input) {
     }
     return r.outcome === "added";
   });
-  if (result.status === "updated" && !curated) {
-    (input.logger ?? defaultLogger()).info(customServiceHint(name));
+  if (result.status === "updated") {
+    if (curated) {
+      const defaults = curatedServiceEnvDefaults(arg);
+      if (Object.keys(defaults).length > 0) {
+        const home = input.monocerosHome ?? monocerosHome();
+        await ensureEnvGitignored(containerConfigsDir(home));
+        const seeded = await ensureEnvVars(
+          containerEnvPath(input.name, home),
+          input.name,
+          defaults
+        );
+        if (seeded.added.length > 0) {
+          (input.logger ?? defaultLogger()).info(
+            `Seeded ${seeded.added.join(", ")} into ${input.name}.env (dev-defaults \u2014 change them there if needed).`
+          );
+        }
+      }
+    } else {
+      (input.logger ?? defaultLogger()).info(customServiceHint(name));
+    }
   }
   return result;
 }
@@ -3165,6 +3269,14 @@ async function runAddRepo(input) {
       "--git-name and --git-email must be set together. Pass both, or neither."
     );
   }
+  if (hasEmail) {
+    const email = input.gitEmail.trim();
+    if (!isValidEmail(email) && !hasVarPlaceholder(email)) {
+      throw new Error(
+        `Invalid --git-email '${email}': must be a valid email or a \${VAR} placeholder resolved from <name>.env.`
+      );
+    }
+  }
   const explicitProvider = normalizeProvider(input.provider);
   let host;
   try {
@@ -3195,7 +3307,23 @@ async function runAddRepo(input) {
     } : {},
     ...providerToWrite ? { provider: providerToWrite } : {}
   };
-  const result = await mutate(input, (doc) => addRepoToDoc(doc, entry2));
+  let gitUserScaffolded = false;
+  const result = await mutate(input, (doc) => {
+    const repoAdded = addRepoToDoc(doc, entry2);
+    if (repoAdded) gitUserScaffolded = ensureContainerGitUserPlaceholder(doc);
+    return repoAdded;
+  });
+  if (result.status === "updated" && gitUserScaffolded) {
+    const home = input.monocerosHome ?? monocerosHome();
+    await ensureEnvGitignored(containerConfigsDir(home));
+    await ensureEnvVars(containerEnvPath(input.name, home), input.name, [
+      GIT_IDENTITY_VAR.name,
+      GIT_IDENTITY_VAR.email
+    ]);
+    (input.logger ?? defaultLogger()).info(
+      `Added a container git.user with \${${GIT_IDENTITY_VAR.name}}/\${${GIT_IDENTITY_VAR.email}} placeholders and seeded ${input.name}.env \u2014 fill them or leave blank to use your global git identity.`
+    );
+  }
   if (result.status === "updated") {
     await tryCloneInRunningContainer(input, entry2);
   }
@@ -4971,6 +5099,44 @@ ${sectionLine(label)}
   }
   createOpts.services = interpServices.services;
   if (createOpts.features) createOpts.features = interpFeatures.features;
+  const gitUserErrors = [];
+  let containerGitOverride;
+  if (parsed.config.git?.user) {
+    const f = resolveGitUserFields(parsed.config.git.user, envVars);
+    if (f.email.value !== void 0 && !isValidEmail(f.email.value)) {
+      gitUserErrors.push(
+        `git.user.email resolved to "${f.email.value}", which is not a valid email`
+      );
+    }
+    const override2 = {
+      ...f.name.value !== void 0 ? { name: f.name.value } : {},
+      ...f.email.value !== void 0 ? { email: f.email.value } : {}
+    };
+    if (Object.keys(override2).length > 0) containerGitOverride = override2;
+  }
+  for (const repo of createOpts.repos ?? []) {
+    if (!repo.gitUser) continue;
+    const f = resolveGitUserFields(repo.gitUser, envVars);
+    if (f.name.value === void 0 || f.email.value === void 0) {
+      delete repo.gitUser;
+      continue;
+    }
+    if (!isValidEmail(f.email.value)) {
+      gitUserErrors.push(
+        `repos[${repo.path}].git.user.email resolved to "${f.email.value}", which is not a valid email`
+      );
+      continue;
+    }
+    repo.gitUser = { name: f.name.value, email: f.email.value };
+  }
+  if (gitUserErrors.length > 0) {
+    throw new Error(
+      `Invalid git identity after resolving ${prettyPath(envPath)}:
+` + gitUserErrors.map((e) => `  - ${e}`).join("\n") + `
+
+Fix the value in the env file (or the yml).`
+    );
+  }
   validateOptions(createOpts);
   logger.success(`yml validated ${dim(`(${prettyPath(ymlPath)})`)}`);
   const hasRepos = (createOpts.repos ?? []).length > 0;
@@ -4985,7 +5151,7 @@ ${sectionLine(label)}
       ...opts.identitySpawn ? { spawn: opts.identitySpawn } : {},
       ...opts.identityPrompt ? { prompt: opts.identityPrompt } : {},
       ...opts.identityScopePrompt ? { scopePrompt: opts.identityScopePrompt } : {},
-      ...parsed.config.git?.user ? { containerOverride: parsed.config.git.user } : {},
+      ...containerGitOverride ? { containerOverride: containerGitOverride } : {},
       ...globalConfig?.defaults?.git?.user ? { defaults: globalConfig.defaults.git.user } : {},
       logger: idLogger
     });
@@ -5193,7 +5359,7 @@ async function persistPromptedIdentity(prompted, ymlPath, home, logger) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "1.13.0" : "dev";
+var CLI_VERSION = true ? "1.13.2" : "dev";
 
 // src/commands/_dispatch.ts
 import { consola as consola12 } from "consola";
@@ -5828,6 +5994,7 @@ function generateComposedYml(name, composed, lookupManifest, repoUrls = [], port
     lines.push("");
   }
   if (repoUrls.length > 0) {
+    pushGitIdentityBlock(lines);
     pushSectionHeader(
       lines,
       REPOS_HEADER,
@@ -5945,6 +6112,7 @@ function generateDocumentedYml(name, catalog, lookupManifest, repoUrls = [], por
     lines.push("");
   }
   if (repoUrls.length > 0) {
+    pushGitIdentityBlock(lines);
     pushSectionHeader(
       lines,
       REPOS_HEADER,
@@ -6024,6 +6192,20 @@ function pushServiceEntry(out, svc) {
 var FEATURES_HEADER_ACTIVE = "A Monoceros dev-container is shaped by features \u2014 pluggable units that drop tooling (AI assistants, language CLIs, cloud SDKs, \u2026) into the container and bring their own options. The features active for this container are listed below; adjust their options as needed. Shared credentials used across containers belong in monoceros-config.yml under `defaults.features.<ref>` rather than here. Full catalog: `monoceros list-components`.";
 var FEATURES_HEADER_DOCUMENTED = "A Monoceros dev-container is shaped by features \u2014 pluggable units that drop tooling (AI assistants, language CLIs, cloud SDKs, \u2026) into the container and bring their own options. Un-comment the blocks below for the features you want active. Shared credentials used across containers belong in monoceros-config.yml under `defaults.features.<ref>` rather than here. Full catalog: `monoceros list-components`.";
 var REPOS_HEADER = "Git repositories cloned into `projects/` on container start-up. HTTPS URLs only. The provider is auto-detected for github.com / gitlab.com / bitbucket.org; for any other host (self-hosted GitLab, Gitea, \u2026) declare `provider:` explicitly. Add more later with `monoceros add-repo`.";
+var GIT_IDENTITY_HEADER = "Git committer identity for commits made inside the container. The ${VAR} values resolve from <name>.env at apply time \u2014 fill them there, or leave them blank to fall back to your global git config (or a one-time prompt). Override per repo under repos[].git.user.";
+function pushGitIdentityBlock(lines) {
+  pushSectionHeader(
+    lines,
+    GIT_IDENTITY_HEADER,
+    /* commented */
+    false
+  );
+  lines.push("git:");
+  lines.push("  user:");
+  lines.push(`    name: \${${GIT_IDENTITY_VAR.name}}`);
+  lines.push(`    email: \${${GIT_IDENTITY_VAR.email}}`);
+  lines.push("");
+}
 function routingHeader(name) {
   return `Container ports exposed to the host through Traefik. Reach them in your browser as ${name}-<port>.localhost (e.g. ${name}-3000.localhost). The first entry is the default route and is also reachable as the bare ${name}.localhost. Manage the list with \`monoceros add-port\`.`;
 }
@@ -6168,17 +6350,6 @@ async function runInit(opts) {
     seenPorts.add(raw);
     ports.push(raw);
   }
-  let promptedIdentity;
-  if (repos.length > 0) {
-    const globalConfig = await readMonocerosConfig({ monocerosHome: home });
-    promptedIdentity = await resolveIdentityWithPrompt({
-      ...opts.identitySpawn ? { spawn: opts.identitySpawn } : {},
-      ...opts.identityPrompt ? { prompt: opts.identityPrompt } : {},
-      ...opts.identityScopePrompt ? { scopePrompt: opts.identityScopePrompt } : {},
-      ...globalConfig?.defaults?.git?.user ? { defaults: globalConfig.defaults.git.user } : {},
-      logger: { info: logger.info, warn: logger.info }
-    });
-  }
   let text;
   const composed = resolveComposedInit(catalog, {
     languages: opts.languages ?? [],
@@ -6196,57 +6367,26 @@ async function runInit(opts) {
   await ensureEnvGitignored(containerConfigsDir(home));
   await fs14.writeFile(dest, text, "utf8");
   const envPath = containerEnvPath(opts.name, home);
-  const featureVars = composed.features.flatMap(
-    (f) => featureOptionHints(lookup(f.ref), f.ref, Object.keys(f.options ?? {})).map(
-      (h) => h.envVar
-    )
-  );
-  await ensureEnvVars(envPath, opts.name, featureVars);
-  if (promptedIdentity?.prompted) {
-    const { name, email, scope } = promptedIdentity.prompted;
-    if (scope === "g" || scope === "b") {
-      try {
-        const result = await writeGlobalDefaultGitUser(
-          { name, email },
-          { monocerosHome: home }
-        );
-        if (result.alreadySet) {
-          logger.info(
-            `monoceros-config.yml already had a defaults.git.user \u2014 left it alone.`
-          );
-        } else if (result.created) {
-          logger.info(
-            `Saved identity globally \u2014 created ${prettyPath(result.filePath)} with defaults.git.user.`
-          );
-        } else {
-          logger.info(
-            `Saved identity globally to ${prettyPath(result.filePath)}.`
-          );
-        }
-      } catch (err) {
-        logger.info(
-          `Could not persist identity to monoceros-config.yml: ${err instanceof Error ? err.message : String(err)}. \`monoceros apply\` will re-prompt.`
-        );
-      }
+  const seedVars = {};
+  for (const f of composed.features) {
+    for (const h of featureOptionHints(
+      lookup(f.ref),
+      f.ref,
+      Object.keys(f.options ?? {})
+    )) {
+      if (!(h.envVar in seedVars)) seedVars[h.envVar] = "";
     }
-    if (scope === "c" || scope === "b") {
-      try {
-        const written = await fs14.readFile(dest, "utf8");
-        const parsed = parseConfig(written, dest);
-        const changed = setContainerGitUserInDoc(parsed.doc, { name, email });
-        if (changed) {
-          await fs14.writeFile(dest, stringifyConfig(parsed.doc), "utf8");
-          logger.info(
-            `Saved identity in ${prettyPath(dest)} (container-level git.user).`
-          );
-        }
-      } catch (err) {
-        logger.info(
-          `Could not persist identity into ${prettyPath(dest)}: ${err instanceof Error ? err.message : String(err)}. \`monoceros apply\` will re-prompt.`
-        );
-      }
+  }
+  for (const svc of composed.services) {
+    if (svc.kind === "curated") {
+      Object.assign(seedVars, curatedServiceEnvDefaults(svc.name));
     }
   }
+  if (repos.length > 0) {
+    seedVars[GIT_IDENTITY_VAR.name] = "";
+    seedVars[GIT_IDENTITY_VAR.email] = "";
+  }
+  await ensureEnvVars(envPath, opts.name, seedVars);
   const documented = !anyComposed;
   const ymlRel = path16.relative(home, dest);
   const envRel = path16.relative(home, envPath);