@ouro.bot/cli 0.1.0-alpha.478 → 0.1.0-alpha.479

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.479",
+      "changes": [
+        "Hosted Outlook mailbox reads now stay on the visible recent slice instead of requesting 500 full hosted messages, so Slugger's live mailbox can load again after the large HEY archive import.",
+        "Hosted Blob mail reads and index backfills now use bounded fan-out plus per-blob timeouts, which keeps large Azure Blob sweeps from hanging forever when one request stalls.",
+        "Ouro Outlook now treats missing old private mail keys as recovery state instead of a full mailbox outage: readable mail still renders, undecryptable counts surface in recovery, and the wrapper stays version-synced for the hosted mail stability release."
+      ]
+    },
     {
       "version": "0.1.0-alpha.478",
       "changes": [

package/dist/heart/outlook/readers/mail.js

@@ -7,7 +7,7 @@ const file_store_1 = require("../../../mailroom/file-store");
 const reader_1 = require("../../../mailroom/reader");
 const core_1 = require("../../../mailroom/core");
 const OUTLOOK_MAIL_LIST_LIMIT = 50;
-const OUTLOOK_MAIL_COUNT_LIMIT = 500;
+const OUTLOOK_MAIL_SUMMARY_LIMIT = OUTLOOK_MAIL_LIST_LIMIT;
 const OUTLOOK_MAIL_BODY_LIMIT = 12_000;
 function emptyFolders() {
     return [
@@ -22,7 +22,7 @@ function emptyFolders() {
     ];
 }
 function emptyRecovery() {
-    return { discardedCount: 0, quarantineCount: 0 };
+    return { discardedCount: 0, quarantineCount: 0, undecryptableCount: 0, missingKeyIds: [] };
 }
 function unavailableMailView(agentName, status, error) {
     return {
@@ -81,6 +81,26 @@ function mailSummary(message) {
         provenance,
     };
 }
+function missingPrivateMailKeyId(error) {
+    const match = /^(?:Error: )?Missing private mail key ([^\s]+)$/.exec(String(error));
+    return match?.[1] ?? null;
+}
+function decryptVisibleMessages(messages, privateKeys) {
+    const decrypted = [];
+    const skipped = [];
+    for (const message of messages) {
+        try {
+            decrypted.push((0, file_store_1.decryptMessages)([message], privateKeys)[0]);
+        }
+        catch (error) {
+            const keyId = missingPrivateMailKeyId(error);
+            if (!keyId)
+                throw error;
+            skipped.push({ messageId: message.id, keyId });
+        }
+    }
+    return { decrypted, skipped };
+}
 function buildFolders(messages, outbound) {
     const folders = [
         { id: "imbox", label: "Imbox", count: messages.filter((message) => message.placement === "imbox").length },
@@ -188,10 +208,12 @@ function outboundRecord(record) {
         reason: record.reason,
     };
 }
-function buildRecovery(messages) {
+function buildRecovery(messages, skipped = []) {
     return {
         discardedCount: messages.filter((message) => message.placement === "discarded").length,
         quarantineCount: messages.filter((message) => message.placement === "quarantine").length,
+        undecryptableCount: skipped.length,
+        missingKeyIds: [...new Set(skipped.map((entry) => entry.keyId))].sort(),
     };
 }
 function accessEntries(entries) {
@@ -240,9 +262,9 @@ async function readMailView(agentName) {
         return unavailableMailView(agentName, status, resolved.error);
     }
     try {
-        const stored = await resolved.store.listMessages({ agentId: agentName, limit: OUTLOOK_MAIL_COUNT_LIMIT });
-        const decrypted = (0, file_store_1.decryptMessages)(stored, resolved.config.privateKeys);
-        const summaries = decrypted.map(mailSummary);
+        const stored = await resolved.store.listMessages({ agentId: agentName, limit: OUTLOOK_MAIL_SUMMARY_LIMIT });
+        const result = decryptVisibleMessages(stored, resolved.config.privateKeys);
+        const summaries = result.decrypted.map(mailSummary);
         const screener = (await resolved.store.listScreenerCandidates({ agentId: agentName, status: "pending", limit: 100 }))
             .map(screenerCandidate);
         const outbound = (await resolved.store.listMailOutbound(agentName)).map(outboundRecord);
@@ -266,7 +288,7 @@ async function readMailView(agentName) {
             messages: summaries.slice(0, OUTLOOK_MAIL_LIST_LIMIT),
             screener,
             outbound,
-            recovery: buildRecovery(summaries),
+            recovery: buildRecovery(summaries, result.skipped),
             accessLog,
             error: null,
         };

package/dist/mailroom/blob-store.js

@@ -8,7 +8,9 @@ const MESSAGE_INDEX_PREFIX = "message-index";
 const MESSAGE_INDEX_SORT_MAX_MS = 9_999_999_999_999;
 const MESSAGE_INDEX_SORT_WIDTH = 13;
 const MESSAGE_INDEX_NO_SOURCE = "~";
-const MESSAGE_INDEX_BACKFILL_CONCURRENCY = 16;
+const DEFAULT_BLOB_OPERATION_TIMEOUT_MS = 20_000;
+const DEFAULT_MESSAGE_FETCH_CONCURRENCY = 20;
+const DEFAULT_MESSAGE_INDEX_BACKFILL_CONCURRENCY = 8;
 const MESSAGE_LIST_SCAN_CONCURRENCY = 32;
 function compareNewestFirst(left, right) {
     return Date.parse(right.receivedAt) - Date.parse(left.receivedAt);
@@ -19,10 +21,88 @@ function compareCandidatesNewestFirst(left, right) {
 function blobText(value) {
     return Buffer.from(`${JSON.stringify(value, null, 2)}\n`, "utf-8");
 }
-async function downloadJson(blob) {
+function positiveInteger(value, fallback) {
+    if (typeof value !== "number" || !Number.isFinite(value))
+        return fallback;
+    const normalized = Math.floor(value);
+    return normalized > 0 ? normalized : fallback;
+}
+function blobClientName(blob) {
+    return typeof blob.name === "string" && blob.name.trim().length > 0 ? blob.name : "<unknown-blob>";
+}
+function timeoutSignal(timeoutMs) {
+    if (typeof AbortSignal.timeout === "function") {
+        return {
+            signal: AbortSignal.timeout(timeoutMs),
+            dispose() {
+                return undefined;
+            },
+        };
+    }
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(new Error(`The operation timed out after ${timeoutMs}ms`)), timeoutMs);
+    return {
+        signal: controller.signal,
+        dispose() {
+            clearTimeout(timer);
+        },
+    };
+}
+async function withBlobOperationTimeout(timeoutMs, operation) {
+    const timeout = timeoutSignal(timeoutMs);
+    try {
+        return await operation(timeout.signal);
+    }
+    finally {
+        timeout.dispose();
+    }
+}
+function normalizeBlobOperationError(action, blob, timeoutMs, error) {
+    const message = error instanceof Error ? error.message : String(error);
+    if ((error instanceof Error && error.name === "AbortError") || message.toLowerCase().includes("aborted")) {
+        return new Error(`${action} ${blobClientName(blob)} timed out after ${timeoutMs}ms`);
+    }
+    return new Error(`${action} ${blobClientName(blob)} failed: ${message}`);
+}
+async function downloadJson(blob, timeoutMs) {
     if (!await blob.exists())
         return null;
-    return JSON.parse((await blob.downloadToBuffer()).toString("utf-8"));
+    try {
+        const buffer = await withBlobOperationTimeout(timeoutMs, (abortSignal) => {
+            return blob.downloadToBuffer(undefined, undefined, { abortSignal });
+        });
+        return JSON.parse(buffer.toString("utf-8"));
+    }
+    catch (error) {
+        throw normalizeBlobOperationError("download", blob, timeoutMs, error);
+    }
+}
+async function uploadJson(blob, value, timeoutMs) {
+    try {
+        await withBlobOperationTimeout(timeoutMs, (abortSignal) => {
+            return blob.uploadData(blobText(value), { abortSignal });
+        });
+    }
+    catch (error) {
+        throw normalizeBlobOperationError("upload", blob, timeoutMs, error);
+    }
+}
+async function mapWithConcurrency(items, concurrency, worker) {
+    if (items.length === 0)
+        return [];
+    const results = new Array(items.length);
+    let nextIndex = 0;
+    const workerLoop = async () => {
+        while (true) {
+            const current = nextIndex;
+            nextIndex += 1;
+            if (current >= items.length)
+                return;
+            results[current] = await worker(items[current], current);
+        }
+    };
+    await Promise.all(Array.from({ length: Math.min(concurrency, items.length) }, async () => workerLoop()));
+    return results;
 }
 function encodeSourceToken(source) {
     return source ? encodeURIComponent(source.toLowerCase()) : MESSAGE_INDEX_NO_SOURCE;
@@ -94,10 +174,16 @@ function messageMatchesFilters(message, filters) {
 class AzureBlobMailroomStore {
     serviceClient;
     containerName;
+    blobOperationTimeoutMs;
+    messageFetchConcurrency;
+    backfillConcurrency;
     containerReady = null;
     constructor(options) {
         this.serviceClient = options.serviceClient;
         this.containerName = options.containerName;
+        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);
         (0, runtime_1.emitNervesEvent)({
             component: "senses",
             event: "senses.mail_blob_store_init",
@@ -136,7 +222,7 @@ class AzureBlobMailroomStore {
         return this.container.getBlockBlobClient(`outbound/${id}.json`);
     }
     async putMessageIndex(message) {
-        await this.messageIndexBlob(messageIndexBlobName(message)).uploadData(blobText(messageIndexRecord(message)));
+        await uploadJson(this.messageIndexBlob(messageIndexBlobName(message)), messageIndexRecord(message), this.blobOperationTimeoutMs);
     }
     async removeMessageIndex(message) {
         await this.messageIndexBlob(messageIndexBlobName(message)).deleteIfExists();
@@ -153,7 +239,7 @@ class AzureBlobMailroomStore {
             while (nextIndex < messageBlobNames.length) {
                 const current = messageBlobNames[nextIndex];
                 nextIndex += 1;
-                const message = await downloadJson(this.container.getBlockBlobClient(current));
+                const message = await downloadJson(this.container.getBlockBlobClient(current), this.blobOperationTimeoutMs);
                 if (!message || !messageMatchesFilters(message, filters))
                     continue;
                 matches.push(message);
@@ -179,7 +265,9 @@ class AzureBlobMailroomStore {
         }
         if (!sawIndex)
             return null;
-        return (await Promise.all(messageIds.map(async (id) => downloadJson(this.messageBlob(id)))))
+        return (await mapWithConcurrency(messageIds, this.messageFetchConcurrency, async (id) => {
+            return downloadJson(this.messageBlob(id), this.blobOperationTimeoutMs);
+        }))
             .filter((message) => message !== null)
             .filter((message) => messageMatchesFilters(message, filters))
             .sort(compareNewestFirst)
@@ -192,21 +280,31 @@ class AzureBlobMailroomStore {
             messageBlobNames.push(item.name);
         }
         let indexed = 0;
+        const failures = [];
         let nextIndex = 0;
         const worker = async () => {
             while (nextIndex < messageBlobNames.length) {
                 const current = messageBlobNames[nextIndex];
                 nextIndex += 1;
-                const message = await downloadJson(this.container.getBlockBlobClient(current));
-                if (!message)
-                    continue;
-                if (agentId && message.agentId !== agentId)
-                    continue;
-                await this.messageIndexBlob(messageIndexBlobName(message)).uploadData(blobText(messageIndexRecord(message)));
-                indexed += 1;
+                try {
+                    const message = await downloadJson(this.container.getBlockBlobClient(current), this.blobOperationTimeoutMs);
+                    if (!message)
+                        continue;
+                    if (agentId && message.agentId !== agentId)
+                        continue;
+                    await uploadJson(this.messageIndexBlob(messageIndexBlobName(message)), messageIndexRecord(message), this.blobOperationTimeoutMs);
+                    indexed += 1;
+                }
+                catch (error) {
+                    failures.push(error instanceof Error ? error.message : String(error));
+                }
             }
         };
-        await Promise.all(Array.from({ length: Math.min(MESSAGE_INDEX_BACKFILL_CONCURRENCY, Math.max(messageBlobNames.length, 1)) }, async () => worker()));
+        await Promise.all(Array.from({ length: Math.min(this.backfillConcurrency, Math.max(messageBlobNames.length, 1)) }, async () => worker()));
+        if (failures.length > 0) {
+            const sample = failures.slice(0, 3).join("; ");
+            throw new Error(`hosted message index backfill incomplete after indexing ${indexed} message(s); ${failures.length} blob operation(s) failed. first failure(s): ${sample}. rerun the command to retry remaining messages.`);
+        }
         (0, runtime_1.emitNervesEvent)({
             component: "senses",
             event: "senses.mail_blob_index_backfilled",
@@ -218,7 +316,7 @@ class AzureBlobMailroomStore {
     async putRawMessage(input) {
         await this.ensureContainer();
         const { message, rawPayload, candidate } = await (0, core_1.buildStoredMailMessage)(input);
-        const existing = await downloadJson(this.messageBlob(message.id));
+        const existing = await downloadJson(this.messageBlob(message.id), this.blobOperationTimeoutMs);
         if (existing) {
             await this.putMessageIndex(existing);
             (0, runtime_1.emitNervesEvent)({
@@ -245,7 +343,7 @@ class AzureBlobMailroomStore {
     }
     async getMessage(id) {
         await this.ensureContainer();
-        const message = await downloadJson(this.messageBlob(id));
+        const message = await downloadJson(this.messageBlob(id), this.blobOperationTimeoutMs);
         (0, runtime_1.emitNervesEvent)({
             component: "senses",
             event: "senses.mail_blob_store_message_read",
@@ -273,7 +371,7 @@ class AzureBlobMailroomStore {
     async updateMessagePlacement(id, placement) {
         await this.ensureContainer();
         const blob = this.messageBlob(id);
-        const message = await downloadJson(blob);
+        const message = await downloadJson(blob, this.blobOperationTimeoutMs);
         if (!message) {
             (0, runtime_1.emitNervesEvent)({
                 component: "senses",
@@ -297,7 +395,7 @@ class AzureBlobMailroomStore {
     }
     async readRawPayload(objectName) {
         await this.ensureContainer();
-        const payload = await downloadJson(this.rawBlob(objectName));
+        const payload = await downloadJson(this.rawBlob(objectName), this.blobOperationTimeoutMs);
         (0, runtime_1.emitNervesEvent)({
             component: "senses",
             event: "senses.mail_blob_store_raw_read",
@@ -324,7 +422,7 @@ class AzureBlobMailroomStore {
         await this.ensureContainer();
         const candidates = [];
         for await (const item of this.container.listBlobsFlat({ prefix: "candidates/" })) {
-            const candidate = await downloadJson(this.container.getBlockBlobClient(item.name));
+            const candidate = await downloadJson(this.container.getBlockBlobClient(item.name), this.blobOperationTimeoutMs);
             if (candidate)
                 candidates.push(candidate);
         }
@@ -351,7 +449,7 @@ class AzureBlobMailroomStore {
             createdAt: entry.createdAt ?? new Date().toISOString(),
         };
         const blob = this.decisionsBlob(entry.agentId);
-        const existing = await downloadJson(blob).catch(() => null);
+        const existing = await downloadJson(blob, this.blobOperationTimeoutMs).catch(() => null);
         const entries = Array.isArray(existing) ? existing : [];
         entries.push(complete);
         await blob.uploadData(blobText(entries));
@@ -365,7 +463,7 @@ class AzureBlobMailroomStore {
     }
     async listMailDecisions(agentId) {
         await this.ensureContainer();
-        const entries = await downloadJson(this.decisionsBlob(agentId));
+        const entries = await downloadJson(this.decisionsBlob(agentId), this.blobOperationTimeoutMs);
         const safeEntries = Array.isArray(entries) ? entries : [];
         (0, runtime_1.emitNervesEvent)({
             component: "senses",
@@ -388,7 +486,7 @@ class AzureBlobMailroomStore {
     }
     async getMailOutbound(id) {
         await this.ensureContainer();
-        const record = await downloadJson(this.outboundBlob(id));
+        const record = await downloadJson(this.outboundBlob(id), this.blobOperationTimeoutMs);
         (0, runtime_1.emitNervesEvent)({
             component: "senses",
             event: "senses.mail_blob_outbound_record_read",
@@ -401,7 +499,7 @@ class AzureBlobMailroomStore {
         await this.ensureContainer();
         const records = [];
         for await (const item of this.container.listBlobsFlat({ prefix: "outbound/" })) {
-            const record = await downloadJson(this.container.getBlockBlobClient(item.name));
+            const record = await downloadJson(this.container.getBlockBlobClient(item.name), this.blobOperationTimeoutMs);
             if (record)
                 records.push(record);
         }
@@ -424,7 +522,7 @@ class AzureBlobMailroomStore {
             accessedAt: new Date().toISOString(),
         };
         const blob = this.accessLogBlob(entry.agentId);
-        const existing = await downloadJson(blob).catch(() => null);
+        const existing = await downloadJson(blob, this.blobOperationTimeoutMs).catch(() => null);
         const entries = Array.isArray(existing) ? existing : [];
         entries.push(complete);
         await blob.uploadData(blobText(entries));
@@ -438,7 +536,7 @@ class AzureBlobMailroomStore {
     }
     async listAccessLog(agentId) {
         await this.ensureContainer();
-        const entries = await downloadJson(this.accessLogBlob(agentId));
+        const entries = await downloadJson(this.accessLogBlob(agentId), this.blobOperationTimeoutMs);
         const safeEntries = Array.isArray(entries) ? entries : [];
         (0, runtime_1.emitNervesEvent)({
             component: "senses",