forgedock 1.24.2 → 1.24.3

package/bin/engine/outcome-codes.mjs

@@ -36,6 +36,7 @@ export const OUTCOME_CODES = Object.freeze({
   BASE_CONFLICT: "base.conflict",
   RATE_LIMITED: "rate_limited",
   HOST_BUSY: "host.busy",
+  PATH_SWITCH_CONFLICT: "path.switch_conflict",
   ENGINE_ERROR: "engine.error",
   INFRA_DISK_QUOTA: "infra.disk_quota",
   INFRA_CLI_SPAWN_TRANSIENT: "infra.cli_spawn_transient",

package/bin/engine/runlog.mjs

@@ -56,7 +56,22 @@ export function readLog(dir, issue) {
 }
 
 /** Fold events into a RunState. The commit rule lives here. */
-export function deriveState(events) {
+/**
+ * #4109: the run log is shared by the full and the core path. Keep only the events of runs whose `path` (from RUN_START;
+ * missing means "full", for historic logs) equals `path`, so one path never replays the other's commits or terminals.
+ */
+export function scopeEvents(events, path = "full") {
+  let cur = "full";
+  const out = [];
+  for (const e of events) {
+    if (e.event === "RUN_START") cur = e.path ?? "full";
+    if (cur === path) out.push(e);
+  }
+  return out;
+}
+
+export function deriveState(allEvents, { path = "full" } = {}) {
+  const events = scopeEvents(allEvents, path);
   /** @type {import("./phases.mjs").RunState} */
   const s = { v: 0, run: null, issue: null, lane: "staging", committed: [],
               phase: null, branch: null, pr: null, terminal: false,

package/bin/engine-cli.mjs

@@ -510,7 +510,7 @@ export async function runFromCli(argv, deps = {}) {
     return res;
   }
   // forge#3932: refused before any state write (open or unreadable **Depends on**); nothing ran.
-  if (res.terminalReason === "dependency-open" || res.terminalReason === "dependency-unreadable") {
+  if (res.terminalReason === "dependency-open" || res.terminalReason === "dependency-unreadable" || res.code === "path.switch_conflict") {
     console.log(res.detail ?? "run refused: dependency check");
     return res;
   }

package/bin/engine.mjs

@@ -8,7 +8,7 @@ import { readFileSync, rmSync, readdirSync } from "node:fs";
 import { execFileSync } from "node:child_process";
 import { createHash, scryptSync } from "node:crypto";
 import { hostname as osHostname, homedir } from "node:os";
-import { appendEvent, readLog, deriveState, rewriteLog } from "./engine/runlog.mjs";
+import { appendEvent, readLog, deriveState, rewriteLog, scopeEvents } from "./engine/runlog.mjs";
 import { pickPhase, TERMINAL_REASONS, issueSnapshot, hasInvestigationExit, postCycleMarker, nextCycleNumber, newestCycle, cycleResetProvable, remediationHeadStale, decompositionRevoked, openDependency } from "./engine/phases.mjs";
 import { reconcileState } from "./engine/reconcile.mjs";
 import { makeProjector } from "./engine/projector.mjs";
@@ -440,7 +440,8 @@ export async function runIssue(opts) {
   const projector = makeProjector(io);
 
   // 1. Load + reconcile (GitHub wins).
-  const local = readLog(dir, issue).length ? deriveState(readLog(dir, issue)) : null;
+  // #4109: only this (full) path's own events: core-path commits and terminals in the shared log are never replayed here.
+  const local = scopeEvents(readLog(dir, issue)).length ? deriveState(readLog(dir, issue)) : null;
   let remote = await projector.readState(issue);
   let { state, action } = reconcileState(local, remote);
   const leaseHeld = (r) => !!(r?.lease && r.lease.until > now() && r.lease.by !== agentId &&
@@ -495,6 +496,19 @@ export async function runIssue(opts) {
       };
     }
   }
+  // #4109: an open core-path PR means the work already exists; a second implementation from the full path would duplicate it.
+  {
+    let prs = [];
+    try { prs = JSON.parse(String(await io.gh(["pr", "list", ...(repo ? ["-R", String(repo)] : []), "--head", `feat/issue-${issue}-lean`, "--state", "open", "--json", "number,headRefName"])) || "[]"); } catch { prs = []; }
+    prs = Array.isArray(prs) ? prs.filter((x) => x?.headRefName === `feat/issue-${issue}-lean`) : [];
+    if (Array.isArray(prs) && prs.length && Number.isInteger(prs[0]?.number)) {
+      return {
+        terminalReason: "needs-human",
+        code: OUTCOME_CODES.PATH_SWITCH_CONFLICT,
+        detail: `issue ${issue} has an open core-path PR #${prs[0].number}; rerun on the default path (base-sync) or close that PR first.`,
+      };
+    }
+  }
   // forge#3824: hoisted so RUN_START can carry the repo (lazy, memoised; null when unresolved).
   let repoPromise = null;
   const resolveRepo = () => (repoPromise ??= (async () => {

package/docs/OUTCOME-CODES.md

@@ -33,6 +33,7 @@ An absent or unknown code is recorded as `unclassified`, with the raw reason kep
 | `ci.red` | CI failed | reserved | `REVIEW_RESULT` carries no CI field yet |
 | `ci.timeout` | CI timed out | reserved | `REVIEW_RESULT` carries no CI field yet |
 | `base.conflict` | Base-branch conflict blocked the PR | reserved | `REVIEW_RESULT` carries no conflict field yet |
+| `path.switch_conflict` | The full path was started on an issue that has an open core-path PR (`feat/issue-<n>-lean`); refused to avoid a second implementation. Rerun on the default path (base-sync) or close that PR first | engine | `bin/engine.mjs` admission |
 | `host.busy` | Core run deferred at admission: free memory, free tmp space or load per core outside `engine.admission` limits; no lease taken, nothing posted | lean | `bin/lean/admission.mjs` |
 | `rate_limited` | Session or usage limit outlasted the pause budget | engine | `err.usageLimit` / `err.resetAtEpochMs` |
 | `engine.error` | Engine or tool failure (missing key/SDK, CLI crash, max turns, unresolved args, runner threw every attempt) | engine | `err.code` |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forgedock",
-  "version": "1.24.2",
+  "version": "1.24.3",
   "description": "Autonomous development pipeline for coding agents. GitHub as institutional memory, with native Claude Code and OpenCode entrypoints.",
   "bin": {
     "forgedock": "bin/forgedock.mjs"