linksee-memory 0.12.0 → 0.13.0

package/dist/mcp/prompts.js

@@ -63,23 +63,23 @@ export function getPrompt(name, args) {
                         role: 'user',
                         content: {
                             type: 'text',
-                            text: `You are an agent-memory writer. Read the session transcript below and propose memories to save. Output a JSON array; each item has {entity_name, entity_kind, layer, content, importance}.
-
-Layers (use exactly one per memory):
-- goal: WHY this work exists, target outcome
-- context: WHY THIS NOW, situation, timing
-- emotion: USER tone, feelings expressed
-- implementation: HOW it was done, what worked, what failed
-- caveat: PAIN lesson, "never X" / "always Y" — these are protected from forgetting
-- learning: GROWTH, decisions made, insights
-
-Rules:
-- Max 6 entries (one per layer). Skip layers with nothing worth saving.
-- Importance 0-1. Set 0.9+ to pin (use sparingly).
-- Caveats must be 1 sentence and start with a verb.
-- Quote nothing verbatim; summarize.
-
-Transcript:
+                            text: `You are an agent-memory writer. Read the session transcript below and propose memories to save. Output a JSON array; each item has {entity_name, entity_kind, layer, content, importance}.
+
+Layers (use exactly one per memory):
+- goal: WHY this work exists, target outcome
+- context: WHY THIS NOW, situation, timing
+- emotion: USER tone, feelings expressed
+- implementation: HOW it was done, what worked, what failed
+- caveat: PAIN lesson, "never X" / "always Y" — these are protected from forgetting
+- learning: GROWTH, decisions made, insights
+
+Rules:
+- Max 6 entries (one per layer). Skip layers with nothing worth saving.
+- Importance 0-1. Set 0.9+ to pin (use sparingly).
+- Caveats must be 1 sentence and start with a verb.
+- Quote nothing verbatim; summarize.
+
+Transcript:
 ${transcript}${entityHint}`,
                         },
                     },
@@ -96,15 +96,15 @@ ${transcript}${entityHint}`,
                         role: 'user',
                         content: {
                             type: 'text',
-                            text: `You are a caveat extractor. Read the source text below and output a JSON list of caveats. Each caveat:
-- Starts with a verb ("Never", "Always", "Watch out", "Reject", "Confirm")
-- Is one sentence
-- Is concrete (a specific failure mode, not abstract advice)
-- Captures something the reader does NOT want to relearn the hard way
-
-Output format: [{"content": "Never X when Y, because Z", "importance": 0.7-1.0}]
-
-Source text:
+                            text: `You are a caveat extractor. Read the source text below and output a JSON list of caveats. Each caveat:
+- Starts with a verb ("Never", "Always", "Watch out", "Reject", "Confirm")
+- Is one sentence
+- Is concrete (a specific failure mode, not abstract advice)
+- Captures something the reader does NOT want to relearn the hard way
+
+Output format: [{"content": "Never X when Y, because Z", "importance": 0.7-1.0}]
+
+Source text:
 ${text}${entityHint}`,
                         },
                     },
@@ -121,17 +121,17 @@ ${text}${entityHint}`,
                         role: 'user',
                         content: {
                             type: 'text',
-                            text: `Consolidate the past week's memories for entity "${entityName}" (week_offset=${weekOffset}).
-
-Step 1: Call recall(query="${entityName}", entity_name="${entityName}", max_tokens=4000) to retrieve recent memories.
-Step 2: Read the returned memories and produce ONE learning-layer summary that captures:
-  - What we set out to do (goal trajectory)
-  - What actually happened (implementation summary)
-  - What we learned (1-3 insights)
-  - Any caveats we should never forget (preserve these — do NOT consolidate them away)
-
-Step 3: Output a JSON object {entity_name, layer:"learning", content, importance:0.7}.
-
+                            text: `Consolidate the past week's memories for entity "${entityName}" (week_offset=${weekOffset}).
+
+Step 1: Call recall(query="${entityName}", entity_name="${entityName}", max_tokens=4000) to retrieve recent memories.
+Step 2: Read the returned memories and produce ONE learning-layer summary that captures:
+  - What we set out to do (goal trajectory)
+  - What actually happened (implementation summary)
+  - What we learned (1-3 insights)
+  - Any caveats we should never forget (preserve these — do NOT consolidate them away)
+
+Step 3: Output a JSON object {entity_name, layer:"learning", content, importance:0.7}.
+
 Do not write to memory directly — just return the JSON. The user will choose whether to save.`,
                         },
                     },
@@ -151,15 +151,15 @@ Do not write to memory directly — just return the JSON. The user will choose w
                         role: 'user',
                         content: {
                             type: 'text',
-                            text: `Before doing this task, recall first.
-
-Task: ${task}
-
-Step 1: Call ${recallCmd}.
-Step 2: Skim the returned memories. Identify any caveats that apply.
-Step 3: Produce your output with INLINE citations to relevant memory_ids: e.g. "Use better-sqlite3 v12+ [memory:1234] because v11 breaks on Node 24 [memory:5678]."
-Step 4: If you found NO relevant memories, say so explicitly: "No prior memories on this — proceeding from first principles."
-
+                            text: `Before doing this task, recall first.
+
+Task: ${task}
+
+Step 1: Call ${recallCmd}.
+Step 2: Skim the returned memories. Identify any caveats that apply.
+Step 3: Produce your output with INLINE citations to relevant memory_ids: e.g. "Use better-sqlite3 v12+ [memory:1234] because v11 breaks on Node 24 [memory:5678]."
+Step 4: If you found NO relevant memories, say so explicitly: "No prior memories on this — proceeding from first principles."
+
 Goal: never solve a problem twice without checking.`,
                         },
                     },
@@ -176,18 +176,18 @@ Goal: never solve a problem twice without checking.`,
                         role: 'user',
                         content: {
                             type: 'text',
-                            text: `Produce a handoff document for entity "${entityName}", aimed at: ${audience}.
-
-Step 1: Call recall(query="${entityName}", entity_name="${entityName}", max_tokens=6000).
-Step 2: Skim memories grouped by layer.
-Step 3: Output a markdown doc with these sections:
-  - **Identity**: name, kind, canonical key (if any)
-  - **Goal** (from goal-layer memories): what this entity is for
-  - **State** (from latest implementation memories): where things stand right now
-  - **Caveats** (from caveat-layer memories): what NEVER to do, with memory_id citations
-  - **Open questions**: things the prior session left unresolved
-  - **Suggested next steps**: 3 concrete actions for the audience
-
+                            text: `Produce a handoff document for entity "${entityName}", aimed at: ${audience}.
+
+Step 1: Call recall(query="${entityName}", entity_name="${entityName}", max_tokens=6000).
+Step 2: Skim memories grouped by layer.
+Step 3: Output a markdown doc with these sections:
+  - **Identity**: name, kind, canonical key (if any)
+  - **Goal** (from goal-layer memories): what this entity is for
+  - **State** (from latest implementation memories): where things stand right now
+  - **Caveats** (from caveat-layer memories): what NEVER to do, with memory_id citations
+  - **Open questions**: things the prior session left unresolved
+  - **Suggested next steps**: 3 concrete actions for the audience
+
 Keep it under 1 page. Cite memory_ids inline like [memory:1234].`,
                         },
                     },

package/dist/mcp/resources.js

@@ -71,10 +71,10 @@ function fmtMemory(row) {
         access_count: row.access_count,
     };
 }
-const SELECT_MEMORY_BASE = `
-  SELECT m.id, m.layer, m.content, m.importance, m.protected, m.created_at, m.last_accessed_at, m.access_count,
-         e.name as entity_name, e.kind as entity_kind
-  FROM memories m JOIN entities e ON e.id = m.entity_id
+const SELECT_MEMORY_BASE = `
+  SELECT m.id, m.layer, m.content, m.importance, m.protected, m.created_at, m.last_accessed_at, m.access_count,
+         e.name as entity_name, e.kind as entity_kind
+  FROM memories m JOIN entities e ON e.id = m.entity_id
 `;
 export function readResource(db, uri) {
     // Static endpoints
@@ -101,9 +101,9 @@ export function readResource(db, uri) {
         // heat_band is dynamic; approximate "hot" via access_count + recent access desc.
         // For exact heat scoring, use the recall tool with band='hot'.
         const rows = db
-            .prepare(`${SELECT_MEMORY_BASE}
-         WHERE m.last_accessed_at IS NOT NULL
-         ORDER BY m.access_count DESC, m.last_accessed_at DESC
+            .prepare(`${SELECT_MEMORY_BASE}
+         WHERE m.last_accessed_at IS NOT NULL
+         ORDER BY m.access_count DESC, m.last_accessed_at DESC
          LIMIT 50`)
             .all();
         return {

package/dist/mcp/sampling.js

@@ -38,15 +38,15 @@ export async function sampleConsolidation(server, memoryTexts, entityName) {
     if (memoryTexts.length === 0)
         return { ok: false, reason: 'no input memories' };
     const numbered = memoryTexts.map((t, i) => `[${i + 1}] ${t}`).join('\n\n');
-    const userPrompt = `Consolidate these ${memoryTexts.length} memories about "${entityName}" into a single learning-layer summary. The summary must:
-- Preserve the trajectory (what was attempted, what worked, what changed)
-- Be 2-4 sentences max
-- Not invent facts not in the originals
-- Not include verbatim quotes
-
-Memories:
-${numbered}
-
+    const userPrompt = `Consolidate these ${memoryTexts.length} memories about "${entityName}" into a single learning-layer summary. The summary must:
+- Preserve the trajectory (what was attempted, what worked, what changed)
+- Be 2-4 sentences max
+- Not invent facts not in the originals
+- Not include verbatim quotes
+
+Memories:
+${numbered}
+
 Output the summary text only — no preamble, no JSON wrapper.`;
     return sample(server, {
         systemPrompt: 'You are a memory consolidator. Compress without distorting.',
@@ -56,17 +56,17 @@ Output the summary text only — no preamble, no JSON wrapper.`;
     });
 }
 export async function sampleLayerClassification(server, content) {
-    const userPrompt = `Classify this memory content into exactly one layer:
-- goal: WHY this work exists, target outcome
-- context: WHY THIS NOW, situation, timing
-- emotion: USER tone, feelings expressed
-- implementation: HOW it was done, what worked, what failed
-- caveat: PAIN lesson, "never X" / "always Y"
-- learning: GROWTH, decisions made, insights
-
-Content:
-${content}
-
+    const userPrompt = `Classify this memory content into exactly one layer:
+- goal: WHY this work exists, target outcome
+- context: WHY THIS NOW, situation, timing
+- emotion: USER tone, feelings expressed
+- implementation: HOW it was done, what worked, what failed
+- caveat: PAIN lesson, "never X" / "always Y"
+- learning: GROWTH, decisions made, insights
+
+Content:
+${content}
+
 Output just the layer name — no explanation, no JSON.`;
     return sample(server, {
         systemPrompt: 'You are a layer classifier. Output one word.',

package/dist/mcp/server.js

@@ -479,15 +479,15 @@ function appendAxisFilters(sql, params, filters) {
     return sql;
 }
 function runFtsQuery(query, layer, limit, axis) {
-    let sql = `
-    SELECT m.id, m.entity_id, e.name as entity_name, e.kind as entity_kind, e.momentum_score,
-           m.layer, m.content, m.importance, m.created_at, m.last_accessed_at, m.access_count,
-           m.altitude as _altitude, m.mem_type as _mem_type, m.mem_state as _mem_state, m.thread_id as _thread_id,
-           bm25(memories_fts) as bm25_score
-    FROM memories_fts
-    JOIN memories m ON m.id = memories_fts.rowid
-    JOIN entities e ON e.id = m.entity_id
-    WHERE memories_fts MATCH ?
+    let sql = `
+    SELECT m.id, m.entity_id, e.name as entity_name, e.kind as entity_kind, e.momentum_score,
+           m.layer, m.content, m.importance, m.created_at, m.last_accessed_at, m.access_count,
+           m.altitude as _altitude, m.mem_type as _mem_type, m.mem_state as _mem_state, m.thread_id as _thread_id,
+           bm25(memories_fts) as bm25_score
+    FROM memories_fts
+    JOIN memories m ON m.id = memories_fts.rowid
+    JOIN entities e ON e.id = m.entity_id
+    WHERE memories_fts MATCH ?
   `;
     const params = [query];
     if (layer) {
@@ -501,14 +501,14 @@ function runFtsQuery(query, layer, limit, axis) {
     return db.prepare(sql).all(...params);
 }
 function runLikeQuery(query, entityName, layer, limit, axis) {
-    let sql = `
-    SELECT m.id, m.entity_id, e.name as entity_name, e.kind as entity_kind, e.momentum_score,
-           m.layer, m.content, m.importance, m.created_at, m.last_accessed_at, m.access_count,
-           m.altitude as _altitude, m.mem_type as _mem_type, m.mem_state as _mem_state, m.thread_id as _thread_id,
-           0 as bm25_score
-    FROM memories m
-    JOIN entities e ON e.id = m.entity_id
-    WHERE 1=1
+    let sql = `
+    SELECT m.id, m.entity_id, e.name as entity_name, e.kind as entity_kind, e.momentum_score,
+           m.layer, m.content, m.importance, m.created_at, m.last_accessed_at, m.access_count,
+           m.altitude as _altitude, m.mem_type as _mem_type, m.mem_state as _mem_state, m.thread_id as _thread_id,
+           0 as bm25_score
+    FROM memories m
+    JOIN entities e ON e.id = m.entity_id
+    WHERE 1=1
   `;
     const params = [];
     if (entityName) {
@@ -839,8 +839,8 @@ function handleForget(args) {
     }
     // Auto-sweep — also respect pin (importance >= 0.9) as protection
     const rows = db
-        .prepare(`SELECT id, layer, importance, access_count, last_accessed_at, protected, altitude
-              FROM memories
+        .prepare(`SELECT id, layer, importance, access_count, last_accessed_at, protected, altitude
+              FROM memories
               WHERE protected = 0 AND importance < 0.9`)
         .all();
     const now = Math.floor(Date.now() / 1000);
@@ -889,17 +889,17 @@ function handleConsolidate(args) {
         // read-only audit: count candidates using the same rules.
         const now = Math.floor(Date.now() / 1000);
         const ageCutoff = now - (args.min_age_days ?? 7) * 86400;
-        const candidates = db.prepare(`
-      SELECT m.entity_id, e.name as entity_name, m.layer, COUNT(*) as c
-      FROM memories m
-      JOIN entities e ON e.id = m.entity_id
-      WHERE m.protected = 0
-        AND m.importance < 0.9
-        AND m.layer IN ('context', 'emotion', 'implementation')
-        AND m.created_at <= ?
-      GROUP BY m.entity_id, m.layer
-      HAVING c >= 2
-      ORDER BY c DESC
+        const candidates = db.prepare(`
+      SELECT m.entity_id, e.name as entity_name, m.layer, COUNT(*) as c
+      FROM memories m
+      JOIN entities e ON e.id = m.entity_id
+      WHERE m.protected = 0
+        AND m.importance < 0.9
+        AND m.layer IN ('context', 'emotion', 'implementation')
+        AND m.created_at <= ?
+      GROUP BY m.entity_id, m.layer
+      HAVING c >= 2
+      ORDER BY c DESC
     `).all(ageCutoff);
         const totalReplaced = candidates.reduce((s, c) => s + c.c, 0);
         return JSON.stringify({
@@ -973,19 +973,19 @@ function handleListEntities(args) {
     const minMemories = Math.max(1, Number(args?.min_memories ?? 1));
     const limit = Math.max(1, Math.min(200, Number(args?.limit ?? 30)));
     const offset = Math.max(0, Number(args?.offset ?? 0));
-    let sql = `
-    SELECT e.id, e.name, e.kind, e.canonical_key, e.momentum_score,
-           e.updated_at, e.created_at,
-           COUNT(m.id) as memory_count,
-           MAX(m.last_accessed_at) as last_memory_access,
-           SUM(CASE WHEN m.layer = 'goal' THEN 1 ELSE 0 END) as goal_count,
-           SUM(CASE WHEN m.layer = 'caveat' THEN 1 ELSE 0 END) as caveat_count,
-           SUM(CASE WHEN m.layer = 'learning' THEN 1 ELSE 0 END) as learning_count,
-           SUM(CASE WHEN m.layer = 'implementation' THEN 1 ELSE 0 END) as impl_count,
-           SUM(CASE WHEN m.importance >= 0.9 THEN 1 ELSE 0 END) as pinned_count
-    FROM entities e
-    LEFT JOIN memories m ON m.entity_id = e.id
-    WHERE 1=1
+    let sql = `
+    SELECT e.id, e.name, e.kind, e.canonical_key, e.momentum_score,
+           e.updated_at, e.created_at,
+           COUNT(m.id) as memory_count,
+           MAX(m.last_accessed_at) as last_memory_access,
+           SUM(CASE WHEN m.layer = 'goal' THEN 1 ELSE 0 END) as goal_count,
+           SUM(CASE WHEN m.layer = 'caveat' THEN 1 ELSE 0 END) as caveat_count,
+           SUM(CASE WHEN m.layer = 'learning' THEN 1 ELSE 0 END) as learning_count,
+           SUM(CASE WHEN m.layer = 'implementation' THEN 1 ELSE 0 END) as impl_count,
+           SUM(CASE WHEN m.importance >= 0.9 THEN 1 ELSE 0 END) as pinned_count
+    FROM entities e
+    LEFT JOIN memories m ON m.entity_id = e.id
+    WHERE 1=1
   `;
     const params = [];
     if (kind) {
@@ -1037,29 +1037,29 @@ function handleRecallFile(args) {
         return JSON.stringify({ ok: true, count: 0, note: 'No edits found for that path substring.' });
     }
     // Daily breakdown
-    const daily = db.prepare(`
-    SELECT DATE(occurred_at, 'unixepoch') as day, operation, COUNT(*) as edits
-    FROM session_file_edits WHERE file_path LIKE ?
-    GROUP BY day, operation ORDER BY day
+    const daily = db.prepare(`
+    SELECT DATE(occurred_at, 'unixepoch') as day, operation, COUNT(*) as edits
+    FROM session_file_edits WHERE file_path LIKE ?
+    GROUP BY day, operation ORDER BY day
   `).all(`%${sub}%`);
     // Distinct context_snippets (intents) — deduped, ordered by recency
-    const intents = db.prepare(`
-    SELECT DISTINCT context_snippet, MAX(occurred_at) as last_at, COUNT(*) as freq
-    FROM session_file_edits
-    WHERE file_path LIKE ? AND context_snippet IS NOT NULL AND LENGTH(context_snippet) > 20
-    GROUP BY context_snippet
-    ORDER BY last_at DESC
-    LIMIT ?
+    const intents = db.prepare(`
+    SELECT DISTINCT context_snippet, MAX(occurred_at) as last_at, COUNT(*) as freq
+    FROM session_file_edits
+    WHERE file_path LIKE ? AND context_snippet IS NOT NULL AND LENGTH(context_snippet) > 20
+    GROUP BY context_snippet
+    ORDER BY last_at DESC
+    LIMIT ?
   `).all(`%${sub}%`, maxIntents);
     // Linked memories
-    const memories = db.prepare(`
-    SELECT DISTINCT m.id, m.layer, m.content, m.importance, e.name as entity_name
-    FROM session_file_edits sfe
-    JOIN memories m ON m.id = sfe.memory_id
-    JOIN entities e ON e.id = m.entity_id
-    WHERE sfe.file_path LIKE ?
-    ORDER BY m.importance DESC
-    LIMIT 20
+    const memories = db.prepare(`
+    SELECT DISTINCT m.id, m.layer, m.content, m.importance, e.name as entity_name
+    FROM session_file_edits sfe
+    JOIN memories m ON m.id = sfe.memory_id
+    JOIN entities e ON e.id = m.entity_id
+    WHERE sfe.file_path LIKE ?
+    ORDER BY m.importance DESC
+    LIMIT 20
   `).all(`%${sub}%`);
     // Distinct file paths matched (the substring may match multiple files)
     const paths = db.prepare(`SELECT file_path, COUNT(*) as edits FROM session_file_edits WHERE file_path LIKE ? GROUP BY file_path ORDER BY edits DESC`).all(`%${sub}%`);
@@ -1126,10 +1126,10 @@ async function handleConsolidateWithSampling(args) {
     const ageCutoff = Math.floor(Date.now() / 1000) - (typeof args?.min_age_days === 'number' ? args.min_age_days : 7) * 86400;
     const snapshot = new Map();
     const candidateRows = db
-        .prepare(`SELECT m.id, m.content, e.name as entity_name
-       FROM memories m JOIN entities e ON e.id = m.entity_id
-       WHERE m.protected = 0
-         AND m.layer IN ('context','emotion','implementation')
+        .prepare(`SELECT m.id, m.content, e.name as entity_name
+       FROM memories m JOIN entities e ON e.id = m.entity_id
+       WHERE m.protected = 0
+         AND m.layer IN ('context','emotion','implementation')
          AND m.created_at <= ?`)
         .all(ageCutoff);
     for (const r of candidateRows)
@@ -1352,8 +1352,8 @@ function resolveProjectFromRecentEdits() {
     if (projects.length <= 1)
         return { project: projects[0] };
     const rows = db
-        .prepare(`SELECT file_path FROM session_file_edits
-        WHERE occurred_at > unixepoch() - 86400
+        .prepare(`SELECT file_path FROM session_file_edits
+        WHERE occurred_at > unixepoch() - 86400
         ORDER BY occurred_at DESC LIMIT 50`)
         .all();
     if (rows.length === 0)
@@ -1504,25 +1504,25 @@ function handleFlagProposals(args) {
     const sessionContext = args.session_context ?? 'conversation session';
     const PROPOSAL_TAG = 'orphaned_proposal';
     const now = Math.floor(Date.now() / 1000);
-    const insertAnchor = db.prepare(`
-    INSERT INTO drift_anchors (
-      kind, statement, rationale, domain, decision_mode,
-      confidence, lifecycle, status, owner,
-      evidence_refs, created_at, updated_at
-    ) VALUES (
-      'decision', ?, ?, ?, 'hypothesis',
-      ?, 'active', 'active', 'agent',
-      ?, ?, ?
-    )
+    const insertAnchor = db.prepare(`
+    INSERT INTO drift_anchors (
+      kind, statement, rationale, domain, decision_mode,
+      confidence, lifecycle, status, owner,
+      evidence_refs, created_at, updated_at
+    ) VALUES (
+      'decision', ?, ?, ?, 'hypothesis',
+      ?, 'active', 'active', 'agent',
+      ?, ?, ?
+    )
   `);
-    const insertCandidate = db.prepare(`
-    INSERT INTO memory_write_candidates (
-      scope, candidate_type, target_node_id, rationale,
-      confidence, evidence_refs, status, created_at
-    ) VALUES (
-      'orphaned_proposal', 'update_node', ?, ?,
-      ?, ?, 'pending_review', ?
-    )
+    const insertCandidate = db.prepare(`
+    INSERT INTO memory_write_candidates (
+      scope, candidate_type, target_node_id, rationale,
+      confidence, evidence_refs, status, created_at
+    ) VALUES (
+      'orphaned_proposal', 'update_node', ?, ?,
+      ?, ?, 'pending_review', ?
+    )
   `);
     const results = [];
     const txn = db.transaction(() => {
@@ -1566,13 +1566,13 @@ function handleFlagProposals(args) {
 function handleDream(args) {
     const domainFilter = args?.domain;
     // 1. Fetch active North Star anchor(s)
-    const northStars = db.prepare(`
-    SELECT id, statement, rationale, domain, confidence, lifecycle,
-           datetime(review_after, 'unixepoch') as review_date,
-           datetime(created_at, 'unixepoch') as declared_at
-    FROM drift_anchors
-    WHERE node_type = 'north_star' AND status = 'active'
-    ORDER BY created_at DESC
+    const northStars = db.prepare(`
+    SELECT id, statement, rationale, domain, confidence, lifecycle,
+           datetime(review_after, 'unixepoch') as review_date,
+           datetime(created_at, 'unixepoch') as declared_at
+    FROM drift_anchors
+    WHERE node_type = 'north_star' AND status = 'active'
+    ORDER BY created_at DESC
   `).all();
     // Re-injection friction — the active-observability loop closing back into reflection.
     // "Re-surfaced N×, yet still contradicted in reality" is the machine evidence behind #15443.
@@ -1589,18 +1589,18 @@ function handleDream(args) {
     // why-strings so the existing backlog is drainable without a backfill write.
     let distillQueue = [];
     try {
-        const rows = db.prepare(`
-      SELECT m.id, m.layer, m.content, datetime(m.created_at, 'unixepoch') AS created, e.name AS entity
-        FROM memories m JOIN entities e ON e.id = m.entity_id
-       WHERE m.layer IN ('learning', 'caveat')
-         AND json_valid(m.content)
-         -- settle window: the Stop hook extracts every turn, so the newest rows belong to a
-         -- session still in motion. Don't ask the agent to distill the conversation it is in.
-         AND m.created_at < unixepoch() - 1800
-         AND (json_extract(m.content, '$.needs_distill') = 1
-              OR json_extract(m.content, '$.why') = 'Decision detected by pattern match — may need agent enrichment'
-              OR json_extract(m.content, '$.why') = 'User-stated warning/prohibition — auto-extracted by caveat pattern match')
-       ORDER BY m.created_at DESC LIMIT 8
+        const rows = db.prepare(`
+      SELECT m.id, m.layer, m.content, datetime(m.created_at, 'unixepoch') AS created, e.name AS entity
+        FROM memories m JOIN entities e ON e.id = m.entity_id
+       WHERE m.layer IN ('learning', 'caveat')
+         AND json_valid(m.content)
+         -- settle window: the Stop hook extracts every turn, so the newest rows belong to a
+         -- session still in motion. Don't ask the agent to distill the conversation it is in.
+         AND m.created_at < unixepoch() - 1800
+         AND (json_extract(m.content, '$.needs_distill') = 1
+              OR json_extract(m.content, '$.why') = 'Decision detected by pattern match — may need agent enrichment'
+              OR json_extract(m.content, '$.why') = 'User-stated warning/prohibition — auto-extracted by caveat pattern match')
+       ORDER BY m.created_at DESC LIMIT 8
     `).all();
         distillQueue = rows.map((r) => {
             let c = {};
@@ -1638,26 +1638,26 @@ function handleDream(args) {
     }
     // 2. Fetch pending orphaned proposals
     const candidateQuery = domainFilter
-        ? `SELECT mc.id as candidate_id, mc.target_node_id as anchor_id,
-              mc.rationale as candidate_rationale, mc.confidence,
-              mc.evidence_refs, mc.status,
-              datetime(mc.created_at, 'unixepoch') as flagged_at,
-              da.statement, da.rationale as anchor_rationale, da.domain,
-              da.evidence_refs as anchor_evidence
-       FROM memory_write_candidates mc
-       JOIN drift_anchors da ON mc.target_node_id = da.id
-       WHERE mc.scope = 'orphaned_proposal' AND mc.status = 'pending_review'
-         AND da.domain = ?
+        ? `SELECT mc.id as candidate_id, mc.target_node_id as anchor_id,
+              mc.rationale as candidate_rationale, mc.confidence,
+              mc.evidence_refs, mc.status,
+              datetime(mc.created_at, 'unixepoch') as flagged_at,
+              da.statement, da.rationale as anchor_rationale, da.domain,
+              da.evidence_refs as anchor_evidence
+       FROM memory_write_candidates mc
+       JOIN drift_anchors da ON mc.target_node_id = da.id
+       WHERE mc.scope = 'orphaned_proposal' AND mc.status = 'pending_review'
+         AND da.domain = ?
        ORDER BY mc.created_at DESC`
-        : `SELECT mc.id as candidate_id, mc.target_node_id as anchor_id,
-              mc.rationale as candidate_rationale, mc.confidence,
-              mc.evidence_refs, mc.status,
-              datetime(mc.created_at, 'unixepoch') as flagged_at,
-              da.statement, da.rationale as anchor_rationale, da.domain,
-              da.evidence_refs as anchor_evidence
-       FROM memory_write_candidates mc
-       JOIN drift_anchors da ON mc.target_node_id = da.id
-       WHERE mc.scope = 'orphaned_proposal' AND mc.status = 'pending_review'
+        : `SELECT mc.id as candidate_id, mc.target_node_id as anchor_id,
+              mc.rationale as candidate_rationale, mc.confidence,
+              mc.evidence_refs, mc.status,
+              datetime(mc.created_at, 'unixepoch') as flagged_at,
+              da.statement, da.rationale as anchor_rationale, da.domain,
+              da.evidence_refs as anchor_evidence
+       FROM memory_write_candidates mc
+       JOIN drift_anchors da ON mc.target_node_id = da.id
+       WHERE mc.scope = 'orphaned_proposal' AND mc.status = 'pending_review'
        ORDER BY mc.created_at DESC`;
     const candidates = domainFilter
         ? db.prepare(candidateQuery).all(domainFilter)
@@ -1737,12 +1737,12 @@ function handleResolveProposal(args) {
         throw new Error('verdict must be "surface" or "dismiss"');
     }
     // Verify candidate exists and is pending
-    const candidate = db.prepare(`
-    SELECT mc.id, mc.target_node_id, mc.status, mc.evidence_refs,
-           da.statement
-    FROM memory_write_candidates mc
-    JOIN drift_anchors da ON mc.target_node_id = da.id
-    WHERE mc.id = ? AND mc.scope = 'orphaned_proposal'
+    const candidate = db.prepare(`
+    SELECT mc.id, mc.target_node_id, mc.status, mc.evidence_refs,
+           da.statement
+    FROM memory_write_candidates mc
+    JOIN drift_anchors da ON mc.target_node_id = da.id
+    WHERE mc.id = ? AND mc.scope = 'orphaned_proposal'
   `).get(candidateId);
     if (!candidate) {
         throw new Error(`Candidate #${candidateId} not found or not an orphaned proposal`);