@ouro.bot/cli 0.1.0-alpha.29 → 0.1.0-alpha.291

package/dist/heart/daemon/daemon-entry.js

@@ -1,15 +1,64 @@
 #!/usr/bin/env node
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
 const process_manager_1 = require("./process-manager");
 const daemon_1 = require("./daemon");
 const runtime_1 = require("../../nerves/runtime");
+const index_1 = require("../../nerves/index");
 const message_router_1 = require("./message-router");
 const health_monitor_1 = require("./health-monitor");
+const daemon_health_1 = require("./daemon-health");
 const task_scheduler_1 = require("./task-scheduler");
 const runtime_logging_1 = require("./runtime-logging");
 const sense_manager_1 = require("./sense-manager");
 const agent_discovery_1 = require("./agent-discovery");
+const identity_1 = require("../identity");
+const runtime_mode_1 = require("./runtime-mode");
+const habit_scheduler_1 = require("../habits/habit-scheduler");
+const habit_migration_1 = require("../habits/habit-migration");
+const os_cron_deps_1 = require("./os-cron-deps");
+const os_cron_1 = require("./os-cron");
+const daemon_tombstone_1 = require("./daemon-tombstone");
+const os = __importStar(require("os"));
+const agent_config_check_1 = require("./agent-config-check");
+const pulse_1 = require("./pulse");
+const socket_client_1 = require("./socket-client");
+const bundle_manifest_1 = require("../../mind/bundle-manifest");
 function parseSocketPath(argv) {
     const socketIndex = argv.indexOf("--socket");
     if (socketIndex >= 0) {
@@ -21,12 +70,24 @@ function parseSocketPath(argv) {
 }
 const socketPath = parseSocketPath(process.argv);
 (0, runtime_logging_1.configureDaemonRuntimeLogger)("daemon");
+const entryPath = path.resolve(__dirname, "daemon-entry.js");
+const mode = (0, runtime_mode_1.detectRuntimeMode)((0, identity_1.getRepoRoot)());
 (0, runtime_1.emitNervesEvent)({
     component: "daemon",
     event: "daemon.entry_start",
     message: "starting daemon entrypoint",
-    meta: { socketPath },
+    meta: { socketPath, entryPath, mode },
 });
+/* v8 ignore next -- dev-mode indicator: false branch (production) tested in daemon-boot-updates.test.ts @preserve */
+if (mode === "dev") {
+    const repoRoot = (0, identity_1.getRepoRoot)();
+    (0, runtime_1.emitNervesEvent)({
+        component: "daemon",
+        event: "daemon.dev_mode_indicator",
+        message: `[dev] running from ${repoRoot}`,
+        meta: { repoRoot },
+    });
+}
 const managedAgents = (0, agent_discovery_1.listEnabledBundleAgents)();
 const processManager = new process_manager_1.DaemonProcessManager({
     agents: managedAgents.map((agent) => ({
@@ -35,6 +96,30 @@ const processManager = new process_manager_1.DaemonProcessManager({
         channel: "inner-dialog",
         autoStart: true,
     })),
+    existsSync: fs.existsSync,
+    /* v8 ignore next 4 -- wiring: delegates to checkAgentConfig which has full unit tests @preserve */
+    configCheck: (agent) => {
+        const bundlesRoot = (0, identity_1.getAgentBundlesRoot)();
+        const secretsRoot = path.join(os.homedir(), ".agentsecrets");
+        return (0, agent_config_check_1.checkAgentConfig)(agent, bundlesRoot, secretsRoot);
+    },
+    /* v8 ignore start -- pulse flush wiring: integration code; flushPulse itself has full unit tests @preserve */
+    onSnapshotChange: () => {
+        (0, pulse_1.flushPulse)({
+            snapshots: processManager.listAgentSnapshots(),
+            bundlesRoot: (0, identity_1.getAgentBundlesRoot)(),
+            daemonVersion: (0, bundle_manifest_1.getPackageVersion)(),
+            now: new Date(),
+            // Default I/O wired into pulse.ts (writePulse, readPulse, etc.)
+            // Wake recipient: send inner.wake over the daemon's own socket so
+            // the recipient agent runs an inner-dialog turn that picks up the
+            // pulse alert. Catch errors silently — pulse is best-effort.
+            fireInnerWake: (agent) => {
+                (0, socket_client_1.sendDaemonCommand)(socketPath, { kind: "inner.wake", agent }).catch(() => { });
+            },
+        });
+    },
+    /* v8 ignore stop */
 });
 const scheduler = new task_scheduler_1.TaskDrivenScheduler({
     agents: [...managedAgents],
@@ -63,21 +148,168 @@ const daemon = new daemon_1.OuroDaemon({
     scheduler,
     healthMonitor,
     router,
+    mode,
 });
-void daemon.start().catch(async () => {
+/* v8 ignore start — daemon health writer wiring, tested via daemon-health.test.ts @preserve */
+const healthWriter = new daemon_health_1.DaemonHealthWriter((0, daemon_health_1.getDefaultHealthPath)());
+const healthSink = (0, daemon_health_1.createHealthNervesSink)(healthWriter, () => ({
+    status: "ok",
+    mode,
+    pid: process.pid,
+    startedAt: new Date().toISOString(),
+    uptimeSeconds: Math.floor(process.uptime()),
+    safeMode: null,
+    degraded: [],
+    agents: {},
+    habits: {},
+}));
+(0, index_1.registerGlobalLogSink)(healthSink);
+/* v8 ignore stop */
+const habitSchedulers = [];
+/* v8 ignore start -- habit wiring: lambdas delegate to processManager/fs; tested via HabitScheduler unit tests @preserve */
+void daemon.start().then(() => {
+    const bundlesRoot = (0, identity_1.getAgentBundlesRoot)();
+    const ouroPath = (0, os_cron_deps_1.resolveOuroBinaryPath)();
+    const osCronDeps = (0, os_cron_deps_1.createRealOsCronDeps)();
+    for (const agent of managedAgents) {
+        const bundleRoot = path.join(bundlesRoot, `${agent}.ouro`);
+        const habitsDir = path.join(bundleRoot, "habits");
+        // Migrate old tasks/habits/ to habits/ at bundle root
+        (0, habit_migration_1.migrateHabitsFromTaskSystem)(bundleRoot);
+        const osCronManager = new os_cron_1.LaunchdCronManager(osCronDeps);
+        const scheduler = new habit_scheduler_1.HabitScheduler({
+            agent,
+            habitsDir,
+            osCronManager,
+            onHabitFire: (habitName) => {
+                processManager.sendToAgent(agent, { type: "habit", habitName });
+            },
+            deps: {
+                readdir: (dir) => fs.readdirSync(dir),
+                readFile: (p, enc) => fs.readFileSync(p, enc),
+                writeFile: (p, c, enc) => fs.writeFileSync(p, c, enc),
+                existsSync: (p) => fs.existsSync(p),
+                now: () => Date.now(),
+                ouroPath,
+                watch: (dir, cb) => fs.watch(dir, cb),
+            },
+        });
+        scheduler.start();
+        scheduler.startPeriodicReconciliation();
+        scheduler.watchForChanges();
+        habitSchedulers.push(scheduler);
+    }
+    /* v8 ignore start -- startup failure + signal handlers: call process.exit, untestable in vitest @preserve */
+}).catch(async (err) => {
+    const error = err instanceof Error ? err : new Error(String(err));
+    _tombstoneWritten = true;
+    (0, daemon_tombstone_1.writeDaemonTombstone)("startupFailure", error);
     (0, runtime_1.emitNervesEvent)({
         level: "error",
         component: "daemon",
         event: "daemon.entry_error",
         message: "daemon entrypoint failed",
-        meta: {},
+        meta: { error: error.message },
     });
+    setTimeout(() => process.exit(1), 5_000).unref();
     await daemon.stop();
     process.exit(1);
 });
 process.on("SIGINT", () => {
+    // ALWAYS write a tombstone, even on signal-driven shutdown. The previous
+    // behavior was to set _gracefulShutdown=true and skip the tombstone, which
+    // meant ANY external SIGINT/SIGTERM (launchd policy, OOM killer, manual
+    // kill, killOrphanProcesses from a sibling daemon) silently disappeared
+    // from the death log. The user lost weeks of visibility into why their
+    // daemon kept dying. Tombstones are informational — having a "sigint"
+    // tombstone is strictly better than silence.
+    _tombstoneWritten = true;
+    (0, daemon_tombstone_1.writeDaemonTombstone)("sigint", new Error("daemon received SIGINT"));
+    for (const s of habitSchedulers) {
+        s.stopWatching();
+        s.stop();
+    }
+    setTimeout(() => process.exit(1), 5_000).unref();
     void daemon.stop().then(() => process.exit(0));
 });
 process.on("SIGTERM", () => {
+    _tombstoneWritten = true;
+    (0, daemon_tombstone_1.writeDaemonTombstone)("sigterm", new Error("daemon received SIGTERM"));
+    for (const s of habitSchedulers) {
+        s.stopWatching();
+        s.stop();
+    }
+    setTimeout(() => process.exit(1), 5_000).unref();
     void daemon.stop().then(() => process.exit(0));
 });
+/* v8 ignore stop */
+// Suppress EPIPE on stdout/stderr — normal when detached daemon's parent exits
+/* v8 ignore start -- EPIPE suppression: only fires when parent process exits @preserve */
+process.stdout?.on?.("error", () => { });
+process.stderr?.on?.("error", () => { });
+/* v8 ignore stop */
+/* v8 ignore start -- global exception handlers: genuinely untestable in vitest; exercised by real daemon crashes @preserve */
+let _uncaughtCount = 0;
+let _tombstoneWritten = false;
+let _lastKnownCause = null;
+const CIRCUIT_BREAKER_WINDOW_MS = 60_000;
+const CIRCUIT_BREAKER_MAX = 10;
+process.on("uncaughtException", (error) => {
+    // EPIPE is normal for detached daemon processes — parent closed the pipe
+    if (error.code === "EPIPE")
+        return;
+    _uncaughtCount++;
+    _lastKnownCause = error;
+    setTimeout(() => { _uncaughtCount--; }, CIRCUIT_BREAKER_WINDOW_MS).unref();
+    _tombstoneWritten = true;
+    (0, daemon_tombstone_1.writeDaemonTombstone)("uncaughtException", error);
+    (0, runtime_1.emitNervesEvent)({
+        level: "error",
+        component: "daemon",
+        event: "daemon.uncaught_exception",
+        message: "uncaught exception in daemon process (continuing)",
+        meta: { error: error.message, stack: error.stack ?? null, uncaughtCount: _uncaughtCount },
+    });
+    // Circuit breaker: if too many exceptions in a short window, the process
+    // is in a bad state — exit so launchd/self-spawn can restart fresh.
+    if (_uncaughtCount >= CIRCUIT_BREAKER_MAX) {
+        (0, runtime_1.emitNervesEvent)({
+            level: "error",
+            component: "daemon",
+            event: "daemon.circuit_breaker_exit",
+            message: `daemon exiting: ${_uncaughtCount} uncaught exceptions in ${CIRCUIT_BREAKER_WINDOW_MS / 1000}s`,
+            meta: { uncaughtCount: _uncaughtCount },
+        });
+        setTimeout(() => process.exit(1), 5_000).unref();
+        void daemon.stop().then(() => process.exit(1));
+    }
+});
+process.on("unhandledRejection", (reason) => {
+    const error = reason instanceof Error ? reason : new Error(String(reason));
+    _lastKnownCause = error;
+    _tombstoneWritten = true;
+    (0, daemon_tombstone_1.writeDaemonTombstone)("unhandledRejection", error);
+    (0, runtime_1.emitNervesEvent)({
+        level: "error",
+        component: "daemon",
+        event: "daemon.unhandled_rejection",
+        message: "unhandled promise rejection in daemon process",
+        meta: { reason: error.message, stack: error.stack ?? null },
+    });
+});
+// Catch-all: write tombstone on any exit where we didn't already record the cause.
+// process.on('exit') is synchronous-only — writeDaemonTombstone uses writeFileSync, so it works.
+//
+// Previously this skipped writing if `_gracefulShutdown` was true, which made
+// SIGINT/SIGTERM-driven exits invisible in the death log. The signal handlers
+// above now always write their own tombstone before exiting, so this catch-all
+// only runs for exits the signal handlers didn't reach (e.g. process.exit
+// called from somewhere unexpected).
+process.on("exit", (code) => {
+    if (_tombstoneWritten)
+        return;
+    const reason = code === 0 ? "unexpectedCleanExit" : "unexpectedExit";
+    const error = _lastKnownCause ?? new Error(`daemon exited with code ${code} (no specific cause captured)`);
+    (0, daemon_tombstone_1.writeDaemonTombstone)(reason, error);
+});
+/* v8 ignore stop */

package/dist/heart/daemon/daemon-health.js

@@ -0,0 +1,136 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HEALTH_TRACKED_EVENTS = exports.DaemonHealthWriter = void 0;
+exports.getDefaultHealthPath = getDefaultHealthPath;
+exports.createHealthNervesSink = createHealthNervesSink;
+exports.readHealth = readHealth;
+const fs = __importStar(require("fs"));
+const os = __importStar(require("os"));
+const path = __importStar(require("path"));
+const runtime_1 = require("../../nerves/runtime");
+class DaemonHealthWriter {
+    healthPath;
+    constructor(healthPath) {
+        this.healthPath = healthPath;
+    }
+    writeHealth(state) {
+        try {
+            const dir = path.dirname(this.healthPath);
+            fs.mkdirSync(dir, { recursive: true });
+            const tmpPath = `${this.healthPath}.tmp.${process.pid}`;
+            fs.writeFileSync(tmpPath, JSON.stringify(state, null, 2) + "\n", "utf-8");
+            fs.renameSync(tmpPath, this.healthPath);
+            (0, runtime_1.emitNervesEvent)({
+                component: "daemon",
+                event: "daemon.health_written",
+                message: "daemon health file written",
+                meta: { path: this.healthPath, status: state.status },
+            });
+        }
+        catch {
+            // Best-effort: if we can't write, don't crash the daemon.
+        }
+    }
+}
+exports.DaemonHealthWriter = DaemonHealthWriter;
+function getDefaultHealthPath() {
+    return path.join(os.homedir(), ".ouro-cli", "daemon-health.json");
+}
+/** Events that trigger a debounced health file write */
+exports.HEALTH_TRACKED_EVENTS = new Set([
+    "daemon.habit_cron_verification_failed",
+    "daemon.habit_fire",
+    "daemon.agent_exit",
+    "daemon.agent_started",
+    "daemon.agent_restart_exhausted",
+    "daemon.agent_permanent_failure",
+    "daemon.agent_cooldown_recovery",
+    "daemon.safe_mode_entered",
+    "daemon.habit_scheduler_start",
+]);
+/**
+ * Creates a nerves LogSink that triggers debounced health writes on relevant events.
+ * Components don't know about the health writer — they just emit events.
+ */
+function createHealthNervesSink(writer, getState) {
+    let debounceTimer = null;
+    return (entry) => {
+        if (!exports.HEALTH_TRACKED_EVENTS.has(entry.event)) {
+            return;
+        }
+        // Debounce: max once per second
+        if (debounceTimer !== null) {
+            clearTimeout(debounceTimer);
+        }
+        debounceTimer = setTimeout(() => {
+            debounceTimer = null;
+            const state = getState();
+            writer.writeHealth(state);
+        }, 1000);
+    };
+}
+function readHealth(healthPath) {
+    try {
+        const raw = fs.readFileSync(healthPath, "utf-8");
+        const parsed = JSON.parse(raw);
+        if (typeof parsed.status !== "string" ||
+            typeof parsed.mode !== "string" ||
+            typeof parsed.pid !== "number" ||
+            typeof parsed.startedAt !== "string" ||
+            typeof parsed.uptimeSeconds !== "number" ||
+            !Array.isArray(parsed.degraded) ||
+            typeof parsed.agents !== "object" ||
+            parsed.agents === null ||
+            typeof parsed.habits !== "object" ||
+            parsed.habits === null) {
+            return null;
+        }
+        return {
+            status: parsed.status,
+            mode: parsed.mode,
+            pid: parsed.pid,
+            startedAt: parsed.startedAt,
+            uptimeSeconds: parsed.uptimeSeconds,
+            safeMode: parsed.safeMode,
+            degraded: parsed.degraded,
+            agents: parsed.agents,
+            habits: parsed.habits,
+        };
+    }
+    catch {
+        return null;
+    }
+}

package/dist/heart/daemon/daemon-runtime-sync.js

@@ -2,19 +2,100 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureCurrentDaemonRuntime = ensureCurrentDaemonRuntime;
 const runtime_1 = require("../../nerves/runtime");
+/* v8 ignore start -- daemon liveness poll: real socket timing untestable in vitest @preserve */
+async function verifyDaemonStarted(deps) {
+    if (!deps.checkSocketAlive)
+        return true;
+    const maxWaitMs = 10_000;
+    const pollIntervalMs = 500;
+    const deadline = Date.now() + maxWaitMs;
+    while (Date.now() < deadline) {
+        await new Promise((r) => setTimeout(r, pollIntervalMs));
+        if (await deps.checkSocketAlive(deps.socketPath))
+            return true;
+    }
+    return false;
+}
+/* v8 ignore stop */
 function isKnownVersion(version) {
     return version !== "unknown" && version.trim().length > 0;
 }
+function isKnownRuntimeValue(value) {
+    return typeof value === "string" && value.trim().length > 0 && value !== "unknown";
+}
 function formatErrorReason(error) {
     return error instanceof Error ? error.message : String(error);
 }
+function normalizeRuntimeIdentity(value) {
+    return {
+        version: typeof value.version === "string" ? value.version : "unknown",
+        lastUpdated: typeof value.lastUpdated === "string" ? value.lastUpdated : "unknown",
+        repoRoot: typeof value.repoRoot === "string" ? value.repoRoot : "unknown",
+        configFingerprint: typeof value.configFingerprint === "string" ? value.configFingerprint : "unknown",
+    };
+}
+async function readRunningRuntimeIdentity(deps) {
+    if (!deps.fetchRunningRuntimeMetadata) {
+        return normalizeRuntimeIdentity({
+            version: await deps.fetchRunningVersion(),
+        });
+    }
+    const metadata = normalizeRuntimeIdentity(await deps.fetchRunningRuntimeMetadata());
+    if (isKnownVersion(metadata.version))
+        return metadata;
+    return normalizeRuntimeIdentity({
+        ...metadata,
+        version: await deps.fetchRunningVersion(),
+    });
+}
+function collectRuntimeDriftReasons(local, running) {
+    const reasons = [];
+    const comparableVersions = isKnownVersion(local.version) && isKnownVersion(running.version);
+    if (comparableVersions && local.version !== running.version) {
+        reasons.push({ key: "version", label: "version", local: local.version, running: running.version });
+    }
+    if (comparableVersions && isKnownRuntimeValue(local.lastUpdated) && isKnownRuntimeValue(running.lastUpdated) && local.lastUpdated !== running.lastUpdated) {
+        reasons.push({ key: "lastUpdated", label: "last updated", local: local.lastUpdated, running: running.lastUpdated });
+    }
+    if (isKnownRuntimeValue(local.repoRoot) && isKnownRuntimeValue(running.repoRoot) && local.repoRoot !== running.repoRoot) {
+        reasons.push({ key: "repoRoot", label: "code path", local: local.repoRoot, running: running.repoRoot });
+    }
+    if (isKnownRuntimeValue(local.configFingerprint)
+        && isKnownRuntimeValue(running.configFingerprint)
+        && local.configFingerprint !== running.configFingerprint) {
+        reasons.push({
+            key: "configFingerprint",
+            label: "config fingerprint",
+            local: local.configFingerprint,
+            running: running.configFingerprint,
+        });
+    }
+    return reasons;
+}
+function formatRuntimeValue(reason) {
+    if (reason.key === "configFingerprint") {
+        return `${reason.running.slice(0, 12)} -> ${reason.local.slice(0, 12)}`;
+    }
+    return `${reason.running} -> ${reason.local}`;
+}
+function formatRuntimeDriftSummary(reasons) {
+    return reasons.map((reason) => `${reason.label} ${formatRuntimeValue(reason)}`).join("; ");
+}
 async function ensureCurrentDaemonRuntime(deps) {
+    const localRuntime = normalizeRuntimeIdentity({
+        version: deps.localVersion,
+        lastUpdated: deps.localLastUpdated,
+        repoRoot: deps.localRepoRoot,
+        configFingerprint: deps.localConfigFingerprint,
+    });
     try {
-        const runningVersion = await deps.fetchRunningVersion();
+        const runningRuntime = await readRunningRuntimeIdentity(deps);
+        const runningVersion = runningRuntime.version;
+        const driftReasons = collectRuntimeDriftReasons(localRuntime, runningRuntime);
         let result;
-        if (isKnownVersion(deps.localVersion) &&
-            isKnownVersion(runningVersion) &&
-            runningVersion !== deps.localVersion) {
+        if (driftReasons.length > 0) {
+            const includesVersionDrift = driftReasons.some((entry) => entry.key === "version");
+            const driftSummary = formatRuntimeDriftSummary(driftReasons);
             try {
                 await deps.stopDaemon();
             }
@@ -22,32 +103,66 @@ async function ensureCurrentDaemonRuntime(deps) {
                 const reason = formatErrorReason(error);
                 result = {
                     alreadyRunning: true,
-                    message: `daemon already running (${deps.socketPath}; could not replace stale daemon ${runningVersion} -> ${deps.localVersion}: ${reason})`,
+                    message: includesVersionDrift
+                        ? `daemon already running (${deps.socketPath}; could not replace stale daemon ${runningVersion} -> ${deps.localVersion}: ${reason})`
+                        : `daemon already running (${deps.socketPath}; could not replace drifted daemon ${driftSummary}: ${reason})`,
                 };
                 (0, runtime_1.emitNervesEvent)({
                     level: "warn",
                     component: "daemon",
                     event: "daemon.runtime_sync_decision",
                     message: "evaluated daemon runtime sync outcome",
-                    meta: { socketPath: deps.socketPath, localVersion: deps.localVersion, runningVersion, action: "stale_replace_failed", reason },
+                    meta: {
+                        socketPath: deps.socketPath,
+                        localVersion: deps.localVersion,
+                        localLastUpdated: localRuntime.lastUpdated,
+                        localRepoRoot: localRuntime.repoRoot,
+                        localConfigFingerprint: localRuntime.configFingerprint,
+                        runningVersion,
+                        runningLastUpdated: runningRuntime.lastUpdated,
+                        runningRepoRoot: runningRuntime.repoRoot,
+                        runningConfigFingerprint: runningRuntime.configFingerprint,
+                        action: "stale_replace_failed",
+                        driftKeys: driftReasons.map((entry) => entry.key),
+                        reason,
+                    },
                 });
                 return result;
             }
             deps.cleanupStaleSocket(deps.socketPath);
             const started = await deps.startDaemonProcess(deps.socketPath);
+            const pid = started.pid ?? "unknown";
+            const verified = await verifyDaemonStarted(deps);
+            /* v8 ignore next -- daemon liveness failure: requires real daemon crash timing @preserve */
+            const suffix = verified ? "" : " — but daemon failed to respond, check logs";
             result = {
                 alreadyRunning: false,
-                message: `restarted stale daemon from ${runningVersion} to ${deps.localVersion} (pid ${started.pid ?? "unknown"})`,
+                message: includesVersionDrift
+                    ? `restarted stale daemon from ${runningVersion} to ${deps.localVersion} (pid ${pid})${suffix}`
+                    : `restarted drifted daemon (${driftSummary}) (pid ${pid})${suffix}`,
             };
             (0, runtime_1.emitNervesEvent)({
                 component: "daemon",
                 event: "daemon.runtime_sync_decision",
                 message: "evaluated daemon runtime sync outcome",
-                meta: { socketPath: deps.socketPath, localVersion: deps.localVersion, runningVersion, action: "stale_restarted", pid: started.pid ?? null },
+                meta: {
+                    socketPath: deps.socketPath,
+                    localVersion: deps.localVersion,
+                    localLastUpdated: localRuntime.lastUpdated,
+                    localRepoRoot: localRuntime.repoRoot,
+                    localConfigFingerprint: localRuntime.configFingerprint,
+                    runningVersion,
+                    runningLastUpdated: runningRuntime.lastUpdated,
+                    runningRepoRoot: runningRuntime.repoRoot,
+                    runningConfigFingerprint: runningRuntime.configFingerprint,
+                    action: "stale_restarted",
+                    driftKeys: driftReasons.map((entry) => entry.key),
+                    pid: started.pid ?? null,
+                },
             });
             return result;
         }
-        if (!isKnownVersion(deps.localVersion) || !isKnownVersion(runningVersion)) {
+        if (!isKnownVersion(localRuntime.version) || !isKnownVersion(runningVersion)) {
             result = {
                 alreadyRunning: true,
                 message: `daemon already running (${deps.socketPath}; unable to verify version)`,
@@ -56,7 +171,18 @@ async function ensureCurrentDaemonRuntime(deps) {
                 component: "daemon",
                 event: "daemon.runtime_sync_decision",
                 message: "evaluated daemon runtime sync outcome",
-                meta: { socketPath: deps.socketPath, localVersion: deps.localVersion, runningVersion, action: "unknown_version" },
+                meta: {
+                    socketPath: deps.socketPath,
+                    localVersion: deps.localVersion,
+                    localLastUpdated: localRuntime.lastUpdated,
+                    localRepoRoot: localRuntime.repoRoot,
+                    localConfigFingerprint: localRuntime.configFingerprint,
+                    runningVersion,
+                    runningLastUpdated: runningRuntime.lastUpdated,
+                    runningRepoRoot: runningRuntime.repoRoot,
+                    runningConfigFingerprint: runningRuntime.configFingerprint,
+                    action: "unknown_version",
+                },
             });
             return result;
         }
@@ -72,7 +198,15 @@ async function ensureCurrentDaemonRuntime(deps) {
             component: "daemon",
             event: "daemon.runtime_sync_decision",
             message: "evaluated daemon runtime sync outcome",
-            meta: { socketPath: deps.socketPath, localVersion: deps.localVersion, action: "status_lookup_failed", reason },
+            meta: {
+                socketPath: deps.socketPath,
+                localVersion: deps.localVersion,
+                localLastUpdated: localRuntime.lastUpdated,
+                localRepoRoot: localRuntime.repoRoot,
+                localConfigFingerprint: localRuntime.configFingerprint,
+                action: "status_lookup_failed",
+                reason,
+            },
         });
         return result;
     }
@@ -84,7 +218,14 @@ async function ensureCurrentDaemonRuntime(deps) {
         component: "daemon",
         event: "daemon.runtime_sync_decision",
         message: "evaluated daemon runtime sync outcome",
-        meta: { socketPath: deps.socketPath, localVersion: deps.localVersion, action: "already_current" },
+        meta: {
+            socketPath: deps.socketPath,
+            localVersion: deps.localVersion,
+            localLastUpdated: localRuntime.lastUpdated,
+            localRepoRoot: localRuntime.repoRoot,
+            localConfigFingerprint: localRuntime.configFingerprint,
+            action: "already_current",
+        },
     });
     return result;
 }