forgedock 1.36.0 → 1.37.0

package/bin/bot-token-status.mjs

@@ -0,0 +1,26 @@
+// SPDX-FileCopyrightText: Copyright (c) RapierCraft Studios
+// SPDX-License-Identifier: AGPL-3.0-or-later
+/** #4662: bot token lifetime from the stamp scripts/refresh-bot-token.sh writes (~/.forge/bot-token.json). Pure; `doctor` renders it. */
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+import { homedir } from "node:os";
+
+export const MIN_REMAINING_MS = 10 * 60 * 1000;
+export const MAX_AGE_MS = 50 * 60 * 1000;
+
+export const stampPath = (env = process.env) => join(env.FORGE_HOME_DIR || join(homedir(), ".forge"), "bot-token.json");
+
+/** @returns {{configured:boolean, ok:boolean, remainingMs?:number, ageMs?:number, refreshedAt?:string, reason?:string}} */
+export function botTokenStatus({ now = Date.now(), env = process.env, read = (p) => readFileSync(p, "utf8") } = {}) {
+  let raw;
+  try { raw = read(stampPath(env)); } catch { return { configured: false, ok: true }; }
+  let s;
+  try { s = JSON.parse(raw); } catch { return { configured: true, ok: false, reason: "bot-token.json is not valid JSON" }; }
+  const refreshed = Date.parse(s?.refreshedAt), expires = Date.parse(s?.expiresAt);
+  if (!Number.isFinite(refreshed) || !Number.isFinite(expires)) return { configured: true, ok: false, reason: "bot-token.json has no refreshedAt/expiresAt" };
+  const remainingMs = expires - now, ageMs = now - refreshed;
+  const out = { configured: true, remainingMs, ageMs, refreshedAt: s.refreshedAt };
+  if (remainingMs < MIN_REMAINING_MS) return { ...out, ok: false, reason: remainingMs <= 0 ? "token expired" : "less than 10 min of token lifetime remain" };
+  if (ageMs > MAX_AGE_MS) return { ...out, ok: false, reason: "no refresh in the last 50 min" };
+  return { ...out, ok: true };
+}

package/bin/engine/events.mjs

@@ -65,11 +65,20 @@ export function experimentEvent(report) {
   return { type: "experiment.verdict", data: { experiment: report.id, verdict, detail: `${passes.length} target(s)` }, ctx: {} };
 }
 
-/** A fix reached the default branch -> release.promoted; null without a fix. Reserved: no detection emits it yet. */
+/** A fix reached the default branch -> release.promoted; null without a fix. Emitted by the probe sweep (probeSweepEvents). */
 export function promotedEvent({ fix, default_branch } = {}) {
   return typeof fix === "string" && fix ? { type: "release.promoted", data: { fix, default_branch }, ctx: {} } : null;
 }
 
+/**
+ * Events for one probe-sweep row. A probe pass/fail row proves the fix is on the default branch (probeIssue gates on onDefault) and is
+ * recorded once per fix, so it also yields release.promoted. Monitor rows carry no defaultBranch and never do (they repeat per window).
+ */
+export function probeSweepEvents(row) {
+  const promoted = row?.defaultBranch && (row.outcome === "pass" || row.outcome === "fail") ? promotedEvent({ fix: row.fix, default_branch: row.defaultBranch }) : null;
+  return [probeEvent(row), regressionEvent(row), promoted && { ...promoted, ctx: { issue: row.issue } }].filter(Boolean);
+}
+
 /**
  * Pure mapping of one run-log record to {type, data, ctx} or null. `cost` is the lane's running spend, kept by the caller
  * from PHASE_ATTEMPT_USAGE (`cost_usd_delta` when present, else `cost_usd`).

package/bin/engine/events.test.mjs

@@ -7,7 +7,7 @@ import { readFileSync, existsSync, writeFileSync } from "node:fs";
 import { tmpDir } from "../tests/_tmp.mjs";
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
-import { EVENT_TYPES, EVENT_VERSION, buildEvent, mapRunRecord, makeEventEmitter, probeEvent, regressionEvent, experimentEvent, promotedEvent, sign, webhookUrlOk, postWebhook } from "./events.mjs";
+import { EVENT_TYPES, EVENT_VERSION, buildEvent, mapRunRecord, makeEventEmitter, probeEvent, probeSweepEvents, regressionEvent, experimentEvent, promotedEvent, sign, webhookUrlOk, postWebhook } from "./events.mjs";
 
 const tmp = () => tmpDir("forge-events-");
 const fixed = () => new Date("2026-10-26T12:00:00Z");
@@ -57,6 +57,20 @@ describe("event contract (v1)", () => {
   });
 });
 
+describe("probeSweepEvents emits release.promoted (#4644)", () => {
+  it("probe pass/fail rows with defaultBranch add release.promoted", () => {
+    const ev = probeSweepEvents({ issue: 3, outcome: "pass", fix: "abc", defaultBranch: "main", detail: "ok" });
+    assert.deepEqual(ev.map((e) => e.type), ["probe.passed", "release.promoted"]);
+    assert.deepEqual(ev[1].data, { fix: "abc", default_branch: "main" }); assert.equal(ev[1].ctx.issue, 3);
+    assert.equal(probeSweepEvents({ issue: 3, outcome: "fail", fix: "abc", defaultBranch: "main" }).length, 2);
+  });
+  it("monitor rows, awaiting-promotion and errors do not", () => {
+    assert.deepEqual(probeSweepEvents({ issue: 3, outcome: "pass", fix: "abc" }).map((e) => e.type), ["probe.passed"]);
+    assert.deepEqual(probeSweepEvents({ issue: 3, outcome: "awaiting-promotion", fix: "abc", defaultBranch: "main" }), []);
+    assert.deepEqual(probeSweepEvents({ issue: 3, outcome: "error" }), []);
+  });
+});
+
 describe("regression, experiment and promoted builders (#4632)", () => {
   it("regressionEvent: only a fail row that filed a regression issue", () => {
     assert.equal(regressionEvent({ issue: 5, outcome: "pass" }), null);

package/bin/engine/outcome-codes.mjs

@@ -32,17 +32,20 @@ export const OUTCOME_CODES = Object.freeze({
   REMEDIATE_UNFIXABLE: "remediate.unfixable",
   REMEDIATE_INPR_REQUESTED: "remediate.inpr_requested",
   CI_RED: "ci.red",
+  CI_DCO: "ci.dco", // forge#4651: a failed DCO check (or no identity to sign off the lane's commits); never recoverable: a new commit cannot fix history
   CI_TIMEOUT: "ci.timeout",
   BASE_CONFLICT: "base.conflict",
   RATE_LIMITED: "rate_limited",
   HOST_BUSY: "host.busy",
   GH_UNAVAILABLE: "gh.unavailable", // forge#4157: `gh` unreachable after retries during the --repo identity check; run deferred, nothing posted
+  GH_AUTH: "gh.auth", // forge#4662: gh answered HTTP 401 and one token refresh did not fix it; run deferred, a rerun resumes
   MERGE_TRANSIENT: "merge.transient",
   PUSH_TRANSIENT: "push.transient",
   CLI_IDLE: "cli.idle",
   RUN_INTERRUPTED: "run.interrupted", // forge#4179: SIGTERM/SIGINT on a core run; teardown ran from the ledger, lane requeued
   PATH_SWITCH_CONFLICT: "path.switch_conflict",
   ENGINE_ERROR: "engine.error",
+  ENGINE_VALIDATE_RESULT_LOST: "engine.validate_result_lost", // forge#4708: a validate result recorded before a CI fix round is missing after it and could not be carried forward
   INFRA_DISK_QUOTA: "infra.disk_quota",
   INFRA_CLI_SPAWN_TRANSIENT: "infra.cli_spawn_transient",
   CLI_TIMEOUT: "cli.timeout",
@@ -51,9 +54,12 @@ export const OUTCOME_CODES = Object.freeze({
   ENV_SETUP_FAILED: "env.setup_failed", // forge#4163: forge.yaml env.setup failed before the builder; an environment error, not a build failure
   ENV_TOOL_MISSING: "env.tool_missing", // forge#4323: a validate command could not run because a host tool or module is missing; an environment error, not a conformance failure
   ENV_REPRO_UNRUNNABLE: "env.repro_unrunnable", // forge#4334: the repro harness could not run the repro test on head; an environment error, not a conformance failure
+  ENV_LANE_LIMIT: "env.lane_limit", // forge#4690: the lane hit its own scope limit (TasksMax or MemoryMax) and was stopped; an environment error, never an engine-error, so the breaker ignores it
   ENV_CAPABILITY_REMOTE: "env.capability_remote", // forge#4542: a remote sandbox lane blocked only on a host-only capability (SOPS key, ops credentials, prod monitor SSH) the dispatching host has; recovered locally
   SANDBOX_START_FAILED: "sandbox.start_failed", // forge#4254: a lane sandbox could not start; needs-human, not relaunched
   SANDBOX_CAPACITY: "sandbox.capacity", // forge#4254: the sandbox provider had no capacity; deferred with backoff
+  SANDBOX_AUTH: "sandbox.auth", // forge#4685: the sandbox provider refused or lacked the credential (HTTP 401/403, no token); deferred, never needs-human
+  SANDBOX_UNREACHABLE: "sandbox.unreachable", // forge#4672: the sandbox provider stayed unreachable past execution.unreachable_window_min; deferred, the sandbox is kept for adopt
   LEASE_HELD: "lease.held",
   DEPENDENCY_OPEN: "dependency.open",
   DEPENDENCY_UNREADABLE: "dependency.unreadable",
@@ -79,11 +85,13 @@ export const OUTCOME_CODES = Object.freeze({
   REVIEW_INCONSISTENT: "review.inconsistent",
   CONFORMANCE_OMISSION: "conformance.omission",
   CONFORMANCE_UNIMPLEMENTED: "conformance.unimplemented",
+  CONFORMANCE_E2E_UNVERIFIED: "conformance.e2e_unverified",
   CONFORMANCE_SCOPE_CREEP: "conformance.scope_creep",
   CONFORMANCE_UNTRACKED_DEFERRAL: "conformance.untracked_deferral",
   CONFORMANCE_UNJUSTIFIED_DEFERRAL: "conformance.unjustified_deferral",
   CONFORMANCE_PRESERVE_VIOLATED: "conformance.preserve_violated",
   CONFORMANCE_REGRESSION: "conformance.regression",
+  CONFORMANCE_GUARD_BROKEN: "conformance.guard_broken", // forge#4693: the base version of a merged fix's guarding test fails against the lane's tree
   STRUCTURE_UNDECLARED_EDGE: "structure.undeclared_edge", // forge#4159: a workspace package.json edge the contract does not name
   DOCS_STALE: "docs.stale", // the target repo's devdocs freshness rule still fails after one builder resume
   MAINTENANCE_HOTSPOT_GROWTH: "maintenance.hotspot_growth", // forge#4195: an over-threshold file grew past growth_lines without hotspot-exempt
@@ -196,7 +204,17 @@ export const HUMAN_CODES = Object.freeze([OUTCOME_CODES.BUILDER_BLOCKED]);
  * edit (`issueEdited`), `ci-pending` on a conflicting PR (`conflicting`), and the non-human `budget-exceeded` turn-overrun end (forge#4505). Human: `builder.blocked`. Anything else
  * (another code, or not a needs-human/ci-pending row) is terminal. Pure, never throws.
  */
-export function classifyNeedsHuman(row) {
+export function classifyNeedsHuman(row, { parked = false } = {}) {
+  const cls = classifyNeedsHumanBase(row);
+  // forge#4656: opt-in `parked` class: a needs-human row ended on a mechanical terminal code (not a human block, not recoverable).
+  return parked && cls === "terminal" && isTerminalCodeRow(row) ? "parked" : cls;
+}
+
+function isTerminalCodeRow(row) {
+  return (row.outcome ?? row.terminalReason) === "needs-human" && typeof row.code === "string" && row.code !== "" && row.code !== UNCLASSIFIED;
+}
+
+function classifyNeedsHumanBase(row) {
   if (!row || typeof row !== "object") return "terminal";
   const outcome = row.outcome ?? row.terminalReason;
   if (outcome === "ci-pending") return row.conflicting === true ? "recoverable" : "terminal";
@@ -211,3 +229,23 @@ export function classifyNeedsHuman(row) {
 export function recoveryCodeOf(row) {
   return (row?.outcome ?? row?.terminalReason) === "ci-pending" ? OUTCOME_CODES.BASE_CONFLICT : normalizeCode(row?.code);
 }
+
+/** forge#4656: the label of a human-owned wait (an owner and an unblock condition are required in its comment). */
+export const NEEDS_HUMAN_EXTERNAL_LABEL = "needs-human:external";
+/** forge#4656: the single remediation queue (`/work-on:remediate`) a parked issue moves to once recovery attempts run out. */
+export const REMEDIATION_QUEUE_LABEL = "remediation-queue";
+/** forge#4656: `parked:<terminal-code>` label of a mechanical park. */
+export function parkedLabel(code) {
+  return `parked:${String(code ?? UNCLASSIFIED).trim().toLowerCase().replace(/[^a-z0-9._-]+/g, "-").slice(0, 40) || UNCLASSIFIED}`;
+}
+
+/**
+ * forge#4656 migration: classify a legacy bare `needs-human` issue from its last FORGE terminal annotation text.
+ * `{ kind: "parked", code }` when the text names a mechanical terminal code, else `{ kind: "external" }` (the default).
+ */
+export function classifyLegacyNeedsHuman(annotation) {
+  const text = String(annotation ?? "");
+  const m = /\b(ci\.red|ci\.timeout|base\.conflict|review_incomplete|builder\.block_untyped|conformance\.[a-z_]+|contract\.invalid|env\.[a-z_]+)\b/i.exec(text);
+  if (m) return { kind: "parked", code: m[1].toLowerCase() };
+  return { kind: "external" };
+}

package/bin/engine/phases.mjs

@@ -14,6 +14,7 @@
 import { PHASE_MARKERS } from "../../packages/protocol/src/phases.js";
 // forge#3833: closed outcome-code enum; every code below comes from structured evidence, never `detail` prose.
 import { OUTCOME_CODES as OC } from "./outcome-codes.mjs";
+import { parseState } from "./state.mjs";
 
 // forge#2261: "engine-error" is a distinct terminal reason for engine/tool-level
 // failures (e.g. an exhausted retry loop where the runner itself never once
@@ -355,7 +356,16 @@ export function parseDependsOn(body, issue = null) {
  * when the issue or a declared dependency cannot be read (fail closed: the caller refuses the run).
  * An empty read of the issue itself means "no body to trust" and yields `null`.
  */
-export async function openDependency(issue, io) {
+export async function openDependency(issue, io, { lane = null } = {}) {
+  const satisfied = [];
+  const prsOnLane = lane ? laneMergedPrs(lane, io) : null;
+  /** An open dependency whose change is already on `lane` is satisfied (records the merge commit). */
+  const onLane = async (n, rec = null) => {
+    if (!prsOnLane) return false;
+    const hit = await dependencyOnLane(n, lane, await prsOnLane, io, rec);
+    if (hit) satisfied.push({ issue: n, ...hit });
+    return !!hit;
+  };
   let rec;
   try { rec = await readIssueRecord(issue, io); } catch (e) {
     return { unreadable: true, detail: `issue ${issue} could not be read for its **Depends on** line: ${e?.message || e}` };
@@ -374,21 +384,71 @@ export async function openDependency(issue, io) {
     // when all close). No usable trail (none, untrusted, revoked, unreadable) keeps the parent itself open (fail closed).
     if (isDecomposedRecord(d) && (st === "open" || st === "closed")) {
       const subs = await decomposedSubissues(dep, io);
-      if (!subs) { open.push(dep); continue; }
+      if (!subs) { if (!(st === "open" && await onLane(dep, d))) open.push(dep); continue; }
       for (const s of subs) {
         let sr;
         try { sr = await readIssueRecord(s, io); } catch (e) {
           return { unreadable: true, detail: `sub-issue #${s} of decomposed dependency #${dep} could not be read: ${e?.message || e}` };
         }
         const ss = typeof sr?.state === "string" ? sr.state.toLowerCase() : "";
-        if (ss === "open") open.push(s);
+        if (ss === "open") { if (!(await onLane(s, sr))) open.push(s); }
         else if (ss !== "closed") return { unreadable: true, detail: `sub-issue #${s} of decomposed dependency #${dep} has no readable state` };
       }
     }
-    else if (st === "open") open.push(dep);
+    else if (st === "open") { if (!(await onLane(dep, d))) open.push(dep); }
     else if (st !== "closed") return { unreadable: true, detail: `dependency #${dep} of issue ${issue} has no readable state` };
   }
-  return open.length ? { open: [...new Set(open)].filter((n) => n !== Number(issue)) } : null;
+  const still = [...new Set(open)].filter((n) => n !== Number(issue));
+  if (still.length) return { open: still, ...(satisfied.length ? { satisfied } : {}) };
+  return satisfied.length ? { satisfied } : null;
+}
+
+/** Merged PRs on base `lane` (null when the list cannot be read: fail closed, nothing is satisfied). */
+export async function laneMergedPrs(lane, io) {
+  try {
+    const out = String((await io.gh(["pr", "list", "--state", "merged", "--base", lane, "--limit", "200", "--json", "number,mergeCommit,closingIssuesReferences,title,body"])) ?? "").trim();
+    const j = out ? JSON.parse(out) : [];
+    return Array.isArray(j) ? j : null;
+  } catch { return null; }
+}
+
+/**
+ * #4711: the `mergedTo` {lane, pr, sha} fact on a trusted issue record's FORGE:STATE, when it names `lane`, the PR reads MERGED with that
+ * merge commit, and the commit is an ancestor of `origin/<lane>` ({ pr, sha }), else null. Any lookup error is "not on the lane".
+ */
+async function mergedToByState(lane, io, rec) {
+  if (!rec || typeof rec.body !== "string" || !isTrustedComment(rec)) return null;
+  const m = parseState(rec.body)?.mergedTo;
+  if (!m || m.lane !== lane || !Number.isInteger(m.pr) || typeof m.sha !== "string" || !/^[0-9a-f]{7,64}$/i.test(m.sha)) return null;
+  try {
+    const pr = JSON.parse(String((await io.gh(["pr", "view", String(m.pr), "--json", "state,mergeCommit,baseRefName"])) ?? "{}"));
+    if (String(pr.state).toUpperCase() !== "MERGED" || pr.mergeCommit?.oid !== m.sha || (pr.baseRefName && pr.baseRefName !== lane)) return null;
+    try { await io.git(["fetch", "origin", lane]); } catch { /* offline: use the local ref */ }
+    await io.git(["merge-base", "--is-ancestor", m.sha, `origin/${lane}`]);
+    return { pr: m.pr, sha: m.sha };
+  } catch { return null; }
+}
+
+/**
+ * #4686: the PR that closes or references issue `n` and whose merge commit is an ancestor of `origin/<lane>`
+ * ({ pr, sha }), else null. Judged by commit ancestry, not issue state; any lookup error is "not on the lane".
+ */
+export async function dependencyOnLane(n, lane, prs, io, rec = null) {
+  const stated = await mergedToByState(lane, io, rec);
+  if (stated) return stated;
+  if (!Array.isArray(prs)) return null;
+  const ref = new RegExp(`(?:close[sd]?|fix(?:e[sd])?|resolve[sd]?|refs?|references?|part of)[ \\t:]+(?:[\\w.-]+/[\\w.-]+)?#${n}(?!\\d)`, "i");
+  const cands = prs.filter((p) => typeof p?.mergeCommit?.oid === "string" && p.mergeCommit.oid
+    && ((p.closingIssuesReferences ?? []).some((r) => Number(r?.number) === n) || ref.test(`${p.title ?? ""}\n${p.body ?? ""}`)));
+  if (!cands.length) return null;
+  try { await io.git(["fetch", "origin", lane]); } catch { /* offline: use the local ref */ }
+  for (const p of cands) {
+    try {
+      await io.git(["merge-base", "--is-ancestor", p.mergeCommit.oid, `origin/${lane}`]);
+      return { pr: p.number, sha: p.mergeCommit.oid };
+    } catch { /* not on the lane */ }
+  }
+  return null;
 }
 
 /**

package/bin/engine/telemetry-seam.mjs

@@ -63,7 +63,7 @@ export function mapRecord(rec, wallMs) {
     }) };
   }
   if (rec.event === "RUN_TERMINAL") {
-    return { event: "run_terminal", phase: null, ...prOf(rec), payload: compact({ reason: rec.reason, code: rec.code, wall_ms: wallMs,
+    return { event: "run_terminal", phase: null, ...prOf(rec), payload: compact({ reason: rec.reason, code: rec.code, wall_ms: wallMs, guard_added_ms: rec.guard_added_ms, // #4705
       milestone: rec.milestone, conformance_mode: rec.conformance_mode, shadow_would: rec.shadow_would,
       builder_tier: rec.builder_tier, builder_class: rec.builder_class, builder_model: rec.builder_model, // #4394: the model per merge
       builder_escalated: typeof rec.builder_escalated === "boolean" ? Number(rec.builder_escalated) : undefined,

package/bin/engine/telemetry-seam.test.mjs

@@ -80,6 +80,10 @@ describe("engine telemetry seam", () => {
     assert.deepEqual(p2, { reason: "merged", wall_ms: 0, milestone: "M", conformance_mode: "shadow", shadow_would: "conforms" });
     assert.equal(mapRecord({ event: "RUN_TERMINAL", reason: "merged", pr: 0 }, 1).pr, undefined, "no pr 0 in ctx");
   });
+  it("#4705: RUN_TERMINAL carries the guard gate's added wall time beside wall_ms", () => {
+    const m = mapRecord({ event: "RUN_TERMINAL", reason: "merged", wall_ms: 1000, guard_added_ms: 40 }, 1);
+    assert.equal(m.payload.guard_added_ms, 40);
+  });
   it("forge#4255: SANDBOX_USAGE maps to sandbox_usage with provider, minutes and cost", async () => {
     const { calls, emit } = harness();
     await emit({ event: "SANDBOX_USAGE", issue: 7, provider: "container", sandbox_id: "fdsbx-b-7", minutes: 12.5, cost_usd: 0.1234567891, batch: "b1" });