@ouro.bot/cli 0.1.0-alpha.39 → 0.1.0-alpha.390

package/dist/heart/{daemon → versioning}/update-checker.js

@@ -86,7 +86,15 @@ function startUpdateChecker(options) {
             if (result.available && options.onUpdate) {
                 await options.onUpdate(result);
             }
-        })();
+        })().catch((err) => {
+            (0, runtime_1.emitNervesEvent)({
+                component: "daemon",
+                event: "daemon.update_checker_error",
+                level: "warn",
+                message: "update checker tick failed",
+                meta: { reason: err instanceof Error ? err.message : /* v8 ignore next -- defensive: non-Error catch branch @preserve */ String(err) },
+            });
+        });
     }, intervalMs);
 }
 function stopUpdateChecker() {
@@ -94,9 +102,11 @@ function stopUpdateChecker() {
         clearInterval(_intervalId);
         _intervalId = null;
     }
+    // `_end` (not `_stop`) to satisfy the nerves audit's start/end pairing
+    // rule — counterpart to `daemon.update_checker_start` above.
     (0, runtime_1.emitNervesEvent)({
         component: "daemon",
-        event: "daemon.update_checker_stop",
+        event: "daemon.update_checker_end",
         message: "stopping update checker",
         meta: {},
     });

package/dist/heart/{daemon → versioning}/update-hooks.js

@@ -65,74 +65,78 @@ async function applyPendingUpdates(bundlesRoot, currentVersion) {
         message: "applying pending updates",
         meta: { bundlesRoot, currentVersion },
     });
-    if (!fs.existsSync(bundlesRoot)) {
-        return summary;
-    }
-    let entries;
     try {
-        entries = fs.readdirSync(bundlesRoot, { withFileTypes: true });
-    }
-    catch {
-        return summary;
-    }
-    for (const entry of entries) {
-        if (!entry.isDirectory() || !entry.name.endsWith(".ouro"))
-            continue;
-        const agentRoot = path.join(bundlesRoot, entry.name);
-        let previousVersion;
-        const metaPath = path.join(agentRoot, "bundle-meta.json");
+        if (!fs.existsSync(bundlesRoot)) {
+            return summary;
+        }
+        let entries;
         try {
-            if (fs.existsSync(metaPath)) {
-                const raw = fs.readFileSync(metaPath, "utf-8");
-                const meta = JSON.parse(raw);
-                previousVersion = meta.runtimeVersion;
-                if (previousVersion === currentVersion) {
-                    continue;
-                }
-                // Skip downgrades — only update forward
-                if (semver.valid(previousVersion) && semver.valid(currentVersion) && semver.gte(previousVersion, currentVersion)) {
-                    (0, runtime_1.emitNervesEvent)({
-                        component: "daemon",
-                        event: "daemon.update_hook_skip_downgrade",
-                        message: "skipping downgrade",
-                        meta: { agentRoot, previousVersion, currentVersion },
-                    });
-                    continue;
-                }
-            }
+            entries = fs.readdirSync(bundlesRoot, { withFileTypes: true });
         }
         catch {
-            // Malformed or unreadable bundle-meta.json -- treat as needing update
-            previousVersion = undefined;
+            return summary;
         }
-        const ctx = { agentRoot, currentVersion, previousVersion };
-        for (const hook of _hooks) {
+        for (const entry of entries) {
+            if (!entry.isDirectory() || !entry.name.endsWith(".ouro"))
+                continue;
+            const agentRoot = path.join(bundlesRoot, entry.name);
+            let previousVersion;
+            const metaPath = path.join(agentRoot, "bundle-meta.json");
             try {
-                await hook(ctx);
+                if (fs.existsSync(metaPath)) {
+                    const raw = fs.readFileSync(metaPath, "utf-8");
+                    const meta = JSON.parse(raw);
+                    previousVersion = meta.runtimeVersion;
+                    if (previousVersion === currentVersion) {
+                        continue;
+                    }
+                    // Skip downgrades — only update forward
+                    if (semver.valid(previousVersion) && semver.valid(currentVersion) && semver.gte(previousVersion, currentVersion)) {
+                        (0, runtime_1.emitNervesEvent)({
+                            component: "daemon",
+                            event: "daemon.update_hook_skip_downgrade",
+                            message: "skipping downgrade",
+                            meta: { agentRoot, previousVersion, currentVersion },
+                        });
+                        continue;
+                    }
+                }
+            }
+            catch {
+                // Malformed or unreadable bundle-meta.json -- treat as needing update
+                previousVersion = undefined;
             }
-            catch (err) {
-                (0, runtime_1.emitNervesEvent)({
-                    component: "daemon",
-                    event: "daemon.update_hook_error",
-                    message: "update hook threw",
-                    meta: {
-                        agentRoot,
-                        error: err instanceof Error ? err.message : /* v8 ignore next -- defensive: non-Error catch branch @preserve */ String(err),
-                    },
-                });
+            const ctx = { agentRoot, currentVersion, previousVersion };
+            for (const hook of _hooks) {
+                try {
+                    await hook(ctx);
+                }
+                catch (err) {
+                    (0, runtime_1.emitNervesEvent)({
+                        component: "daemon",
+                        event: "daemon.update_hook_error",
+                        message: "update hook threw",
+                        meta: {
+                            agentRoot,
+                            error: err instanceof Error ? err.message : /* v8 ignore next -- defensive: non-Error catch branch @preserve */ String(err),
+                        },
+                    });
+                }
             }
+            summary.updated.push({
+                agent: entry.name.replace(/\.ouro$/, ""),
+                from: previousVersion,
+                to: currentVersion,
+            });
         }
-        summary.updated.push({
-            agent: entry.name.replace(/\.ouro$/, ""),
-            from: previousVersion,
-            to: currentVersion,
+        return summary;
+    }
+    finally {
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.apply_pending_updates_end",
+            message: "pending updates applied",
+            meta: { bundlesRoot },
         });
     }
-    (0, runtime_1.emitNervesEvent)({
-        component: "daemon",
-        event: "daemon.apply_pending_updates_end",
-        message: "pending updates applied",
-        meta: { bundlesRoot },
-    });
-    return summary;
 }

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,34 +33,42 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateSessionMessages = exports.repairSessionMessages = exports.migrateToolNames = 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, "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;
     while (i < messages.length) {
         const msg = messages[i];
-        if (msg?.role === "system") {
+        if (msg.role === "system") {
             i++;
             continue;
         }
         // Tool coherence block: assistant message with tool_calls + immediately following tool results
-        if (msg?.role === "assistant" && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0) {
+        if (msg.role === "assistant" && Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0) {
             const indices = [i];
             i++;
             while (i < messages.length) {
                 const next = messages[i];
-                if (next?.role !== "tool")
+                if (next.role !== "tool")
                     break;
                 indices.push(i);
                 i++;
@@ -78,13 +86,13 @@ function buildTrimmableBlocks(messages) {
 function getSystemMessageIndices(messages) {
     const indices = [];
     for (let i = 0; i < messages.length; i++) {
-        if (messages[i]?.role === "system")
+        if (messages[i].role === "system")
             indices.push(i);
     }
     return indices;
 }
 function buildTrimmedMessages(messages, kept) {
-    return messages.filter((m, idx) => m?.role === "system" || kept.has(idx));
+    return messages.filter((m, idx) => m.role === "system" || kept.has(idx));
 }
 function trimMessages(messages, maxTokens, contextMargin, actualTokenCount) {
     const targetTokens = Math.floor(maxTokens * (1 - contextMargin / 100));
@@ -132,7 +140,7 @@ function trimMessages(messages, maxTokens, contextMargin, actualTokenCount) {
     let remaining = actualTokenCount;
     const kept = new Set();
     for (let i = 0; i < messages.length; i++) {
-        if (messages[i]?.role !== "system")
+        if (messages[i].role !== "system")
             kept.add(i);
     }
     // Drop oldest blocks until we fall under target.
@@ -146,7 +154,7 @@ function trimMessages(messages, maxTokens, contextMargin, actualTokenCount) {
     let trimmed = buildTrimmedMessages(messages, kept);
     // If we're still above budget after dropping everything trimmable, preserve system only.
     if (remaining > targetTokens) {
-        trimmed = messages.filter((m) => m?.role === "system");
+        trimmed = messages.filter((m) => m.role === "system");
     }
     const estimatedAfter = (0, token_estimate_1.estimateTokensForMessages)(trimmed);
     (0, runtime_1.emitNervesEvent)({
@@ -173,106 +181,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 },
+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 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,
+        },
     });
-    return result;
+    writeSessionEnvelope(filePath, envelope);
 }
-function saveSession(filePath, messages, lastUsage) {
-    const violations = validateSessionMessages(messages);
-    if (violations.length > 0) {
+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;
+    }
+    catch {
+        return false;
     }
-    fs.mkdirSync(path.dirname(filePath), { recursive: true });
-    const envelope = { version: 1, messages };
-    if (lastUsage)
-        envelope.lastUsage = lastUsage;
-    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);
-        }
-        return { messages, lastUsage: data.lastUsage };
+        return {
+            messages: (0, session_events_1.annotateMessageTimestamps)(envelope, (0, session_events_1.projectProviderMessages)(envelope)),
+            events: envelope.events,
+            lastUsage: envelope.lastUsage ?? undefined,
+            state: denormalizeContinuityState(envelope.state),
+        };
     }
     catch {
         return null;
     }
 }
-function postTurn(messages, sessPath, usage, hooks) {
+/**
+ * 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)({
@@ -287,9 +283,60 @@ function postTurn(messages, sessPath, usage, hooks) {
         }
     }
     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);
+    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;
+}
+/**
+ * Deferred persist: same as postTurnPersist but runs on the next event loop tick.
+ * Returns a promise that resolves when the persist completes.
+ */
+function deferPostTurnPersist(sessPath, prepared, usage, state) {
+    return 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],
+    };
+}