abmind 0.1.3 → 0.1.5-alpha.1

package/dist/src/session-context.js

@@ -1,83 +1,151 @@
 import { localTime, localDateTime } from "./local-time.js";
-export const RECENT_MSG_LIMIT = 8;
-export const RECENT_MSG_CAP = 2500;
+import { getAbmindEnv } from "./env-schema.js";
+import { join } from "node:path";
+import { readdirSync, readFileSync } from "node:fs";
+export const SESSION_HISTORY_MIN_MSGS = 8;
 /**
- * Format recent messages for injection. Keeps newest messages intact —
- * drops oldest messages first if over the soft cap (never truncates mid-message).
+ * Build session-start context for injection after /new, /reset, or restart.
+ * Budget-based interleaved fill: dailies + recent messages (#615).
  */
-function formatRecentMessages(rows) {
-    // rows come DESC from DB — reverse to chronological, skip empty
-    const chronological = [...rows].reverse().filter(r => r.content.trim());
-    const lines = chronological.map(r => {
-        const time = localTime(new Date(r.timestamp));
-        return `[${time}] ${r.role}: ${r.content}`;
-    });
-    // Drop oldest lines until under cap
-    while (lines.length > 1) {
-        const total = lines.join("\n").length;
-        if (total <= RECENT_MSG_CAP)
+export function buildSessionStartContext(memory, userId, maxContext, opts) {
+    const env = getAbmindEnv();
+    const ctxWindow = maxContext ?? 128000;
+    const pct = parseFloat(process.env["SESSION_HISTORY_PCT"] ?? "3");
+    const minMsgs = parseInt(process.env["SESSION_HISTORY_MIN_MSGS"] ?? "8", 10);
+    const cap = parseInt(process.env["SESSION_HISTORY_CAP"] ?? "25000", 10);
+    const budget = Math.min(Math.floor(ctxWindow * pct / 100), cap);
+    // --- Load sources ---
+    let recentRows = loadRecentUserMessages(memory, minMsgs + 50); // fetch extra for enrichment
+    // Age filter (Code sessions — discard messages older than maxAgeMs)
+    if (opts?.maxAgeMs) {
+        const cutoff = Date.now() - opts.maxAgeMs;
+        recentRows = recentRows.filter(r => r.timestamp >= cutoff);
+    }
+    const dailies = opts?.skipDailies ? [] : loadDailySummaries(memory.getConfig().memoryDir, 14);
+    // --- Floor: 1 daily + min messages (always included) ---
+    const recentBucket = [];
+    const dailyBucket = [];
+    // Floor messages — take NEWEST (last N elements, since recentRows is oldest-first after reverse+filter)
+    const floorStart = Math.max(0, recentRows.length - minMsgs);
+    for (let i = floorStart; i < recentRows.length; i++) {
+        recentBucket.push(formatMessage(recentRows[i]));
+    }
+    // Floor daily
+    if (dailies.length > 0) {
+        dailyBucket.push(dailies[0].content);
+    }
+    let used = recentBucket.join("\n").length + dailyBucket.join("\n").length;
+    // --- Enrichment cycle: fill BACKWARD (older messages) + forward (older dailies) within budget ---
+    let msgCursor = floorStart - 1;
+    let dailyCursor = 1;
+    while (used < budget) {
+        let added = false;
+        if (msgCursor >= 0) {
+            const line = formatMessage(recentRows[msgCursor]);
+            if (used + line.length <= budget) {
+                recentBucket.unshift(line); // prepend to maintain chronological order
+                used += line.length;
+                msgCursor--;
+                added = true;
+            }
+        }
+        if (dailyCursor < dailies.length) {
+            const entry = dailies[dailyCursor].content;
+            if (used + entry.length <= budget) {
+                dailyBucket.push(entry);
+                used += entry.length;
+                dailyCursor++;
+                added = true;
+            }
+        }
+        if (!added)
             break;
-        lines.shift();
     }
-    return lines.join("\n");
-}
-/**
- * Build session-start context for injection after /new, /reset, or restart.
- * Returns the latest daily summary, or recent messages if no daily covers the gap.
- * Wrapped in REQ-4 temporal markers.
- */
-export function buildSessionStartContext(memory, userId) {
-    const daily = memory.getLatestCompaction(userId);
-    const dailyTs = daily?.timestamp ?? 0;
-    const lastMsgTs = memory.store?.getLastMessageTimestamp() ?? 0;
+    // --- Assemble: clean separation, temporal order ---
+    if (recentBucket.length === 0 && dailyBucket.length === 0)
+        return null;
     const now = localDateTime(new Date());
-    let body;
-    let endedAt;
-    if (lastMsgTs > dailyTs && dailyTs > 0) {
-        const rows = memory.store.getMessagesSince(dailyTs, RECENT_MSG_LIMIT);
-        body = formatRecentMessages(rows);
-        endedAt = localDateTime(new Date(lastMsgTs));
+    const lastMsgTs = recentRows.length > 0 ? recentRows[recentRows.length - 1].timestamp : Date.now();
+    const endedAt = localDateTime(new Date(lastMsgTs));
+    const parts = [];
+    if (dailyBucket.length > 0) {
+        parts.push("[PAST DAYS]\n" + dailyBucket.join("\n\n"));
     }
-    else if (daily) {
-        body = daily.summary;
-        endedAt = localDateTime(new Date(dailyTs));
+    if (recentBucket.length > 0) {
+        parts.push(`[RECENT — last session, ended ${endedAt}]\n` + recentBucket.join("\n"));
     }
-    else if (lastMsgTs > 0) {
-        const rows = memory.store.getMessagesSince(0, RECENT_MSG_LIMIT);
-        body = formatRecentMessages(rows);
-        endedAt = localDateTime(new Date(lastMsgTs));
+    // Emotional tone
+    const tone = getEmotionalTone(memory, userId);
+    if (tone)
+        parts.push(tone);
+    parts.push(`[SESSION START — ${now}]`);
+    return parts.join("\n\n");
+}
+function formatMessage(row) {
+    const time = localTime(new Date(row.timestamp));
+    return `[${time}] ${row.content}`;
+}
+function loadRecentUserMessages(memory, limit) {
+    if (!memory.store)
+        return [];
+    try {
+        const rows = memory.store.getMessagesSince(0, limit);
+        // getMessagesSince returns oldest first — reverse for newest first, filter to user only
+        return [...rows].reverse().filter(r => r.role === "user" && r.content.trim());
     }
-    else {
-        return null;
+    catch {
+        return [];
     }
-    if (!body)
-        return null;
-    // Emotional tone of last session
-    let emotionalTone = "";
+}
+function loadDailySummaries(memoryDir, days) {
+    const dir = join(memoryDir, "daily");
+    try {
+        const files = readdirSync(dir).filter(f => f.endsWith(".md")).sort().reverse(); // newest first
+        const cutoff = Date.now() - days * 86_400_000;
+        const results = [];
+        for (const file of files) {
+            const m = file.match(/daily_(\d{4})-(\d{2})-(\d{2})\.md/);
+            if (!m)
+                continue;
+            const ts = new Date(`${m[1]}-${m[2]}-${m[3]}T00:00:00Z`).getTime();
+            if (ts < cutoff)
+                break;
+            const content = readFileSync(join(dir, file), "utf-8").trim();
+            if (content)
+                results.push({ timestamp: ts, content });
+        }
+        return results;
+    }
+    catch {
+        return [];
+    }
+}
+function getEmotionalTone(memory, userId) {
     try {
         const db = memory.getDatabase();
-        if (db) {
-            const rows = db.prepare(`SELECT emotion_tags, emotion_context FROM extracted_memories
-         WHERE user_id = ? AND emotion_tags IS NOT NULL AND emotion_tags != ''
-         ORDER BY created_at DESC LIMIT 5`).all(userId);
-            if (rows.length > 0) {
-                const tagCounts = new Map();
-                for (const r of rows) {
-                    for (const t of r.emotion_tags.split(",")) {
-                        const tag = t.trim();
-                        if (tag)
-                            tagCounts.set(tag, (tagCounts.get(tag) ?? 0) + 1);
-                    }
-                }
-                const top = [...tagCounts.entries()].sort((a, b) => b[1] - a[1]).slice(0, 3).map(([t]) => t);
-                const contexts = rows.map(r => r.emotion_context).filter(Boolean).slice(0, 2);
-                if (top.length > 0) {
-                    emotionalTone = `\n[Last session tone: ${top.join(", ")}${contexts.length > 0 ? ` (${contexts.join("; ")})` : ""}]`;
-                }
+        if (!db)
+            return null;
+        const rows = db.prepare(`SELECT emotion_tags, emotion_context FROM extracted_memories
+       WHERE user_id = ? AND emotion_tags IS NOT NULL AND emotion_tags != ''
+       ORDER BY created_at DESC LIMIT 5`).all(userId);
+        if (rows.length === 0)
+            return null;
+        const tagCounts = new Map();
+        for (const r of rows) {
+            for (const t of r.emotion_tags.split(",")) {
+                const tag = t.trim();
+                if (tag)
+                    tagCounts.set(tag, (tagCounts.get(tag) ?? 0) + 1);
             }
         }
+        const top = [...tagCounts.entries()].sort((a, b) => b[1] - a[1]).slice(0, 3).map(([t]) => t);
+        const contexts = rows.map(r => r.emotion_context).filter(Boolean).slice(0, 2);
+        if (top.length === 0)
+            return null;
+        return `[Last session tone: ${top.join(", ")}${contexts.length > 0 ? ` (${contexts.join("; ")})` : ""}]`;
+    }
+    catch {
+        return null;
     }
-    catch { /* */ }
-    return `[LAST SESSION SUMMARY — ended ${endedAt}]\n${body}${emotionalTone}\n[SESSION START — ${now}]`;
 }
 //# sourceMappingURL=session-context.js.map

package/dist/src/session-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-context.js","sourceRoot":"","sources":["../../src/session-context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-context.js","sourceRoot":"","sources":["../../src/session-context.ts"],"names":[],"mappings":"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"}

package/dist/src/sleep/levels.d.ts

@@ -3,12 +3,13 @@
  *
  * - basic:    1 LLM call. Single-shot combined prompt. Frontier-model-only.
  *             Prompt: prompts/sleep/basic.md. Emits ===DAILY=== + ===MEMORIES===.
- * - budget:   ~3 LLM calls. gc-noise + daily-summary + extract-from-daily only.
- * - normal:   ~10-14 LLM calls. All eligible prompts except weekly-only
- *             (skill-review, core-knowledge, consolidation) on non-curation days;
- *             full set on curation day. Default.
- * - ultimate: ~14 LLM calls. All eligible prompts every day; candidate-driven
- *             skips still apply.
+ * - budget:   ~3 calls daily, ~5 on curation day (adds retro + derive).
+ * - normal:   ~7 calls daily, ~15 on curation day. Default.
+ *             Daily: gc-noise, daily-summary, retrospective, extract-memories,
+ *             retro-derive, feedback, contradiction+graph.
+ *             Curation adds: topic-assignment, core-promotion, merge, translation,
+ *             skill-review, consolidation, emotion-context, rem-synthesis.
+ * - ultimate: ~15 calls every night. All steps, no weekly gating.
  *
  * See docs/plans/163-sleep-to-abmind.md for audience + tradeoff notes.
  */

package/dist/src/sleep/levels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"levels.d.ts","sourceRoot":"","sources":["../../../src/sleep/levels.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,MAAM,MAAM,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;AAI1E,0DAA0D;AAC1D,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,KAAK,CAI3C;AAED,kFAAkF;AAClF,eAAO,MAAM,aAAa,EAAE,KAAgB,CAAC"}
+{"version":3,"file":"levels.d.ts","sourceRoot":"","sources":["../../../src/sleep/levels.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,MAAM,MAAM,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;AAI1E,0DAA0D;AAC1D,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,KAAK,CAI3C;AAED,kFAAkF;AAClF,eAAO,MAAM,aAAa,EAAE,KAAgB,CAAC"}

package/dist/src/sleep/levels.js.map

@@ -1 +1 @@
-{"version":3,"file":"levels.js","sourceRoot":"","sources":["../../../src/sleep/levels.ts"],"names":[],"mappings":"AAgBA,MAAM,MAAM,GAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAU,CAAC;AAE9F,0DAA0D;AAC1D,MAAM,UAAU,UAAU,CAAC,CAAS;IAClC,MAAM,KAAK,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IAC9B,IAAK,MAA4B,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAc,CAAC;IACzE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,wBAAwB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACxF,CAAC;AAED,kFAAkF;AAClF,MAAM,CAAC,MAAM,aAAa,GAAU,QAAQ,CAAC"}
+{"version":3,"file":"levels.js","sourceRoot":"","sources":["../../../src/sleep/levels.ts"],"names":[],"mappings":"AAiBA,MAAM,MAAM,GAAqB,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAU,CAAC;AAE9F,0DAA0D;AAC1D,MAAM,UAAU,UAAU,CAAC,CAAS;IAClC,MAAM,KAAK,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IAC9B,IAAK,MAA4B,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAc,CAAC;IACzE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,wBAAwB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AACxF,CAAC;AAED,kFAAkF;AAClF,MAAM,CAAC,MAAM,aAAa,GAAU,QAAQ,CAAC"}

package/dist/src/sleep/orchestrator.d.ts

@@ -4,7 +4,7 @@
  *
  * Called via runSleepCycle({ runtime, level, ... }). Gathers system state,
  * runs through a pipeline of prompt-driven steps (gc-noise, daily-summary,
- * extract-from-daily, retrospective, etc.), persists audit log, returns result.
+ * extract-memories, retrospective, retro-derive, etc.), persists audit log, returns result.
  *
  * Library-only — no CLI entry point here. Standalone entry lives in
  * cli/abmind-sleep.ts.

package/dist/src/sleep/orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../../src/sleep/orchestrator.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;GAcG;AAoBH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,KAAK,KAAK,EAA6B,MAAM,aAAa,CAAC;AAgBpE,+FAA+F;AAC/F,eAAO,MAAM,eAAe,EAAE,WAAW,CAAC,MAAM,CAAqE,CAAC;AAGtH,qEAAqE;AACrE,qBAAa,cAAe,SAAQ,KAAK;gBAC3B,OAAO,EAAE,MAAM;CAC5B;AAED,qFAAqF;AACrF,qBAAa,iBAAkB,SAAQ,KAAK;gBAC9B,OAAO,EAAE,MAAM;CAC5B;AAED,2FAA2F;AAC3F,MAAM,WAAW,OAAO;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,YAAY,CAAC;IACtB,0EAA0E;IAC1E,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,iHAAiH;IACjH,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,iFAAiF;IACjF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iGAAiG;IACjG,SAAS,CAAC,EAAE,CAAC,mBAAmB,EAAE,MAAM,KAAK,MAAM,CAAC;IACpD,mDAAmD;IACnD,oBAAoB,CAAC,EAAE,OAAO,CAAC,OAAO,qBAAqB,EAAE,YAAY,CAAC,CAAC;CAC5E;AAED,kEAAkE;AAClE,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;CACnB;AAID,MAAM,MAAM,OAAO,GAAG;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC;AAE5E,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAmBjD;AAmdD;;;;;;;GAOG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAujBrE"}
+{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["../../../src/sleep/orchestrator.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;GAcG;AAoBH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,KAAK,KAAK,EAA6B,MAAM,aAAa,CAAC;AAgBpE,+FAA+F;AAC/F,eAAO,MAAM,eAAe,EAAE,WAAW,CAAC,MAAM,CAAmE,CAAC;AAGpH,qEAAqE;AACrE,qBAAa,cAAe,SAAQ,KAAK;gBAC3B,OAAO,EAAE,MAAM;CAC5B;AAED,qFAAqF;AACrF,qBAAa,iBAAkB,SAAQ,KAAK;gBAC9B,OAAO,EAAE,MAAM;CAC5B;AAED,2FAA2F;AAC3F,MAAM,WAAW,OAAO;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,YAAY,CAAC;IACtB,0EAA0E;IAC1E,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,iHAAiH;IACjH,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,iFAAiF;IACjF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iGAAiG;IACjG,SAAS,CAAC,EAAE,CAAC,mBAAmB,EAAE,MAAM,KAAK,MAAM,CAAC;IACpD,mDAAmD;IACnD,oBAAoB,CAAC,EAAE,OAAO,CAAC,OAAO,qBAAqB,EAAE,YAAY,CAAC,CAAC;CAC5E;AAED,kEAAkE;AAClE,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;CACnB;AAID,MAAM,MAAM,OAAO,GAAG;IAAE,MAAM,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC;AAE5E,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAmBjD;AAmdD;;;;;;;GAOG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAomBrE"}

package/dist/src/sleep/orchestrator.js

@@ -4,7 +4,7 @@
  *
  * Called via runSleepCycle({ runtime, level, ... }). Gathers system state,
  * runs through a pipeline of prompt-driven steps (gc-noise, daily-summary,
- * extract-from-daily, retrospective, etc.), persists audit log, returns result.
+ * extract-memories, retrospective, retro-derive, etc.), persists audit log, returns result.
  *
  * Library-only — no CLI entry point here. Standalone entry lives in
  * cli/abmind-sleep.ts.
@@ -42,7 +42,7 @@ function toIsoDate(ts) {
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
 }
 /** Steps whose failure blocks watermark advance. Public so tests can derive reject targets. */
-export const ESSENTIAL_STEPS = new Set(["daily-summary", "extract-from-daily", "retrospective"]);
+export const ESSENTIAL_STEPS = new Set(["daily-summary", "extract-memories", "retrospective"]);
 const CATCHUP_MAX_AGE_DAYS = 3;
 /** Thrown by runSleepCycle when memory layer fails to initialize. */
 export class SleepInitError extends Error {
@@ -401,12 +401,12 @@ async function runCatchUp(locks, sleepData, memoryConfig, steps, flags, runtime,
             }
             writeStateFile(lock.path, lock.state);
         }
-        // 04b — extract from daily (needs daily file to exist)
-        if (needed.includes("extract-from-daily")) {
+        // 04b — extract memories from daily (needs daily file to exist)
+        if (needed.includes("extract-memories")) {
             const dailyPath = join(memoryConfig.memoryDir, "daily", `daily_${dateStrToFormatted(lock.dateStr)}.md`);
             if (!existsSync(dailyPath)) {
                 logInfo(TAG, `[CATCH-UP] ⏭ 04b — no daily file for ${lock.dateStr}`);
-                lock.state.steps["extract-from-daily"] = { status: "skipped" };
+                lock.state.steps["extract-memories"] = { status: "skipped" };
             }
             else {
                 const start = Date.now();
@@ -414,12 +414,12 @@ async function runCatchUp(locks, sleepData, memoryConfig, steps, flags, runtime,
                     const userId = sleepData.getPrimaryUserId();
                     const result = await extractFromDaily(dailyPath, userId, (p) => sendWithRetry(runtime, p, "catch-up-04b", flags.verbose, budget).then(r => { if (r === null)
                         throw new LLMUnavailableError(); return r; }));
-                    lock.state.steps["extract-from-daily"] = { status: "ok", duration: Math.round((Date.now() - start) / 100) / 10 };
-                    logInfo(TAG, `[CATCH-UP] ✓ 04b-extract-from-daily for ${lock.dateStr} (${((Date.now() - start) / 1000).toFixed(1)}s) — ${result.slice(0, 80)}`);
+                    lock.state.steps["extract-memories"] = { status: "ok", duration: Math.round((Date.now() - start) / 100) / 10 };
+                    logInfo(TAG, `[CATCH-UP] ✓ 04b-extract-memories for ${lock.dateStr} (${((Date.now() - start) / 1000).toFixed(1)}s) — ${result.slice(0, 80)}`);
                 }
                 catch (err) {
                     logWarn(TAG, `[CATCH-UP] ✗ 04b for ${lock.dateStr}: ${err instanceof Error ? err.message : String(err)}`);
-                    lock.state.steps["extract-from-daily"] = { status: "failed", duration: Math.round((Date.now() - start) / 100) / 10 };
+                    lock.state.steps["extract-memories"] = { status: "failed", duration: Math.round((Date.now() - start) / 100) / 10 };
                 }
             }
             writeStateFile(lock.path, lock.state);
@@ -485,6 +485,11 @@ export async function runSleepCycle(opts) {
     try {
         const sleepData = memory.getSleepData();
         const db = memory.db; // access DB for meta writes
+        // TTL: clean ephemeral system/agent messages older than 24h
+        try {
+            db.prepare("DELETE FROM messages WHERE user_id IN ('system', 'agent') AND timestamp < ?").run(Date.now() - 86_400_000);
+        }
+        catch { /* */ }
         const { metaSet, metaIncrement, metaGetInt } = await import("../meta-store.js");
         // Record attempt
         metaSet(db, "sleep_last_attempt_ts", Date.now());
@@ -532,7 +537,7 @@ export async function runSleepCycle(opts) {
         const wiredResults = await runWiredPreTasks(sleepData, memoryConfig.memoryDir, memory);
         logInfo(TAG, `[SLEEP] Wired: ${formatWiredResults(wiredResults)}`);
         // Build candidate lists for conditional prompts
-        const candidates = sleepData.buildSleepCandidates();
+        const candidates = sleepData.buildSleepCandidates(getAbmindEnv().sleepModelName ?? "unknown");
         logInfo(TAG, `[SLEEP] Candidates: topics=${candidates.untaggedMemories ? "yes" : "none"}, promote=${candidates.promotionCandidates ? "yes" : "none"}, contradict=${candidates.contradictions ? "yes" : "none"}, merge=${candidates.mergeCandidates ? "yes" : "none"}, translate=${candidates.translationIssues ? "yes" : "none"}, emotion-ctx=${candidates.emotionContextGaps ? "yes" : "none"}, feedback=${candidates.recallFeedback ? "yes" : "none"}`);
         // Load step files + build vars
         const vars = buildSleepVars(snapshot);
@@ -563,7 +568,7 @@ export async function runSleepCycle(opts) {
                 }
             }
             catch { /* no garbage file */ }
-            const msgs = sleepData.getMessagesAfter(lastSleepTs);
+            const msgs = sleepData.getMessagesAfter(lastSleepTs, sleepData.getPrimaryUserId());
             const lines = msgs
                 .filter(m => !garbageIds.has(m.id) && !m.content.startsWith("[SYSTEM"))
                 .map(m => `[${m.role}]${m.emotion_score ? ` (emotion:${m.emotion_score})` : ""} ${m.content.slice(0, 500)}`);
@@ -578,6 +583,7 @@ export async function runSleepCycle(opts) {
         // Set remaining missing vars
         vars.MESSAGES_SINCE_WATERMARK = vars.CLEAN_MESSAGES; // same data, different name for gc-noise
         vars.RETRO_PATH = join(memoryConfig.memoryDir, "daily", `daily_${toIsoDate(now())}.md`);
+        vars.DAILY_PATH = vars.RETRO_PATH; // step 03 appends retro to the daily file
         try {
             const { getLatestConsolidationFile } = await import("../consolidation-search.js");
             const latest = getLatestConsolidationFile(memoryConfig.memoryDir, "weekly");
@@ -586,6 +592,20 @@ export async function runSleepCycle(opts) {
         catch {
             vars.CONSOLIDATION_PATH = "No consolidation files yet.";
         }
+        // Output path for consolidation — weekly or quarterly
+        const todayIso = new Date(now()).toISOString().slice(0, 10); // YYYY-MM-DD
+        const weeklyDir = join(memoryConfig.memoryDir, "weekly");
+        const quarterlyDir = join(memoryConfig.memoryDir, "quarterly");
+        mkdirSync(weeklyDir, { recursive: true });
+        mkdirSync(quarterlyDir, { recursive: true });
+        const month = new Date(now()).getMonth(); // 0-based
+        const isQuarterBoundary = month % 3 === 0 && new Date(now()).getDate() <= 7;
+        if (isQuarterBoundary) {
+            vars.CONSOLIDATION_OUTPUT_PATH = join(quarterlyDir, `quarterly_${todayIso}.md`);
+        }
+        else {
+            vars.CONSOLIDATION_OUTPUT_PATH = join(weeklyDir, `weekly_${todayIso}.md`);
+        }
         const steps = loadSleepSteps();
         // Merge snapshot vars + bridge vars into one map for JIT substitution
         const snapshotVars = buildSleepVars(snapshot);
@@ -611,56 +631,50 @@ export async function runSleepCycle(opts) {
         const curationDay = getAbmindEnv().sleepCurationDay;
         const today = new Date(now()).toLocaleDateString("en", { weekday: "long" }).toLowerCase();
         const isCurationDay = today === curationDay;
-        const BUDGET_ONLY = new Set(["gc-noise", "daily-summary", "extract-from-daily"]);
-        const WEEKLY_ONLY = new Set(["skill-review", "core-knowledge", "consolidation"]);
-        const ULTIMATE_ONLY = new Set(["rem-synthesis"]);
-        if (quality === "budget") {
+        const BUDGET_ONLY = new Set(["gc-noise", "daily-summary", "extract-memories"]);
+        const BUDGET_CURATION = new Set([...BUDGET_ONLY, "retrospective", "retro-derive"]);
+        const WEEKLY_ONLY = new Set(["memory-maintenance", "translation",
+            "skill-review", "consolidation", "rem-synthesis"]);
+        if (quality === "budget" && !isCurationDay) {
             for (const step of steps) {
                 if (!BUDGET_ONLY.has(step.name))
                     skipSet.add(step.name);
             }
             logInfo(TAG, `[SLEEP] Quality=budget — only essential extraction`);
         }
+        else if (quality === "budget" && isCurationDay) {
+            for (const step of steps) {
+                if (!BUDGET_CURATION.has(step.name))
+                    skipSet.add(step.name);
+            }
+            logInfo(TAG, `[SLEEP] Quality=budget (curation day) — adds retro + derive`);
+        }
         else if (quality === "normal" && !isCurationDay) {
             for (const name of WEEKLY_ONLY)
                 skipSet.add(name);
-            for (const name of ULTIMATE_ONLY)
-                skipSet.add(name);
-            logInfo(TAG, `[SLEEP] Quality=normal — weekly + ultimate prompts skipped (curation day: ${curationDay})`);
+            logInfo(TAG, `[SLEEP] Quality=normal — weekly prompts skipped (curation day: ${curationDay})`);
         }
         else if (quality === "normal" && isCurationDay) {
-            for (const name of ULTIMATE_ONLY)
-                skipSet.add(name);
-            logInfo(TAG, `[SLEEP] Quality=normal (curation day) — ultimate prompts skipped`);
+            logInfo(TAG, `[SLEEP] Quality=normal (curation day) — all steps`);
         }
         else {
-            // ultimate: only skip REM on non-curation days
-            if (!isCurationDay)
-                skipSet.add("rem-synthesis");
+            // ultimate: all steps every night
             logInfo(TAG, `[SLEEP] Quality=${quality}${isCurationDay ? " (curation day)" : ""} — all eligible`);
         }
         // Candidate-driven skips (empty = nothing to do)
         if (!candidates.recallFeedback)
             skipSet.add("feedback");
-        if (!candidates.untaggedMemories)
-            skipSet.add("topic-assignment");
-        if (!candidates.promotionCandidates)
-            skipSet.add("core-promotion");
-        if (!candidates.mergeCandidates)
-            skipSet.add("merge");
-        if (!candidates.translationIssues)
-            skipSet.add("translation-check");
+        // memory-maintenance: skip if ALL three inputs are empty
+        if (!candidates.untaggedMemories && !candidates.mergeCandidates && !candidates.emotionContextGaps)
+            skipSet.add("memory-maintenance");
+        // promotion candidates are optional input to retro-derive — don't skip the step for it
         if (!candidates.translationIssues)
             skipSet.add("translation");
-        if (!candidates.emotionContextGaps)
-            skipSet.add("emotion-context");
-        if (!candidates.emotionContextGaps)
-            skipSet.add("emotion-context-backfill");
         // Legacy skip names (old prompt files)
         if (snapshot.topicFiles.length === 0)
             skipSet.add("topic-reorg");
         if (snapshot.dbStats.extractedMemoryCount < 10) {
-            skipSet.add("merge");
+            skipSet.add("memory-maintenance");
             skipSet.add("darwinism");
         }
         if (snapshot.dbStats.extractedMemoryCount < 20)
@@ -699,6 +713,11 @@ export async function runSleepCycle(opts) {
         let dailySummaryPath = null;
         try {
             // ── LLM call budget (hard safety limit) ──
+            // On resume: reset llmCalls to completed step count (don't carry stale counter)
+            if (isResume) {
+                const completedCount = Object.values(state.steps).filter(s => s.status === "ok").length;
+                state.llmCalls = completedCount;
+            }
             const budget = new LlmBudget(state, statePath);
             // ── Catch-up: recover failed essentials from previous days ──
             const sleepDir = join(memoryConfig.memoryDir, "sleep");
@@ -707,6 +726,29 @@ export async function runSleepCycle(opts) {
                 logInfo(TAG, `[CATCH-UP] Found ${previousLocks.length} previous lock(s)`);
                 await runCatchUp(previousLocks, sleepData, memoryConfig, steps, flags, runtime, budget);
             }
+            // Housekeeping: move misplaced daily/consolidation_* to weekly/ (#640)
+            try {
+                const dailyDir = join(memoryConfig.memoryDir, "daily");
+                if (existsSync(dailyDir)) {
+                    for (const f of readdirSync(dailyDir).filter(fn => fn.startsWith("consolidation_"))) {
+                        const m = f.match(/consolidation_(\d{4})-(\d{2})-week(\d)/);
+                        if (m) {
+                            const [, year, month, week] = m;
+                            const day = (parseInt(week) - 1) * 7 + 1;
+                            const approxDate = `${year}-${month}-${String(Math.min(day, 28)).padStart(2, "0")}`;
+                            const dest = join(weeklyDir, `weekly_${approxDate}.md`);
+                            if (!existsSync(dest)) {
+                                const { renameSync } = await import("node:fs");
+                                renameSync(join(dailyDir, f), dest);
+                                logInfo(TAG, `[HOUSEKEEPING] Moved ${f} → weekly_${approxDate}.md`);
+                            }
+                        }
+                    }
+                }
+            }
+            catch (err) {
+                logWarn(TAG, `[HOUSEKEEPING] consolidation migration failed: ${err}`);
+            }
             emitProgress("starting");
             let consecutiveFailures = 0;
             // Create day directory for per-step logs
@@ -779,10 +821,10 @@ export async function runSleepCycle(opts) {
                     logInfo(TAG, `[SLEEP] ${state.steps[step.name]?.status === "ok" ? "✓" : "✗"} ${step.name} (${((Date.now() - start) / 1000).toFixed(1)}s)`);
                     continue;
                 }
-                if (step.name === "extract-from-daily") {
+                if (step.name === "extract-memories") {
                     // Resume path: if daily-summary already completed in a prior run, the
                     // in-memory dailySummaryPath is null. Recover it from the lock's
-                    // recorded path so extract-from-daily can still run. #181.
+                    // recorded path so extract-memories can still run. #181.
                     if (!dailySummaryPath) {
                         const priorPath = state.steps["daily-summary"]?.path;
                         if (priorPath && existsSync(priorPath)) {