@ouro.bot/cli 0.1.0-alpha.379 → 0.1.0-alpha.380

package/changelog.json

@@ -1,6 +1,14 @@
 {
   "_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.380",
+      "changes": [
+        "Daemon startup now supplements pidfile cleanup with the scoped orphan-process scan, so a partial stale pidfile cannot leave an older daemon process alive after `ouro up` replaces the runtime.",
+        "`ouro status` now keeps vault runtime/config failures compact in sense rows, replacing multi-line vault-lock explanations with a direct `ouro vault unlock --agent <agent>` hint.",
+        "`@ouro.bot/cli` and the `ouro.bot` wrapper are version-synced for the daemon/status polish release."
+      ]
+    },
     {
       "version": "0.1.0-alpha.379",
       "changes": [

package/dist/heart/daemon/daemon.js

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OuroDaemon = void 0;
 exports.parseOrphanPidsFromPs = parseOrphanPidsFromPs;
 exports.filterPidfilePidsToActualOrphans = filterPidfilePidsToActualOrphans;
+exports.mergeUniqueOrphanPids = mergeUniqueOrphanPids;
 exports.killOrphanProcesses = killOrphanProcesses;
 exports.writePidfile = writePidfile;
 exports.handleAgentSenseTurn = handleAgentSenseTurn;
@@ -162,6 +163,19 @@ function filterPidfilePidsToActualOrphans(candidatePids, psRunner = runPsCheck)
     }
     return survivingOrphans;
 }
+function mergeUniqueOrphanPids(...sources) {
+    const merged = [];
+    const seen = new Set();
+    for (const source of sources) {
+        for (const pid of source) {
+            if (seen.has(pid))
+                continue;
+            seen.add(pid);
+            merged.push(pid);
+        }
+    }
+    return merged;
+}
 /* v8 ignore start -- shells out to ps; covered by filterPidfilePidsToActualOrphans unit tests via injected runner @preserve */
 function runPsCheck(pids) {
     try {
@@ -203,7 +217,8 @@ function killOrphanProcesses() {
         return;
     }
     try {
-        let pidsToKill = [];
+        let pidfileOrphans = [];
+        let scanOrphans = [];
         // Primary: read pidfile from previous daemon
         try {
             const raw = fs.readFileSync(PIDFILE_PATH, "utf-8");
@@ -212,19 +227,21 @@ function killOrphanProcesses() {
                 .filter((n) => !isNaN(n) && n !== process.pid);
             // Verify each candidate is an actual live orphan before killing. See
             // docstring above for why this matters.
-            pidsToKill = filterPidfilePidsToActualOrphans(candidates);
+            pidfileOrphans = filterPidfilePidsToActualOrphans(candidates);
             fs.unlinkSync(PIDFILE_PATH);
         }
         catch {
-            // No pidfile — fall back to ps scan (scoped to orphans with PPID=1).
+            // No pidfile — the ps scan below still covers true orphans.
         }
-        if (pidsToKill.length === 0) {
-            try {
-                const result = (0, child_process_1.execSync)("ps -eo pid,ppid,command", { encoding: "utf-8", timeout: 5000 });
-                pidsToKill = parseOrphanPidsFromPs(result, process.pid);
-            }
-            catch { /* ps failed — best effort */ }
+        // Always supplement the pidfile with the scoped ps scan. A stale or
+        // partial pidfile can otherwise kill one old daemon while leaving a
+        // sibling PPID=1 daemon alive without a socket.
+        try {
+            const result = (0, child_process_1.execSync)("ps -eo pid,ppid,command", { encoding: "utf-8", timeout: 5000 });
+            scanOrphans = parseOrphanPidsFromPs(result, process.pid);
         }
+        catch { /* ps failed — best effort */ }
+        const pidsToKill = mergeUniqueOrphanPids(pidfileOrphans, scanOrphans);
         if (pidsToKill.length > 0) {
             for (const pid of pidsToKill) {
                 try {

package/dist/heart/daemon/sense-manager.js

@@ -96,6 +96,20 @@ function numberField(record, key, fallback) {
     const value = record?.[key];
     return typeof value === "number" && Number.isFinite(value) ? value : fallback;
 }
+function compactRuntimeConfigError(agent, error) {
+    const compact = error.replace(/\s+/g, " ").trim();
+    if (/credential vault is locked|vault locked|vault is locked/i.test(compact)) {
+        return `vault locked; run 'ouro vault unlock --agent ${agent}'`;
+    }
+    return compact || "unavailable";
+}
+function runtimeConfigUnavailableDetail(agent, runtimeConfig) {
+    if (runtimeConfig.ok)
+        return "";
+    if (runtimeConfig.reason === "missing")
+        return `missing vault runtime/config (${agent})`;
+    return `vault runtime/config unavailable (${compactRuntimeConfigError(agent, runtimeConfig.error)})`;
+}
 function senseFactsFromRuntimeConfig(agent, senses, runtimeConfig) {
     const base = {
         cli: { configured: true, detail: "local interactive terminal" },
@@ -103,11 +117,7 @@ function senseFactsFromRuntimeConfig(agent, senses, runtimeConfig) {
         bluebubbles: { configured: false, detail: "not enabled in agent.json" },
     };
     const payload = runtimeConfig.ok ? runtimeConfig.config : {};
-    const unavailableDetail = runtimeConfig.ok
-        ? ""
-        : runtimeConfig.reason === "missing"
-            ? `missing vault runtime/config (${agent})`
-            : `vault runtime/config unavailable (${runtimeConfig.error})`;
+    const unavailableDetail = runtimeConfigUnavailableDetail(agent, runtimeConfig);
     const teams = payload.teams;
     const teamsChannel = payload.teamsChannel;
     const bluebubbles = payload.bluebubbles;

package/package.json

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