@ouro.bot/cli 0.1.0-alpha.28 → 0.1.0-alpha.280

package/dist/heart/{daemon → versioning}/staged-restart.js

@@ -45,14 +45,22 @@ async function performStagedRestart(version, deps) {
     });
     // Step 1: Install new version
     try {
-        deps.execSync(`npm install -g @ouro.bot/cli@${version}`);
+        if (deps.installNewVersion) {
+            deps.installNewVersion(version);
+        }
+        else {
+            // Backward-compat fallback for callers that haven't migrated to the
+            // version-managed installer. Tests use this path with a mocked
+            // execSync; production callers inject installNewVersion.
+            deps.execSync(`npm install -g @ouro.bot/cli@${version}`);
+        }
     }
     catch (err) {
         const errorMessage = err instanceof Error ? err.message : /* v8 ignore next -- defensive: non-Error catch branch @preserve */ String(err);
         (0, runtime_1.emitNervesEvent)({
             component: "daemon",
             event: "daemon.staged_restart_install_failed",
-            message: "npm install failed",
+            message: "install failed",
             meta: { version, error: errorMessage },
         });
         return { ok: false, error: errorMessage };
@@ -90,25 +98,49 @@ async function performStagedRestart(version, deps) {
         });
         return { ok: false, error: `hook runner exited with code ${spawnResult.status}` };
     }
-    // Step 4: Graceful shutdown (launchd will restart with new code)
+    // Step 4: Graceful shutdown then self-spawn new daemon
+    // We can't rely on launchd KeepAlive — the plist may not be loaded.
+    // Instead: shut down (releases socket), spawn new daemon from updated code.
     (0, runtime_1.emitNervesEvent)({
         component: "daemon",
         event: "daemon.staged_restart_hooks_passed",
-        message: "hooks passed, shutting down for restart",
+        message: "hooks passed, shutting down and spawning new daemon",
         meta: { version },
     });
+    let shutdownError;
     try {
         await deps.gracefulShutdown();
     }
     catch (err) {
-        const shutdownError = err instanceof Error ? err.message : /* v8 ignore next -- defensive: non-Error catch branch @preserve */ String(err);
+        shutdownError = err instanceof Error ? err.message : /* v8 ignore next -- defensive: non-Error catch branch @preserve */ String(err);
         (0, runtime_1.emitNervesEvent)({
             component: "daemon",
             event: "daemon.staged_restart_shutdown_error",
-            message: "graceful shutdown encountered error",
+            message: "graceful shutdown encountered error (continuing with spawn)",
             meta: { version, error: shutdownError },
         });
-        return { ok: true, shutdownError };
     }
-    return { ok: true };
+    // Spawn new daemon from updated code path
+    const newEntry = path.join(newCodePath, "dist", "heart", "daemon", "daemon-entry.js");
+    const socketArg = deps.socketPath ?? "/tmp/ouroboros-daemon.sock";
+    try {
+        const { pid } = deps.spawnNewDaemon(newEntry, socketArg);
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.staged_restart_spawned",
+            message: "new daemon spawned successfully",
+            meta: { version, pid, entry: newEntry },
+        });
+    }
+    catch (err) {
+        const spawnError = err instanceof Error ? err.message : /* v8 ignore next -- defensive: non-Error catch branch @preserve */ String(err);
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.staged_restart_respawn_failed",
+            message: "failed to spawn new daemon after shutdown",
+            meta: { version, error: spawnError, entry: newEntry },
+        });
+        return { ok: false, error: `shutdown succeeded but failed to spawn new daemon: ${spawnError}`, shutdownError };
+    }
+    return { ok: true, shutdownError };
 }

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/associative-recall.js

@@ -35,59 +35,42 @@ 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 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 +116,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 +157,80 @@ 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) {
+                resultLines.push({
+                    text: `[diary] ${fact.text} [score=${fact.score.toFixed(3)} source=${fact.source}]`,
+                    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 +240,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 +250,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,8 +52,15 @@ 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" },
     { path: "skills", kind: "dir" },
     { path: "senses", kind: "dir" },