@getmonoceros/workbench 1.13.0 → 1.13.1

package/dist/bin.js

@@ -742,13 +742,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);
@@ -1972,6 +1979,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 +2006,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 +2069,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];
@@ -3137,8 +3188,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;
 }
@@ -5193,7 +5262,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.1" : "dev";
 
 // src/commands/_dispatch.ts
 import { consola as consola12 } from "consola";
@@ -6196,12 +6265,22 @@ 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);
+  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] = "";
+    }
+  }
+  for (const svc of composed.services) {
+    if (svc.kind === "curated") {
+      Object.assign(seedVars, curatedServiceEnvDefaults(svc.name));
+    }
+  }
+  await ensureEnvVars(envPath, opts.name, seedVars);
   if (promptedIdentity?.prompted) {
     const { name, email, scope } = promptedIdentity.prompted;
     if (scope === "g" || scope === "b") {