harnery 0.45.0 → 0.45.2

package/src/core/storage/segments.ts

@@ -338,23 +338,20 @@ export async function withFamilyLease<T>(
   let owner: LeaseOwner | undefined;
   while (true) {
     try {
-      mkdirSync(lease, { mode: stateDirMode() });
-      const leaseIdentity = captureDirectoryIdentity(lease);
-      owner = {
-        owner_id: randomUUID(),
-        pid: process.pid,
-        acquired_at: new Date().toISOString(),
-      };
-      writeNewFile(join(lease, "owner.json"), Buffer.from(`${JSON.stringify(owner)}\n`));
-      assertDirectoryIdentity(leaseIdentity);
+      owner = claimLease(lease);
       break;
     } catch (error) {
-      if (pathExists(lease) && !safeLeaseDirectory(lease)) {
+      if (leaseHasWrongType(lease)) {
         throw new HarneryLogLeaseError("wrong_type", `log lease is not a directory: ${lease}`);
       }
       if (recoverStaleLease(lease, policy.lease_stale_ms)) continue;
       if (Date.now() - started >= policy.lease_timeout_ms) {
-        throw new HarneryLogLeaseError("timeout", `timed out acquiring log lease: ${lease}`);
+        throw new HarneryLogLeaseError(
+          "timeout",
+          leaseHasValidOwner(lease)
+            ? `timed out acquiring log lease: ${lease}`
+            : `timed out acquiring log lease with no valid owner; an interrupted writer left it, and it is never recovered automatically: ${lease}`,
+        );
       }
       await new Promise((resolve) => setTimeout(resolve, policy.lease_retry_ms));
       void error;
@@ -367,6 +364,41 @@ export async function withFamilyLease<T>(
   }
 }
 
+/**
+ * Publish a complete lease in one rename. The owner record is written and synced
+ * in a private claim directory first, so a writer stopped at any point leaves
+ * either no lease or one with an owner. A held lease always has an owner record,
+ * here and in the earlier create-then-write protocol, so a rename that replaces
+ * an empty lease directory never takes a held lease. A lease with any entry makes
+ * the rename fail, and the caller waits or recovers as before.
+ */
+function claimLease(lease: string): LeaseOwner {
+  const owner: LeaseOwner = {
+    owner_id: randomUUID(),
+    pid: process.pid,
+    acquired_at: new Date().toISOString(),
+  };
+  const content = `${JSON.stringify(owner)}\n`;
+  const claim = `${lease}.claim-${process.pid}-${owner.owner_id}`;
+  try {
+    mkdirSync(claim, { mode: stateDirMode() });
+    writeNewFile(join(claim, "owner.json"), Buffer.from(content));
+    renameSync(claim, lease);
+  } finally {
+    rmSync(claim, { recursive: true, force: true });
+  }
+  try {
+    captureDirectoryIdentity(lease);
+    if (readRegularFile(join(lease, "owner.json"), 4_096).toString("utf8") !== content) {
+      throw new Error(`log lease owner changed during claim: ${lease}`);
+    }
+  } catch (error) {
+    releaseOwnedLease(lease, owner);
+    throw error;
+  }
+  return owner;
+}
+
 function shouldRotate(
   active: string,
   incoming: readonly Buffer[],
@@ -476,6 +508,22 @@ interface LeaseOwner {
   acquired_at: string;
 }
 
+function leaseHasValidOwner(lease: string): boolean {
+  try {
+    const owner = JSON.parse(
+      readRegularFile(join(lease, "owner.json"), 4_096).toString("utf8"),
+    ) as LeaseOwner;
+    return (
+      typeof owner?.owner_id === "string" &&
+      owner.owner_id.length > 0 &&
+      Number.isSafeInteger(owner.pid) &&
+      Number.isFinite(Date.parse(owner.acquired_at))
+    );
+  } catch {
+    return false;
+  }
+}
+
 function recoverStaleLease(lease: string, maximumAgeMs: number): boolean {
   let identity: DirectoryIdentity;
   let raw: string;
@@ -504,7 +552,7 @@ function recoverStaleLease(lease: string, maximumAgeMs: number): boolean {
   try {
     assertDirectoryIdentity(identity);
     if (readRegularFile(join(lease, "owner.json"), 4_096).toString("utf8") !== raw) return false;
-    rmSync(lease, { recursive: true, force: false });
+    retireLease(lease, randomUUID());
     return true;
   } catch {
     return false;
@@ -517,12 +565,23 @@ function releaseOwnedLease(lease: string, owner: LeaseOwner): void {
       readRegularFile(join(lease, "owner.json"), 4_096).toString("utf8"),
     ) as LeaseOwner;
     if (current.owner_id !== owner.owner_id) return;
-    rmSync(lease, { recursive: true, force: false });
+    retireLease(lease, owner.owner_id);
   } catch {
     // A missing or replaced lease does not belong to this operation.
   }
 }
 
+/**
+ * Move a lease aside before deleting it. Its path goes from held to absent in
+ * one rename and is never an empty directory that a concurrent claim could
+ * replace while a recursive removal is still running.
+ */
+function retireLease(lease: string, tag: string): void {
+  const retired = `${lease}.retired-${process.pid}-${tag}`;
+  renameSync(lease, retired);
+  rmSync(retired, { recursive: true, force: true });
+}
+
 function processIsAlive(pid: number): boolean {
   try {
     process.kill(pid, 0);
@@ -699,11 +758,14 @@ function nativeWriteSync(fd: number, buffer: Buffer, offset: number, length: num
   return writeSync(fd, buffer, offset, length);
 }
 
-function safeLeaseDirectory(path: string): boolean {
+/** One lstat, so a lease released between checks reads as absent, not as a wrong type. */
+function leaseHasWrongType(path: string): boolean {
   try {
-    return !lstatSync(path).isSymbolicLink() && lstatSync(path).isDirectory();
-  } catch {
-    return false;
+    const stat = lstatSync(path);
+    return stat.isSymbolicLink() || !stat.isDirectory();
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") return false;
+    throw error;
   }
 }
 

package/src/core/supervisor/service.ts

@@ -1,32 +1,26 @@
 import { spawn } from "node:child_process";
-import { randomUUID } from "node:crypto";
-import {
-  closeSync,
-  existsSync,
-  mkdirSync,
-  openSync,
-  readdirSync,
-  readFileSync,
-  rmSync,
-  unlinkSync,
-  writeFileSync,
-} from "node:fs";
+import { existsSync, mkdirSync, readdirSync, rmSync } from "node:fs";
 import { hostname } from "node:os";
 import { resolve } from "node:path";
 import { performance } from "node:perf_hooks";
 import { fileURLToPath } from "node:url";
 import { collectCoordinationHealthSnapshot } from "../agents/health.ts";
+import { processStartToken } from "../agents/state/proc-start.ts";
 import {
-  type ProcessGenerationSignalDependencies,
-  type ProcessGenerationVerdict,
-  processStartToken,
-  signalIfSameGeneration,
-} from "../agents/state/proc-start.ts";
+  acquireServiceLease,
+  requestServiceStop,
+  type ServiceLiveness,
+  type ServiceProcessDependencies,
+  type ServiceStopFields,
+  serviceLeaseOwner,
+  serviceStartRefusal,
+} from "../agents/state/service-process.ts";
 import { resolveBinName } from "../config.ts";
 import { pressureHistoryFromSupervisor } from "../diagnostics/advice.ts";
 import { assessPressure } from "../diagnostics/pressure.ts";
 import { readEventV3ControlState } from "../events/v3/control.ts";
 import { janitorLiveDisplayV3 } from "../events/v3/live-feed.ts";
+import { installedHarneryBuild } from "../events/v3/runtime-build.ts";
 import type { ResourceSamplerState } from "../resources/contract.ts";
 import { sampleResources } from "../resources/sampler.ts";
 import { requestResourceServiceStop } from "../resources/service.ts";
@@ -34,7 +28,7 @@ import { readResourceServiceStatus } from "../resources/service-status.ts";
 import { resourcePaths } from "../resources/storage.ts";
 import { writePrivateJsonAtomic } from "../storage/atomic-json.ts";
 import { closeProcessLoggers, legacyLogFields, processLogger } from "../storage/logger.ts";
-import { stateDirMode, stateFileMode } from "../storage/modes.ts";
+import { stateDirMode } from "../storage/modes.ts";
 import { collectSupervisorActivitySnapshot } from "./activity.ts";
 import {
   SUPERVISOR_PRESSURE_SCHEMA_VERSION,
@@ -58,12 +52,7 @@ import type {
 } from "./ledger-state.ts";
 import { SupervisorLogCollector } from "./log-feed.ts";
 import { collectServiceHealth } from "./services.ts";
-import {
-  installedSupervisorBuild,
-  readSupervisorStatus,
-  type SupervisorProcessDependencies,
-  supervisorProcessLiveness,
-} from "./status.ts";
+import { readSupervisorStatus } from "./status.ts";
 import {
   readSupervisorFindings,
   readSupervisorHistory,
@@ -80,14 +69,6 @@ const SUPERVISOR_MIN_IDLE_EXIT_MS = 5_000;
 const SUPERVISOR_MAX_IDLE_EXIT_MS = 24 * 60 * 60_000;
 const LIVE_DISPLAY_SWEEP_INTERVAL_MS = 5 * 60_000;
 
-interface SupervisorLease {
-  pid: number;
-  start_token?: string;
-  host: string;
-  nonce: string;
-  created_at: string;
-}
-
 export interface RunSupervisorInput {
   coordRoot: string;
   intervalMs?: number;
@@ -108,12 +89,10 @@ export async function spawnSupervisor(
 ): Promise<SupervisorStatus> {
   const coordRoot = resolve(coordRootRaw);
   const current = readSupervisorStatus(coordRoot);
-  if (current.liveness === "unknown") throw unknownOwnerError();
-  if (current.liveness === "running") {
-    throw new Error(`local supervisor is already running under pid ${current.record?.pid}`);
-  }
+  if (current.liveness !== "stopped") throw startRefusal(current.record?.pid, current.liveness);
   const paths = supervisorPaths(coordRoot);
-  assertLeaseAvailable(paths.lease);
+  const lease = serviceLeaseOwner(paths.lease);
+  if (lease.liveness !== "stopped") throw startRefusal(lease.lease?.pid, lease.liveness);
   await stopLegacyResourceObserver(coordRoot);
   const intervalMs = normalizeInterval(options.intervalMs);
   const idleExitMs = normalizeIdleExit(options.idleExitMs);
@@ -179,44 +158,21 @@ export async function ensureSupervisorRunning(coordRoot: string): Promise<Ensure
   }
 }
 
-export interface SupervisorStopResult extends SupervisorStatus {
-  signal_sent: boolean;
-  signal_verdict: ProcessGenerationVerdict;
-}
+export type SupervisorStopResult = SupervisorStatus & ServiceStopFields;
 
+/** Windows has no graceful SIGTERM, so the durable request alone stops it there. */
 export function requestSupervisorStop(
   coordRootRaw: string,
-  dependencies: SupervisorProcessDependencies & ProcessGenerationSignalDependencies = {},
+  dependencies: ServiceProcessDependencies = {},
 ): SupervisorStopResult {
   const coordRoot = resolve(coordRootRaw);
-  const paths = supervisorPaths(coordRoot);
-  const status = readSupervisorStatus(coordRoot, Date.now(), dependencies);
-  mkdirSync(paths.root, { recursive: true, mode: stateDirMode() });
-  writePrivateJsonAtomic(paths.stop, {
-    requested_at: new Date().toISOString(),
-    requested_by_pid: process.pid,
-  });
   const legacyPaths = resourcePaths(coordRoot);
   if (existsSync(legacyPaths.service) || existsSync(legacyPaths.lease))
     requestResourceServiceStop(coordRoot, dependencies);
-  let signal = { sent: false, verdict: status.generation };
-  if (
-    status.liveness === "running" &&
-    status.record?.host === hostname() &&
-    process.platform !== "win32"
-  ) {
-    signal = signalIfSameGeneration(
-      status.record.pid,
-      status.record.start_token,
-      "SIGTERM",
-      dependencies,
-    );
-  }
-  return {
-    ...readSupervisorStatus(coordRoot, Date.now(), dependencies),
-    signal_sent: signal.sent,
-    signal_verdict: signal.verdict,
-  };
+  const read = () => readSupervisorStatus(coordRoot, Date.now(), dependencies);
+  return requestServiceStop(read(), read, supervisorPaths(coordRoot).stop, dependencies, {
+    signal: process.platform !== "win32",
+  });
 }
 
 export async function runSupervisor(
@@ -224,17 +180,14 @@ export async function runSupervisor(
 ): Promise<SupervisorServiceStatusRecord> {
   const coordRoot = resolve(input.coordRoot);
   const current = readSupervisorStatus(coordRoot);
-  if (current.liveness === "unknown") throw unknownOwnerError();
-  if (current.liveness === "running") {
-    throw new Error(`local supervisor is already running under pid ${current.record?.pid}`);
-  }
+  if (current.liveness !== "stopped") throw startRefusal(current.record?.pid, current.liveness);
   const paths = supervisorPaths(coordRoot);
   const intervalMs = normalizeInterval(input.intervalMs);
   const idleExitMs = normalizeIdleExit(input.idleExitMs);
   const keepAlive = input.keepAlive ?? false;
   const now = input.now ?? (() => new Date());
   const wait = input.wait ?? delay;
-  const lease = acquireLease(coordRoot, now());
+  const lease = acquireServiceLease(paths.lease, startRefusal);
   rmSync(paths.stop, { force: true });
   const startedAt = now().toISOString();
   const startToken = processStartToken(process.pid);
@@ -242,7 +195,7 @@ export async function runSupervisor(
     schema_version: SUPERVISOR_STATUS_SCHEMA_VERSION,
     pid: process.pid,
     ...(startToken ? { start_token: startToken } : {}),
-    running_build: installedSupervisorBuild(),
+    running_build: installedHarneryBuild(),
     host: hostname(),
     nonce: lease.nonce,
     state: "starting",
@@ -488,7 +441,7 @@ export async function runSupervisor(
     try {
       await closeProcessLoggers();
     } finally {
-      releaseLease(paths.lease, lease.nonce);
+      lease.release();
     }
   }
   return status;
@@ -533,44 +486,6 @@ function observeLedgerControlState(
   }
 }
 
-function acquireLease(coordRoot: string, now: Date): SupervisorLease {
-  const paths = supervisorPaths(coordRoot);
-  mkdirSync(paths.root, { recursive: true, mode: stateDirMode() });
-  for (let attempt = 0; attempt < 2; attempt++) {
-    const startToken = processStartToken(process.pid);
-    const lease: SupervisorLease = {
-      pid: process.pid,
-      ...(startToken ? { start_token: startToken } : {}),
-      host: hostname(),
-      nonce: randomUUID(),
-      created_at: now.toISOString(),
-    };
-    try {
-      const fd = openSync(paths.lease, "wx", stateFileMode());
-      try {
-        writeFileSync(fd, `${JSON.stringify(lease)}\n`, "utf8");
-      } finally {
-        closeSync(fd);
-      }
-      return lease;
-    } catch (error) {
-      if ((error as NodeJS.ErrnoException).code !== "EEXIST") throw error;
-      const existing = readLease(paths.lease);
-      const liveness = existing ? leaseIsLive(existing) : "unknown";
-      if (liveness === "unknown") throw unknownOwnerError();
-      if (existing && liveness === "running") {
-        throw new Error(`local supervisor lease is held by pid ${existing.pid}`);
-      }
-      try {
-        unlinkSync(paths.lease);
-      } catch {
-        // A concurrent starter may have replaced or removed the stale lease.
-      }
-    }
-  }
-  throw new Error("local supervisor could not acquire its singleton lease");
-}
-
 function pruneProjectionDirectory(
   directory: string,
   retainedFindingIds: ReadonlySet<string>,
@@ -582,49 +497,12 @@ function pruneProjectionDirectory(
   }
 }
 
-function releaseLease(path: string, nonce: string): void {
-  const current = readLease(path);
-  if (current?.nonce !== nonce) return;
-  try {
-    unlinkSync(path);
-  } catch {
-    // A missing lease is already released.
-  }
-}
-
-function readLease(path: string): SupervisorLease | undefined {
-  try {
-    const value = JSON.parse(readFileSync(path, "utf8")) as SupervisorLease;
-    return value &&
-      Number.isSafeInteger(value.pid) &&
-      value.pid > 0 &&
-      typeof value.host === "string" &&
-      value.host.length > 0 &&
-      typeof value.nonce === "string" &&
-      value.nonce.length > 0
-      ? value
-      : undefined;
-  } catch {
-    return undefined;
-  }
-}
-
-function leaseIsLive(lease: SupervisorLease): SupervisorStatus["liveness"] {
-  return supervisorProcessLiveness(lease).liveness;
-}
-
-function assertLeaseAvailable(path: string): void {
-  if (!existsSync(path)) return;
-  const lease = readLease(path);
-  const liveness = lease ? leaseIsLive(lease) : "unknown";
-  if (liveness === "unknown") throw unknownOwnerError();
-  if (liveness === "running")
-    throw new Error(`local supervisor lease is held by pid ${lease?.pid}`);
-}
-
-function unknownOwnerError(): Error {
-  return new Error(
-    `local supervisor process identity is unknown; run ${resolveBinName()} supervisor stop to write the durable stop request before starting again`,
+function startRefusal(pid: number | undefined, liveness: ServiceLiveness): Error {
+  return serviceStartRefusal(
+    "local supervisor",
+    `${resolveBinName()} supervisor stop`,
+    pid,
+    liveness,
   );
 }
 

package/src/core/supervisor/services.ts

@@ -1,7 +1,7 @@
 import { existsSync, readdirSync, readFileSync, rmSync, statSync } from "node:fs";
 import { hostname } from "node:os";
 import { join } from "node:path";
-import { checkPidToken, processStartToken } from "../agents/state/proc-start.ts";
+import { processStartToken, verifyProcessGeneration } from "../agents/state/proc-start.ts";
 import { readGovernorServiceStatus } from "../governor/service-read.ts";
 import { writePrivateJsonAtomic } from "../storage/atomic-json.ts";
 import {
@@ -105,7 +105,7 @@ function consumerAlive(record: SupervisorConsumerRecord): boolean {
   } catch (error) {
     if ((error as NodeJS.ErrnoException).code !== "EPERM") return false;
   }
-  return checkPidToken(record.pid, record.start_token) !== "mismatch";
+  return verifyProcessGeneration(record.pid, record.start_token) !== "different";
 }
 
 interface DetachedServiceRecord {

package/src/core/supervisor/status.ts

@@ -1,14 +1,11 @@
-import { existsSync, readFileSync } from "node:fs";
-import { hostname } from "node:os";
-import { join } from "node:path";
+import { existsSync } from "node:fs";
 import {
-  type ProcessGenerationVerdict,
-  verifyProcessGeneration,
-} from "../agents/state/proc-start.ts";
-import { currentHarneryRuntimeBuild, harneryPackageRoot } from "../events/v3/runtime-build.ts";
+  observeServiceProcess,
+  type ServiceProcessDependencies,
+} from "../agents/state/service-process.ts";
+import { serviceBuildStatus } from "../events/v3/runtime-build.ts";
 import {
   SUPERVISOR_STATUS_SCHEMA_VERSION,
-  type SupervisorBuild,
   type SupervisorServiceStatusRecord,
   type SupervisorStatus,
 } from "./contract.ts";
@@ -16,49 +13,14 @@ import { readSupervisorServiceRecord, supervisorPaths } from "./storage.ts";
 
 const STALE_HEARTBEAT_MS = 15_000;
 
-export interface SupervisorProcessDependencies {
-  readToken?: (pid: number) => string | null;
-  probePid?: (pid: number) => unknown;
-}
-
-export function installedSupervisorBuild(): SupervisorBuild {
-  let version = "unknown";
-  let revision = "unknown";
-  try {
-    const pkg = JSON.parse(readFileSync(join(harneryPackageRoot(), "package.json"), "utf8"));
-    if (typeof pkg.version === "string") version = pkg.version;
-    revision = currentHarneryRuntimeBuild();
-  } catch {
-    // Missing build evidence must still produce an inspectable status.
-  }
-  return { version, revision };
-}
-
 export function readSupervisorStatus(
   coordRoot: string,
   nowMs = Date.now(),
-  dependencies: SupervisorProcessDependencies = {},
+  dependencies: ServiceProcessDependencies = {},
 ): SupervisorStatus {
   const paths = supervisorPaths(coordRoot);
   const record = readSupervisorServiceRecord(coordRoot);
-  const installedBuild = installedSupervisorBuild();
-  const runningBuild = validBuild(record?.running_build) ? record.running_build : null;
-  const restartNeeded =
-    !runningBuild ||
-    installedBuild.version === "unknown" ||
-    installedBuild.revision === "unknown" ||
-    runningBuild.version !== installedBuild.version ||
-    runningBuild.revision !== installedBuild.revision;
-  const build = {
-    running_build: runningBuild,
-    installed_build: installedBuild,
-    restart_needed: restartNeeded,
-    build_status: !runningBuild
-      ? "running build unknown; restart needed"
-      : restartNeeded
-        ? "restart needed"
-        : "current",
-  };
+  const build = serviceBuildStatus(record?.running_build);
   if (!validRecord(record)) {
     return {
       running: false,
@@ -72,13 +34,11 @@ export function readSupervisorStatus(
   }
   const heartbeatAt = Date.parse(record.heartbeat_at);
   const stale = !Number.isFinite(heartbeatAt) || nowMs - heartbeatAt > STALE_HEARTBEAT_MS;
-  const owner = supervisorProcessLiveness(record, dependencies);
-  const liveness =
-    owner.generation === "same" && record.state === "stopped" ? "stopped" : owner.liveness;
+  const { generation, liveness } = observeServiceProcess(record, dependencies);
   return {
-    running: liveness === "running" && !stale && record.state !== "stopped",
+    running: liveness === "running" && !stale,
     stale,
-    generation: owner.generation,
+    generation,
     liveness,
     ...build,
     record,
@@ -99,38 +59,3 @@ function validRecord(
     typeof value.keep_alive === "boolean"
   );
 }
-
-/** A stale heartbeat does not prove that a process has exited. */
-export function supervisorProcessLiveness(
-  owner: { pid: number; host: string; start_token?: string },
-  dependencies: SupervisorProcessDependencies = {},
-): { liveness: SupervisorStatus["liveness"]; generation: ProcessGenerationVerdict } {
-  if (owner.host !== hostname()) return { liveness: "unknown", generation: "unknown" };
-  try {
-    (dependencies.probePid ?? ((pid) => process.kill(pid, 0)))(owner.pid);
-  } catch (error) {
-    return {
-      liveness: (error as NodeJS.ErrnoException).code === "ESRCH" ? "stopped" : "unknown",
-      generation: "unknown",
-    };
-  }
-  const generation = verifyProcessGeneration(owner.pid, owner.start_token, dependencies.readToken);
-  return {
-    generation,
-    liveness:
-      generation === "same" ? "running" : generation === "different" ? "stopped" : "unknown",
-  };
-}
-
-function validBuild(value: unknown): value is SupervisorBuild {
-  if (!value || typeof value !== "object") return false;
-  const build = value as Partial<SupervisorBuild>;
-  return (
-    typeof build.version === "string" &&
-    !!build.version &&
-    build.version !== "unknown" &&
-    typeof build.revision === "string" &&
-    !!build.revision &&
-    build.revision !== "unknown"
-  );
-}

package/src/core/work/state.ts

@@ -20,7 +20,7 @@ import {
 import { stateDirMode, stateFileMode } from "../storage/modes.ts";
 import { readWorkflowApproval } from "../workflow/approvals.ts";
 import { stableDigest } from "../workflow/durable-record.ts";
-import { deriveRunFailureClass, readWorkflowProof } from "../workflow/proof.ts";
+import { readWorkflowProof } from "../workflow/proof.ts";
 import { readWorkflowRunManifest, workflowScriptDigest } from "../workflow/run-state.ts";
 import { WORKFLOW_TRANSCRIPT_EVENT_BYTES, workflowTranscriptPath } from "../workflow/transcript.ts";
 import { isWorkspaceBoundExecutionEvidence } from "../workflow/workspaces/validate.ts";
@@ -718,14 +718,14 @@ function inspectAttempt(
       proof.acceptance.summary.unknown === 0
         ? "succeeded"
         : "failed";
-    // Re-derive no-effect eligibility from every participant rather than
-    // trusting a persisted transport class. Missing evidence stays charged.
-    // The script's explicit decision authority remains a separate path.
+    // A failed attempt the run classified as uninformative about the work is
+    // uncharged (ADR 0046). Absent class ⇒ charged, as before. Read only for a
+    // failed attempt: a succeeded run never carries a class.
     if (
       attempt.status === "failed" &&
-      (proof.run.class === "decision" ||
-        ((proof.run.class === "environment" || proof.run.class === "upstream") &&
-          deriveRunFailureClass(proof.run.status, proof.agents) === proof.run.class))
+      (proof.run.class === "environment" ||
+        proof.run.class === "upstream" ||
+        proof.run.class === "decision")
     ) {
       attempt.uncharged = proof.run.class;
       if (proof.run.class === "decision" && typeof proof.run.decision_id === "string") {