@mutmutco/cli 4.5.43 → 4.5.44

package/dist/main.cjs

@@ -7620,6 +7620,33 @@ function cadenceContainsCron(cadence, cron) {
   if (!cronTokens.length || cronTokens.length > cadenceTokens.length) return false;
   return cadenceTokens.some((_, i) => i + cronTokens.length <= cadenceTokens.length && cronTokens.every((t, j) => cadenceTokens[i + j] === t));
 }
+var DECLARED_UNSCHEDULED = /* @__PURE__ */ new Set(["on demand", "on-demand", "manual", "manual only", "event-driven"]);
+var CRON_FIELD2 = /^[0-9A-Za-z*,/\-]+$/;
+var DOW_NAMES = /* @__PURE__ */ new Set(["SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"]);
+function dowOk(dow) {
+  return dow.split(",").every((part) => {
+    const slash2 = part.indexOf("/");
+    const step = slash2 === -1 ? "" : part.slice(slash2);
+    if (step !== "" && !/^\/[1-9]\d*$/.test(step)) return false;
+    const tokens2 = (slash2 === -1 ? part : part.slice(0, slash2)).split("-");
+    if (tokens2.length > 2 || tokens2.some((t) => t === "")) return false;
+    return tokens2.every((t) => t === "*" || (/^\d+$/.test(t) ? Number(t) <= 7 : DOW_NAMES.has(t.toUpperCase())));
+  });
+}
+function cadenceProblem(cadence) {
+  const c = cadence.trim();
+  const cut = c.search(/[(+]/);
+  const lead = (cut === -1 ? c : c.slice(0, cut)).trim();
+  if (DECLARED_UNSCHEDULED.has(lead.toLowerCase())) return null;
+  if (/^((?:rate|cron)\([^()]+\))(?:\s*[(+].*)?$/is.test(c)) return null;
+  const f = lead.split(/\s+/);
+  if (f.length !== 5) return `cadence not mappable to a Scheduler expression: ${JSON.stringify(cadence)}`;
+  const [minute, hour, dom, month, dow] = f;
+  if (![minute, hour, dom, month].every((x) => CRON_FIELD2.test(x)) || dom !== "*" && dow !== "*" || !dowOk(dow)) {
+    return `cadence not mappable to a Scheduler expression: ${JSON.stringify(cadence)}`;
+  }
+  return null;
+}
 function scheduleRecordFromWorkflow(repo, workflowPath, yamlText) {
   const crons = extractWorkflowCrons(yamlText);
   const header = parseScheduleHeader(yamlText);
@@ -7638,6 +7665,10 @@ function scheduleRecordFromWorkflow(repo, workflowPath, yamlText) {
   if (!SCHEDULE_EXECUTORS.has(h.executor)) {
     throw new Error(`schedules register: ${expectedId} header \`executor: ${h.executor}\` is not a member of the closed executor taxonomy (${[...SCHEDULE_EXECUTORS].join(", ")}) \u2014 an unknown executor would register a row the harbour can never dispatch (docs/schedules.md "The entry template", H2 #4429).`);
   }
+  const problem = cadenceProblem(h.cadence);
+  if (problem) {
+    throw new Error(`schedules register: ${expectedId} ${problem} \u2014 lead with a 5-field cron, rate(...) or cron(...), then any note in (...) or after +; or declare one of: ${[...DECLARED_UNSCHEDULED].join(", ")} (docs/schedules.md "The entry template", #7415).`);
+  }
   for (const cron of crons) {
     if (!cadenceContainsCron(h.cadence, cron)) {
       throw new Error(`schedules register: ${expectedId} cadence \`${h.cadence}\` does not contain the workflow cron \`${cron}\` (whole-token comparison) \u2014 the declared cadence disagrees with the actual schedule.`);
@@ -14366,7 +14397,7 @@ function loadBootstrapSeeds(manifestJson) {
   };
 }
 function renderSeed(template, vars) {
-  return template.replace(PLACEHOLDER_RE, (match, key) => key in vars ? vars[key] : match);
+  return template.replace(PLACEHOLDER_RE, (match, key) => key in vars ? vars[key].replace(PLACEHOLDER_RE, (inner, innerKey) => innerKey !== key && innerKey in vars ? vars[innerKey] : inner) : match);
 }
 function missingPlaceholders(rendered) {
   const out = /* @__PURE__ */ new Set();
@@ -15370,7 +15401,10 @@ function gateSeedVars(cls, releaseTrack, runtime = "node", requiredCheckBranches
     GATE_MAX_SECONDS: DEFAULT_GATE_MAX_SECONDS,
     // The pin is the CLI's blessed SHA, not an operator knob — one central place to bump (#3178).
     GATE_BUDGET_SHA: BLESSED_RUN_WITH_BUDGET_SHA,
-    GATE_RUNNER_SHA: BLESSED_RUNNER_GATE_SHA
+    GATE_RUNNER_SHA: BLESSED_RUNNER_GATE_SHA,
+    // #7407: repo-declared service containers and extra check steps; empty renders today's gate byte-for-byte.
+    GATE_SERVICES_YAML: "",
+    GATE_EXTRA_STEPS_YAML: ""
   };
   const track = releaseTrack ?? (cls === "content" ? "trunk" : "full");
   const trackBranches = track === "trunk" ? ["main"] : track === "direct" ? ["development", "main"] : ["development", "rc", "main"];
@@ -15417,6 +15451,112 @@ function withDerivedRepoVars(vars, parsed, cls, releaseTrack, requiredCheckBranc
   if (!out.GATE_AFFECTED_CMD.trim()) out.GATE_AFFECTED_CMD = out.GATE_CMD;
   return out;
 }
+var GATE_SERVICE_KEYS = /* @__PURE__ */ new Set(["image", "env", "ports", "options", "tmpfs"]);
+var GATE_STEP_KEYS = /* @__PURE__ */ new Set(["name", "command", "env", "maxSeconds"]);
+function gateLine(value, field) {
+  if (typeof value !== "string" || !value.trim() || /[\r\n]/.test(value)) throw new Error(`${field} must be a non-empty single-line string`);
+  return value.trim();
+}
+function gateEnv(value, field) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error(`${field} must be an object of NAME: "value" strings`);
+  const out = {};
+  for (const [name, entry] of Object.entries(value)) {
+    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(name)) throw new Error(`${field}.${name} is not a valid environment variable name`);
+    if (typeof entry !== "string" || /[\r\n]/.test(entry)) throw new Error(`${field}.${name} must be a single-line string`);
+    out[name] = entry;
+  }
+  return out;
+}
+function gateSeconds(value, field) {
+  const text = typeof value === "number" ? String(value) : value;
+  if (typeof text !== "string" || !/^\d+$/.test(text.trim()) || Number(text) <= 0) throw new Error(`${field} must be a positive whole number of seconds`);
+  return text.trim();
+}
+function validateGateExtras(gate) {
+  const out = {};
+  if (gate.services !== void 0) {
+    if (!gate.services || typeof gate.services !== "object" || Array.isArray(gate.services)) throw new Error("gate.services must be an object keyed by service name");
+    out.services = {};
+    for (const [name, raw] of Object.entries(gate.services)) {
+      const field = `gate.services.${name}`;
+      if (!/^[a-z][a-z0-9_-]*$/.test(name)) throw new Error(`${field}: service name must be lowercase letters, digits, - or _`);
+      if (!raw || typeof raw !== "object" || Array.isArray(raw)) throw new Error(`${field} must be an object with an image`);
+      const service = raw;
+      for (const key of Object.keys(service)) if (!GATE_SERVICE_KEYS.has(key)) throw new Error(`${field}.${key} is not a service field (expected image/env/ports/options/tmpfs)`);
+      const parsed = { image: gateLine(service.image, `${field}.image`) };
+      if (service.env !== void 0) parsed.env = gateEnv(service.env, `${field}.env`);
+      if (service.ports !== void 0) {
+        if (!Array.isArray(service.ports) || service.ports.length === 0) throw new Error(`${field}.ports must be a non-empty array`);
+        parsed.ports = service.ports.map((port, index) => {
+          const ok = typeof port === "number" && Number.isInteger(port) && port > 0 && port < 65536 || typeof port === "string" && /^\d{1,5}(:\d{1,5})?$/.test(port);
+          if (!ok) throw new Error(`${field}.ports[${index}] must be a port number or "host:container"`);
+          return port;
+        });
+      }
+      if (service.options !== void 0) parsed.options = gateLine(service.options, `${field}.options`);
+      if (service.tmpfs !== void 0) {
+        if (!Array.isArray(service.tmpfs) || service.tmpfs.length === 0) throw new Error(`${field}.tmpfs must be a non-empty array of paths`);
+        parsed.tmpfs = service.tmpfs.map((path2, index) => gateLine(path2, `${field}.tmpfs[${index}]`));
+      }
+      out.services[name] = parsed;
+    }
+  }
+  if (gate.steps !== void 0) {
+    if (!Array.isArray(gate.steps)) throw new Error("gate.steps must be an array");
+    out.steps = gate.steps.map((raw, index) => {
+      const field = `gate.steps[${index}]`;
+      if (!raw || typeof raw !== "object" || Array.isArray(raw)) throw new Error(`${field} must be an object with name and command`);
+      const step = raw;
+      for (const key of Object.keys(step)) if (!GATE_STEP_KEYS.has(key)) throw new Error(`${field}.${key} is not a step field (expected name/command/env/maxSeconds)`);
+      const parsed = { name: gateLine(step.name, `${field}.name`), command: gateLine(step.command, `${field}.command`) };
+      if (step.env !== void 0) parsed.env = gateEnv(step.env, `${field}.env`);
+      if (step.maxSeconds !== void 0) parsed.maxSeconds = gateSeconds(step.maxSeconds, `${field}.maxSeconds`);
+      return parsed;
+    });
+  }
+  return out;
+}
+function yamlScalar(value) {
+  const plainSafe = /^[A-Za-z0-9_./$(][^\r\n]*$/.test(value) && !/: |\s#|[\s:]$/.test(value) && !/^(?:true|false|yes|no|on|off|null|~|[-+]?[\d.][\d_.eE+-]*)$/i.test(value);
+  return plainSafe ? value : JSON.stringify(value);
+}
+function envYaml(env, indent) {
+  return Object.entries(env).map(([name, value]) => `
+${indent}${name}: ${yamlScalar(value)}`).join("");
+}
+function gateServicesYaml(services) {
+  let out = "\n    services:";
+  for (const [name, service] of Object.entries(services)) {
+    out += `
+      ${name}:
+        image: ${yamlScalar(service.image)}`;
+    if (service.env && Object.keys(service.env).length) out += `
+        env:${envYaml(service.env, "          ")}`;
+    if (service.ports) out += `
+        ports:${service.ports.map((port) => `
+          - ${typeof port === "number" ? port : yamlScalar(port)}`).join("")}`;
+    const options = [...service.options ? [service.options] : [], ...(service.tmpfs ?? []).map((path2) => `--tmpfs ${path2}`)];
+    if (options.length) out += `
+        options: >-${options.map((line) => `
+          ${line}`).join("")}`;
+  }
+  return out;
+}
+function gateExtraStepsYaml(steps) {
+  return steps.map((step) => [
+    `
+      - name: ${yamlScalar(step.name)}`,
+    step.env && Object.keys(step.env).length ? `
+        env:${envYaml(step.env, "          ")}` : "",
+    "\n        uses: mutmutco/MMI-Hub/.github/actions/run-with-budget@{{GATE_BUDGET_SHA}}",
+    "\n        with:",
+    `
+          command: ${yamlScalar(step.command)}`,
+    `
+          max-seconds: ${step.maxSeconds ?? "{{GATE_MAX_SECONDS}}"}`,
+    "\n          working-directory: {{GATE_WORKDIR}}"
+  ].join("")).join("");
+}
 function gateConfigToVars(gate) {
   const out = {};
   if (!gate || typeof gate !== "object") return out;
@@ -15428,6 +15568,9 @@ function gateConfigToVars(gate) {
   if (typeof gate.pyVersion === "string" && gate.pyVersion.trim()) out.GATE_PY_VERSION = gate.pyVersion;
   const seconds = typeof gate.maxSeconds === "number" ? String(gate.maxSeconds) : gate.maxSeconds;
   if (typeof seconds === "string" && /^\d+$/.test(seconds.trim()) && Number(seconds) > 0) out.GATE_MAX_SECONDS = seconds.trim();
+  const extras = validateGateExtras(gate);
+  if (extras.services && Object.keys(extras.services).length) out.GATE_SERVICES_YAML = gateServicesYaml(extras.services);
+  if (extras.steps?.length) out.GATE_EXTRA_STEPS_YAML = gateExtraStepsYaml(extras.steps);
   return out;
 }
 function seedMatchesDeployModel(seed, deployModel) {
@@ -16871,10 +17014,10 @@ var rollout_plan_default = {
     note: "The v4.0.0 stamp happens at cut time (D6e #4463); until then the candidate is the origin/development head artifacts (built cli/dist + npm pack), identity proven by dist content hash (D6a)."
   },
   baseline: {
-    version: "4.5.43",
-    tag: "v4.5.43",
-    commit: "daaa2fa607cd",
-    npm: "@mutmutco/cli@4.5.43"
+    version: "4.5.44",
+    tag: "v4.5.44",
+    commit: "dda7c3cc34f2",
+    npm: "@mutmutco/cli@4.5.44"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -16891,14 +17034,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.5.43"
+          v3Target: "v4.5.44"
         }
       ],
       rollbackTrigger: "Any red inside the post-contract soak window: `devops train gate` FAIL attributable to the v4 doors, Hub endpoint health probe failure, a pre-v4 client admitted instead of receiving actionable HTTP 426, or npm consumer install/doctor failure on the v4-only dist.",
       rollback: {
         independent: true,
-        mechanism: "npm dist-tag latest -> 4.5.43 and redeploy the Hub Lambda from tag v4.5.43 (daaa2fa607cd); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.5.43 (@mutmutco/cli@4.5.43, tag commit daaa2fa607cd \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.5.44 and redeploy the Hub Lambda from tag v4.5.44 (dda7c3cc34f2); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.5.44 (@mutmutco/cli@4.5.44, tag commit dda7c3cc34f2 \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -27801,8 +27944,15 @@ async function seedGateYml(repo, deps, meta, result) {
     result.skipped.push(`gate.yml missing \u2014 no registry gate config; set \`mmi-cli oracle org project set ${repo} --var gate={...}\` first, then re-run reconcile`);
     return "none";
   }
+  let gateVars;
+  try {
+    gateVars = gateConfigToVars(gate);
+  } catch (e) {
+    result.errors.push(`gate.yml re-seed: registry gate config is invalid \u2014 ${e.message}`);
+    return "none";
+  }
   const derivedVars = withDerivedRepoVars(
-    { ...gateConfigToVars(gate), REPO_SLUG: parsed.slug },
+    { ...gateVars, REPO_SLUG: parsed.slug },
     parsed,
     "deployable",
     releaseTrack,
@@ -29906,13 +30056,15 @@ function parseManifest(text) {
     const where = `box control manifest: files[${i}]`;
     if (typeof f.src !== "string" || !f.src || f.src.startsWith("/") || f.src.includes("..")) throw new Error(`${where}: src must be a repo-relative path`);
     if (f.mode !== "0644" && f.mode !== "0755") throw new Error(`${where} (${f.src}): mode must be "0644" or "0755"`);
-    if (f.post !== void 0 && (typeof f.post !== "string" || !ALLOWED_POST.has(f.post))) {
-      throw new Error(`${where} (${f.src}): post must be one of ${[...ALLOWED_POST].join(", ")}`);
-    }
     const targets = [];
     if (Array.isArray(f.targets)) targets.push(...f.targets);
     if (f.lanes !== void 0) targets.push(...expandLanes(f.lanes, where));
     if (!targets.length) throw new Error(`${where} (${f.src}): needs targets or lanes`);
+    const ownSysctl = typeof f.post === "string" && /^sysctl -p (\/etc\/sysctl\.d\/[A-Za-z0-9._-]+\.conf)$/.exec(f.post);
+    const postOk = f.post === void 0 || typeof f.post === "string" && ALLOWED_POST.has(f.post) || !!ownSysctl && targets.every((t) => t.dest === ownSysctl[1]);
+    if (!postOk) {
+      throw new Error(`${where} (${f.src}): post must be one of ${[...ALLOWED_POST].join(", ")}, or \`sysctl -p <its own /etc/sysctl.d dest>\``);
+    }
     for (const t of targets) {
       if (typeof t.box !== "string" || !/^[a-z0-9-]+$/.test(t.box)) throw new Error(`${where} (${f.src}): bad box name`);
       if (typeof t.dest !== "string" || !/^\/[A-Za-z0-9._\/-]+$/.test(t.dest) || t.dest.includes("..")) {
@@ -29947,9 +30099,19 @@ function planRemoteScript(dests) {
   for (const d of dests) {
     lines2.push(`if [ -f '${d}' ]; then printf '%s %s %s\\n' "$(md5sum < '${d}' | cut -d' ' -f1)" "$(stat -c %a '${d}')" '${d}'; else printf 'MISSING - %s\\n' '${d}'; fi`);
   }
+  lines2.push(`for f in ${ALERT_DIR}/*; do [ -f "$f" ] && printf 'ALERT %s %s\\n' "$(basename "$f")" "$(head -c 300 "$f" | tr '\\n' ' ')"; done; true`);
   return `${lines2.join("\n")}
 `;
 }
+var ALERT_DIR = "/var/lib/mmi-control/alerts";
+function parseAlerts(output) {
+  const out = [];
+  for (const line of output.split("\n")) {
+    const m = /^ALERT ([A-Za-z0-9._-]+) ?(.*)$/.exec(line.trim());
+    if (m) out.push({ name: m[1], message: m[2].trim() });
+  }
+  return out;
+}
 function parsePlanOutput(output, rows) {
   const seen = /* @__PURE__ */ new Map();
   for (const line of output.split("\n")) {
@@ -30415,14 +30577,20 @@ function parseGateVar(raw) {
   const map = parsed;
   const out = {};
   for (const [key, value] of Object.entries(map)) {
-    if (key === "runtime") {
+    if (key === "services" || key === "steps") {
+      try {
+        Object.assign(out, validateGateExtras({ [key]: value }));
+      } catch (error) {
+        throw new Error(`org project set: ${error.message}`);
+      }
+    } else if (key === "runtime") {
       if (value !== "node" && value !== "python") throw new Error('org project set: gate.runtime must be "node" or "python"');
       out.runtime = value;
     } else if (key === "cmd" || key === "affectedCmd" || key === "workdir" || key === "cacheDepPath" || key === "pyVersion") {
       if (typeof value !== "string" || !value.trim()) throw new Error(`org project set: gate.${key} must be a non-empty string`);
       out[key] = value.trim();
     } else {
-      throw new Error(`org project set: gate key "${key}" \u2014 expected only runtime/cmd/affectedCmd/workdir/cacheDepPath/pyVersion`);
+      throw new Error(`org project set: gate key "${key}" \u2014 expected only runtime/cmd/affectedCmd/workdir/cacheDepPath/pyVersion/services/steps`);
     }
   }
   return out;
@@ -31625,10 +31793,11 @@ ${SSH_RECIPE_AGENT_NOTE}`);
       const results = parsePlanOutput(output, probeRows);
       const drift = results.filter((r) => r.status !== "in-sync").length;
       const unread = results.some((r) => r.status === "unread");
-      const payload = { box: found.box.name, ref: o.ref, mode: o.apply ? "apply" : "plan", files: results, drift, ok: drift === 0 };
+      const alerts = parseAlerts(output);
+      const payload = { box: found.box.name, ref: o.ref, mode: o.apply ? "apply" : "plan", files: results, drift, alerts, ok: drift === 0 && alerts.length === 0 };
       if (o.json) console.log(JSON.stringify(payload, null, 2));
-      else console.log(formatControl(payload.mode, found.box.name, results));
-      process.exitCode = unread ? 2 : drift ? 1 : 0;
+      else console.log([formatControl(payload.mode, found.box.name, results), ...alerts.map((a) => `ALERT ${a.name}: ${a.message}`)].join("\n"));
+      process.exitCode = unread ? 2 : drift || alerts.length ? 1 : 0;
     } catch (e) {
       if (o.json) console.log(JSON.stringify({ box: name, ref: o.ref, ok: false, error: e.message }, null, 2));
       else console.error(e.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "4.5.43",
+  "version": "4.5.44",
   "description": "MMI Future CLI — the org dev toolbox and shared cross-IDE engine for every registry-declared MMI coding surface.",
   "type": "module",
   "license": "UNLICENSED",