@ouro.bot/cli 0.1.0-alpha.694 → 0.1.0-alpha.695

package/changelog.json

@@ -1,6 +1,13 @@
 {
   "_note": "This changelog is maintained as part of the PR/version-bump workflow. Agent-curated, not auto-generated. Agents read this file directly via read_file to understand what changed between versions.",
   "versions": [
+    {
+      "version": "0.1.0-alpha.695",
+      "changes": [
+        "Prevent daemon-health context-loss Sentinel checks from treating Sentinel-authored flight-recorder cleanup as bundle dirt.",
+        "Clear daemon shutdown fallback timers after graceful SIGINT/SIGTERM and circuit-breaker stops."
+      ]
+    },
     {
       "version": "0.1.0-alpha.694",
       "changes": [

package/dist/heart/context-loss-sentinel.js

@@ -48,6 +48,7 @@ const runtime_1 = require("../nerves/runtime");
 const context_loss_gauntlet_1 = require("./context-loss-gauntlet");
 const provider_visibility_1 = require("./provider-visibility");
 const CONTEXT_LOSS_SENTINEL_RECEIPT_FILE_LIMIT = 512;
+const CONTEXT_LOSS_SENTINEL_GIT_STATUS_TIMEOUT_MS = 5_000;
 const REQUIRED_LANES = ["outward", "inner"];
 function logicalLocator(...parts) {
     return path.posix.join(...parts);
@@ -524,7 +525,7 @@ function defaultGitStatus(agentRoot) {
             cwd: agentRoot,
             encoding: "utf-8",
             stdio: ["ignore", "pipe", "pipe"],
-            timeout: 1_000,
+            timeout: CONTEXT_LOSS_SENTINEL_GIT_STATUS_TIMEOUT_MS,
         });
         return { ok: true, porcelain };
     }
@@ -574,7 +575,167 @@ function isSentinelGitStatusEntry(entry) {
         return normalizedPath === sentinelRoot || normalizedPath.startsWith(`${sentinelRoot}/`);
     });
 }
-function bundleSignal(status, options = {}) {
+function isContextLossSentinelBlockerText(value) {
+    return value.startsWith("context-loss Sentinel blocked:");
+}
+function hasContextLossSentinelCheckpointEvents(agentRoot, resume) {
+    const events = readFlightRecorderEventsByIds(agentRoot, resume.lastSafeCheckpoint.sourceEventIds);
+    const foundEventIds = new Set(events.map((event) => event.id));
+    if (resume.lastSafeCheckpoint.sourceEventIds.some((eventId) => !foundEventIds.has(eventId)))
+        return false;
+    return resume.blockedBecause.length > 0
+        ? events.every(isContextLossSentinelBlockerEvent)
+        : events.every(isContextLossSentinelRecoveryEvent);
+}
+function isContextLossSentinelCheckpoint(agentRoot, resume) {
+    return resume.lastSafeCheckpoint.sourceEventIds.length > 0
+        && resume.lastSafeCheckpoint.sourceEventIds.every((eventId) => eventId.startsWith("fr-sentinel-"))
+        && resume.blockedBecause.every(isContextLossSentinelBlockerText)
+        && hasContextLossSentinelCheckpointEvents(agentRoot, resume);
+}
+function neutralizeSentinelCheckpoint(resume) {
+    return {
+        ...resume,
+        canContinue: true,
+        blockedBecause: [],
+        lastSafeCheckpoint: {
+            turnId: null,
+            sessionRef: null,
+            recordedAt: null,
+            sourceEventIds: [],
+        },
+        recorderHealth: { status: "ok", issues: [] },
+    };
+}
+function isContextLossSentinelProducedRef(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return false;
+    const record = value;
+    if (record.kind !== "arc" || typeof record.locator !== "string")
+        return false;
+    const sentinelRoot = relativeSentinelRoot();
+    return record.locator === sentinelRoot || record.locator.startsWith(`${sentinelRoot}/`);
+}
+function isContextLossSentinelFlightRecorderEvent(value) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        return false;
+    const record = value;
+    const meta = record.meta;
+    const producedRefs = record.producedRefs;
+    return typeof record.id === "string"
+        && record.id.startsWith("fr-sentinel-")
+        && (record.kind === "blocker_detected" || record.kind === "agent_note")
+        && meta?.source === "context-loss-sentinel"
+        && Array.isArray(producedRefs)
+        && producedRefs.length > 0
+        && producedRefs.every(isContextLossSentinelProducedRef);
+}
+function isContextLossSentinelBlockerEvent(event) {
+    return isContextLossSentinelFlightRecorderEvent(event)
+        && event.kind === "blocker_detected"
+        && Array.isArray(event.blockedBecause)
+        && event.blockedBecause.length > 0
+        && event.blockedBecause.every(isContextLossSentinelBlockerText);
+}
+function isContextLossSentinelRecoveryEvent(event) {
+    return isContextLossSentinelFlightRecorderEvent(event)
+        && event.kind === "agent_note"
+        && Array.isArray(event.blockedBecause)
+        && event.blockedBecause.length === 0
+        && event.meta?.resolution === "blocked-signals-recovered";
+}
+function gitShowHeadFile(agentRoot, entryPath) {
+    try {
+        return (0, child_process_1.execFileSync)("git", ["show", `HEAD:${entryPath}`], {
+            cwd: agentRoot,
+            encoding: "utf-8",
+            stdio: ["ignore", "pipe", "ignore"],
+            timeout: CONTEXT_LOSS_SENTINEL_GIT_STATUS_TIMEOUT_MS,
+        });
+    }
+    catch {
+        return null;
+    }
+}
+function nonEmptyLines(text) {
+    return text.split(/\r?\n/).filter((line) => line.trim().length > 0);
+}
+function isFlightRecorderEventsPath(entryPath) {
+    return /^arc\/flight-recorder\/events\/[^/]+\.jsonl$/.test(entryPath);
+}
+function isFlightRecorderLatestPath(entryPath) {
+    return entryPath === "arc/flight-recorder/latest.json";
+}
+function isDeletedGitStatusEntry(entry) {
+    return entry.slice(0, 2).includes("D");
+}
+function isUntrackedGitStatusEntry(entry) {
+    return entry.startsWith("??");
+}
+function isWorktreeOnlyModifiedGitStatusEntry(entry) {
+    return entry.slice(0, 2) === " M";
+}
+function parseJsonLine(line) {
+    try {
+        return JSON.parse(line);
+    }
+    catch {
+        return null;
+    }
+}
+function isContextLossSentinelEventFileDirty(agentRoot, entry, entryPath) {
+    if (isDeletedGitStatusEntry(entry))
+        return false;
+    const filePath = path.join(agentRoot, entryPath);
+    if (isUntrackedGitStatusEntry(entry)) {
+        const candidateLines = fs.existsSync(filePath) ? nonEmptyLines(fs.readFileSync(filePath, "utf-8")) : [];
+        return candidateLines.length > 0
+            && candidateLines.every((line) => isContextLossSentinelFlightRecorderEvent(parseJsonLine(line)));
+    }
+    if (!isWorktreeOnlyModifiedGitStatusEntry(entry) || !fs.existsSync(filePath))
+        return false;
+    const headText = gitShowHeadFile(agentRoot, entryPath);
+    if (headText === null)
+        return false;
+    const headLines = nonEmptyLines(headText);
+    const currentLines = nonEmptyLines(fs.readFileSync(filePath, "utf-8"));
+    if (currentLines.length <= headLines.length)
+        return false;
+    if (!headLines.every((line, index) => currentLines[index] === line))
+        return false;
+    const appendedLines = currentLines.slice(headLines.length);
+    return appendedLines.every((line) => isContextLossSentinelFlightRecorderEvent(parseJsonLine(line)));
+}
+function isContextLossSentinelLatestDirty(agentRoot, entry, entryPath) {
+    if (isDeletedGitStatusEntry(entry) || isUntrackedGitStatusEntry(entry))
+        return false;
+    if (!isWorktreeOnlyModifiedGitStatusEntry(entry))
+        return false;
+    const current = readJson(path.join(agentRoot, entryPath));
+    if (!current.ok || !(0, flight_recorder_1.isFlightRecorderResume)(current.value) || !isContextLossSentinelCheckpoint(agentRoot, current.value)) {
+        return false;
+    }
+    const headText = gitShowHeadFile(agentRoot, entryPath);
+    if (headText === null)
+        return false;
+    const head = parseJsonLine(headText);
+    if (!(0, flight_recorder_1.isFlightRecorderResume)(head))
+        return false;
+    return JSON.stringify(neutralizeSentinelCheckpoint(current.value))
+        === JSON.stringify(neutralizeSentinelCheckpoint(head));
+}
+function isContextLossSentinelFlightRecorderGitStatusEntry(agentRoot, entry) {
+    return gitStatusPaths(entry).every((entryPath) => (isFlightRecorderEventsPath(entryPath)
+        ? isContextLossSentinelEventFileDirty(agentRoot, entry, entryPath)
+        : isFlightRecorderLatestPath(entryPath)
+            ? isContextLossSentinelLatestDirty(agentRoot, entry, entryPath)
+            : false));
+}
+function isContextLossSentinelOwnedGitStatusEntry(entry, options) {
+    return isSentinelGitStatusEntry(entry)
+        || isContextLossSentinelFlightRecorderGitStatusEntry(options.agentRoot, entry);
+}
+function bundleSignal(status, options) {
     const gitStatusCommand = "git status --porcelain=v1 -uall";
     if (!status.ok) {
         return {
@@ -589,7 +750,7 @@ function bundleSignal(status, options = {}) {
         };
     }
     const dirtyEntries = gitStatusEntries(status.porcelain)
-        .filter((entry) => !(options.ignoreSentinelDirtyEntries && isSentinelGitStatusEntry(entry)));
+        .filter((entry) => !(options.ignoreSentinelDirtyEntries && isContextLossSentinelOwnedGitStatusEntry(entry, options)));
     if (dirtyEntries.length > 0) {
         return {
             id: "bundle:git",
@@ -723,6 +884,7 @@ function makeReceipt(agentName, agentRoot, options, generatedAt) {
         ...healthSignals(options.daemonHealthResults ?? []),
         bundleSignal((options.gitStatus ?? (() => defaultGitStatus(agentRoot)))(), {
             ignoreSentinelDirtyEntries: options.trigger === "daemon_health",
+            agentRoot,
         }),
     ];
     const verdict = sentinelVerdict(signals);

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

@@ -687,9 +687,15 @@ void preloadProviderCredentialPools().then(() => daemon.start()).then(async () =
         message: "daemon entrypoint failed",
         meta: { error: error.message },
     });
-    setTimeout(() => process.exit(1), 5_000).unref();
-    await daemon.stop();
-    process.exit(1);
+    const forcedExit = setTimeout(() => process.exit(1), 5_000);
+    forcedExit.unref();
+    try {
+        await daemon.stop();
+    }
+    finally {
+        clearTimeout(forcedExit);
+        process.exit(1);
+    }
 });
 process.on("SIGINT", () => {
     // ALWAYS write a tombstone, even on signal-driven shutdown. The previous
@@ -702,15 +708,29 @@ process.on("SIGINT", () => {
     _tombstoneWritten = true;
     (0, daemon_tombstone_1.writeDaemonTombstone)("sigint", new Error("daemon received SIGINT"));
     stopEntryRuntime();
-    setTimeout(() => process.exit(1), 5_000).unref();
-    void daemon.stop().then(() => process.exit(0));
+    const forcedExit = setTimeout(() => process.exit(1), 5_000);
+    forcedExit.unref();
+    void daemon.stop().then(() => {
+        clearTimeout(forcedExit);
+        process.exit(0);
+    }, () => {
+        clearTimeout(forcedExit);
+        process.exit(1);
+    });
 });
 process.on("SIGTERM", () => {
     _tombstoneWritten = true;
     (0, daemon_tombstone_1.writeDaemonTombstone)("sigterm", new Error("daemon received SIGTERM"));
     stopEntryRuntime();
-    setTimeout(() => process.exit(1), 5_000).unref();
-    void daemon.stop().then(() => process.exit(0));
+    const forcedExit = setTimeout(() => process.exit(1), 5_000);
+    forcedExit.unref();
+    void daemon.stop().then(() => {
+        clearTimeout(forcedExit);
+        process.exit(0);
+    }, () => {
+        clearTimeout(forcedExit);
+        process.exit(1);
+    });
 });
 /* v8 ignore stop */
 // Suppress EPIPE on stdout/stderr — normal when detached daemon's parent exits
@@ -750,8 +770,12 @@ process.on("uncaughtException", (error) => {
             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));
+        const forcedExit = setTimeout(() => process.exit(1), 5_000);
+        forcedExit.unref();
+        void daemon.stop().finally(() => {
+            clearTimeout(forcedExit);
+            process.exit(1);
+        });
     }
 });
 process.on("unhandledRejection", (reason) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.694",
+  "version": "0.1.0-alpha.695",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
     "cli": "dist/heart/daemon/ouro-bot-entry.js",