omp-conductor 0.15.10 → 0.15.12

package/src/config.ts

@@ -355,8 +355,11 @@ export function findProject(c: ConductorConfig, name?: string): ProjectConfig {
   if (name === undefined) {
     const only = c.projects[0];
     if (c.projects.length !== 1 || only === undefined) {
+      // #514: every operator hitting this has to guess the spelling of the
+      // flag that names a project — say it outright. Doctor's project finding
+      // quotes this text, so keep the "name one explicitly" phrase.
       throw new Error(
-        `Ambiguous project: config has ${c.projects.length} projects (${names.join(", ") || "none"}) — name one explicitly.`,
+        `Ambiguous project: config has ${c.projects.length} projects (${names.join(", ") || "none"}) — name one explicitly with --project NAME.`,
       );
     }
     return only;
@@ -558,13 +561,17 @@ function checkDigest(d: Raw, label: string, problems: string[]): void {
 function checkAuthority(a: Raw, label: string, problems: string[]): void {
   const merge = a["merge"];
   const release = a["release"];
+  const promotion = a["promotion"];
   if (merge !== undefined && typeof merge === "string" && !(AUTHORITY_HOLDERS as readonly string[]).includes(merge)) {
     problems.push(`${label}: authority.merge must be ${AUTHORITY_HOLDER_LIST}, found ${JSON.stringify(merge)}`);
   }
   if (release !== undefined && typeof release === "string" && !(AUTHORITY_HOLDERS as readonly string[]).includes(release)) {
     problems.push(`${label}: authority.release must be ${AUTHORITY_HOLDER_LIST}, found ${JSON.stringify(release)}`);
   }
-  const unknown = Object.keys(a).filter((k) => k !== "merge" && k !== "release");
+  if (promotion !== undefined && typeof promotion === "string" && !(AUTHORITY_HOLDERS as readonly string[]).includes(promotion)) {
+    problems.push(`${label}: authority.promotion must be ${AUTHORITY_HOLDER_LIST}, found ${JSON.stringify(promotion)}`);
+  }
+  const unknown = Object.keys(a).filter((k) => k !== "merge" && k !== "release" && k !== "promotion");
   if (unknown.length > 0) problems.push(`${label}: authority has unknown key(s): ${unknown.join(", ")}`);
 }
 
@@ -817,7 +824,7 @@ function clauseFor(rel: readonly PropertyKey[], issue: {
     }
     if (rel.length === 1 && relStr === "escalation") return `escalation must be an object`;
     if (rel.length === 1 && relStr === "authority") {
-      return `authority must be an object with "merge" and "release" of ${AUTHORITY_HOLDER_LIST}`;
+      return `authority must be an object with "merge", "release" and "promotion" of ${AUTHORITY_HOLDER_LIST}`;
     }
     if (rel.length === 1 && relStr === "policy") {
       return `policy must be an object with "merge" and "release" sections`;
@@ -909,7 +916,7 @@ function clauseFor(rel: readonly PropertyKey[], issue: {
     }
     if (pathStr === "reporting.digest.cadence") return `${pathStr} must be ${DIGEST_CADENCE_LIST}, found ${found()}`;
     if (pathStr === "escalation.orchestrator") return `${pathStr} must be ${ORCHESTRATOR_MODE_LIST}, found ${found()}`;
-    if (pathStr === "authority.merge" || pathStr === "authority.release") {
+    if (pathStr === "authority.merge" || pathStr === "authority.release" || pathStr === "authority.promotion") {
       return `${pathStr} must be ${AUTHORITY_HOLDER_LIST}, found ${found()}`;
     }
     if (pathStr === "policy.merge.baseFreshness") return `${pathStr} must be ${BASE_FRESHNESS_LIST}, found ${found()}`;
@@ -1076,6 +1083,34 @@ function finalizeProject(
   const workerModel =
     typeof rawWorkerModel === "string" && rawWorkerModel.trim() !== "" ? rawWorkerModel : undefined;
 
+  // The failover chain is a hint like workerModel, not a ceiling: an unusable
+  // entry or a malformed threshold is dropped rather than failing the load,
+  // and absent/empty `modelFallbacks` keeps today's dispatch byte for byte.
+  const rawFallbacks = p["modelFallbacks"];
+  const modelFallbacks = Array.isArray(rawFallbacks)
+    ? rawFallbacks
+        .filter((entry): entry is string => typeof entry === "string")
+        .map((entry) => entry.trim())
+        .filter((entry) => entry !== "")
+    : [];
+  const rawThreshold = p["modelFallbackThreshold"];
+  const modelFallbackThreshold =
+    typeof rawThreshold === "number" && Number.isInteger(rawThreshold) && rawThreshold >= 1
+      ? rawThreshold
+      : undefined;
+
+  // Marked critical-base/safety markers (commit SHAs or refs). A continuation
+  // branch must contain every one before the dispatcher may reattach it;
+  // unusable entries are dropped like `modelFallbacks` and an absent or empty
+  // list keeps today's behaviour byte for byte.
+  const rawCriticalBase = p["criticalBase"];
+  const criticalBase = Array.isArray(rawCriticalBase)
+    ? rawCriticalBase
+        .filter((entry): entry is string => typeof entry === "string")
+        .map((entry) => entry.trim())
+        .filter((entry) => entry !== "")
+    : [];
+
   if (problems.length > before) return undefined;
 
   return {
@@ -1091,12 +1126,15 @@ function finalizeProject(
     routing: { labelPrefix, repos },
     caps,
     ...(workerModel === undefined ? {} : { workerModel }),
+    ...(modelFallbacks.length === 0 ? {} : { modelFallbacks }),
+    ...(modelFallbackThreshold === undefined ? {} : { modelFallbackThreshold }),
     escalation,
     authority,
     releasePolicy,
     policy,
     ...(recoveryMerges === undefined ? {} : { recoveryMerges }),
     reporting,
+    ...(criticalBase.length === 0 ? {} : { criticalBase }),
     workspaceRoot: expandHome(pickString(p["workspaceRoot"], defaultWorkspaceRoot())),
     mirrorRoot: expandHome(pickString(p["mirrorRoot"], defaultMirrorRoot())),
   };
@@ -1136,6 +1174,9 @@ function finalizeAuthority(parsed: Raw | undefined): ProjectConfig["authority"]
   return {
     merge: (parsed["merge"] as ProjectConfig["authority"]["merge"]) ?? DEFAULT_AUTHORITY.merge,
     release: (parsed["release"] as ProjectConfig["authority"]["release"]) ?? DEFAULT_AUTHORITY.release,
+    // Unstated defaults to the human: a config written before promotion was a
+    // key must load as operator-owned, never as a silent delegation.
+    promotion: (parsed["promotion"] as ProjectConfig["authority"]["promotion"] | undefined) ?? DEFAULT_AUTHORITY.promotion,
   };
 }