@ouro.bot/cli 0.1.0-alpha.539 → 0.1.0-alpha.540

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.540",
+      "changes": [
+        "Runtime prompt rendering, MCP child-process startup, and BlueBubbles recovery now repair a deleted process cwd back to the runtime root instead of failing with `uv_cwd` after a transient worktree disappears.",
+        "BlueBubbles captured-inbound recovery now has regression coverage proving a stuck iMessage recovery item can replay successfully even when the daemon inherited a vanished working directory."
+      ]
+    },
     {
       "version": "0.1.0-alpha.539",
       "changes": [

package/dist/heart/runtime-cwd.js

@@ -0,0 +1,87 @@
+"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.recoverRuntimeCwd = recoverRuntimeCwd;
+const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
+const runtime_1 = require("../nerves/runtime");
+function defaultRuntimeRoot() {
+    return path.resolve(__dirname, "../..");
+}
+const defaultDeps = {
+    cwd: process.cwd.bind(process),
+    chdir: process.chdir.bind(process),
+    existsSync: fs.existsSync,
+};
+function recoverRuntimeCwd(fallback = defaultRuntimeRoot(), deps = defaultDeps) {
+    try {
+        return deps.cwd();
+    }
+    catch (error) {
+        const reason = error instanceof Error ? error.message : String(error);
+        let recovered = false;
+        let resolved = fallback;
+        let repairReason;
+        try {
+            if (deps.existsSync(fallback)) {
+                deps.chdir(fallback);
+                resolved = deps.cwd();
+                recovered = true;
+            }
+            else {
+                repairReason = "fallback cwd does not exist";
+            }
+        }
+        catch (repairError) {
+            repairReason = repairError instanceof Error ? repairError.message : String(repairError);
+        }
+        (0, runtime_1.emitNervesEvent)({
+            level: recovered ? "warn" : "error",
+            component: "heart",
+            event: "heart.cwd_recovery",
+            message: recovered
+                ? "recovered process cwd after the previous working directory disappeared"
+                : "process cwd disappeared and could not be repaired automatically",
+            meta: {
+                reason,
+                fallback,
+                resolved,
+                recovered,
+                ...(repairReason ? { repairReason } : {}),
+            },
+        });
+        return resolved;
+    }
+}

package/dist/mailroom/blob-store.js

@@ -229,6 +229,7 @@ function messageMatchesFilters(message, filters) {
 class AzureBlobMailroomStore {
     serviceClient;
     containerName;
+    mailSearchCache;
     blobOperationTimeoutMs;
     messageFetchConcurrency;
     backfillConcurrency;
@@ -236,6 +237,7 @@ class AzureBlobMailroomStore {
     constructor(options) {
         this.serviceClient = options.serviceClient;
         this.containerName = options.containerName;
+        this.mailSearchCache = options.mailSearchCache ?? null;
         this.blobOperationTimeoutMs = positiveInteger(options.blobOperationTimeoutMs, DEFAULT_BLOB_OPERATION_TIMEOUT_MS);
         this.messageFetchConcurrency = positiveInteger(options.messageFetchConcurrency, DEFAULT_MESSAGE_FETCH_CONCURRENCY);
         this.backfillConcurrency = positiveInteger(options.backfillConcurrency, DEFAULT_MESSAGE_INDEX_BACKFILL_CONCURRENCY);
@@ -282,6 +284,16 @@ class AzureBlobMailroomStore {
     async removeMessageIndex(message) {
         await this.messageIndexBlob(messageIndexBlobName(message)).deleteIfExists();
     }
+    upsertMailSearchCache(message, privateEnvelope) {
+        if (!this.mailSearchCache)
+            return;
+        (0, search_cache_1.upsertMailSearchCacheDocument)(message, privateEnvelope, this.mailSearchCache);
+    }
+    syncMailSearchCache(message) {
+        if (!this.mailSearchCache)
+            return;
+        (0, search_cache_1.syncMailSearchCacheMetadata)(message, this.mailSearchCache);
+    }
     async listMessagesLegacy(filters) {
         const messageBlobNames = [];
         for await (const item of this.container.listBlobsFlat({ prefix: "messages/" })) {
@@ -413,7 +425,7 @@ class AzureBlobMailroomStore {
             throw error;
         }
         if (existing) {
-            (0, search_cache_1.upsertMailSearchCacheDocument)(existing, privateEnvelope);
+            this.upsertMailSearchCache(existing, privateEnvelope);
             await this.putMessageIndex(existing);
             (0, runtime_1.emitNervesEvent)({
                 component: "senses",
@@ -426,7 +438,7 @@ class AzureBlobMailroomStore {
         await this.rawBlob(message.rawObject).uploadData(blobText(rawPayload));
         await this.messageBlob(message.id).uploadData(blobText(message));
         await this.putMessageIndex(message);
-        (0, search_cache_1.upsertMailSearchCacheDocument)(message, privateEnvelope);
+        this.upsertMailSearchCache(message, privateEnvelope);
         if (candidate) {
             await this.candidateBlob(candidate.id).uploadData(blobText(candidate));
         }
@@ -493,7 +505,7 @@ class AzureBlobMailroomStore {
         await blob.uploadData(blobText(updated));
         await this.removeMessageIndex(message);
         await this.putMessageIndex(updated);
-        (0, search_cache_1.syncMailSearchCacheMetadata)(updated);
+        this.syncMailSearchCache(updated);
         (0, runtime_1.emitNervesEvent)({
             component: "senses",
             event: "senses.mail_blob_store_message_placement_updated",

package/dist/mailroom/file-store.js

@@ -74,8 +74,12 @@ function sourceMatchesFilter(source, filter) {
 }
 class FileMailroomStore {
     rootDir;
+    mailSearchCache;
     constructor(options) {
         this.rootDir = options.rootDir;
+        this.mailSearchCache = options.mailSearchCache ?? {
+            cacheDirForAgent: () => path.resolve(this.rootDir, "..", "mail-search"),
+        };
         ensureDir(this.messagesDir);
         ensureDir(this.rawDir);
         ensureDir(this.logsDir);
@@ -129,7 +133,7 @@ class FileMailroomStore {
         const { message, rawPayload, privateEnvelope, candidate } = await (0, core_1.buildStoredMailMessage)(input);
         const existing = readJson(this.messagePath(message.id));
         if (existing) {
-            (0, search_cache_1.upsertMailSearchCacheDocument)(existing, privateEnvelope);
+            (0, search_cache_1.upsertMailSearchCacheDocument)(existing, privateEnvelope, this.mailSearchCache);
             (0, runtime_1.emitNervesEvent)({
                 component: "senses",
                 event: "senses.mail_store_dedupe",
@@ -140,7 +144,7 @@ class FileMailroomStore {
         }
         writeJson(this.rawPath(message.rawObject), rawPayload);
         writeJson(this.messagePath(message.id), message);
-        (0, search_cache_1.upsertMailSearchCacheDocument)(message, privateEnvelope);
+        (0, search_cache_1.upsertMailSearchCacheDocument)(message, privateEnvelope, this.mailSearchCache);
         if (candidate) {
             writeJson(this.candidatePath(candidate.id), candidate);
         }
@@ -194,7 +198,7 @@ class FileMailroomStore {
         }
         const updated = { ...message, placement };
         writeJson(this.messagePath(id), updated);
-        (0, search_cache_1.syncMailSearchCacheMetadata)(updated);
+        (0, search_cache_1.syncMailSearchCacheMetadata)(updated, this.mailSearchCache);
         (0, runtime_1.emitNervesEvent)({
             component: "senses",
             event: "senses.mail_store_message_placement_updated",

package/dist/mailroom/reader.js

@@ -118,6 +118,9 @@ function createMailroomStore(config, agentName) {
             store: new blob_store_1.AzureBlobMailroomStore({
                 serviceClient: new storage_blob_1.BlobServiceClient(config.azureAccountUrl, createBlobCredential(config)),
                 containerName,
+                mailSearchCache: {
+                    cacheDirForAgent: (agentId) => path.join((0, identity_2.getAgentRoot)(agentId), "state", "mail-search"),
+                },
             }),
             storeKind: "azure-blob",
             storeLabel: `${config.azureAccountUrl}/${containerName}`,

package/dist/mailroom/search-cache.js

@@ -50,14 +50,18 @@ const search_relevance_1 = require("./search-relevance");
 const SEARCH_TEXT_EXCERPT_LIMIT = 16_384;
 exports.MAIL_SEARCH_TEXT_PROJECTION_VERSION = 2;
 const cacheStates = new Map();
-function cacheDir(agentId) {
+function defaultCacheDir(agentId) {
     return path.join((0, identity_1.getAgentRoot)(agentId), "state", "mail-search");
 }
-function cachePath(agentId, messageId) {
-    return path.join(cacheDir(agentId), `${messageId}.json`);
+function cacheDir(agentId, options = {}) {
+    const resolve = options.cacheDirForAgent ?? defaultCacheDir;
+    return resolve(agentId);
 }
-function coverageDir(agentId) {
-    return path.join(cacheDir(agentId), "coverage");
+function cachePath(agentId, messageId, options) {
+    return path.join(cacheDir(agentId, options), `${messageId}.json`);
+}
+function coverageDir(agentId, options) {
+    return path.join(cacheDir(agentId, options), "coverage");
 }
 function normalizedCoverageKey(key) {
     return {
@@ -68,10 +72,10 @@ function normalizedCoverageKey(key) {
         ...(key.source ? { source: key.source.toLowerCase() } : {}),
     };
 }
-function coveragePath(key) {
+function coveragePath(key, options) {
     const normalized = normalizedCoverageKey(key);
     const encoded = Buffer.from(JSON.stringify(normalized)).toString("base64url");
-    return path.join(coverageDir(normalized.agentId), `${encoded}.json`);
+    return path.join(coverageDir(normalized.agentId, options), `${encoded}.json`);
 }
 function normalizeSearchText(privateEnvelope) {
     const readableText = (0, core_1.privateMailEnvelopeReadableText)(privateEnvelope);
@@ -90,8 +94,8 @@ function readJsonDocument(filePath) {
         return null;
     }
 }
-function cacheState(agentId) {
-    const key = `${agentId}:${cacheDir(agentId)}`;
+function cacheState(agentId, options) {
+    const key = `${agentId}:${cacheDir(agentId, options)}`;
     let state = cacheStates.get(key);
     if (state)
         return state;
@@ -99,12 +103,12 @@ function cacheState(agentId) {
     cacheStates.set(key, state);
     return state;
 }
-function loadCache(agentId) {
-    const state = cacheState(agentId);
+function loadCache(agentId, options) {
+    const state = cacheState(agentId, options);
     if (state.loaded)
         return state.docs;
     state.loaded = true;
-    const dir = cacheDir(agentId);
+    const dir = cacheDir(agentId, options);
     if (!fs.existsSync(dir))
         return state.docs;
     for (const entry of fs.readdirSync(dir)) {
@@ -138,12 +142,12 @@ function buildMailSearchCacheDocument(message, privateEnvelope) {
         attachmentCount: privateEnvelope.attachments.length,
     };
 }
-function upsertMailSearchCacheDocument(message, privateEnvelope) {
+function upsertMailSearchCacheDocument(message, privateEnvelope, options) {
     const document = buildMailSearchCacheDocument(message, privateEnvelope);
-    const dir = cacheDir(message.agentId);
+    const dir = cacheDir(message.agentId, options);
     fs.mkdirSync(dir, { recursive: true });
-    fs.writeFileSync(cachePath(message.agentId, message.id), `${JSON.stringify(document)}\n`, "utf-8");
-    const state = cacheState(message.agentId);
+    fs.writeFileSync(cachePath(message.agentId, message.id, options), `${JSON.stringify(document)}\n`, "utf-8");
+    const state = cacheState(message.agentId, options);
     if (state.loaded)
         state.docs.set(document.messageId, document);
     (0, runtime_1.emitNervesEvent)({
@@ -159,8 +163,8 @@ function upsertMailSearchCacheDocument(message, privateEnvelope) {
     });
     return document;
 }
-function syncMailSearchCacheMetadata(message) {
-    const existing = readJsonDocument(cachePath(message.agentId, message.id));
+function syncMailSearchCacheMetadata(message, options) {
+    const existing = readJsonDocument(cachePath(message.agentId, message.id, options));
     if (!existing)
         return;
     const updated = {
@@ -171,8 +175,8 @@ function syncMailSearchCacheMetadata(message) {
         ...(message.ownerEmail ? { ownerEmail: message.ownerEmail } : {}),
         ...(message.source ? { source: message.source } : {}),
     };
-    fs.writeFileSync(cachePath(message.agentId, message.id), `${JSON.stringify(updated)}\n`, "utf-8");
-    const state = cacheState(message.agentId);
+    fs.writeFileSync(cachePath(message.agentId, message.id, options), `${JSON.stringify(updated)}\n`, "utf-8");
+    const state = cacheState(message.agentId, options);
     if (state.loaded)
         state.docs.set(updated.messageId, updated);
 }
@@ -183,9 +187,9 @@ function sourceMatches(source, filter) {
         return false;
     return source.toLowerCase() === filter.toLowerCase();
 }
-function searchMailSearchCache(filters) {
+function searchMailSearchCache(filters, options) {
     const queryTerms = filters.queryTerms ?? [];
-    const docs = [...loadCache(filters.agentId).values()]
+    const docs = [...loadCache(filters.agentId, options).values()]
         .filter((document) => filters.placement ? document.placement === filters.placement : true)
         .filter((document) => filters.compartmentKind ? document.compartmentKind === filters.compartmentKind : true)
         .filter((document) => sourceMatches(document.source, filters.source))
@@ -204,8 +208,8 @@ function searchMailSearchCache(filters) {
     }
     return typeof filters.limit === "number" ? ordered.slice(0, filters.limit) : ordered;
 }
-function readMailSearchCoverageRecord(key) {
-    const document = readJsonDocument(coveragePath(key));
+function readMailSearchCoverageRecord(key, options) {
+    const document = readJsonDocument(coveragePath(key, options));
     if (!document || document.schemaVersion !== 1 || document.agentId !== key.agentId)
         return null;
     const normalized = normalizedCoverageKey(key);
@@ -214,7 +218,7 @@ function readMailSearchCoverageRecord(key) {
         return null;
     return document;
 }
-function writeMailSearchCoverageRecord(record) {
+function writeMailSearchCoverageRecord(record, options) {
     const normalized = normalizedCoverageKey(record);
     const document = {
         schemaVersion: 1,
@@ -229,8 +233,8 @@ function writeMailSearchCoverageRecord(record) {
         ...(record.oldestReceivedAt ? { oldestReceivedAt: record.oldestReceivedAt } : {}),
         ...(record.newestReceivedAt ? { newestReceivedAt: record.newestReceivedAt } : {}),
     };
-    fs.mkdirSync(coverageDir(document.agentId), { recursive: true });
-    fs.writeFileSync(coveragePath(document), `${JSON.stringify(document)}\n`, "utf-8");
+    fs.mkdirSync(coverageDir(document.agentId, options), { recursive: true });
+    fs.writeFileSync(coveragePath(document, options), `${JSON.stringify(document)}\n`, "utf-8");
     (0, runtime_1.emitNervesEvent)({
         component: "senses",
         event: "senses.mail_search_coverage_written",

package/dist/mind/prompt.js

@@ -66,6 +66,7 @@ const ouro_version_manager_1 = require("../heart/versioning/ouro-version-manager
 const tools_1 = require("../repertoire/tools");
 const skills_1 = require("../repertoire/skills");
 const identity_1 = require("../heart/identity");
+const runtime_cwd_1 = require("../heart/runtime-cwd");
 const config_1 = require("../heart/config");
 const runtime_credentials_1 = require("../heart/runtime-credentials");
 const runtime_mode_1 = require("../heart/daemon/runtime-mode");
@@ -380,7 +381,7 @@ function runtimeInfoSection(channel, options) {
     const sourceRoot = (0, identity_1.getRepoRoot)();
     lines.push(`source root: ${sourceRoot}`);
     lines.push(`runtime mode: ${(0, runtime_mode_1.detectRuntimeMode)(sourceRoot)}`);
-    lines.push(`cwd: ${process.cwd()}`);
+    lines.push(`cwd: ${(0, runtime_cwd_1.recoverRuntimeCwd)(sourceRoot)}`);
     lines.push(`channel: ${channel}`);
     lines.push(`current sense: ${channel}`);
     lines.push(`process type: ${processTypeLabel(channel)}`);

package/dist/repertoire/mcp-client.js

@@ -5,6 +5,7 @@ exports.isMcpTransportError = isMcpTransportError;
 const child_process_1 = require("child_process");
 const readline_1 = require("readline");
 const runtime_1 = require("../nerves/runtime");
+const runtime_cwd_1 = require("../heart/runtime-cwd");
 const MCP_PROTOCOL_VERSION = "2024-11-05";
 const DEFAULT_REQUEST_TIMEOUT = 10_000;
 const DEFAULT_TOOL_CALL_TIMEOUT = 30_000;
@@ -43,10 +44,11 @@ class McpClient {
             meta: { command: this.config.command },
         });
         const env = { ...process.env, ...this.config.env };
+        const spawnCwd = this.config.cwd ?? (0, runtime_cwd_1.recoverRuntimeCwd)();
         this.process = (0, child_process_1.spawn)(this.config.command, this.config.args ?? [], {
             env,
             stdio: ["pipe", "pipe", "pipe"],
-            cwd: this.config.cwd,
+            cwd: spawnCwd,
         });
         this.setupLineReader();
         this.setupProcessHandlers();

package/dist/senses/bluebubbles/index.js

@@ -55,6 +55,7 @@ const path = __importStar(require("node:path"));
 const core_1 = require("../../heart/core");
 const config_1 = require("../../heart/config");
 const identity_1 = require("../../heart/identity");
+const runtime_cwd_1 = require("../../heart/runtime-cwd");
 const turn_coordinator_1 = require("../../heart/turn-coordinator");
 const context_1 = require("../../mind/context");
 const tokens_1 = require("../../mind/friends/tokens");
@@ -759,6 +760,7 @@ async function shouldFilterAgentSelfHandle(event, resolvedDeps) {
 async function handleBlueBubblesNormalizedEvent(event, resolvedDeps, source, options = {}) {
     const client = resolvedDeps.createClient();
     const agentName = resolvedDeps.getAgentName();
+    (0, runtime_cwd_1.recoverRuntimeCwd)();
     if (event.fromMe) {
         (0, runtime_1.emitNervesEvent)({
             component: "senses",

package/package.json

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