@ouro.bot/cli 0.1.0-alpha.34 → 0.1.0-alpha.340

package/dist/mind/associative-recall.js

@@ -35,59 +35,43 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cosineSimilarity = cosineSimilarity;
 exports.recallFactsForQuery = recallFactsForQuery;
+exports.searchJournalIndex = searchJournalIndex;
 exports.injectAssociativeRecall = injectAssociativeRecall;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const config_1 = require("../heart/config");
-const identity_1 = require("../heart/identity");
 const runtime_1 = require("../nerves/runtime");
-const DEFAULT_EMBEDDING_MODEL = "text-embedding-3-small";
+const diary_1 = require("./diary");
+const provenance_trust_1 = require("./provenance-trust");
+const embedding_provider_1 = require("./embedding-provider");
 const DEFAULT_MIN_SCORE = 0.5;
 const DEFAULT_TOP_K = 3;
-class OpenAIEmbeddingProvider {
-    apiKey;
-    model;
-    constructor(apiKey, model = DEFAULT_EMBEDDING_MODEL) {
-        this.apiKey = apiKey;
-        this.model = model;
-    }
-    async embed(texts) {
-        const response = await fetch("https://api.openai.com/v1/embeddings", {
-            method: "POST",
-            headers: {
-                Authorization: `Bearer ${this.apiKey}`,
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                model: this.model,
-                input: texts,
-            }),
-        });
-        if (!response.ok) {
-            throw new Error(`embedding request failed: ${response.status} ${response.statusText}`);
-        }
-        const payload = (await response.json());
-        if (!payload.data || payload.data.length !== texts.length) {
-            throw new Error("embedding response missing expected vectors");
-        }
-        return payload.data.map((entry) => entry.embedding);
-    }
-}
 function createDefaultProvider() {
-    const apiKey = (0, config_1.getOpenAIEmbeddingsApiKey)();
-    if (!apiKey) {
+    const provider = (0, embedding_provider_1.createDefaultEmbeddingProvider)();
+    if (!provider) {
         throw new Error("openaiEmbeddingsApiKey not configured");
     }
-    return new OpenAIEmbeddingProvider(apiKey);
+    return provider;
 }
-function readFacts(memoryRoot) {
-    const factsPath = path.join(memoryRoot, "facts.jsonl");
+function readFacts(diaryRoot) {
+    const factsPath = path.join(diaryRoot, "facts.jsonl");
     if (!fs.existsSync(factsPath))
         return [];
     const raw = fs.readFileSync(factsPath, "utf8").trim();
     if (!raw)
         return [];
-    return raw.split("\n").map((line) => JSON.parse(line));
+    const facts = [];
+    for (const line of raw.split("\n")) {
+        const trimmed = line.trim();
+        if (!trimmed)
+            continue;
+        try {
+            facts.push(JSON.parse(trimmed));
+        }
+        catch {
+            // Skip corrupt lines (e.g. partial write from a crash).
+        }
+    }
+    return facts;
 }
 function getLatestUserText(messages) {
     for (let i = messages.length - 1; i >= 0; i--) {
@@ -133,6 +117,40 @@ async function recallFactsForQuery(query, facts, provider, options) {
         .sort((left, right) => right.score - left.score)
         .slice(0, topK);
 }
+function readJournalIndex(journalDir) {
+    const indexPath = path.join(journalDir, ".index.json");
+    try {
+        const raw = fs.readFileSync(indexPath, "utf8");
+        const parsed = JSON.parse(raw);
+        if (!Array.isArray(parsed))
+            return [];
+        return parsed;
+    }
+    catch {
+        return [];
+    }
+}
+function searchJournalIndex(queryEmbedding, entries, options) {
+    const minScore = options?.minScore ?? DEFAULT_MIN_SCORE;
+    const topK = options?.topK ?? DEFAULT_TOP_K;
+    return entries
+        .filter((entry) => Array.isArray(entry.embedding) && entry.embedding.length > 0)
+        .map((entry) => ({
+        filename: entry.filename,
+        preview: entry.preview,
+        score: cosineSimilarity(queryEmbedding, entry.embedding),
+    }))
+        .filter((entry) => entry.score >= minScore)
+        .sort((left, right) => right.score - left.score)
+        .slice(0, topK);
+}
+function resolveJournalDir(diaryRoot, explicitJournalDir) {
+    if (explicitJournalDir)
+        return explicitJournalDir;
+    // journal/ is a sibling of diary/ at the agent root level
+    const agentRoot = path.dirname(diaryRoot);
+    return path.join(agentRoot, "journal");
+}
 async function injectAssociativeRecall(messages, options) {
     try {
         if (messages[0]?.role !== "system" || typeof messages[0].content !== "string")
@@ -140,37 +158,90 @@ async function injectAssociativeRecall(messages, options) {
         const query = getLatestUserText(messages);
         if (!query)
             return;
-        const memoryRoot = options?.memoryRoot ?? path.join((0, identity_1.getAgentRoot)(), "psyche", "memory");
-        const facts = readFacts(memoryRoot);
-        if (facts.length === 0)
+        const diaryRoot = options?.diaryRoot ?? (0, diary_1.resolveDiaryRoot)();
+        const facts = readFacts(diaryRoot);
+        const journalDir = resolveJournalDir(diaryRoot, options?.journalDir);
+        const journalEntries = readJournalIndex(journalDir);
+        if (facts.length === 0 && journalEntries.length === 0)
             return;
-        let recalled;
-        try {
-            const provider = options?.provider ?? createDefaultProvider();
-            recalled = await recallFactsForQuery(query, facts, provider, options);
-        }
-        catch {
-            // Embeddings unavailable — fall back to substring matching
-            const lowerQuery = query.toLowerCase();
-            const topK = options?.topK ?? DEFAULT_TOP_K;
-            recalled = facts
-                .filter((fact) => fact.text.toLowerCase().includes(lowerQuery))
-                .slice(0, topK)
-                .map((fact) => ({ ...fact, score: 1 }));
-            if (recalled.length > 0) {
-                (0, runtime_1.emitNervesEvent)({
-                    level: "warn",
-                    component: "mind",
-                    event: "mind.associative_recall_fallback",
-                    message: "embeddings unavailable, used substring fallback",
-                    meta: { matchCount: recalled.length },
+        // Build combined result lines tagged by source
+        const resultLines = [];
+        let queryEmbedding;
+        // Search diary entries
+        if (facts.length > 0) {
+            let recalled;
+            try {
+                const provider = options?.provider ?? createDefaultProvider();
+                recalled = await recallFactsForQuery(query, facts, provider, options);
+                // Compute query embedding for journal search while provider is available
+                if (journalEntries.length > 0) {
+                    const [qe] = await provider.embed([query.trim()]);
+                    queryEmbedding = qe;
+                }
+            }
+            catch {
+                // Embeddings unavailable — fall back to substring matching
+                const lowerQuery = query.toLowerCase();
+                const topK = options?.topK ?? DEFAULT_TOP_K;
+                recalled = facts
+                    .filter((fact) => fact.text.toLowerCase().includes(lowerQuery))
+                    .slice(0, topK)
+                    .map((fact) => ({ ...fact, score: 1 }));
+                if (recalled.length > 0) {
+                    (0, runtime_1.emitNervesEvent)({
+                        level: "warn",
+                        component: "mind",
+                        event: "mind.associative_recall_fallback",
+                        message: "embeddings unavailable, used substring fallback",
+                        meta: { matchCount: recalled.length },
+                    });
+                }
+            }
+            for (const fact of recalled) {
+                let meta = `score=${fact.score.toFixed(3)} source=${fact.source}`;
+                if (fact.provenance) {
+                    if (fact.provenance.channel)
+                        meta += ` channel=${fact.provenance.channel}`;
+                    if (fact.provenance.friendName)
+                        meta += ` friend=${fact.provenance.friendName}`;
+                    if (fact.provenance.trust)
+                        meta += ` trust=${fact.provenance.trust}`;
+                }
+                const tag = (0, provenance_trust_1.classifyProvenanceTrust)(fact.provenance) === "external" ? "diary/external" : "diary";
+                resultLines.push({
+                    text: `[${tag}] ${fact.text} [${meta}]`,
+                    score: fact.score,
                 });
             }
         }
-        if (recalled.length === 0)
+        // Search journal entries (works whether diary had results or not)
+        if (journalEntries.length > 0) {
+            try {
+                if (!queryEmbedding) {
+                    const provider = options?.provider ?? createDefaultProvider();
+                    const [qe] = await provider.embed([query.trim()]);
+                    queryEmbedding = qe;
+                }
+                if (queryEmbedding) {
+                    const journalResults = searchJournalIndex(queryEmbedding, journalEntries, options);
+                    for (const entry of journalResults) {
+                        resultLines.push({
+                            text: `[journal] ${entry.filename}: ${entry.preview} [score=${entry.score.toFixed(3)}]`,
+                            score: entry.score,
+                        });
+                    }
+                }
+            }
+            catch {
+                // Embeddings unavailable — no journal fallback
+            }
+        }
+        if (resultLines.length === 0)
             return;
-        const recallSection = recalled
-            .map((fact, index) => `${index + 1}. ${fact.text} [score=${fact.score.toFixed(3)} source=${fact.source}]`)
+        // Sort all results by score descending
+        resultLines.sort((left, right) => right.score - left.score);
+        const recallSection = resultLines
+            .map((entry, index) => `${index + 1}. ${entry.text}`)
             .join("\n");
         messages[0] = {
             role: "system",
@@ -180,7 +251,7 @@ async function injectAssociativeRecall(messages, options) {
             component: "mind",
             event: "mind.associative_recall",
             message: "associative recall injected",
-            meta: { count: recalled.length },
+            meta: { count: resultLines.length },
         });
     }
     catch (error) {
@@ -190,7 +261,7 @@ async function injectAssociativeRecall(messages, options) {
             event: "mind.associative_recall_error",
             message: "associative recall failed",
             meta: {
-                reason: error instanceof Error ? error.message : String(error),
+                reason: error instanceof Error ? error.message : /* v8 ignore start -- defensive: non-Error catch branch @preserve */ String(error) /* v8 ignore stop */,
             },
         });
     }

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,39 @@ 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.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 +83,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 +137,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 +151,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 +178,80 @@ 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 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,
+        },
     });
-    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) {
+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)({
@@ -287,9 +266,26 @@ function postTurn(messages, sessPath, usage, hooks) {
         }
     }
     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);
+    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/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],
+    };
+}