harnery 0.43.0 → 0.45.0

package/dist/core/governor/service-read.d.ts

@@ -1,7 +1,15 @@
-import type { GovernorServiceConfig, GovernorServiceRuntime, GovernorServiceStatus } from "./service.js";
+import { type ProcessGenerationVerdict } from "../agents/state/proc-start.js";
+import type { GovernorServiceBuild, GovernorServiceConfig, GovernorServiceProcessDependencies, GovernorServiceRuntime, GovernorServiceStatus, GovernorServiceStatusRecord } from "./service.js";
+export declare function currentGovernorServiceBuild(): GovernorServiceBuild;
+export declare function governorServiceBuildStatus(record: GovernorServiceStatusRecord | undefined): Pick<GovernorServiceStatus, "running_build" | "installed_build" | "restart_needed" | "build_status">;
+/** An unknown token or process probe cannot establish a running or stopped owner. */
+export declare function observeGovernorServiceProcess(record: Pick<GovernorServiceStatusRecord, "pid" | "host" | "state" | "start_token"> | undefined, dependencies?: GovernorServiceProcessDependencies): {
+    generation: ProcessGenerationVerdict;
+    liveness: GovernorServiceStatus["liveness"];
+};
 export declare function readGovernorServiceConfig(coordRootRaw: string): GovernorServiceConfig;
 export declare function readGovernorServiceRuntime(coordRootRaw: string): GovernorServiceRuntime | undefined;
-export declare function readGovernorServiceStatus(coordRootRaw: string): GovernorServiceStatus;
+export declare function readGovernorServiceStatus(coordRootRaw: string, dependencies?: GovernorServiceProcessDependencies): GovernorServiceStatus;
 export declare function governorServiceLogPath(coordRoot: string): string;
 export interface GovernorServiceLogReadOptions {
     max_bytes?: number;

package/dist/core/governor/service-read.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-read.d.ts","sourceRoot":"","sources":["../../../src/core/governor/service-read.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EAEtB,MAAM,cAAc,CAAC;AAOtB,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,MAAM,GAAG,qBAAqB,CA0BrF;AAED,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,GACnB,sBAAsB,GAAG,SAAS,CAgBpC;AAED,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,MAAM,GAAG,qBAAqB,CAkBrF;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAahE;AAED,MAAM,WAAW,6BAA6B;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,4BAA4B;IAC3C,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;CACpB;AAeD,wFAAwF;AACxF,wBAAgB,uBAAuB,CACrC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE,6BAAkC,GAC1C,4BAA4B,CA6D9B"}
+{"version":3,"file":"service-read.d.ts","sourceRoot":"","sources":["../../../src/core/governor/service-read.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,wBAAwB,EAE9B,MAAM,+BAA+B,CAAC;AAMvC,OAAO,KAAK,EACV,oBAAoB,EACpB,qBAAqB,EACrB,kCAAkC,EAClC,sBAAsB,EACtB,qBAAqB,EACrB,2BAA2B,EAC5B,MAAM,cAAc,CAAC;AAMtB,wBAAgB,2BAA2B,IAAI,oBAAoB,CAqBlE;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,2BAA2B,GAAG,SAAS,GAC9C,IAAI,CACL,qBAAqB,EACrB,eAAe,GAAG,iBAAiB,GAAG,gBAAgB,GAAG,cAAc,CACxE,CAgCA;AAED,qFAAqF;AACrF,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,IAAI,CAAC,2BAA2B,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,aAAa,CAAC,GAAG,SAAS,EAC/F,YAAY,GAAE,kCAAuC,GACpD;IAAE,UAAU,EAAE,wBAAwB,CAAC;IAAC,QAAQ,EAAE,qBAAqB,CAAC,UAAU,CAAC,CAAA;CAAE,CA2BvF;AAOD,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,MAAM,GAAG,qBAAqB,CA0BrF;AAED,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,GACnB,sBAAsB,GAAG,SAAS,CAgBpC;AAED,wBAAgB,yBAAyB,CACvC,YAAY,EAAE,MAAM,EACpB,YAAY,GAAE,kCAAuC,GACpD,qBAAqB,CA4BvB;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAahE;AAED,MAAM,WAAW,6BAA6B;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,4BAA4B;IAC3C,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;CACpB;AAeD,wFAAwF;AACxF,wBAAgB,uBAAuB,CACrC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE,6BAAkC,GAC1C,4BAA4B,CA6D9B"}

package/dist/core/governor/service-read.js

@@ -3,13 +3,99 @@ import { hostname } from "node:os";
 import { join, resolve } from "node:path";
 import { gunzipSync } from "node:zlib";
 import { coordEnv } from "../../lib/env.js";
+import { verifyProcessGeneration, } from "../agents/state/proc-start.js";
+import { currentHarneryRuntimeBuild } from "../events/v3/runtime-build.js";
 import { createStorageCatalog } from "../storage/catalog.js";
 import { parseLogRecord } from "../storage/jsonl.js";
 import { familyLogDirectory, readSegmentManifest } from "../storage/segments.js";
 const MAX_FILE_BYTES = 512 * 1024;
 const MAX_LOG_RECORDS = 10_000;
 const MAX_GOALS = 100;
-const FOREIGN_STATUS_STALE_MS = 30_000;
+export function currentGovernorServiceBuild() {
+    let version = "unknown";
+    let revision = "unknown";
+    try {
+        const manifest = JSON.parse(readFileSync(new URL("../../../package.json", import.meta.url), "utf8"));
+        if (typeof manifest.version === "string" && manifest.version.length <= 100) {
+            version = manifest.version;
+        }
+    }
+    catch {
+        // Missing package metadata cannot establish that the running build is current.
+    }
+    try {
+        revision = currentHarneryRuntimeBuild();
+    }
+    catch {
+        // Status still reports the unavailable build instead of guessing a match.
+    }
+    return { version, revision };
+}
+export function governorServiceBuildStatus(record) {
+    const installed_build = currentGovernorServiceBuild();
+    const candidate = record?.running_build;
+    const running_build = candidate &&
+        typeof candidate.version === "string" &&
+        candidate.version.length > 0 &&
+        candidate.version.length <= 100 &&
+        typeof candidate.revision === "string" &&
+        candidate.revision.length > 0 &&
+        candidate.revision.length <= 100 &&
+        candidate.version !== "unknown" &&
+        candidate.revision !== "unknown"
+        ? candidate
+        : null;
+    const restart_needed = running_build === null ||
+        installed_build.version === "unknown" ||
+        installed_build.revision === "unknown" ||
+        running_build.version !== installed_build.version ||
+        running_build.revision !== installed_build.revision;
+    return {
+        running_build,
+        installed_build,
+        restart_needed,
+        build_status: running_build === null
+            ? "running build unknown; restart needed"
+            : restart_needed
+                ? "restart needed"
+                : "current",
+    };
+}
+/** An unknown token or process probe cannot establish a running or stopped owner. */
+export function observeGovernorServiceProcess(record, dependencies = {}) {
+    if (!record)
+        return { generation: "unknown", liveness: "stopped" };
+    const generation = record.host === hostname()
+        ? verifyProcessGeneration(record.pid, record.start_token, dependencies.readToken)
+        : "unknown";
+    if (record.host !== hostname())
+        return { generation, liveness: "unknown" };
+    try {
+        const present = (dependencies.probePid ?? probePid)(record.pid);
+        if (!present)
+            return { generation, liveness: "stopped" };
+    }
+    catch (error) {
+        return {
+            generation,
+            liveness: error.code === "ESRCH" ? "stopped" : "unknown",
+        };
+    }
+    return {
+        generation,
+        liveness: generation === "same"
+            ? record.state === "stopped"
+                ? "stopped"
+                : "running"
+            : generation === "different"
+                ? "stopped"
+                : "unknown",
+    };
+}
+function probePid(pid) {
+    process.kill(pid, 0);
+    return true;
+}
 export function readGovernorServiceConfig(coordRootRaw) {
     const coordRoot = resolve(coordRootRaw);
     const config = readBoundedJson(join(serviceDir(coordRoot), "config.json"), "governor service configuration");
@@ -48,7 +134,7 @@ export function readGovernorServiceRuntime(coordRootRaw) {
     }
     return runtime;
 }
-export function readGovernorServiceStatus(coordRootRaw) {
+export function readGovernorServiceStatus(coordRootRaw, dependencies = {}) {
     const coordRoot = resolve(coordRootRaw);
     const record = readStatusRecord(coordRoot);
     let config;
@@ -65,10 +151,19 @@ export function readGovernorServiceStatus(coordRootRaw) {
     catch {
         // Runtime is recoverable and must not make the dashboard unreadable.
     }
-    if (!record)
-        return { running: false, stale: false, config, runtime };
-    const running = statusOwnerIsLive(record);
-    return { running, stale: !running && record.state !== "stopped", record, config, runtime };
+    const observation = observeGovernorServiceProcess(record, dependencies);
+    if (!record && existsSync(join(serviceDir(coordRoot), "status.json"))) {
+        observation.liveness = "unknown";
+    }
+    return {
+        running: observation.liveness === "running" && record?.state !== "stopped",
+        stale: observation.liveness === "stopped" && record !== undefined && record.state !== "stopped",
+        ...observation,
+        ...governorServiceBuildStatus(record),
+        record,
+        config,
+        runtime,
+    };
 }
 export function governorServiceLogPath(coordRoot) {
     const root = resolve(coordRoot);
@@ -346,27 +441,15 @@ function readStatusRecord(coordRoot) {
             !validTimestamp(value.heartbeat_at)) {
             return undefined;
         }
-        return value;
+        return {
+            ...value,
+            start_token: typeof value.start_token === "string" ? value.start_token : undefined,
+        };
     }
     catch {
         return undefined;
     }
 }
-function statusOwnerIsLive(record) {
-    if (record.state === "stopped")
-        return false;
-    if (record.host === hostname()) {
-        try {
-            process.kill(record.pid, 0);
-            return true;
-        }
-        catch (error) {
-            return error.code === "EPERM";
-        }
-    }
-    const age = Date.now() - Date.parse(record.heartbeat_at);
-    return Number.isFinite(age) && age < FOREIGN_STATUS_STALE_MS;
-}
 function readBoundedJson(path, label) {
     if (!existsSync(path))
         throw new Error(`${label} does not exist`);

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

@@ -1,3 +1,4 @@
+import { type ProcessGenerationSignalDependencies, type ProcessGenerationVerdict } from "../agents/state/proc-start.js";
 import { type NormalizedPolicy, type PolicyIsolation } from "../policy/index.js";
 import type { RunWorkItemInput } from "../work/index.js";
 import { type GovernorRunReport, type GovernorStopReason } from "./runner.js";
@@ -50,9 +51,18 @@ export interface GovernorServiceRuntime {
     goals: Record<string, GovernorServiceGoalRuntime>;
 }
 export type GovernorServiceProcessState = "starting" | "running" | "stopping" | "stopped";
+export interface GovernorServiceBuild {
+    version: string;
+    revision: string;
+}
+export interface GovernorServiceProcessDependencies extends ProcessGenerationSignalDependencies {
+    probePid?: (pid: number) => boolean;
+}
 export interface GovernorServiceStatusRecord {
     schema_version: typeof GOVERNOR_SERVICE_STATUS_SCHEMA_VERSION;
     pid: number;
+    start_token?: string;
+    running_build?: GovernorServiceBuild;
     host: string;
     nonce: string;
     state: GovernorServiceProcessState;
@@ -69,6 +79,14 @@ export interface GovernorServiceStatusRecord {
 export interface GovernorServiceStatus {
     running: boolean;
     stale: boolean;
+    generation: ProcessGenerationVerdict;
+    liveness: "running" | "stopped" | "unknown";
+    running_build: GovernorServiceBuild | null;
+    installed_build: GovernorServiceBuild;
+    restart_needed: boolean;
+    build_status: string;
+    signal_sent?: boolean;
+    signal_verdict?: ProcessGenerationVerdict;
     record?: GovernorServiceStatusRecord;
     config?: GovernorServiceConfig;
     runtime?: GovernorServiceRuntime;
@@ -105,9 +123,9 @@ export interface RunGovernorServiceDaemonInput {
 export declare function configureGovernorService(input: ConfigureGovernorServiceInput): GovernorServiceConfig;
 export declare function readGovernorServiceConfig(coordRootRaw: string): GovernorServiceConfig;
 export declare function readGovernorServiceRuntime(coordRootRaw: string): GovernorServiceRuntime | undefined;
-export declare function readGovernorServiceStatus(coordRootRaw: string): GovernorServiceStatus;
+export declare function readGovernorServiceStatus(coordRootRaw: string, dependencies?: GovernorServiceProcessDependencies): GovernorServiceStatus;
 export declare function spawnGovernorService(coordRootRaw: string): Promise<GovernorServiceStatus>;
-export declare function requestGovernorServiceStop(coordRootRaw: string): GovernorServiceStatus;
+export declare function requestGovernorServiceStop(coordRootRaw: string, dependencies?: GovernorServiceProcessDependencies): GovernorServiceStatus;
 export declare function runGovernorServiceSweep(input: RunGovernorServiceSweepInput): Promise<GovernorServiceSweepReport>;
 export declare function runGovernorServiceDaemon(input: RunGovernorServiceDaemonInput): Promise<GovernorServiceStatusRecord>;
 export declare function governorServiceLogPath(coordRoot: string): string;

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

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/core/governor/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/core/governor/service.ts"],"names":[],"mappings":"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"}

package/dist/core/governor/service.js

@@ -4,11 +4,14 @@ import { chmodSync, closeSync, existsSync, mkdirSync, openSync, readFileSync, re
 import { hostname } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { coordEnv } from "../../lib/env.js";
+import { processStartToken, signalIfSameGeneration, } from "../agents/state/proc-start.js";
+import { resolveBinName } from "../config.js";
 import { normalizePolicy } from "../policy/index.js";
 import { closeProcessLoggers, legacyLogFields, processLogger } from "../storage/logger.js";
 import { stateDirMode, stateFileMode } from "../storage/modes.js";
 import { RotatingTextSink } from "../storage/process-log.js";
 import { runGovernor } from "./runner.js";
+import { currentGovernorServiceBuild, governorServiceBuildStatus, observeGovernorServiceProcess, } from "./service-read.js";
 import { readGovernor } from "./state.js";
 export const GOVERNOR_SERVICE_CONFIG_SCHEMA_VERSION = 1;
 export const GOVERNOR_SERVICE_RUNTIME_SCHEMA_VERSION = 1;
@@ -16,12 +19,16 @@ export const GOVERNOR_SERVICE_STATUS_SCHEMA_VERSION = 1;
 const MAX_FILE_BYTES = 512 * 1024;
 const MAX_GOALS = 100;
 const MAX_ERROR = 2_000;
-const FOREIGN_STATUS_STALE_MS = 30_000;
 export function configureGovernorService(input) {
     const coordRoot = resolve(input.coordRoot);
     const active = readStatusRecord(coordRoot);
-    if (active && statusOwnerIsLive(active)) {
-        throw new Error(`stop governor service pid ${active.pid} before changing its configuration`);
+    if (!active && existsSync(serviceStatusPath(coordRoot))) {
+        throw serviceStartRefusal(coordRoot, undefined, "unknown");
+    }
+    if (active) {
+        const liveness = statusOwnerIsLive(active);
+        if (liveness !== "stopped")
+            throw serviceStartRefusal(coordRoot, active.pid, liveness);
     }
     const goalIds = unique(input.goalIds.map((value) => value.trim()).filter(Boolean));
     if (goalIds.length < 1 || goalIds.length > MAX_GOALS) {
@@ -73,7 +80,7 @@ export function readGovernorServiceRuntime(coordRootRaw) {
     }
     return runtime;
 }
-export function readGovernorServiceStatus(coordRootRaw) {
+export function readGovernorServiceStatus(coordRootRaw, dependencies = {}) {
     const coordRoot = resolve(coordRootRaw);
     const record = readStatusRecord(coordRoot);
     let config;
@@ -90,17 +97,25 @@ export function readGovernorServiceStatus(coordRootRaw) {
     catch {
         // Status remains readable when recoverable runtime state is corrupt.
     }
-    if (!record)
-        return { running: false, stale: false, config, runtime };
-    const running = statusOwnerIsLive(record);
-    return { running, stale: !running && record.state !== "stopped", record, config, runtime };
+    const observation = observeGovernorServiceProcess(record, dependencies);
+    if (!record && existsSync(serviceStatusPath(coordRoot)))
+        observation.liveness = "unknown";
+    return {
+        running: observation.liveness === "running" && record?.state !== "stopped",
+        stale: observation.liveness === "stopped" && record !== undefined && record.state !== "stopped",
+        ...observation,
+        ...governorServiceBuildStatus(record),
+        record,
+        config,
+        runtime,
+    };
 }
 export async function spawnGovernorService(coordRootRaw) {
     const coordRoot = resolve(coordRootRaw);
     readGovernorServiceConfig(coordRoot);
     const current = readGovernorServiceStatus(coordRoot);
-    if (current.running) {
-        throw new Error(`governor service is already running under pid ${current.record?.pid}`);
+    if (current.liveness !== "stopped") {
+        throw serviceStartRefusal(coordRoot, current.record?.pid, current.liveness);
     }
     mkdirSync(serviceDir(coordRoot), { recursive: true, mode: stateDirMode() });
     const sharedLogs = coordEnv("SHARED_LOGS") !== "0";
@@ -143,24 +158,24 @@ export async function spawnGovernorService(coordRootRaw) {
     }
     throw new Error(`governor service failed to start; inspect ${governorServiceLogPath(coordRoot)}`);
 }
-export function requestGovernorServiceStop(coordRootRaw) {
+export function requestGovernorServiceStop(coordRootRaw, dependencies = {}) {
     const coordRoot = resolve(coordRootRaw);
-    const status = readGovernorServiceStatus(coordRoot);
-    if (!status.running || !status.record)
-        return status;
+    const status = readGovernorServiceStatus(coordRoot, dependencies);
+    if ((status.record?.state === "stopped" || !status.record) && status.liveness === "stopped") {
+        return { ...status, signal_sent: false, signal_verdict: status.generation };
+    }
     writePrivateJsonAtomic(serviceStopPath(coordRoot), {
         requested_at: new Date().toISOString(),
         requested_by_pid: process.pid,
     });
-    if (status.record.host === hostname()) {
-        try {
-            process.kill(status.record.pid, "SIGTERM");
-        }
-        catch {
-            // The durable stop request remains for a racing or restarted daemon.
-        }
-    }
-    return readGovernorServiceStatus(coordRoot);
+    const signal = status.record?.host === hostname() && status.record.state !== "stopped"
+        ? signalIfSameGeneration(status.record.pid, status.record.start_token, "SIGTERM", dependencies)
+        : { sent: false, verdict: status.generation };
+    return {
+        ...readGovernorServiceStatus(coordRoot, dependencies),
+        signal_sent: signal.sent,
+        signal_verdict: signal.verdict,
+    };
 }
 export async function runGovernorServiceSweep(input) {
     const coordRoot = resolve(input.coordRoot);
@@ -298,12 +313,23 @@ export async function runGovernorServiceSweep(input) {
 export async function runGovernorServiceDaemon(input) {
     const coordRoot = resolve(input.coordRoot);
     const config = readGovernorServiceConfig(coordRoot);
+    const existing = readStatusRecord(coordRoot);
+    if (!existing && existsSync(serviceStatusPath(coordRoot))) {
+        throw serviceStartRefusal(coordRoot, undefined, "unknown");
+    }
+    if (existing) {
+        const liveness = statusOwnerIsLive(existing);
+        if (liveness !== "stopped")
+            throw serviceStartRefusal(coordRoot, existing.pid, liveness);
+    }
     const release = acquireServiceLease(coordRoot);
     rmSync(serviceStopPath(coordRoot), { force: true });
     const now = new Date().toISOString();
     const status = {
         schema_version: GOVERNOR_SERVICE_STATUS_SCHEMA_VERSION,
         pid: process.pid,
+        start_token: processStartToken(process.pid) ?? undefined,
+        running_build: currentGovernorServiceBuild(),
         host: hostname(),
         nonce: randomUUID(),
         state: "starting",
@@ -330,6 +356,8 @@ export async function runGovernorServiceDaemon(input) {
     appendGovernorServiceDiagnostic(coordRoot, {
         event: "service.started",
         pid: process.pid,
+        start_token: status.start_token,
+        running_build: status.running_build,
         goals: config.goal_ids,
         config_created_at: config.created_at,
     });
@@ -514,6 +542,8 @@ function acquireServiceLease(coordRoot) {
     mkdirSync(dirname(path), { recursive: true, mode: stateDirMode() });
     const owner = {
         pid: process.pid,
+        start_token: processStartToken(process.pid) ?? undefined,
+        running_build: currentGovernorServiceBuild(),
         host: hostname(),
         nonce: randomUUID(),
         created_at: new Date().toISOString(),
@@ -537,8 +567,9 @@ function acquireServiceLease(coordRoot) {
     };
     if (!acquire()) {
         const existing = readLease(path);
-        if (existing && leaseOwnerIsLive(existing)) {
-            throw new Error(`governor service is already running under pid ${existing.pid}`);
+        const liveness = existing ? leaseOwnerIsLive(existing) : "unknown";
+        if (liveness !== "stopped") {
+            throw serviceStartRefusal(coordRoot, existing?.pid, liveness);
         }
         unlinkSync(path);
         if (!acquire())
@@ -563,7 +594,10 @@ function readLease(path) {
             typeof value.host === "string" &&
             typeof value.nonce === "string" &&
             typeof value.created_at === "string"
-            ? value
+            ? {
+                ...value,
+                start_token: typeof value.start_token === "string" ? value.start_token : undefined,
+            }
             : null;
     }
     catch {
@@ -571,11 +605,7 @@ function readLease(path) {
     }
 }
 function leaseOwnerIsLive(lease) {
-    if (lease.host !== hostname()) {
-        const age = Date.now() - Date.parse(lease.created_at);
-        return Number.isFinite(age) && age < FOREIGN_STATUS_STALE_MS;
-    }
-    return pidAlive(lease.pid);
+    return observeGovernorServiceProcess({ ...lease, state: "running" }).liveness;
 }
 function readStatusRecord(coordRoot) {
     if (!existsSync(serviceStatusPath(coordRoot)))
@@ -591,28 +621,23 @@ function readStatusRecord(coordRoot) {
             !validTimestamp(value.heartbeat_at)) {
             return undefined;
         }
-        return value;
+        return {
+            ...value,
+            start_token: typeof value.start_token === "string" ? value.start_token : undefined,
+        };
     }
     catch {
         return undefined;
     }
 }
 function statusOwnerIsLive(record) {
-    if (record.state === "stopped")
-        return false;
-    if (record.host === hostname())
-        return pidAlive(record.pid);
-    const age = Date.now() - Date.parse(record.heartbeat_at);
-    return Number.isFinite(age) && age < FOREIGN_STATUS_STALE_MS;
-}
-function pidAlive(pid) {
-    try {
-        process.kill(pid, 0);
-        return true;
-    }
-    catch (error) {
-        return error.code === "EPERM";
-    }
+    return observeGovernorServiceProcess(record).liveness;
+}
+function serviceStartRefusal(coordRoot, pid, liveness) {
+    const reason = liveness === "unknown"
+        ? `governor service process generation is unknown${pid ? ` for pid ${pid}` : ""}`
+        : `governor service process is still running under pid ${pid}`;
+    return new Error(`${reason}; run \`${resolveBinName(coordRoot)} governor service stop\` to write a durable stop request before starting or reconfiguring it`);
 }
 export function appendGovernorServiceDiagnostic(coordRoot, data) {
     if (coordEnv("SHARED_LOGS") !== "0") {

package/dist/core/hooks/cli.js

@@ -1938,12 +1938,16 @@ async function emitUserPromptSubmitSystemMessage(coordRoot, instanceId, sessionI
         return false;
     const behavior = adapterBehavior(adapter);
     const { renderPromptContext } = await import("../agents/render/prompt-context.js");
+    let peerMessageIds = [];
     let additionalContext = renderPromptContext({
         coordRoot,
         instanceId,
         sessionId,
         sessionNameNudge: true,
         ...behavior.promptContextNudges,
+        onInboxPrepared: (ids) => {
+            peerMessageIds = ids;
+        },
     }).trim();
     const fileLinkContext = behavior.fileLinkContext?.(coordRoot, workspaceCwd) ?? "";
     if (fileLinkContext) {
@@ -1958,7 +1962,12 @@ async function emitUserPromptSubmitSystemMessage(coordRoot, instanceId, sessionI
     if (!additionalContext)
         return false;
     const { emitContext } = await import("./adapter/output.js");
-    return emitContext(adapter, "UserPromptSubmit", additionalContext);
+    const emitted = emitContext(adapter, "UserPromptSubmit", additionalContext);
+    if (emitted) {
+        const { acknowledgeEmittedPeerInbox } = await import("../inbox/peer-messages.js");
+        await acknowledgeEmittedPeerInbox(coordRoot, instanceId, peerMessageIds);
+    }
+    return emitted;
 }
 async function emitSubagentStartContext(coordRoot, instanceId, sessionId, data, adapter) {
     // Look up the subagent's assigned name (just-written by the in-process name
@@ -1974,19 +1983,26 @@ async function emitSubagentStartContext(coordRoot, instanceId, sessionId, data,
     // is around. Reuse prompt-context (which dedups against the per-owner hash);
     // first call will always emit.
     let combined = message;
+    let peerMessageIds = [];
     const { renderPromptContext } = await import("../agents/render/prompt-context.js");
     const context = renderPromptContext({
         coordRoot,
         instanceId,
         sessionId,
         agentName: subagentName,
+        onInboxPrepared: (ids) => {
+            peerMessageIds = ids;
+        },
     }).trim();
     if (context)
         combined = `${message}\n\n${context}`;
     // Use SubagentStart event-name in CC's hookSpecificOutput shape; cursor's
     // flat `additional_context` works the same way.
     const { emitContext } = await import("./adapter/output.js");
-    emitContext(adapter, "SubagentStart", combined);
+    if (emitContext(adapter, "SubagentStart", combined)) {
+        const { acknowledgeEmittedPeerInbox } = await import("../inbox/peer-messages.js");
+        await acknowledgeEmittedPeerInbox(coordRoot, instanceId, peerMessageIds);
+    }
 }
 function adapterPlatform(adapter) {
     return adapter;
@@ -1995,6 +2011,7 @@ async function emitSessionStartSystemMessage(coordRoot, instanceId, sessionId, e
     const behavior = adapterBehavior(adapter);
     const workflowChild = coordEnv("WORKFLOW_CHILD") === "1";
     let additionalContext = "";
+    let peerMessageIds = [];
     // Opportunistic reconciliation makes normal session starts a failsafe for
     // archive, idle, cascade, and host lifecycle observations. It also runs the
     // stale cache sweep through the shared ADR 0077 composition.
@@ -2013,6 +2030,9 @@ async function emitSessionStartSystemMessage(coordRoot, instanceId, sessionId, e
             sessionId,
             agentName: agentName || undefined,
             platformLabel: behavior.sessionStartPlatformLabel,
+            onInboxPrepared: (ids) => {
+                peerMessageIds = ids;
+            },
         }).trim();
     }
     // Effect (journal-maintaining adapters): merge the journal recovery cue into
@@ -2041,11 +2061,19 @@ async function emitSessionStartSystemMessage(coordRoot, instanceId, sessionId, e
         }
     }
     const { emitContext } = await import("./adapter/output.js");
-    return emitContext(adapter, "SessionStart", additionalContext);
+    const emitted = emitContext(adapter, "SessionStart", additionalContext);
+    if (emitted) {
+        const { acknowledgeEmittedPeerInbox } = await import("../inbox/peer-messages.js");
+        await acknowledgeEmittedPeerInbox(coordRoot, instanceId, peerMessageIds);
+    }
+    return emitted;
 }
 function completeRecoveryInjection(coordRoot, instanceId, sessionId, recovery) {
-    completeContextRecovery(coordRoot, { sessionId, instanceId });
-    void recovery;
+    completeContextRecovery(coordRoot, {
+        sessionId,
+        instanceId,
+        checkpoint: recovery.checkpoint,
+    });
 }
 main()
     .then(async (code) => {

package/dist/core/inbox/contract.d.ts

@@ -17,7 +17,8 @@ export interface HarneryInboxMessageRecordV1 {
     schema: typeof HARNERY_INBOX_RECORD_SCHEMA;
     kind: "message";
     message_id: string;
-    sender_instance_id: string;
+    /** A required null identifies an operator; strings identify real agent instances. */
+    sender_instance_id: string | null;
     sender_display_name: string;
     recipient_instance_id: string;
     recipient_display_name: string;

package/dist/core/inbox/contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../../src/core/inbox/contract.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,2BAA2B,EAAG,yBAAkC,CAAC;AAC9E,eAAO,MAAM,2BAA2B,EAAG,yBAAkC,CAAC;AAE9E,MAAM,WAAW,kBAAkB;IACjC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,OAAO,2BAA2B,CAAC;IAC3C,IAAI,EAAE,SAAS,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,OAAO,2BAA2B,CAAC;IAC3C,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,oBAAoB,GAAG,2BAA2B,GAAG,4BAA4B,CAAC;AAE9F,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,OAAO,2BAA2B,CAAC;IAC3C,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,WAAW,CAAC;IAC7C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,MAAM,0BAA0B,GAClC,oBAAoB,GACpB,qBAAqB,GACrB,qBAAqB,GACrB,qBAAqB,CAAC;AAE1B,qBAAa,yBAA0B,SAAQ,KAAK;IAEhD,QAAQ,CAAC,WAAW,EAAE,0BAA0B;IAChD,QAAQ,CAAC,OAAO,EAAE,MAAM;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM;gBAFb,WAAW,EAAE,0BAA0B,EACvC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM;CAMzB;AAED,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,SAAS,2BAA2B,EAAE,CAAC;IAChD,uBAAuB,EAAE,MAAM,CAAC;IAChC,uBAAuB,EAAE,MAAM,CAAC;IAChC,6BAA6B,EAAE,IAAI,CAAC;CACrC"}
+{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../../src/core/inbox/contract.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,2BAA2B,EAAG,yBAAkC,CAAC;AAC9E,eAAO,MAAM,2BAA2B,EAAG,yBAAkC,CAAC;AAE9E,MAAM,WAAW,kBAAkB;IACjC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,OAAO,2BAA2B,CAAC;IAC3C,IAAI,EAAE,SAAS,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,qFAAqF;IACrF,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,OAAO,2BAA2B,CAAC;IAC3C,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,oBAAoB,GAAG,2BAA2B,GAAG,4BAA4B,CAAC;AAE9F,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,OAAO,2BAA2B,CAAC;IAC3C,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,WAAW,CAAC;IAC7C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,MAAM,0BAA0B,GAClC,oBAAoB,GACpB,qBAAqB,GACrB,qBAAqB,GACrB,qBAAqB,CAAC;AAE1B,qBAAa,yBAA0B,SAAQ,KAAK;IAEhD,QAAQ,CAAC,WAAW,EAAE,0BAA0B;IAChD,QAAQ,CAAC,OAAO,EAAE,MAAM;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM;gBAFb,WAAW,EAAE,0BAA0B,EACvC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM;CAMzB;AAED,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,SAAS,2BAA2B,EAAE,CAAC;IAChD,uBAAuB,EAAE,MAAM,CAAC;IAChC,uBAAuB,EAAE,MAAM,CAAC;IAChC,6BAA6B,EAAE,IAAI,CAAC;CACrC"}

package/dist/core/inbox/index.d.ts

@@ -1,5 +1,7 @@
 export * from "./contract.js";
 export * from "./lifecycle.js";
+export * from "./peer-messages.js";
 export * from "./service.js";
+export * from "./targets.js";
 export * from "./watcher.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/core/inbox/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/inbox/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/inbox/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC"}

package/dist/core/inbox/index.js

@@ -1,4 +1,6 @@
 export * from "./contract.js";
 export * from "./lifecycle.js";
+export * from "./peer-messages.js";
 export * from "./service.js";
+export * from "./targets.js";
 export * from "./watcher.js";