omp-conductor 0.3.18 → 0.3.20

package/src/config.ts

@@ -20,14 +20,17 @@ import {
   CONFIG_VERSION,
   DEFAULT_AUTHORITY,
   DEFAULT_CAPS,
+  DEFAULT_RELEASE_POLICY,
   DEFAULT_REPORT_SCOPE,
   ORCHESTRATOR_MODES,
   READABLE_CONFIG_VERSIONS,
+  RELEASE_POLICIES,
   REPORT_SCOPES,
   type Caps,
   type ConductorConfig,
   type ProjectConfig,
   type ReportScope,
+  type ReleasePolicy,
   type RepoTarget,
 } from "./types.ts";
 
@@ -137,24 +140,28 @@ export function saveConfig(c: ConductorConfig): void {
 }
 
 /**
- * Layers a project's overrides on the global defaults, field by field, so a
- * project that pins one cap still inherits the other five. `??` not `||`: a
- * deliberate `dailySpendUsd: 0` is a hard stop, not "unset", and `null` is a
- * deliberate "no spend gate" that must not fall through to the default.
- * Spelled out per field so adding a `Caps` member fails to compile here.
+ * Layers a project's overrides on the global defaults, field by field. `??`
+ * not `||`: a deliberate `dailySpendUsd: 0` is a hard stop, and `null` is a
+ * deliberate "no spend gate". Spelled out so a new cap fails compilation here.
  */
 export function resolveCaps(p: ProjectConfig, defaults: Caps): Caps {
   const o: Partial<Caps> = p.caps ?? {};
   return {
     maxConcurrentWorkers: o.maxConcurrentWorkers ?? defaults.maxConcurrentWorkers,
-    // nullish only — `null` means off; do not coalesce it to the default.
     dailySpendUsd: o.dailySpendUsd !== undefined ? o.dailySpendUsd : defaults.dailySpendUsd,
     workerMaxTurns: o.workerMaxTurns ?? defaults.workerMaxTurns,
     workerWallClockMs: o.workerWallClockMs ?? defaults.workerWallClockMs,
     maxAttemptsPerIssue: o.maxAttemptsPerIssue ?? defaults.maxAttemptsPerIssue,
+    maxContinuationsPerIssue:
+      o.maxContinuationsPerIssue ?? defaults.maxContinuationsPerIssue,
   };
 }
 
+/** Old configs and omitted keys are fail-closed at the enforcement boundary. */
+export function resolveReleasePolicy(p: ProjectConfig): ReleasePolicy {
+  return p.releasePolicy ?? DEFAULT_RELEASE_POLICY;
+}
+
 /**
  * Resolves a project by name, or the only project when the name is omitted.
  * Refuses to guess between several: picking one silently would spend the wrong
@@ -275,6 +282,14 @@ function normalizeProject(
 
   const escalation = normalizeEscalation(raw["escalation"], label, problems);
   const authority = normalizeAuthority(raw["authority"], label, problems);
+  const releasePolicy = pickLiteral(
+    raw["releasePolicy"],
+    RELEASE_POLICIES,
+    DEFAULT_RELEASE_POLICY,
+    `${label}: releasePolicy`,
+    RELEASE_POLICIES.map((value) => JSON.stringify(value)).join(" or "),
+    problems,
+  );
 
   const caps = coerceCaps(raw["caps"], `${label}: caps`, problems, legacyCaps);
   const reporting = normalizeReporting(raw["reporting"], label, problems);
@@ -300,6 +315,7 @@ function normalizeProject(
     ...(workerModel === undefined ? {} : { workerModel }),
     escalation,
     authority,
+    releasePolicy,
     reporting,
     workspaceRoot: expandHome(pickString(raw["workspaceRoot"], join(stateDir(), "worktrees"))),
     mirrorRoot: expandHome(pickString(raw["mirrorRoot"], join(stateDir(), "mirrors"))),