@ouro.bot/cli 0.1.0-alpha.692 → 0.1.0-alpha.693

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.693",
+      "changes": [
+        "Load vault-backed provider credentials before manual context-loss Sentinel refreshes so a fresh CLI process cannot report false not-loaded provider warnings.",
+        "Have doctor lifecycle checks read the machine-local daemon log alongside bundle-local logs so stale historical bundle logs cannot mask live daemon activity."
+      ]
+    },
     {
       "version": "0.1.0-alpha.692",
       "changes": [

package/dist/heart/daemon/cli-exec.js

@@ -7647,6 +7647,9 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
             throw new Error("work sentinel requires --agent <name>");
         const bundlesRoot = deps.bundlesRoot ?? (0, identity_1.getAgentBundlesRoot)();
         const agentRoot = deps.agentBundleRoot ?? path.join(bundlesRoot, `${command.agent}.ouro`);
+        if (command.kind === "work.sentinel.refresh") {
+            await (0, provider_credentials_1.refreshProviderCredentialPool)(command.agent, { preserveCachedOnFailure: true });
+        }
         const sentinel = command.kind === "work.sentinel.refresh"
             ? await refreshContextLossSentinel(command.agent, agentRoot, { trigger: "manual_cli", homeDir: deps.homeDir })
             : readContextLossSentinelView(agentRoot, { limit: 20 });
@@ -7885,6 +7888,7 @@ async function runOuroCli(args, deps = (0, cli_defaults_1.createDefaultOuroCliDe
             fetchImpl: deps.fetchImpl ?? fetch,
             socketPath: deps.socketPath,
             bundlesRoot: deps.bundlesRoot ?? (0, identity_1.getAgentBundlesRoot)(),
+            daemonLogsDir: path.join((0, ouro_version_manager_1.getOuroCliHome)(deps.homeDir), "daemon", "logs"),
             homedir: os.homedir(),
             envPath: process.env.PATH ?? "",
             platform: process.platform,

package/dist/heart/daemon/doctor.js

@@ -783,83 +783,106 @@ function computeSummary(categories) {
  * to answer the operator's question after the daemon has gone silent: "did
  * it crash? when did it last do anything? did it just upgrade?"
  *
- * Reads daemon.ndjson from the first available agent bundle (one daemon
- * serves all agents, so any agent's bundle has the shared log).
+ * Reads the machine-local daemon.ndjson when available, plus any
+ * bundle-local copies left by older runtimes. The newest parseable event
+ * is the liveness signal; stale bundle logs cannot mask a live daemon.
  */
 function checkLifecycle(deps) {
     const checks = [];
     const HOUR_MS = 60 * 60 * 1000;
     const STALE_THRESHOLD_MS = 5 * 60 * 1000;
-    const cutoff = Date.now() - HOUR_MS;
+    const now = Date.now();
+    const cutoff = now - HOUR_MS;
+    const logPaths = [];
+    const seenLogPaths = new Set();
+    const addLogPath = (candidate) => {
+        if (seenLogPaths.has(candidate) || !deps.existsSync(candidate))
+            return;
+        seenLogPaths.add(candidate);
+        logPaths.push(candidate);
+    };
+    if (deps.daemonLogsDir) {
+        addLogPath(`${deps.daemonLogsDir}/daemon.ndjson`);
+    }
     const agents = discoverAgents(deps);
-    let logPath = null;
     for (const agentDir of agents) {
-        const candidate = `${deps.bundlesRoot}/${agentDir}/state/daemon/logs/daemon.ndjson`;
-        if (deps.existsSync(candidate)) {
-            logPath = candidate;
-            break;
-        }
+        addLogPath(`${deps.bundlesRoot}/${agentDir}/state/daemon/logs/daemon.ndjson`);
     }
-    if (!logPath) {
-        checks.push({ label: "daemon log readable", status: "warn", detail: "no daemon.ndjson found in any agent bundle" });
+    if (logPaths.length === 0) {
+        checks.push({ label: "daemon log readable", status: "warn", detail: "no daemon.ndjson found in daemon or agent bundle logs" });
         return { name: "Lifecycle", checks };
     }
     let lastTs = null;
     let lastEvent = null;
+    let lastEventTimeMs = Number.NEGATIVE_INFINITY;
     let startCount = 0;
     let installCount = 0;
     let installVersions = [];
     let processErrors = [];
     let lastEntryAgeMs = Number.POSITIVE_INFINITY;
-    try {
-        // Read the whole log via deps.readFileSync, then take the tail. For a
-        // chatty daemon this can be a few MB; we only inspect the last 5000
-        // lines which is enough for the last hour of activity. If the file is
-        // small (typical case), reading it all is cheap.
-        const raw = deps.readFileSync(logPath);
-        const allLines = raw.split("\n").filter((l) => l.trim());
-        const usable = allLines.length > 5000 ? allLines.slice(-5000) : allLines;
-        for (const line of usable) {
-            let parsed;
-            try {
-                parsed = JSON.parse(line);
-            }
-            catch {
-                continue;
-            }
-            const ts = typeof parsed.ts === "string" ? parsed.ts : null;
-            const event = typeof parsed.event === "string" ? parsed.event : null;
-            if (!ts || !event)
-                continue;
-            const tsMs = Date.parse(ts);
-            if (Number.isNaN(tsMs))
-                continue;
-            lastTs = ts;
-            lastEvent = event;
-            lastEntryAgeMs = Math.min(lastEntryAgeMs, Date.now() - tsMs);
-            if (tsMs < cutoff)
-                continue;
-            if (event === "daemon.daemon_started")
-                startCount++;
-            if (event === "daemon.cli_version_install_end") {
-                installCount++;
-                const meta = parsed.meta;
-                const ver = typeof meta?.version === "string" ? meta.version : null;
-                if (ver)
-                    installVersions.push(ver);
-            }
-            if (event === "daemon.agent_process_error") {
-                const meta = parsed.meta;
-                const reason = typeof meta?.reason === "string" ? meta.reason : "unknown";
-                const agent = typeof meta?.agent === "string" ? meta.agent : "unknown";
-                processErrors.push(`${agent}: ${reason}`);
+    let readCount = 0;
+    const readErrors = [];
+    for (const logPath of logPaths) {
+        try {
+            // Read the whole log via deps.readFileSync, then take the tail. For a
+            // chatty daemon this can be a few MB; we only inspect the last 5000
+            // lines which is enough for the last hour of activity. If the file is
+            // small (typical case), reading it all is cheap.
+            const raw = deps.readFileSync(logPath);
+            readCount++;
+            const allLines = raw.split("\n").filter((l) => l.trim());
+            const usable = allLines.length > 5000 ? allLines.slice(-5000) : allLines;
+            for (const line of usable) {
+                let parsed;
+                try {
+                    parsed = JSON.parse(line);
+                }
+                catch {
+                    continue;
+                }
+                const ts = typeof parsed.ts === "string" ? parsed.ts : null;
+                const event = typeof parsed.event === "string" ? parsed.event : null;
+                if (!ts || !event)
+                    continue;
+                const tsMs = Date.parse(ts);
+                if (Number.isNaN(tsMs))
+                    continue;
+                if (tsMs > lastEventTimeMs) {
+                    lastEventTimeMs = tsMs;
+                    lastTs = ts;
+                    lastEvent = event;
+                    lastEntryAgeMs = Math.max(0, now - tsMs);
+                }
+                if (tsMs < cutoff)
+                    continue;
+                if (event === "daemon.daemon_started")
+                    startCount++;
+                if (event === "daemon.cli_version_install_end") {
+                    installCount++;
+                    const meta = parsed.meta;
+                    const ver = typeof meta?.version === "string" ? meta.version : null;
+                    if (ver)
+                        installVersions.push(ver);
+                }
+                if (event === "daemon.agent_process_error") {
+                    const meta = parsed.meta;
+                    const reason = typeof meta?.reason === "string" ? meta.reason : "unknown";
+                    const agent = typeof meta?.agent === "string" ? meta.agent : "unknown";
+                    processErrors.push(`${agent}: ${reason}`);
+                }
             }
         }
+        catch (error) {
+            readErrors.push(`${logPath}: ${error instanceof Error ? error.message : /* v8 ignore next -- non-Error throw is unreachable from deps.readFileSync (always Error) @preserve */ String(error)}`);
+        }
     }
-    catch (error) {
-        checks.push({ label: "daemon log readable", status: "fail", detail: `read failed: ${error instanceof Error ? error.message : /* v8 ignore next -- non-Error throw is unreachable from deps.readFileSync (always Error) @preserve */ String(error)}` });
+    if (readCount === 0) {
+        checks.push({ label: "daemon log readable", status: "fail", detail: `read failed: ${readErrors.join("; ")}` });
         return { name: "Lifecycle", checks };
     }
+    if (readErrors.length > 0) {
+        checks.push({ label: "daemon log readable", status: "warn", detail: `some daemon logs were unreadable: ${readErrors.join("; ")}` });
+    }
     if (lastTs === null) {
         checks.push({ label: "recent daemon activity", status: "warn", detail: "no parseable events in tail of daemon.ndjson" });
     }

package/package.json

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