@ouro.bot/cli 0.1.0-alpha.664 → 0.1.0-alpha.665

package/changelog.json

@@ -1,6 +1,12 @@
 {
   "_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.665",
+      "changes": [
+        "Ignore Sentinel-owned daemon-health git dirt when computing the Sentinel bundle signal, preventing a self-sustaining health-receipt loop while keeping real bundle dirt visible."
+      ]
+    },
     {
       "version": "0.1.0-alpha.664",
       "changes": [

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

@@ -482,7 +482,7 @@ function healthSignals(results) {
 }
 function defaultGitStatus(agentRoot) {
     try {
-        const porcelain = (0, child_process_1.execFileSync)("git", ["status", "--porcelain"], {
+        const porcelain = (0, child_process_1.execFileSync)("git", ["status", "--porcelain=v1", "-uall"], {
             cwd: agentRoot,
             encoding: "utf-8",
             stdio: ["ignore", "pipe", "pipe"],
@@ -494,7 +494,50 @@ function defaultGitStatus(agentRoot) {
         return { ok: false, error: String(error) };
     }
 }
-function bundleSignal(status) {
+function gitStatusEntries(porcelain) {
+    return porcelain.split(/\r?\n/).filter((line) => line.trim().length > 0);
+}
+function normalizeGitStatusPath(entryPath) {
+    return entryPath.trim().replace(/^"|"$/g, "");
+}
+function gitStatusPaths(entry) {
+    const rawPath = entry.slice(3).trim();
+    const paths = [];
+    let start = 0;
+    let inQuote = false;
+    let escaped = false;
+    for (let index = 0; index < rawPath.length; index += 1) {
+        const char = rawPath[index];
+        if (escaped) {
+            escaped = false;
+            continue;
+        }
+        if (inQuote && char === "\\") {
+            escaped = true;
+            continue;
+        }
+        if (char === "\"") {
+            inQuote = !inQuote;
+            continue;
+        }
+        if (!inQuote && rawPath.startsWith(" -> ", index)) {
+            paths.push(rawPath.slice(start, index));
+            start = index + 4;
+            index += 3;
+        }
+    }
+    paths.push(rawPath.slice(start));
+    return paths.map(normalizeGitStatusPath);
+}
+function isSentinelGitStatusEntry(entry) {
+    const sentinelRoot = relativeSentinelRoot();
+    return gitStatusPaths(entry).every((entryPath) => {
+        const normalizedPath = entryPath.replace(/\/$/, "");
+        return normalizedPath === sentinelRoot || normalizedPath.startsWith(`${sentinelRoot}/`);
+    });
+}
+function bundleSignal(status, options = {}) {
+    const gitStatusCommand = "git status --porcelain=v1 -uall";
     if (!status.ok) {
         return {
             id: "bundle:git",
@@ -503,11 +546,12 @@ function bundleSignal(status) {
             severity: "warn",
             verdictImpact: "watch",
             summary: `bundle git status unavailable: ${status.error}`,
-            source: { kind: "git", locator: "git status --porcelain" },
-            repair: repair("agent-runnable", "bundle-cleanup", "Inspect bundle git state before assuming the local state is clean.", "git status --porcelain"),
+            source: { kind: "git", locator: gitStatusCommand },
+            repair: repair("agent-runnable", "bundle-cleanup", "Inspect bundle git state before assuming the local state is clean.", gitStatusCommand),
         };
     }
-    const dirtyEntries = status.porcelain.split(/\r?\n/).filter((line) => line.trim().length > 0);
+    const dirtyEntries = gitStatusEntries(status.porcelain)
+        .filter((entry) => !(options.ignoreSentinelDirtyEntries && isSentinelGitStatusEntry(entry)));
     if (dirtyEntries.length > 0) {
         return {
             id: "bundle:git",
@@ -516,8 +560,8 @@ function bundleSignal(status) {
             severity: "warn",
             verdictImpact: "watch",
             summary: `bundle has ${dirtyEntries.length} uncommitted git status entr${dirtyEntries.length === 1 ? "y" : "ies"}`,
-            source: { kind: "git", locator: "git status --porcelain" },
-            repair: repair("agent-runnable", "bundle-cleanup", "Resolve or intentionally preserve local bundle changes before handoff.", "git status --porcelain"),
+            source: { kind: "git", locator: gitStatusCommand },
+            repair: repair("agent-runnable", "bundle-cleanup", "Resolve or intentionally preserve local bundle changes before handoff.", gitStatusCommand),
             meta: { dirtyEntries },
         };
     }
@@ -528,7 +572,7 @@ function bundleSignal(status) {
         severity: "info",
         verdictImpact: "none",
         summary: "bundle git status clean",
-        source: { kind: "git", locator: "git status --porcelain" },
+        source: { kind: "git", locator: gitStatusCommand },
     };
 }
 function sentinelVerdict(signals) {
@@ -633,7 +677,9 @@ function makeReceipt(agentName, agentRoot, options, generatedAt) {
         gauntletSignal(report),
         ...deriveContextLossSentinelProviderSignals(providerVisibility),
         ...healthSignals(options.daemonHealthResults ?? []),
-        bundleSignal((options.gitStatus ?? (() => defaultGitStatus(agentRoot)))()),
+        bundleSignal((options.gitStatus ?? (() => defaultGitStatus(agentRoot)))(), {
+            ignoreSentinelDirtyEntries: options.trigger === "daemon_health",
+        }),
     ];
     const verdict = sentinelVerdict(signals);
     const latestReady = readLatestReady(agentRoot);

package/package.json

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