@ouro.bot/cli 0.1.0-alpha.314 → 0.1.0-alpha.315

package/dist/heart/session-recall.js

@@ -1,65 +1,17 @@
 "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.recallSession = recallSession;
 exports.searchSessionTranscript = searchSessionTranscript;
-const fs = __importStar(require("fs"));
 const runtime_1 = require("../nerves/runtime");
-function normalizeContent(content) {
-    if (typeof content === "string")
-        return content;
-    if (!Array.isArray(content))
-        return "";
-    return content
-        .map((part) => (part && typeof part === "object" && "type" in part && part.type === "text" && "text" in part
-        ? String(part.text ?? "")
-        : ""))
-        .filter((text) => text.length > 0)
-        .join("");
-}
-function normalizeSessionMessages(messages) {
-    if (!Array.isArray(messages))
-        return [];
-    return messages
-        .map((message) => {
-        const record = message && typeof message === "object" ? message : {};
-        return {
-            role: typeof record.role === "string" ? record.role : "",
-            content: normalizeContent(record.content),
-        };
-    })
+const session_events_1 = require("./session-events");
+function normalizeSessionMessages(events) {
+    return events
+        .map((event) => ({
+        id: event.id,
+        role: event.role,
+        content: (0, session_events_1.extractEventText)(event),
+        timestamp: (0, session_events_1.formatSessionEventTimestamp)(event),
+    }))
         .filter((message) => message.role !== "system" && message.content.length > 0);
 }
 function buildSummaryInstruction(friendId, channel, trustLevel) {
@@ -114,6 +66,10 @@ function buildSearchExcerpts(messages, query, maxMatches) {
         const start = Math.max(0, i - 1);
         const end = Math.min(messages.length, i + 2);
         const excerpt = messages
+            .slice(start, end)
+            .map((message) => `[${message.timestamp} | ${message.role} | ${message.id}] ${clip(message.content, 200)}`)
+            .join("\n");
+        const signature = messages
             .slice(start, end)
             .map((message) => `[${message.role}] ${clip(message.content, 200)}`)
             .join("\n");
@@ -121,15 +77,15 @@ function buildSearchExcerpts(messages, query, maxMatches) {
             .slice(start, end)
             .filter((message) => message.content.toLowerCase().includes(normalizedQuery))
             .length;
-        candidates.push({ excerpt, score, index: i });
+        candidates.push({ excerpt, signature, score, index: i });
     }
     const seen = new Set();
     return candidates
         .sort((a, b) => b.score - a.score || a.index - b.index)
         .filter((candidate) => {
-        if (seen.has(candidate.excerpt))
+        if (seen.has(candidate.signature))
             return false;
-        seen.add(candidate.excerpt);
+        seen.add(candidate.signature);
         return true;
     })
         .slice(0, maxMatches)
@@ -147,20 +103,15 @@ async function recallSession(options) {
             messageCount: options.messageCount,
         },
     });
-    let raw;
-    try {
-        raw = fs.readFileSync(options.sessionPath, "utf-8");
-    }
-    catch {
+    const envelope = (0, session_events_1.loadSessionEnvelopeFile)(options.sessionPath);
+    if (!envelope)
         return { kind: "missing" };
-    }
-    const parsed = JSON.parse(raw);
-    const tailMessages = normalizeSessionMessages(parsed.messages).slice(-options.messageCount);
+    const tailMessages = normalizeSessionMessages(envelope.events).slice(-options.messageCount);
     if (tailMessages.length === 0) {
         return { kind: "empty" };
     }
     const transcript = tailMessages
-        .map((message) => `[${message.role}] ${message.content}`)
+        .map((message) => `[${message.timestamp} | ${message.role} | ${message.id}] ${message.content}`)
         .join("\n");
     const summary = options.summarize
         ? await options.summarize(transcript, buildSummaryInstruction(options.friendId, options.channel, options.trustLevel ?? "family"))
@@ -186,15 +137,10 @@ async function searchSessionTranscript(options) {
             maxMatches: options.maxMatches ?? 5,
         },
     });
-    let raw;
-    try {
-        raw = fs.readFileSync(options.sessionPath, "utf-8");
-    }
-    catch {
+    const envelope = (0, session_events_1.loadSessionEnvelopeFile)(options.sessionPath);
+    if (!envelope)
         return { kind: "missing" };
-    }
-    const parsed = JSON.parse(raw);
-    const messages = normalizeSessionMessages(parsed.messages);
+    const messages = normalizeSessionMessages(envelope.events);
     if (messages.length === 0) {
         return { kind: "empty" };
     }

package/dist/heart/start-of-turn-packet.js

@@ -192,6 +192,7 @@ function buildStartOfTurnPacket(view, opts) {
         cares: buildCaresSection(view.activeCares),
         presence: buildPresenceSection(view.peerPresence),
         resumeHint: buildResumeHint(view, opts?.canonicalObligations ? effectiveObligations : undefined),
+        currentSessionTiming: opts?.currentSessionTiming,
         tempo,
         tokenBudget,
         assembledAt: new Date().toISOString(),
@@ -230,6 +231,7 @@ function renderStartOfTurnPacket(packet) {
         { label: "bundleState", content: (0, bundle_state_1.renderBundleStateHint)(packet.bundleState ?? []), priority: 7 },
         { label: "syncFailure", content: packet.syncFailure ?? "", priority: 7 },
         { label: "resume", content: packet.resumeHint, priority: 6 },
+        { label: "sessionTiming", content: packet.currentSessionTiming ?? "", priority: 5 },
         { label: "obligations", content: packet.obligations, priority: 5 },
         { label: "cares", content: packet.cares, priority: 4 },
         { label: "plot", content: packet.plotLine, priority: 3 },

package/dist/mind/context.js

@@ -33,20 +33,23 @@ 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.migrateToolNames = migrateToolNames;
 exports.saveSession = saveSession;
 exports.appendSyntheticAssistantMessage = appendSyntheticAssistantMessage;
 exports.loadSession = loadSession;
 exports.postTurn = postTurn;
 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;
@@ -175,163 +178,47 @@ 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;
-}
-/**
- * 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: "info",
-        event: "mind.session_invariant_repair",
-        component: "mind",
-        message: "repaired session invariant violations",
-        meta: { violations },
-    });
-    return result;
-}
-function stripOrphanedToolResults(messages) {
-    const validCallIds = new Set();
-    for (const msg of messages) {
-        if (msg.role !== "assistant" || !Array.isArray(msg.tool_calls))
-            continue;
-        for (const toolCall of msg.tool_calls)
-            validCallIds.add(toolCall.id);
-    }
-    let removed = 0;
-    const repaired = messages.filter((msg) => {
-        if (msg.role !== "tool")
-            return true;
-        const keep = validCallIds.has(msg.tool_call_id);
-        if (!keep)
-            removed++;
-        return keep;
-    });
-    if (removed > 0) {
-        (0, runtime_1.emitNervesEvent)({
-            level: "info",
-            event: "mind.session_orphan_tool_result_repair",
-            component: "mind",
-            message: "removed orphaned tool results from session history",
-            meta: { removed },
-        });
-    }
-    return repaired;
-}
-// Tool renames that have shipped. Old names in session history confuse the
-// model into calling tools that no longer exist. Applied on session load so
-// the transcript uses the current vocabulary.
-const TOOL_NAME_MIGRATIONS = {
-    final_answer: "settle",
-    no_response: "observe",
-    go_inward: "ponder",
-    descend: "ponder",
-    memory_save: "diary_write",
-    memory_search: "recall",
-};
-function migrateToolNames(messages) {
-    let migrated = 0;
-    const result = messages.map((msg) => {
-        if (msg.role !== "assistant" || !Array.isArray(msg.tool_calls) || msg.tool_calls.length === 0)
-            return msg;
-        let changed = false;
-        const updatedCalls = msg.tool_calls.map((tc) => {
-            if (tc.type !== "function")
-                return tc;
-            const newName = TOOL_NAME_MIGRATIONS[tc.function.name];
-            if (!newName)
-                return tc;
-            changed = true;
-            migrated++;
-            return { ...tc, function: { ...tc.function, name: newName } };
-        });
-        return changed ? { ...msg, tool_calls: updatedCalls } : msg;
-    });
-    if (migrated > 0) {
-        (0, runtime_1.emitNervesEvent)({
-            level: "info",
-            event: "mind.session_tool_name_migration",
-            component: "mind",
-            message: "migrated deprecated tool names in session history",
-            meta: { migrated },
-        });
-    }
-    return result;
+function denormalizeContinuityState(state) {
+    if (!state.mustResolveBeforeHandoff && typeof state.lastFriendActivityAt !== "string")
+        return undefined;
+    return {
+        ...(state.mustResolveBeforeHandoff ? { mustResolveBeforeHandoff: true } : {}),
+        ...(typeof state.lastFriendActivityAt === "string" ? { lastFriendActivityAt: state.lastFriendActivityAt } : {}),
+    };
 }
-function saveSession(filePath, messages, lastUsage, state) {
-    const violations = validateSessionMessages(messages);
-    if (violations.length > 0) {
-        (0, runtime_1.emitNervesEvent)({
-            level: "info",
-            event: "mind.session_invariant_violation",
-            component: "mind",
-            message: "session invariant violated on save",
-            meta: { path: filePath, violations },
-        });
-        messages = repairSessionMessages(messages);
-    }
-    messages = stripOrphanedToolResults(messages);
+function writeSessionEnvelope(filePath, envelope) {
     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 } : {}),
-        };
-    }
     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 sanitized = (0, session_events_1.sanitizeProviderMessages)(messages);
+    const envelope = (0, session_events_1.buildCanonicalSessionEnvelope)({
+        existing,
+        previousMessages,
+        currentMessages: sanitized,
+        trimmedMessages: sanitized,
+        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 raw = fs.readFileSync(filePath, "utf-8");
-        const data = JSON.parse(raw);
-        if (data.version !== 1 || !Array.isArray(data.messages))
+        const envelope = (0, session_events_1.loadSessionEnvelopeFile)(filePath);
+        if (!envelope)
             return false;
-        data.messages.push({ role: "assistant", content });
-        fs.writeFileSync(filePath, JSON.stringify(data, null, 2));
+        const updated = (0, session_events_1.appendSyntheticAssistantEvent)(envelope, content, new Date().toISOString());
+        writeSessionEnvelope(filePath, updated);
         (0, runtime_1.emitNervesEvent)({
             component: "mind",
             event: "mind.session_synthetic_message_appended",
@@ -346,44 +233,25 @@ function appendSyntheticAssistantMessage(filePath, content) {
 }
 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: "info",
-                event: "mind.session_invariant_violation",
-                component: "mind",
-                message: "session invariant violated on load",
-                meta: { path: filePath, violations },
-            });
-            messages = repairSessionMessages(messages);
-        }
-        messages = stripOrphanedToolResults(messages);
-        messages = migrateToolNames(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.projectProviderMessages)(envelope),
+            events: envelope.events,
+            lastUsage: envelope.lastUsage ?? undefined,
+            state: denormalizeContinuityState(envelope.state),
+        };
     }
     catch {
         return null;
     }
 }
 function postTurn(messages, sessPath, usage, hooks, state) {
+    const preTrimMessages = [...messages];
     if (hooks?.beforeTrim) {
         try {
-            hooks.beforeTrim([...messages]);
+            hooks.beforeTrim(preTrimMessages);
         }
         catch (error) {
             (0, runtime_1.emitNervesEvent)({
@@ -398,9 +266,26 @@ function postTurn(messages, sessPath, usage, hooks, state) {
         }
     }
     const { maxTokens, contextMargin } = (0, config_1.getContextConfig)();
-    const trimmed = trimMessages(messages, maxTokens, contextMargin, usage?.input_tokens);
+    const currentMessages = (0, session_events_1.sanitizeProviderMessages)(messages);
+    const trimmed = trimMessages(currentMessages, maxTokens, contextMargin, usage?.input_tokens);
     messages.splice(0, messages.length, ...trimmed);
-    saveSession(sessPath, messages, usage, state);
+    const existing = (0, session_events_1.loadSessionEnvelopeFile)(sessPath);
+    const previousMessages = existing ? (0, session_events_1.projectProviderMessages)(existing) : [];
+    const envelope = (0, session_events_1.buildCanonicalSessionEnvelope)({
+        existing,
+        previousMessages,
+        currentMessages,
+        trimmedMessages: trimmed,
+        recordedAt: new Date().toISOString(),
+        lastUsage: usage ?? null,
+        state,
+        projectionBasis: {
+            maxTokens,
+            contextMargin,
+            inputTokens: usage?.input_tokens ?? null,
+        },
+    });
+    writeSessionEnvelope(sessPath, envelope);
 }
 function deleteSession(filePath) {
     try {

package/dist/mind/prompt.js

@@ -127,8 +127,20 @@ function buildSessionSummary(options) {
         return "";
     const lines = ["## active sessions"];
     for (const entry of entries) {
-        const ago = formatTimeAgo(now - entry.lastActivityMs);
-        lines.push(`- ${entry.friendName}/${entry.channel}/${entry.key} (last: ${ago})`);
+        const parts = [];
+        if (entry.lastInboundAt) {
+            parts.push(`in ${formatTimeAgo(now - Date.parse(entry.lastInboundAt))}`);
+        }
+        else {
+            parts.push(`last ${formatTimeAgo(now - entry.lastActivityMs)}`);
+        }
+        if (entry.lastOutboundAt) {
+            parts.push(`out ${formatTimeAgo(now - Date.parse(entry.lastOutboundAt))}`);
+        }
+        if (entry.unansweredInboundCount > 0) {
+            parts.push(`${entry.unansweredInboundCount} waiting`);
+        }
+        lines.push(`- ${entry.friendName}/${entry.channel}/${entry.key} (${parts.join(" · ")})`);
     }
     return lines.join("\n");
 }

package/dist/nerves/coverage/file-completeness.js

@@ -91,6 +91,10 @@ const DISPATCH_EXEMPT_PATTERNS = [
     "heart/attachments/originals",
     "heart/attachments/sources/index",
     "heart/attachments/sources/cli-local-file",
+    // Browser-safe Outlook contract helpers: shared types/formatting helpers
+    // consumed by server readers and the UI. Outlook read/render modules own
+    // the observability for these projections.
+    "heart/outlook/outlook-types",
 ];
 function isDispatchExempt(filePath) {
     return DISPATCH_EXEMPT_PATTERNS.some((pattern) => filePath.includes(pattern));