@ouro.bot/cli 0.1.0-alpha.156 → 0.1.0-alpha.157

package/changelog.json

@@ -1,6 +1,16 @@
 {
   "_note": "This changelog is maintained as part of the PR/version-bump workflow. Agent-curated, not auto-generated. Agents read this file directly via read_file to understand what changed between versions.",
   "versions": [
+    {
+      "version": "0.1.0-alpha.157",
+      "changes": [
+        "Habit turns as awareness: unified buildHabitTurnMessage replaces contextual-heartbeat. Continuity-first format (checkpoint leads, not elapsed time). Same format for all habits \u2014 no heartbeat special-casing.",
+        "First beat experience: new habits get \"your [Title] is alive. this is its first breath\" on first fire.",
+        "Fix: reconcile() now fires new/overdue habits immediately (was start()-only). New habits created via write_file fire within seconds.",
+        "Rhythm awareness across all channels: rhythmStatusSection() in system prompt shows heartbeat health in every conversation.",
+        "Removed contextual-heartbeat.ts entirely. Dead lastSurfaceAt parameter removed."
+      ]
+    },
     {
       "version": "0.1.0-alpha.156",
       "changes": [
@@ -1033,4 +1043,4 @@
       ]
     }
   ]
-}
+}

package/dist/heart/daemon/habit-scheduler.js

@@ -73,7 +73,24 @@ class HabitScheduler {
         const jobs = this.buildJobs(habits);
         this.osCronManager.sync(jobs);
         this.verifyCronAndCreateFallbacks(jobs);
-        // Fire overdue habits immediately
+        this.fireOverdueHabits(habits);
+    }
+    reconcile() {
+        (0, runtime_1.emitNervesEvent)({
+            component: "daemon",
+            event: "daemon.habit_scheduler_reconcile",
+            message: "habit scheduler reconciling",
+            meta: { agent: this.agent },
+        });
+        // Clear ALL existing timers FIRST to prevent overlap window
+        this.clearAllTimerFallbacks();
+        const habits = this.scanHabits();
+        const jobs = this.buildJobs(habits);
+        this.osCronManager.sync(jobs);
+        this.verifyCronAndCreateFallbacks(jobs);
+        this.fireOverdueHabits(habits);
+    }
+    fireOverdueHabits(habits) {
         for (const habit of habits) {
             if (habit.status !== "active")
                 continue;
@@ -106,20 +123,6 @@ class HabitScheduler {
             }
         }
     }
-    reconcile() {
-        (0, runtime_1.emitNervesEvent)({
-            component: "daemon",
-            event: "daemon.habit_scheduler_reconcile",
-            message: "habit scheduler reconciling",
-            meta: { agent: this.agent },
-        });
-        // Clear ALL existing timers FIRST to prevent overlap window
-        this.clearAllTimerFallbacks();
-        const habits = this.scanHabits();
-        const jobs = this.buildJobs(habits);
-        this.osCronManager.sync(jobs);
-        this.verifyCronAndCreateFallbacks(jobs);
-    }
     stop() {
         (0, runtime_1.emitNervesEvent)({
             component: "daemon",

package/dist/mind/prompt.js

@@ -51,6 +51,7 @@ exports.channelNatureSection = channelNatureSection;
 exports.groupChatParticipationSection = groupChatParticipationSection;
 exports.feedbackSignalSection = feedbackSignalSection;
 exports.mixedTrustGroupSection = mixedTrustGroupSection;
+exports.rhythmStatusSection = rhythmStatusSection;
 exports.buildSystem = buildSystem;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
@@ -71,6 +72,7 @@ const session_activity_1 = require("../heart/session-activity");
 const active_work_1 = require("../heart/active-work");
 const commitments_1 = require("../heart/commitments");
 const obligation_steering_1 = require("./obligation-steering");
+const daemon_health_1 = require("../heart/daemon/daemon-health");
 // Lazy-loaded psyche text cache
 let _psycheCache = null;
 let _senseStatusLinesCache = null;
@@ -886,6 +888,39 @@ function mixedTrustGroupSection(context) {
         return "";
     return "## mixed trust group\nin this group chat, my capabilities depend on who's talking. some people here have full trust, others don't — i adjust what i can do based on who's asking.";
 }
+function formatElapsedBrief(ms) {
+    const minutes = Math.floor(ms / 60000);
+    if (minutes < 60)
+        return `${minutes}m ago`;
+    const hours = Math.floor(minutes / 60);
+    return `${hours}h ago`;
+}
+function rhythmStatusSection() {
+    try {
+        const health = (0, daemon_health_1.readHealth)((0, daemon_health_1.getDefaultHealthPath)());
+        if (!health)
+            return "";
+        const habitNames = Object.keys(health.habits);
+        if (habitNames.length === 0)
+            return "";
+        const nowMs = Date.now();
+        const parts = [];
+        for (const name of habitNames) {
+            const h = health.habits[name];
+            const lastFired = h.lastFired ? formatElapsedBrief(nowMs - new Date(h.lastFired).getTime()) : "never";
+            parts.push(`${name} last fired ${lastFired}`);
+        }
+        const degradedNote = health.degraded.length > 0
+            ? health.degraded.map((d) => `${d.component}: ${d.reason}`).join("; ") + "."
+            : "healthy.";
+        return `my rhythms: ${parts.join(". ")}. ${degradedNote}`;
+        /* v8 ignore start -- defensive: readHealth handles its own errors; this catch is a safety net for truly unexpected failures @preserve */
+    }
+    catch {
+        return "";
+    }
+    /* v8 ignore stop */
+}
 async function buildSystem(channel = "cli", options, context) {
     (0, runtime_1.emitNervesEvent)({
         event: "mind.step_start",
@@ -906,6 +941,7 @@ async function buildSystem(channel = "cli", options, context) {
         channel === "inner" ? journalSection((0, identity_1.getAgentRoot)()) : "",
         loopOrientationSection(channel),
         runtimeInfoSection(channel),
+        rhythmStatusSection(),
         channelNatureSection((0, channel_1.getChannelCapabilities)(channel)),
         providerSection(),
         dateSection(),

package/dist/senses/habit-turn-message.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildHabitTurnMessage = buildHabitTurnMessage;
+const runtime_1 = require("../nerves/runtime");
+function formatElapsed(ms) {
+    const minutes = Math.floor(ms / 60000);
+    if (minutes < 60) {
+        return `${minutes} ${minutes === 1 ? "minute" : "minutes"}`;
+    }
+    const hours = Math.floor(minutes / 60);
+    return `${hours} ${hours === 1 ? "hour" : "hours"}`;
+}
+function buildHabitTurnMessage(options) {
+    const { habitName, habitTitle, habitBody, lastRun, checkpoint, alsoDue, staleObligations, parseErrors, degradedComponents, now, } = options;
+    const hasBody = habitBody !== undefined && habitBody !== "";
+    // First beat: lastRun is null
+    if (lastRun === null) {
+        // Cold start: no checkpoint, no body — bare awareness
+        if (!checkpoint && !hasBody) {
+            (0, runtime_1.emitNervesEvent)({
+                component: "senses",
+                event: "senses.habit_turn_message_built",
+                message: "habit turn message built (cold start)",
+                meta: { habitName, coldStart: true },
+            });
+            return "...time passing. anything stirring?";
+        }
+        if (!hasBody) {
+            // First beat with no body: nudge
+            const sections = [
+                `your ${habitTitle} fired but has no instructions \u2014 add a body to \`habits/${habitName}.md\``,
+            ];
+            appendTrailingExtras(sections, alsoDue, staleObligations, parseErrors, degradedComponents);
+            (0, runtime_1.emitNervesEvent)({
+                component: "senses",
+                event: "senses.habit_turn_message_built",
+                message: "habit turn message built (first beat, no body)",
+                meta: { habitName, firstBeat: true, hasBody: false },
+            });
+            return sections.join("\n\n");
+        }
+        const sections = [
+            `your ${habitTitle} is alive. this is its first breath.`,
+            habitBody,
+        ];
+        appendTrailingExtras(sections, alsoDue, staleObligations, parseErrors, degradedComponents);
+        (0, runtime_1.emitNervesEvent)({
+            component: "senses",
+            event: "senses.habit_turn_message_built",
+            message: "habit turn message built (first beat)",
+            meta: { habitName, firstBeat: true },
+        });
+        return sections.join("\n\n");
+    }
+    // Normal turn
+    const sections = [];
+    // 1. Checkpoint
+    if (checkpoint) {
+        sections.push(`you were thinking about ${checkpoint}.`);
+    }
+    // 2. Elapsed time
+    const nowMs = now().getTime();
+    const lastRunMs = new Date(lastRun).getTime();
+    const elapsed = nowMs - lastRunMs;
+    sections.push(`${formatElapsed(elapsed)} have passed.`);
+    // 3. Body or no-body nudge
+    if (hasBody) {
+        sections.push(habitBody);
+    }
+    else {
+        sections.push(`your ${habitTitle} fired but has no instructions \u2014 add a body to \`habits/${habitName}.md\``);
+    }
+    // 4-7. Trailing extras
+    appendTrailingExtras(sections, alsoDue, staleObligations, parseErrors, degradedComponents);
+    (0, runtime_1.emitNervesEvent)({
+        component: "senses",
+        event: "senses.habit_turn_message_built",
+        message: "habit turn message built",
+        meta: {
+            habitName,
+            hasCheckpoint: !!checkpoint,
+            hasBody: hasBody,
+            staleObligationCount: staleObligations.length,
+        },
+    });
+    return sections.join("\n\n");
+}
+function appendTrailingExtras(sections, alsoDue, staleObligations, parseErrors, degradedComponents) {
+    // 4. Also-due
+    if (alsoDue) {
+        sections.push(alsoDue);
+    }
+    // 5. Stale obligations
+    if (staleObligations.length > 0) {
+        const lines = staleObligations.map((o) => `something for ${o.friendName} has been sitting for ${formatElapsed(o.stalenessMs)}`);
+        sections.push(lines.join("\n"));
+    }
+    // 6. Parse errors
+    if (parseErrors.length > 0) {
+        const lines = parseErrors.map((e) => `I noticed my habit file \`${e.file}\` has invalid frontmatter \u2014 I should fix it. (${e.error})`);
+        sections.push(lines.join("\n"));
+    }
+    // 7. Degraded state
+    if (degradedComponents.length > 0) {
+        const reasons = degradedComponents.map((d) => `${d.component}: ${d.reason}`).join("; ");
+        sections.push(`[note: my scheduling is degraded: ${reasons}]`);
+    }
+}

package/dist/senses/inner-dialog.js

@@ -67,7 +67,7 @@ const manager_1 = require("../heart/bridges/manager");
 const session_activity_1 = require("../heart/session-activity");
 const bluebubbles_1 = require("./bluebubbles");
 const obligations_2 = require("../heart/obligations");
-const contextual_heartbeat_1 = require("./contextual-heartbeat");
+const habit_turn_message_1 = require("./habit-turn-message");
 const journal_index_1 = require("../mind/journal-index");
 const habit_parser_1 = require("../heart/daemon/habit-parser");
 const cadence_1 = require("../heart/daemon/cadence");
@@ -559,106 +559,65 @@ async function runInnerDialogTurn(options) {
                 const habitFilePath = path.join(agentRoot, "habits", `${habitName}.md`);
                 // Read and parse the habit file
                 let habitBody;
+                let habitTitle = habitName;
                 let habitLastRun = null;
                 try {
                     const habitContent = fs.readFileSync(habitFilePath, "utf-8");
                     const parsed = (0, habit_parser_1.parseHabitFile)(habitContent, habitFilePath);
-                    habitBody = parsed.body;
+                    habitBody = parsed.body || undefined;
+                    habitTitle = parsed.title || habitName;
                     habitLastRun = parsed.lastRun;
                 }
                 catch {
                     // Habit file missing or unreadable
                 }
-                if (habitName === "heartbeat") {
-                    // Heartbeat habit: use contextual heartbeat builder with habit body
-                    const journalDir = path.join(agentRoot, "journal");
-                    const runtimeStatePath = innerDialogRuntimeStatePath(sessionFilePath);
-                    let lastCompletedAt;
-                    try {
-                        const raw = fs.readFileSync(runtimeStatePath, "utf-8");
-                        const runtimeState = JSON.parse(raw);
-                        lastCompletedAt = typeof runtimeState.lastCompletedAt === "string" ? runtimeState.lastCompletedAt : undefined;
-                    }
-                    catch {
-                        // no runtime state — will get cold start fallback
-                    }
+                // If the habit file couldn't be read at all (no body, no title parsed), error message
+                if (habitBody === undefined && habitTitle === habitName) {
+                    userContent = `habit "${habitName}" could not be read (file not found or unreadable). check habits/${habitName}.md exists.`;
+                }
+                else {
+                    // Unified path: gather context for ALL habits (heartbeat included)
                     const obligations = (0, obligations_1.listActiveObligations)(agentName);
                     const nowMs = now().getTime();
-                    const pendingObligations = obligations.map((o) => ({
-                        id: o.id,
-                        content: o.delegatedContent,
+                    const staleObligations = obligations.map((o) => ({
                         friendName: o.origin.friendId,
-                        timestamp: o.createdAt,
-                        staleness: nowMs - o.createdAt,
+                        content: o.delegatedContent,
+                        stalenessMs: nowMs - o.createdAt,
                     }));
-                    const heartbeatContent = (0, contextual_heartbeat_1.buildContextualHeartbeat)({
-                        journalDir,
-                        lastCompletedAt,
-                        pendingObligations,
-                        lastSurfaceAt: undefined,
-                        checkpoint: state.checkpoint,
-                        now,
-                        readJournalDir: () => (0, prompt_1.readJournalFiles)(journalDir),
+                    const alsoDue = buildAlsoDueLine(agentRoot, habitName, now);
+                    // Degraded state (best-effort: never crash)
+                    let degradedComponents = [];
+                    try {
+                        const health = (0, daemon_health_1.readHealth)((0, daemon_health_1.getDefaultHealthPath)());
+                        if (health && health.degraded.length > 0) {
+                            degradedComponents = health.degraded.map((d) => ({ component: d.component, reason: d.reason }));
+                        }
+                    }
+                    catch {
+                        // Best-effort: missing file or parse error -> empty array, no crash
+                    }
+                    userContent = (0, habit_turn_message_1.buildHabitTurnMessage)({
+                        habitName,
+                        habitTitle,
                         habitBody,
+                        lastRun: habitLastRun,
+                        checkpoint: displayCheckpoint(state.checkpoint),
+                        alsoDue: alsoDue || undefined,
+                        staleObligations,
+                        parseErrors: options?.parseErrors ?? [],
+                        degradedComponents,
+                        now,
                     });
-                    // Build also-due line
-                    const alsoDue = buildAlsoDueLine(agentRoot, habitName, now);
-                    userContent = alsoDue ? `${heartbeatContent}\n\n${alsoDue}` : heartbeatContent;
-                    // Parse error nudge
-                    const parseErrorNudge = buildParseErrorNudge(options?.parseErrors ?? []);
-                    if (parseErrorNudge)
-                        userContent = `${userContent}\n\n${parseErrorNudge}`;
                     // Piggyback journal embedding indexing (best-effort, fire-and-forget)
+                    const journalDir = path.join(agentRoot, "journal");
                     /* v8 ignore start -- journal indexing piggyback: embedding provider may not be available; tested via journal-index unit tests @preserve */
                     void (0, journal_index_1.indexJournalFiles)(journalDir, path.join(journalDir, ".index.json"), {
                         embed: async () => [],
                     }).catch(() => {
-                        // swallowed: indexing failure must never block heartbeat
+                        // swallowed: indexing failure must never block habit turn
                     });
                     /* v8 ignore stop */
                 }
-                else if (habitBody !== undefined) {
-                    // Non-heartbeat habit: basic context + body
-                    const sections = [];
-                    // Elapsed time since last run
-                    if (habitLastRun) {
-                        const lastRunMs = new Date(habitLastRun).getTime();
-                        const elapsed = now().getTime() - lastRunMs;
-                        const minutes = Math.floor(elapsed / 60000);
-                        if (minutes < 60) {
-                            sections.push(`it's been ${minutes} ${minutes === 1 ? "minute" : "minutes"} since ${habitName} last ran.`);
-                        }
-                        else {
-                            const hours = Math.floor(minutes / 60);
-                            sections.push(`it's been ${hours} ${hours === 1 ? "hour" : "hours"} since ${habitName} last ran.`);
-                        }
-                    }
-                    sections.push(`## habit: ${habitName}\n${habitBody}`);
-                    // Also due line
-                    const alsoDue = buildAlsoDueLine(agentRoot, habitName, now);
-                    if (alsoDue)
-                        sections.push(alsoDue);
-                    // Parse error nudge
-                    const parseErrorNudge = buildParseErrorNudge(options?.parseErrors ?? []);
-                    if (parseErrorNudge)
-                        sections.push(parseErrorNudge);
-                    userContent = sections.join("\n\n");
-                }
-                else {
-                    // Habit file not found
-                    userContent = `habit "${habitName}" could not be read (file not found or unreadable). check habits/${habitName}.md exists.`;
-                }
-                // Degraded state nudge (best-effort: never crash on health file read failure)
-                try {
-                    const health = (0, daemon_health_1.readHealth)((0, daemon_health_1.getDefaultHealthPath)());
-                    if (health && health.degraded.length > 0) {
-                        const reasons = health.degraded.map((d) => `${d.component}: ${d.reason}`).join("; ");
-                        userContent = `${userContent}\n\n[note: my scheduling is degraded: ${reasons}]`;
-                    }
-                }
-                catch {
-                    // Best-effort: missing file or parse error -> no nudge, no crash
-                }
             }
             else {
                 userContent = buildInstinctUserMessage(instincts, reason, state);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ouro.bot/cli",
-  "version": "0.1.0-alpha.156",
+  "version": "0.1.0-alpha.157",
   "main": "dist/heart/daemon/ouro-entry.js",
   "bin": {
     "cli": "dist/heart/daemon/ouro-bot-entry.js",

package/dist/senses/contextual-heartbeat.js

@@ -1,106 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildContextualHeartbeat = buildContextualHeartbeat;
-const runtime_1 = require("../nerves/runtime");
-const STALE_THRESHOLD_MS = 30 * 60 * 1000; // 30 minutes
-const MAX_JOURNAL_FILES = 10;
-function formatElapsed(ms) {
-    const minutes = Math.floor(ms / 60000);
-    if (minutes < 60) {
-        return `${minutes} ${minutes === 1 ? "minute" : "minutes"}`;
-    }
-    const hours = Math.floor(minutes / 60);
-    return `${hours} ${hours === 1 ? "hour" : "hours"}`;
-}
-function formatRelativeTime(nowMs, mtimeMs) {
-    const diffMs = nowMs - mtimeMs;
-    const minutes = Math.floor(diffMs / 60000);
-    if (minutes < 1)
-        return "just now";
-    if (minutes < 60)
-        return `${minutes} ${minutes === 1 ? "minute" : "minutes"} ago`;
-    const hours = Math.floor(minutes / 60);
-    if (hours < 24)
-        return `${hours} ${hours === 1 ? "hour" : "hours"} ago`;
-    const days = Math.floor(hours / 24);
-    return `${days} ${days === 1 ? "day" : "days"} ago`;
-}
-function buildContextualHeartbeat(options) {
-    const { lastCompletedAt, pendingObligations, lastSurfaceAt, checkpoint, now, readJournalDir, habitBody, } = options;
-    const nowDate = now();
-    const nowMs = nowDate.getTime();
-    const journalFiles = readJournalDir();
-    // Cold start: no journal files and no runtime state
-    if (journalFiles.length === 0 && !lastCompletedAt) {
-        const lines = ["...time passing. anything stirring?"];
-        if (checkpoint) {
-            lines.push(`\nlast i remember: ${checkpoint}`);
-        }
-        (0, runtime_1.emitNervesEvent)({
-            component: "senses",
-            event: "senses.contextual_heartbeat_built",
-            message: "contextual heartbeat built (cold start)",
-            meta: { coldStart: true },
-        });
-        return lines.join("\n");
-    }
-    const sections = [];
-    // Elapsed time since last turn
-    if (lastCompletedAt) {
-        const lastMs = new Date(lastCompletedAt).getTime();
-        const elapsed = nowMs - lastMs;
-        sections.push(`it's been ${formatElapsed(elapsed)} since your last turn.`);
-    }
-    // Habit body (instructions from habit file)
-    if (habitBody) {
-        sections.push(habitBody);
-    }
-    // Pending attention count
-    if (pendingObligations.length > 0) {
-        const count = pendingObligations.length;
-        sections.push(`you're holding ${count} ${count === 1 ? "thought" : "thoughts"}.`);
-    }
-    // Journal index
-    if (journalFiles.length > 0) {
-        const sorted = [...journalFiles].sort((a, b) => b.mtime - a.mtime).slice(0, MAX_JOURNAL_FILES);
-        const indexLines = ["## journal"];
-        for (const file of sorted) {
-            const ago = formatRelativeTime(nowMs, file.mtime);
-            const previewClause = file.preview ? ` — ${file.preview}` : "";
-            indexLines.push(`- ${file.name} (${ago})${previewClause}`);
-        }
-        sections.push(indexLines.join("\n"));
-    }
-    // Journal entries since last surface
-    if (lastSurfaceAt && journalFiles.length > 0) {
-        const surfaceMs = new Date(lastSurfaceAt).getTime();
-        const entriesSinceSurface = journalFiles.filter((f) => f.mtime > surfaceMs).length;
-        if (entriesSinceSurface > 0) {
-            const surfaceElapsed = formatElapsed(nowMs - surfaceMs);
-            sections.push(`${entriesSinceSurface} journal ${entriesSinceSurface === 1 ? "entry" : "entries"} since you last surfaced, ${surfaceElapsed} ago.`);
-        }
-    }
-    // Stale obligation alerts
-    const staleObligations = pendingObligations.filter((o) => o.staleness >= STALE_THRESHOLD_MS);
-    if (staleObligations.length > 0) {
-        for (const obligation of staleObligations) {
-            sections.push(`this has been sitting for ${formatElapsed(obligation.staleness)}: ${obligation.content}`);
-        }
-    }
-    // Checkpoint
-    if (checkpoint) {
-        sections.push(`last i remember: ${checkpoint}`);
-    }
-    (0, runtime_1.emitNervesEvent)({
-        component: "senses",
-        event: "senses.contextual_heartbeat_built",
-        message: "contextual heartbeat built",
-        meta: {
-            hasJournal: journalFiles.length > 0,
-            hasLastCompleted: !!lastCompletedAt,
-            obligationCount: pendingObligations.length,
-            staleCount: staleObligations.length,
-        },
-    });
-    return sections.join("\n\n");
-}