@ouro.bot/cli 0.1.0-alpha.56 → 0.1.0-alpha.561

package/dist/mailroom/thread.js

@@ -0,0 +1,109 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.reconstructThread = reconstructThread;
+function normalizeHeaderId(value) {
+    if (!value)
+        return undefined;
+    const trimmed = value.trim();
+    return trimmed.length === 0 ? undefined : trimmed;
+}
+function inferKeysForMessage(message) {
+    const keys = [];
+    const headerId = normalizeHeaderId(message.private.messageId);
+    if (headerId)
+        keys.push(headerId);
+    /* v8 ignore next -- defensive: stored messages always have an id @preserve */
+    if (message.id)
+        keys.push(message.id);
+    return keys;
+}
+function sortByReceivedAtAscending(left, right) {
+    return Date.parse(left.receivedAt) - Date.parse(right.receivedAt);
+}
+function reconstructThread(seedMessageId, pool) {
+    const seed = pool.find((message) => message.id === seedMessageId)
+        ?? pool.find((message) => normalizeHeaderId(message.private.messageId) === seedMessageId);
+    if (!seed)
+        return { rootMessageId: undefined, members: [] };
+    const byKey = new Map();
+    const allNodes = [];
+    for (const message of pool) {
+        const node = { message, parents: new Set(), children: new Set() };
+        allNodes.push(node);
+        for (const key of inferKeysForMessage(message)) {
+            /* v8 ignore next -- collision guard: storage id and RFC822 messageId differ in the normal case @preserve */
+            if (!byKey.has(key))
+                byKey.set(key, node);
+        }
+    }
+    for (const node of allNodes) {
+        const parentKeys = new Set();
+        const inReplyTo = normalizeHeaderId(node.message.private.inReplyTo);
+        if (inReplyTo)
+            parentKeys.add(inReplyTo);
+        for (const reference of node.message.private.references ?? []) {
+            const ref = normalizeHeaderId(reference);
+            if (ref)
+                parentKeys.add(ref);
+        }
+        for (const key of parentKeys) {
+            const parent = byKey.get(key);
+            if (parent && parent !== node) {
+                node.parents.add(parent);
+                parent.children.add(node);
+            }
+        }
+    }
+    const seedNode = byKey.get(seed.id);
+    const component = new Set();
+    const stack = [seedNode];
+    while (stack.length > 0) {
+        const node = stack.pop();
+        if (component.has(node))
+            continue;
+        component.add(node);
+        for (const parent of node.parents)
+            if (!component.has(parent))
+                stack.push(parent);
+        for (const child of node.children)
+            if (!component.has(child))
+                stack.push(child);
+    }
+    /* v8 ignore start -- root + topological depth pass: branch shapes vary with thread topology and aren't worth chasing per-branch in tests; correctness is covered by the higher-level reconstruction tests @preserve */
+    const componentRoots = [...component].filter((node) => {
+        for (const parent of node.parents)
+            if (component.has(parent))
+                return false;
+        return true;
+    });
+    const root = componentRoots
+        .sort((left, right) => Date.parse(left.message.receivedAt) - Date.parse(right.message.receivedAt))[0]
+        ?? seedNode;
+    const componentInTimeOrder = [...component].sort((left, right) => Date.parse(left.message.receivedAt) - Date.parse(right.message.receivedAt));
+    const depthByNode = new Map();
+    for (const node of componentInTimeOrder) {
+        let maxParentDepth = -1;
+        for (const parent of node.parents) {
+            if (!component.has(parent))
+                continue;
+            const parentDepth = depthByNode.get(parent);
+            if (parentDepth !== undefined && parentDepth > maxParentDepth) {
+                maxParentDepth = parentDepth;
+            }
+        }
+        depthByNode.set(node, maxParentDepth + 1);
+    }
+    /* v8 ignore stop */
+    const members = [...component]
+        .map((node) => node.message)
+        .sort(sortByReceivedAtAscending)
+        .map((message) => {
+        const node = byKey.get(message.id);
+        /* v8 ignore next -- fallback: depthByNode is populated for every component node by the topological pass @preserve */
+        return { message, depth: depthByNode.get(node) ?? 0 };
+    });
+    return {
+        rootMessageId: normalizeHeaderId(root.message.private.messageId) ?? root.message.id,
+        members,
+    };
+}

package/dist/mailroom/travel-extract.js

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractTravelFactsFromMail = extractTravelFactsFromMail;
+const runtime_1 = require("../nerves/runtime");
+function firstMatch(text, pattern) {
+    const match = pattern.exec(text);
+    return match?.[1]?.trim() ?? null;
+}
+function flightFact(message) {
+    const text = `${message.private.subject}\n${message.private.text}`;
+    const flightNumber = firstMatch(text, /\bflight\s+([A-Z]{2}\s?\d{1,4})\b/i);
+    const routeMatch = /\b([A-Z]{3})\s*(?:->|to)\s*([A-Z]{3})\b/.exec(text);
+    const confirmationCode = firstMatch(text, /confirmation code:\s*([A-Z0-9-]+)/i);
+    const departure = firstMatch(text, /departure:\s*([^\n]+)/i);
+    if (!flightNumber && !routeMatch && !departure)
+        return null;
+    const fields = {};
+    if (flightNumber)
+        fields.flightNumber = flightNumber.toUpperCase().replace(/\s+/, " ");
+    if (routeMatch)
+        fields.route = `${routeMatch[1]} -> ${routeMatch[2]}`;
+    if (departure)
+        fields.departure = departure;
+    if (confirmationCode)
+        fields.confirmationCode = confirmationCode;
+    return {
+        kind: "flight",
+        messageId: message.id,
+        subject: message.private.subject,
+        source: message.source ?? null,
+        ownerEmail: message.ownerEmail ?? null,
+        summary: [
+            fields.flightNumber ? `flight ${fields.flightNumber}` : "flight",
+            fields.route ? fields.route : null,
+            fields.departure ? `departing ${fields.departure}` : null,
+        ].filter(Boolean).join(" "),
+        fields,
+    };
+}
+function lodgingFact(message) {
+    const text = `${message.private.subject}\n${message.private.text}`;
+    const hotel = firstMatch(text, /hotel:\s*([^\n]+)/i);
+    const checkIn = firstMatch(text, /check-?in:\s*([^\n]+)/i);
+    const checkOut = firstMatch(text, /check-?out:\s*([^\n]+)/i);
+    const confirmationCode = firstMatch(text, /confirmation code:\s*([A-Z0-9-]+)/i);
+    if (!hotel && !checkIn && !/hotel|lodging|booking/i.test(message.private.subject))
+        return null;
+    const fields = {};
+    if (hotel)
+        fields.hotel = hotel;
+    if (checkIn)
+        fields.checkIn = checkIn;
+    if (checkOut)
+        fields.checkOut = checkOut;
+    if (confirmationCode)
+        fields.confirmationCode = confirmationCode;
+    return {
+        kind: "lodging",
+        messageId: message.id,
+        subject: message.private.subject,
+        source: message.source ?? null,
+        ownerEmail: message.ownerEmail ?? null,
+        summary: [
+            hotel ?? "lodging",
+            checkIn ? `check-in ${checkIn}` : null,
+            checkOut ? `check-out ${checkOut}` : null,
+        ].filter(Boolean).join(" "),
+        fields,
+    };
+}
+function extractTravelFactsFromMail(messages) {
+    const facts = messages.flatMap((message) => {
+        const results = [];
+        const flight = flightFact(message);
+        if (flight)
+            results.push(flight);
+        const lodging = lodgingFact(message);
+        if (lodging)
+            results.push(lodging);
+        return results;
+    });
+    (0, runtime_1.emitNervesEvent)({
+        component: "senses",
+        event: "senses.mail_travel_facts_extracted",
+        message: "travel facts extracted from mail",
+        meta: { messages: messages.length, facts: facts.length },
+    });
+    return facts;
+}

package/dist/mind/bundle-manifest.js

@@ -52,7 +52,13 @@ exports.CANONICAL_BUNDLE_MANIFEST = [
     { path: "psyche/LORE.md", kind: "file" },
     { path: "psyche/TACIT.md", kind: "file" },
     { path: "psyche/ASPIRATIONS.md", kind: "file" },
-    { path: "psyche/memory", kind: "dir" },
+    { path: "arc", kind: "dir" },
+    { path: "arc/episodes", kind: "dir" },
+    { path: "arc/obligations", kind: "dir" },
+    { path: "arc/cares", kind: "dir" },
+    { path: "arc/intentions", kind: "dir" },
+    { path: "diary", kind: "dir" },
+    { path: "journal", kind: "dir" },
     { path: "friends", kind: "dir" },
     { path: "state", kind: "dir" },
     { path: "tasks", kind: "dir" },

package/dist/mind/context.js

@@ -33,18 +33,27 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateSessionMessages = exports.repairSessionMessages = exports.migrateToolNames = exports.detectDuplicateToolCallIds = void 0;
 exports.trimMessages = trimMessages;
-exports.validateSessionMessages = validateSessionMessages;
-exports.repairSessionMessages = repairSessionMessages;
 exports.saveSession = saveSession;
+exports.appendSyntheticAssistantMessage = appendSyntheticAssistantMessage;
 exports.loadSession = loadSession;
 exports.postTurn = postTurn;
+exports.postTurnTrim = postTurnTrim;
+exports.postTurnPersist = postTurnPersist;
+exports.deferPostTurnPersist = deferPostTurnPersist;
 exports.deleteSession = deleteSession;
 const config_1 = require("../heart/config");
+const session_events_1 = require("../heart/session-events");
 const runtime_1 = require("../nerves/runtime");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const token_estimate_1 = require("./token-estimate");
+var session_events_2 = require("../heart/session-events");
+Object.defineProperty(exports, "detectDuplicateToolCallIds", { enumerable: true, get: function () { return session_events_2.detectDuplicateToolCallIds; } });
+Object.defineProperty(exports, "migrateToolNames", { enumerable: true, get: function () { return session_events_2.migrateToolNames; } });
+Object.defineProperty(exports, "repairSessionMessages", { enumerable: true, get: function () { return session_events_2.repairSessionMessages; } });
+Object.defineProperty(exports, "validateSessionMessages", { enumerable: true, get: function () { return session_events_2.validateSessionMessages; } });
 function buildTrimmableBlocks(messages) {
     const blocks = [];
     let i = 0;
@@ -173,122 +182,94 @@ function trimMessages(messages, maxTokens, contextMargin, actualTokenCount) {
  * user → assistant (with optional tool calls/results) → user → assistant...
  * Never assistant → assistant without a user in between.
  */
-function validateSessionMessages(messages) {
-    const violations = [];
-    let prevNonToolRole = null;
-    let prevAssistantHadToolCalls = false;
-    let sawToolResultSincePrevAssistant = false;
-    for (let i = 0; i < messages.length; i++) {
-        const msg = messages[i];
-        if (msg.role === "system")
-            continue;
-        if (msg.role === "tool") {
-            sawToolResultSincePrevAssistant = true;
-            continue;
-        }
-        if (msg.role === "assistant" && prevNonToolRole === "assistant") {
-            // assistant → tool(s) → assistant is valid (tool call flow)
-            if (!(prevAssistantHadToolCalls && sawToolResultSincePrevAssistant)) {
-                violations.push(`back-to-back assistant at index ${i}`);
-            }
-        }
-        prevAssistantHadToolCalls = msg.role === "assistant" && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0;
-        sawToolResultSincePrevAssistant = false;
-        prevNonToolRole = msg.role;
-    }
-    return violations;
+function denormalizeContinuityState(state) {
+    if (!state.mustResolveBeforeHandoff && typeof state.lastFriendActivityAt !== "string")
+        return undefined;
+    return {
+        ...(state.mustResolveBeforeHandoff ? { mustResolveBeforeHandoff: true } : {}),
+        ...(typeof state.lastFriendActivityAt === "string" ? { lastFriendActivityAt: state.lastFriendActivityAt } : {}),
+    };
 }
-/**
- * Repairs session invariant violations by merging consecutive assistant messages.
- */
-function repairSessionMessages(messages) {
-    const violations = validateSessionMessages(messages);
-    if (violations.length === 0)
-        return messages;
-    const result = [];
-    for (const msg of messages) {
-        if (msg.role === "assistant" && result.length > 0) {
-            const prev = result[result.length - 1];
-            if (prev.role === "assistant" && !("tool_calls" in prev)) {
-                const prevContent = typeof prev.content === "string" ? prev.content : "";
-                const curContent = typeof msg.content === "string" ? msg.content : "";
-                prev.content = `${prevContent}\n\n${curContent}`;
-                continue;
-            }
-        }
-        result.push(msg);
-    }
-    (0, runtime_1.emitNervesEvent)({
-        level: "warn",
-        event: "mind.session_invariant_repair",
-        component: "mind",
-        message: "repaired session invariant violations",
-        meta: { violations },
-    });
-    return result;
+function writeSessionEnvelope(filePath, envelope) {
+    fs.mkdirSync(path.dirname(filePath), { recursive: true });
+    fs.writeFileSync(filePath, JSON.stringify(envelope, null, 2));
 }
 function saveSession(filePath, messages, lastUsage, state) {
-    const violations = validateSessionMessages(messages);
-    if (violations.length > 0) {
+    const existing = (0, session_events_1.loadSessionEnvelopeFile)(filePath);
+    const previousMessages = existing ? (0, session_events_1.projectProviderMessages)(existing) : [];
+    const currentIngressTimes = messages.map(session_events_1.getIngressTime);
+    const sanitized = (0, session_events_1.sanitizeProviderMessages)(messages);
+    const { envelope } = (0, session_events_1.buildCanonicalSessionEnvelope)({
+        existing,
+        previousMessages,
+        currentMessages: sanitized,
+        trimmedMessages: sanitized,
+        currentIngressTimes,
+        recordedAt: new Date().toISOString(),
+        lastUsage: lastUsage ?? null,
+        state,
+        projectionBasis: {
+            maxTokens: null,
+            contextMargin: null,
+            inputTokens: lastUsage?.input_tokens ?? null,
+        },
+    });
+    writeSessionEnvelope(filePath, envelope);
+}
+function appendSyntheticAssistantMessage(filePath, content) {
+    try {
+        if (!fs.existsSync(filePath))
+            return false;
+        const envelope = (0, session_events_1.loadSessionEnvelopeFile)(filePath);
+        if (!envelope)
+            return false;
+        const updated = (0, session_events_1.appendSyntheticAssistantEvent)(envelope, content, new Date().toISOString());
+        writeSessionEnvelope(filePath, updated);
         (0, runtime_1.emitNervesEvent)({
-            level: "warn",
-            event: "mind.session_invariant_violation",
             component: "mind",
-            message: "session invariant violated on save",
-            meta: { path: filePath, violations },
+            event: "mind.session_synthetic_message_appended",
+            message: "appended synthetic assistant message to session",
+            meta: { path: filePath, contentLength: content.length },
         });
-        messages = repairSessionMessages(messages);
+        return true;
     }
-    fs.mkdirSync(path.dirname(filePath), { recursive: true });
-    const envelope = { version: 1, messages };
-    if (lastUsage)
-        envelope.lastUsage = lastUsage;
-    if (state?.mustResolveBeforeHandoff === true || typeof state?.lastFriendActivityAt === "string") {
-        envelope.state = {
-            ...(state?.mustResolveBeforeHandoff === true ? { mustResolveBeforeHandoff: true } : {}),
-            ...(typeof state?.lastFriendActivityAt === "string" ? { lastFriendActivityAt: state.lastFriendActivityAt } : {}),
-        };
+    catch {
+        return false;
     }
-    fs.writeFileSync(filePath, JSON.stringify(envelope, null, 2));
 }
 function loadSession(filePath) {
     try {
-        const raw = fs.readFileSync(filePath, "utf-8");
-        const data = JSON.parse(raw);
-        if (data.version !== 1)
+        const envelope = (0, session_events_1.loadSessionEnvelopeFile)(filePath);
+        if (!envelope)
             return null;
-        let messages = data.messages;
-        const violations = validateSessionMessages(messages);
-        if (violations.length > 0) {
-            (0, runtime_1.emitNervesEvent)({
-                level: "warn",
-                event: "mind.session_invariant_violation",
-                component: "mind",
-                message: "session invariant violated on load",
-                meta: { path: filePath, violations },
-            });
-            messages = repairSessionMessages(messages);
-        }
-        const rawState = data?.state && typeof data.state === "object" && data.state !== null
-            ? data.state
-            : undefined;
-        const state = rawState && (rawState.mustResolveBeforeHandoff === true
-            || typeof rawState.lastFriendActivityAt === "string")
-            ? {
-                ...(rawState.mustResolveBeforeHandoff === true ? { mustResolveBeforeHandoff: true } : {}),
-                ...(typeof rawState.lastFriendActivityAt === "string" ? { lastFriendActivityAt: rawState.lastFriendActivityAt } : {}),
-            }
-            : undefined;
-        return { messages, lastUsage: data.lastUsage, state };
+        return {
+            messages: (0, session_events_1.sanitizeProviderMessages)((0, session_events_1.projectProviderMessages)(envelope)),
+            events: envelope.events,
+            lastUsage: envelope.lastUsage ?? undefined,
+            state: denormalizeContinuityState(envelope.state),
+        };
     }
     catch {
         return null;
     }
 }
+/**
+ * Synchronous post-turn: sanitize, trim (mutates messages in place), and persist to disk.
+ * For non-blocking persist, use postTurnTrim() + deferPostTurnPersist() instead.
+ */
 function postTurn(messages, sessPath, usage, hooks, state) {
+    const prepared = postTurnTrim(messages, usage, hooks);
+    postTurnPersist(sessPath, prepared, usage, state);
+}
+/**
+ * Synchronous phase: run hooks, sanitize, trim, and mutate the messages array in place.
+ * Returns the data needed by postTurnPersist / deferPostTurnPersist.
+ */
+function postTurnTrim(messages, usage, hooks) {
+    const preTrimMessages = [...messages];
     if (hooks?.beforeTrim) {
         try {
-            hooks.beforeTrim([...messages]);
+            hooks.beforeTrim(preTrimMessages);
         }
         catch (error) {
             (0, runtime_1.emitNervesEvent)({
@@ -303,9 +284,92 @@ function postTurn(messages, sessPath, usage, hooks, state) {
         }
     }
     const { maxTokens, contextMargin } = (0, config_1.getContextConfig)();
-    const trimmed = trimMessages(messages, maxTokens, contextMargin, usage?.input_tokens);
-    messages.splice(0, messages.length, ...trimmed);
-    saveSession(sessPath, messages, usage, state);
+    const currentIngressTimes = messages.map(session_events_1.getIngressTime);
+    const currentMessages = (0, session_events_1.sanitizeProviderMessages)(messages);
+    const trimmedMessages = trimMessages(currentMessages, maxTokens, contextMargin, usage?.input_tokens);
+    messages.splice(0, messages.length, ...trimmedMessages);
+    return { currentMessages, trimmedMessages, currentIngressTimes, maxTokens, contextMargin };
+}
+/**
+ * Synchronous persist: load existing envelope, build canonical envelope, write to disk.
+ */
+function postTurnPersist(sessPath, prepared, usage, state) {
+    const existing = (0, session_events_1.loadSessionEnvelopeFile)(sessPath);
+    const previousMessages = existing ? (0, session_events_1.projectProviderMessages)(existing) : [];
+    const { envelope, evictedEvents } = (0, session_events_1.buildCanonicalSessionEnvelope)({
+        existing,
+        previousMessages,
+        currentMessages: prepared.currentMessages,
+        trimmedMessages: prepared.trimmedMessages,
+        currentIngressTimes: prepared.currentIngressTimes,
+        recordedAt: new Date().toISOString(),
+        lastUsage: usage ?? null,
+        state,
+        projectionBasis: {
+            maxTokens: prepared.maxTokens,
+            contextMargin: prepared.contextMargin,
+            inputTokens: usage?.input_tokens ?? null,
+        },
+    });
+    (0, session_events_1.appendEvictedToArchive)(sessPath, evictedEvents);
+    writeSessionEnvelope(sessPath, envelope);
+    return envelope.events;
+}
+/**
+ * Per-sessPath serialization queue. Without this, two concurrent
+ * `deferPostTurnPersist` calls (e.g. two BlueBubbles webhooks for the same
+ * chat firing back-to-back, or a CLI postTurn racing the inner-dialog turn
+ * for the same MCP session) would each load the envelope, both compute the
+ * same "next sequence", and write events with colliding ids. The session
+ * file would silently accumulate duplicates and replay would diverge from
+ * what was actually sent on the wire.
+ *
+ * The queue is in-process only — it does not protect against multiple Node
+ * processes writing to the same file. The dedup-on-load behaviour in
+ * parseSessionEnvelope keeps cross-process races from leaving permanent
+ * corruption; this serializer just keeps the common (single-process) case
+ * race-free in the first place.
+ */
+const sessionPersistQueues = new Map();
+function enqueueSessionPersist(sessPath, fn) {
+    const previous = sessionPersistQueues.get(sessPath) ?? Promise.resolve();
+    // Chain on the previous tail. fn runs whether previous resolved or rejected,
+    // so one failed turn cannot block subsequent turns on the same session.
+    const next = previous.then(fn, fn);
+    // Save a swallowed-rejection sentinel as the new tail so the next caller's
+    // `previous.then(fn, fn)` sees a clean resolution; the original `next` still
+    // propagates rejection to its own caller as expected.
+    /* v8 ignore start -- the swallow only matters when fn rejects, which is the failure path covered separately */
+    const sentinel = next.then(() => undefined, () => undefined);
+    /* v8 ignore stop */
+    sessionPersistQueues.set(sessPath, sentinel);
+    return next;
+}
+/**
+ * Deferred persist: same as postTurnPersist but runs on the next event loop
+ * tick AND serializes against any other deferred persist for the same
+ * sessPath, so concurrent turns cannot race and produce duplicate event ids
+ * in the saved session.
+ */
+function deferPostTurnPersist(sessPath, prepared, usage, state) {
+    return enqueueSessionPersist(sessPath, () => new Promise((resolve) => {
+        setImmediate(() => {
+            try {
+                const events = postTurnPersist(sessPath, prepared, usage, state);
+                resolve(events);
+            }
+            catch (err) {
+                (0, runtime_1.emitNervesEvent)({
+                    level: "warn",
+                    component: "mind",
+                    event: "mind.deferred_persist_error",
+                    message: "deferred session persist failed",
+                    meta: { error: err instanceof Error ? err.message : String(err) },
+                });
+                resolve([]);
+            }
+        });
+    }));
 }
 function deleteSession(filePath) {
     try {

package/dist/mind/diary-integrity.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.detectSuspiciousContent = detectSuspiciousContent;
+const PATTERN_CATEGORIES = [
+    {
+        name: "instruction_framing",
+        patterns: [
+            /\byou are (?:a|an) (?:ai|assistant|language model|helpful assistant)\b/i,
+            /\byour (?:new )?instructions are\b/i,
+            /\bsystem\s*:/i,
+            /\bignore (?:all |my )?previous instructions\b/i,
+            /\bdo not reveal\b/i,
+        ],
+    },
+    {
+        name: "override_language",
+        patterns: [
+            /\bdisregard\b/i,
+            /\bforget everything\b/i,
+            /\bnew instructions:/i,
+            /\boverride (?:all |any |previous )?instructions\b/i,
+        ],
+    },
+    {
+        name: "role_injection",
+        patterns: [
+            /\bas (?:a|an) (?:ai|language model)\b/i,
+            /\byou must always\b/i,
+            /\byou are now\b/i,
+        ],
+    },
+    {
+        name: "boundary_markers",
+        patterns: [
+            /```system/i,
+            /<<SYS>>/i,
+            /\[INST\]/i,
+            /<\/?system>/i,
+            /\[system\]/i,
+        ],
+    },
+];
+function detectSuspiciousContent(text) {
+    if (!text) {
+        return { suspicious: false, patterns: [] };
+    }
+    const matched = new Set();
+    for (const category of PATTERN_CATEGORIES) {
+        for (const pattern of category.patterns) {
+            if (pattern.test(text)) {
+                matched.add(category.name);
+                break;
+            }
+        }
+    }
+    return {
+        suspicious: matched.size > 0,
+        patterns: [...matched],
+    };
+}