harnery 0.45.0 → 0.45.2

package/dist/core/storage/segments.js

@@ -191,25 +191,19 @@ export async function withFamilyLease(directory, policy, operation) {
     let owner;
     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;
@@ -223,6 +217,42 @@ export async function withFamilyLease(directory, policy, operation) {
             releaseOwnedLease(lease, owner);
     }
 }
+/**
+ * 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) {
+    const owner = {
+        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, incoming, options, now) {
     const stat = regularFileStat(active);
     const incomingBytes = incoming.reduce((sum, record) => sum + record.byteLength, 0);
@@ -315,6 +345,18 @@ function atomicJson(path, value) {
     renameSync(temporary, path);
     assertRegularPath(path, captureDirectoryIdentity(dirname(path)));
 }
+function leaseHasValidOwner(lease) {
+    try {
+        const owner = JSON.parse(readRegularFile(join(lease, "owner.json"), 4_096).toString("utf8"));
+        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, maximumAgeMs) {
     let identity;
     let raw;
@@ -344,7 +386,7 @@ function recoverStaleLease(lease, maximumAgeMs) {
         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 {
@@ -356,12 +398,22 @@ function releaseOwnedLease(lease, owner) {
         const current = JSON.parse(readRegularFile(join(lease, "owner.json"), 4_096).toString("utf8"));
         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, tag) {
+    const retired = `${lease}.retired-${process.pid}-${tag}`;
+    renameSync(lease, retired);
+    rmSync(retired, { recursive: true, force: true });
+}
 function processIsAlive(pid) {
     try {
         process.kill(pid, 0);
@@ -519,12 +571,16 @@ function writeAllSync(fd, buffer, writer) {
 function nativeWriteSync(fd, buffer, offset, length) {
     return writeSync(fd, buffer, offset, length);
 }
-function safeLeaseDirectory(path) {
+/** One lstat, so a lease released between checks reads as absent, not as a wrong type. */
+function leaseHasWrongType(path) {
     try {
-        return !lstatSync(path).isSymbolicLink() && lstatSync(path).isDirectory();
+        const stat = lstatSync(path);
+        return stat.isSymbolicLink() || !stat.isDirectory();
     }
-    catch {
-        return false;
+    catch (error) {
+        if (error.code === "ENOENT")
+            return false;
+        throw error;
     }
 }
 function pathExists(path) {

package/dist/core/supervisor/service.d.ts

@@ -1,6 +1,5 @@
-import { type ProcessGenerationSignalDependencies, type ProcessGenerationVerdict } from "../agents/state/proc-start.js";
+import { type ServiceProcessDependencies, type ServiceStopFields } from "../agents/state/service-process.js";
 import { type SupervisorServiceStatusRecord, type SupervisorStatus } from "./contract.js";
-import { type SupervisorProcessDependencies } from "./status.js";
 export declare const SUPERVISOR_DEFAULT_INTERVAL_MS = 2000;
 export declare const SUPERVISOR_DEFAULT_IDLE_EXIT_MS: number;
 export interface RunSupervisorInput {
@@ -26,10 +25,8 @@ export declare function spawnSupervisor(coordRootRaw: string, options?: {
     keepAlive?: boolean;
 }): Promise<SupervisorStatus>;
 export declare function ensureSupervisorRunning(coordRoot: string): Promise<EnsureSupervisorResult>;
-export interface SupervisorStopResult extends SupervisorStatus {
-    signal_sent: boolean;
-    signal_verdict: ProcessGenerationVerdict;
-}
-export declare function requestSupervisorStop(coordRootRaw: string, dependencies?: SupervisorProcessDependencies & ProcessGenerationSignalDependencies): SupervisorStopResult;
+export type SupervisorStopResult = SupervisorStatus & ServiceStopFields;
+/** Windows has no graceful SIGTERM, so the durable request alone stops it there. */
+export declare function requestSupervisorStop(coordRootRaw: string, dependencies?: ServiceProcessDependencies): SupervisorStopResult;
 export declare function runSupervisor(input: RunSupervisorInput): Promise<SupervisorServiceStatusRecord>;
 //# sourceMappingURL=service.d.ts.map

package/dist/core/supervisor/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/core/supervisor/service.ts"],"names":[],"mappings":"AAkBA,OAAO,EACL,KAAK,mCAAmC,EACxC,KAAK,wBAAwB,EAG9B,MAAM,+BAA+B,CAAC;AAevC,OAAO,EAML,KAAK,6BAA6B,EAElC,KAAK,gBAAgB,EACtB,MAAM,eAAe,CAAC;AAavB,OAAO,EAGL,KAAK,6BAA6B,EAEnC,MAAM,aAAa,CAAC;AASrB,eAAO,MAAM,8BAA8B,OAAQ,CAAC;AACpD,eAAO,MAAM,+BAA+B,QAAa,CAAC;AAe1D,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;IACjB,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAChD;AAED,MAAM,MAAM,sBAAsB,GAC9B;IAAE,KAAK,EAAE,SAAS,GAAG,SAAS,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAA;CAAE,GAC1D;IAAE,KAAK,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE,wBAAsB,eAAe,CACnC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAO,GAC9E,OAAO,CAAC,gBAAgB,CAAC,CAyD3B;AAED,wBAAsB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAahG;AAED,MAAM,WAAW,oBAAqB,SAAQ,gBAAgB;IAC5D,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,wBAAwB,CAAC;CAC1C;AAED,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EACpB,YAAY,GAAE,6BAA6B,GAAG,mCAAwC,GACrF,oBAAoB,CA8BtB;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,6BAA6B,CAAC,CA+QxC"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/core/supervisor/service.ts"],"names":[],"mappings":"AAQA,OAAO,EAIL,KAAK,0BAA0B,EAC/B,KAAK,iBAAiB,EAGvB,MAAM,oCAAoC,CAAC;AAgB5C,OAAO,EAML,KAAK,6BAA6B,EAElC,KAAK,gBAAgB,EACtB,MAAM,eAAe,CAAC;AAsBvB,eAAO,MAAM,8BAA8B,OAAQ,CAAC;AACpD,eAAO,MAAM,+BAA+B,QAAa,CAAC;AAO1D,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;IACjB,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAChD;AAED,MAAM,MAAM,sBAAsB,GAC9B;IAAE,KAAK,EAAE,SAAS,GAAG,SAAS,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAA;CAAE,GAC1D;IAAE,KAAK,EAAE,aAAa,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtE,wBAAsB,eAAe,CACnC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAO,GAC9E,OAAO,CAAC,gBAAgB,CAAC,CAuD3B;AAED,wBAAsB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAahG;AAED,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,GAAG,iBAAiB,CAAC;AAExE,oFAAoF;AACpF,wBAAgB,qBAAqB,CACnC,YAAY,EAAE,MAAM,EACpB,YAAY,GAAE,0BAA+B,GAC5C,oBAAoB,CAStB;AAED,wBAAsB,aAAa,CACjC,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,6BAA6B,CAAC,CA4QxC"}

package/dist/core/supervisor/service.js

@@ -1,24 +1,25 @@
 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.js";
-import { processStartToken, signalIfSameGeneration, } from "../agents/state/proc-start.js";
+import { processStartToken } from "../agents/state/proc-start.js";
+import { acquireServiceLease, requestServiceStop, serviceLeaseOwner, serviceStartRefusal, } from "../agents/state/service-process.js";
 import { resolveBinName } from "../config.js";
 import { pressureHistoryFromSupervisor } from "../diagnostics/advice.js";
 import { assessPressure } from "../diagnostics/pressure.js";
 import { readEventV3ControlState } from "../events/v3/control.js";
 import { janitorLiveDisplayV3 } from "../events/v3/live-feed.js";
+import { installedHarneryBuild } from "../events/v3/runtime-build.js";
 import { sampleResources } from "../resources/sampler.js";
 import { requestResourceServiceStop } from "../resources/service.js";
 import { readResourceServiceStatus } from "../resources/service-status.js";
 import { resourcePaths } from "../resources/storage.js";
 import { writePrivateJsonAtomic } from "../storage/atomic-json.js";
 import { closeProcessLoggers, legacyLogFields, processLogger } from "../storage/logger.js";
-import { stateDirMode, stateFileMode } from "../storage/modes.js";
+import { stateDirMode } from "../storage/modes.js";
 import { collectSupervisorActivitySnapshot } from "./activity.js";
 import { SUPERVISOR_PRESSURE_SCHEMA_VERSION, SUPERVISOR_SNAPSHOT_SCHEMA_VERSION, SUPERVISOR_STATUS_SCHEMA_VERSION, } from "./contract.js";
 import { explainSupervisorFinding } from "./explanations.js";
@@ -29,7 +30,7 @@ import { writeSupervisorHookHealth } from "./hook-health-storage.js";
 import { collectHookHealth } from "./hooks.js";
 import { SupervisorLogCollector } from "./log-feed.js";
 import { collectServiceHealth } from "./services.js";
-import { installedSupervisorBuild, readSupervisorStatus, supervisorProcessLiveness, } from "./status.js";
+import { readSupervisorStatus } from "./status.js";
 import { readSupervisorFindings, readSupervisorHistory, readSupervisorPressure, supervisorPaths, } from "./storage.js";
 import { buildSupervisorTimeline } from "./timeline.js";
 export const SUPERVISOR_DEFAULT_INTERVAL_MS = 2_000;
@@ -42,13 +43,12 @@ const LIVE_DISPLAY_SWEEP_INTERVAL_MS = 5 * 60_000;
 export async function spawnSupervisor(coordRootRaw, options = {}) {
     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);
@@ -112,45 +112,29 @@ export async function ensureSupervisorRunning(coordRoot) {
         };
     }
 }
+/** Windows has no graceful SIGTERM, so the durable request alone stops it there. */
 export function requestSupervisorStop(coordRootRaw, dependencies = {}) {
     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(input) {
     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);
@@ -158,7 +142,7 @@ export async function runSupervisor(input) {
         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",
@@ -400,7 +384,7 @@ export async function runSupervisor(input) {
             await closeProcessLoggers();
         }
         finally {
-            releaseLease(paths.lease, lease.nonce);
+            lease.release();
         }
     }
     return status;
@@ -440,48 +424,6 @@ function observeLedgerControlState(coordRoot, now) {
         };
     }
 }
-function acquireLease(coordRoot, now) {
-    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 = {
-            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.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, retainedFindingIds) {
     for (const file of readdirSync(directory)) {
         if (!file.endsWith(".json"))
@@ -491,49 +433,8 @@ function pruneProjectionDirectory(directory, retainedFindingIds) {
             rmSync(resolve(directory, file), { force: true });
     }
 }
-function releaseLease(path, nonce) {
-    const current = readLease(path);
-    if (current?.nonce !== nonce)
-        return;
-    try {
-        unlinkSync(path);
-    }
-    catch {
-        // A missing lease is already released.
-    }
-}
-function readLease(path) {
-    try {
-        const value = JSON.parse(readFileSync(path, "utf8"));
-        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) {
-    return supervisorProcessLiveness(lease).liveness;
-}
-function assertLeaseAvailable(path) {
-    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() {
-    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, liveness) {
+    return serviceStartRefusal("local supervisor", `${resolveBinName()} supervisor stop`, pid, liveness);
 }
 async function stopLegacyResourceObserver(coordRoot) {
     const legacy = readResourceServiceStatus(coordRoot);

package/dist/core/supervisor/services.js

@@ -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.js";
+import { processStartToken, verifyProcessGeneration } from "../agents/state/proc-start.js";
 import { readGovernorServiceStatus } from "../governor/service-read.js";
 import { writePrivateJsonAtomic } from "../storage/atomic-json.js";
 import { SUPERVISOR_CONSUMER_SCHEMA_VERSION, } from "./contract.js";
@@ -87,7 +87,7 @@ function consumerAlive(record) {
         if (error.code !== "EPERM")
             return false;
     }
-    return checkPidToken(record.pid, record.start_token) !== "mismatch";
+    return verifyProcessGeneration(record.pid, record.start_token) !== "different";
 }
 function readDetachedService(path, id) {
     const record = readBoundedJson(path);

package/dist/core/supervisor/status.d.ts

@@ -1,18 +1,4 @@
-import { type ProcessGenerationVerdict } from "../agents/state/proc-start.js";
-import { type SupervisorBuild, type SupervisorStatus } from "./contract.js";
-export interface SupervisorProcessDependencies {
-    readToken?: (pid: number) => string | null;
-    probePid?: (pid: number) => unknown;
-}
-export declare function installedSupervisorBuild(): SupervisorBuild;
-export declare function readSupervisorStatus(coordRoot: string, nowMs?: number, dependencies?: SupervisorProcessDependencies): SupervisorStatus;
-/** A stale heartbeat does not prove that a process has exited. */
-export declare function supervisorProcessLiveness(owner: {
-    pid: number;
-    host: string;
-    start_token?: string;
-}, dependencies?: SupervisorProcessDependencies): {
-    liveness: SupervisorStatus["liveness"];
-    generation: ProcessGenerationVerdict;
-};
+import { type ServiceProcessDependencies } from "../agents/state/service-process.js";
+import { type SupervisorStatus } from "./contract.js";
+export declare function readSupervisorStatus(coordRoot: string, nowMs?: number, dependencies?: ServiceProcessDependencies): SupervisorStatus;
 //# sourceMappingURL=status.d.ts.map

package/dist/core/supervisor/status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/core/supervisor/status.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,wBAAwB,EAE9B,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAEL,KAAK,eAAe,EAEpB,KAAK,gBAAgB,EACtB,MAAM,eAAe,CAAC;AAKvB,MAAM,WAAW,6BAA6B;IAC5C,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAC3C,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;CACrC;AAED,wBAAgB,wBAAwB,IAAI,eAAe,CAW1D;AAED,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,KAAK,SAAa,EAClB,YAAY,GAAE,6BAAkC,GAC/C,gBAAgB,CA+ClB;AAeD,kEAAkE;AAClE,wBAAgB,yBAAyB,CACvC,KAAK,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,EAC1D,YAAY,GAAE,6BAAkC,GAC/C;IAAE,QAAQ,EAAE,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAAC,UAAU,EAAE,wBAAwB,CAAA;CAAE,CAgBlF"}
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/core/supervisor/status.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,0BAA0B,EAChC,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,eAAe,CAAC;AAKvB,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,KAAK,SAAa,EAClB,YAAY,GAAE,0BAA+B,GAC5C,gBAAgB,CA4BlB"}

package/dist/core/supervisor/status.js

@@ -1,45 +1,13 @@
-import { existsSync, readFileSync } from "node:fs";
-import { hostname } from "node:os";
-import { join } from "node:path";
-import { verifyProcessGeneration, } from "../agents/state/proc-start.js";
-import { currentHarneryRuntimeBuild, harneryPackageRoot } from "../events/v3/runtime-build.js";
+import { existsSync } from "node:fs";
+import { observeServiceProcess, } from "../agents/state/service-process.js";
+import { serviceBuildStatus } from "../events/v3/runtime-build.js";
 import { SUPERVISOR_STATUS_SCHEMA_VERSION, } from "./contract.js";
 import { readSupervisorServiceRecord, supervisorPaths } from "./storage.js";
 const STALE_HEARTBEAT_MS = 15_000;
-export function installedSupervisorBuild() {
-    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, nowMs = Date.now(), dependencies = {}) {
     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,
@@ -53,12 +21,11 @@ export function readSupervisorStatus(coordRoot, nowMs = Date.now(), dependencies
     }
     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,
@@ -74,33 +41,3 @@ function validRecord(value) {
         typeof value.heartbeat_at === "string" &&
         typeof value.keep_alive === "boolean");
 }
-/** A stale heartbeat does not prove that a process has exited. */
-export function supervisorProcessLiveness(owner, dependencies = {}) {
-    if (owner.host !== hostname())
-        return { liveness: "unknown", generation: "unknown" };
-    try {
-        (dependencies.probePid ?? ((pid) => process.kill(pid, 0)))(owner.pid);
-    }
-    catch (error) {
-        return {
-            liveness: error.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) {
-    if (!value || typeof value !== "object")
-        return false;
-    const build = value;
-    return (typeof build.version === "string" &&
-        !!build.version &&
-        build.version !== "unknown" &&
-        typeof build.revision === "string" &&
-        !!build.revision &&
-        build.revision !== "unknown");
-}

package/dist/core/work/state.js

@@ -6,7 +6,7 @@ import { appendSegmentedJsonlFile, readSegmentedJsonlFileSync, } from "../storag
 import { stateDirMode, stateFileMode } from "../storage/modes.js";
 import { readWorkflowApproval } from "../workflow/approvals.js";
 import { stableDigest } from "../workflow/durable-record.js";
-import { deriveRunFailureClass, readWorkflowProof } from "../workflow/proof.js";
+import { readWorkflowProof } from "../workflow/proof.js";
 import { readWorkflowRunManifest, workflowScriptDigest } from "../workflow/run-state.js";
 import { WORKFLOW_TRANSCRIPT_EVENT_BYTES, workflowTranscriptPath } from "../workflow/transcript.js";
 import { isWorkspaceBoundExecutionEvidence } from "../workflow/workspaces/validate.js";
@@ -464,13 +464,13 @@ function inspectAttempt(coordRoot, event, intent, priorRunId) {
                 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") {
                 attempt.blocked_on = proof.run.decision_id;

package/dist/core/workflow/engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../../../src/core/workflow/engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AA0DH,OAAO,KAAK,EAIV,UAAU,EAGV,SAAS,EAeV,MAAM,YAAY,CAAC;AAuDpB,qBAAa,gBAAiB,SAAQ,KAAK;IACzC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;gBAEf,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO;CAM/E;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;gBAEpB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;CAOvF;AAED;;;;6EAI6E;AAC7E,qBAAa,oBAAqB,SAAQ,KAAK;IAC7C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;gBAEjB,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;CAUhD;AAED,wBAAsB,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,CA6E1F"}
+{"version":3,"file":"engine.d.ts","sourceRoot":"","sources":["../../../src/core/workflow/engine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAiDH,OAAO,KAAK,EAIV,UAAU,EAGV,SAAS,EAeV,MAAM,YAAY,CAAC;AAuDpB,qBAAa,gBAAiB,SAAQ,KAAK;IACzC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;gBAEf,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO;CAM/E;AAED,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;gBAEpB,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;CAOvF;AAED;;;;6EAI6E;AAC7E,qBAAa,oBAAqB,SAAQ,KAAK;IAC7C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;gBAEjB,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM;CAUhD;AAED,wBAAsB,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,CA6E1F"}