claude-mem-lite 3.63.0 → 3.65.0

package/.claude-plugin/marketplace.json

@@ -10,7 +10,7 @@
   "plugins": [
     {
       "name": "claude-mem-lite",
-      "version": "3.63.0",
+      "version": "3.65.0",
       "source": "./",
       "description": "Persistent long-term memory for Claude Code via MCP — captures coding decisions, bugfixes, and context across sessions. Hybrid FTS5 + TF-IDF search with episode batching. Single SQLite DB, no external services. A lighter, lower-cost alternative to claude-mem (episode batching + a smaller model; cost savings are an internal estimate, not a measured benchmark)."
     }

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-mem-lite",
-  "version": "3.63.0",
+  "version": "3.65.0",
   "description": "Persistent long-term memory for Claude Code via MCP — captures coding decisions, bugfixes, and context across sessions. Hybrid FTS5 + TF-IDF search with episode batching. Single SQLite DB, no external services. A lighter, lower-cost alternative to claude-mem (episode batching + a smaller model; cost savings are an internal estimate, not a measured benchmark).",
   "author": {
     "name": "sdsrss"

package/deep-search.mjs

@@ -36,6 +36,7 @@ import { sanitizeFtsQuery } from './utils.mjs';
 import { RRF_K } from './tfidf.mjs';
 import { rrfAccumulate } from './lib/rrf.mjs';
 import { llmRerankOrder, defaultRerankLLM } from './rerank.mjs';
+import { liveObsFilterSql } from './lib/inject-search-core.mjs';
 
 // original + up to 3 rewrites (keyword / concept-expansion / HyDE).
 export const MAX_VARIANTS = 4;
@@ -68,7 +69,7 @@ export const AUTO_DEEP_MIN_CORPUS = 10;
  */
 export function hasEscalatableCorpus(db, project, min = AUTO_DEEP_MIN_CORPUS) {
   try {
-    const where = ['superseded_at IS NULL', 'COALESCE(compressed_into, 0) = 0'];
+    const where = [liveObsFilterSql('')];
     const params = [];
     if (project) { where.push('project = ?'); params.push(project); }
     const row = db.prepare(`SELECT COUNT(*) AS c FROM observations WHERE ${where.join(' AND ')}`).get(...params);

package/hook-context.mjs

@@ -12,9 +12,10 @@ import {
   debugLog, debugCatch, neutralizeContextDelimiters,
   DECAY_HALF_LIFE_BY_TYPE, DEFAULT_DECAY_HALF_LIFE_MS, notLowSignalTitleClause,
 } from './utils.mjs';
-import { STALE_SESSION_MS, FALLBACK_OBS_WINDOW_MS, RUNTIME_DIR, effectiveQuiet, isQuietHooks } from './hook-shared.mjs';
+import { STALE_SESSION_MS, FALLBACK_OBS_WINDOW_MS, RUNTIME_DIR, effectiveQuiet, isQuietHooks, KEY_CONTEXT_LIMIT } from './hook-shared.mjs';
 import { extractUnfinishedSummary } from './hook-handoff.mjs';
 import { recentInjectableEvents, renderInjectableEvent } from './lib/events-injection.mjs';
+import { liveObsFilterSql } from './lib/inject-search-core.mjs';
 
 /**
  * Infer the project directory from environment variables or cwd.
@@ -83,12 +84,7 @@ export function selectWithTokenBudget(db, project, budget = 2000) {
   const obsPool = db.prepare(`
     SELECT id, type, title, narrative, importance, created_at_epoch, files_modified, lesson_learned
     FROM observations
-    WHERE project = ? AND COALESCE(compressed_into, 0) = 0
-      -- superseded invisibility: auto-dedup (hook.mjs) sets superseded_at but leaves
-      -- compressed_into=0, so the compressed filter alone lets the hidden near-duplicate
-      -- resurface in the most-visible surface (injected every SessionStart). Sibling
-      -- keyObs already filters this; obsPool + fallbackObs must match.
-      AND superseded_at IS NULL
+    WHERE project = ? AND ${liveObsFilterSql('')}
       AND ${notLowSignalTitleClause('')}
       AND (
         (created_at_epoch > ? AND importance >= 1)
@@ -293,9 +289,15 @@ export function cleanupClaudeMdLegacyBlock() {
  * @param {string|null} [currentCcSessionId=null] Claude Code session id — when provided,
  *   the "Working State (from /clear)" block is filtered to handoffs owned by this
  *   session, preventing parallel-session bleed (see docs/bug.txt).
+ * @param {object|null} [collector=null] Optional out-param: when given, its
+ *   `keyContextIds` property is set to the obs ids ACTUALLY rendered into the
+ *   File Lessons / Key Context sections ([] under quiet/adopted or when the
+ *   sections are empty). handleUserPrompt persists this as its exclude-set
+ *   (D#123: the exclude-set must mirror real injections, not the keyObs query).
  * @returns {string} Joined markdown lines (without <claude-mem-context> wrappers)
  */
-export function buildSessionContextLines(db, project, now = new Date(), currentCcSessionId = null) {
+export function buildSessionContextLines(db, project, now = new Date(), currentCcSessionId = null, collector = null) {
+  if (collector) collector.keyContextIds = [];
   // 1. Token-budgeted observation selection
   const selected = selectWithTokenBudget(db, project, 2000);
   const observations = selected.observations;
@@ -308,8 +310,7 @@ export function buildSessionContextLines(db, project, now = new Date(), currentC
     fallbackObs = db.prepare(`
       SELECT id, type, title, project, created_at
       FROM observations
-      WHERE COALESCE(compressed_into, 0) = 0
-        AND superseded_at IS NULL
+      WHERE ${liveObsFilterSql('')}
         AND ${notLowSignalTitleClause('')}
         AND (
           (created_at_epoch > ? AND importance >= 1)
@@ -335,10 +336,9 @@ export function buildSessionContextLines(db, project, now = new Date(), currentC
   //    and Key Context (informational). Pushed into summaryLines.
   const keyObs = db.prepare(`
     SELECT o.id, o.type, o.title, o.lesson_learned, o.files_modified FROM observations o
-    WHERE o.project = ? AND COALESCE(o.compressed_into, 0) = 0
-      AND o.superseded_at IS NULL
+    WHERE o.project = ? AND ${liveObsFilterSql('o')}
       AND COALESCE(o.importance, 1) >= 2
-    ORDER BY o.created_at_epoch DESC LIMIT 10
+    ORDER BY o.created_at_epoch DESC LIMIT ${KEY_CONTEXT_LIMIT}
   `).all(project);
 
   if (keyObs.length > 0) {
@@ -357,30 +357,35 @@ export function buildSessionContextLines(db, project, now = new Date(), currentC
           const files = JSON.parse(o.files_modified);
           const fname = basename(Array.isArray(files) && files.length > 0 ? files[0] : '');
           if (fname) {
-            fileLessons.push(`- ${fname}: ${truncate(o.lesson_learned, 100)} (#${o.id})`);
+            fileLessons.push({ id: o.id, line: `- ${fname}: ${truncate(o.lesson_learned, 100)} (#${o.id})` });
             continue;
           }
         } catch { /* fall through to keyContext */ }
       }
       const lesson = hasLesson ? ` — ${truncate(o.lesson_learned, 60)}` : '';
-      keyContext.push(`- [${o.type || 'discovery'}] ${truncate(clean, 80)} (#${o.id})${lesson}`);
+      keyContext.push({ id: o.id, line: `- [${o.type || 'discovery'}] ${truncate(clean, 80)} (#${o.id})${lesson}` });
     }
 
     // Phase A (QUIET_HOOKS) + Phase D (adopted sentinel): drop descriptive
     // File Lessons / Key Context sections when the user has opted into low-noise
     // hooks OR adopted invited-memory (MEMORY.md sentinel carries the triggers
     // at higher system-prompt authority). The Recent table still fires so #IDs
-    // remain reachable via mem_get.
+    // remain reachable via mem_get. The collector sees only rows that survive
+    // BOTH the quiet gate and the per-section slice — rendered rows, nothing else.
     const quiet = effectiveQuiet();
     if (fileLessons.length > 0 && !quiet) {
+      const shown = fileLessons.slice(0, 5);
       summaryLines.push('### File Lessons');
-      summaryLines.push(...fileLessons.slice(0, 5));
+      summaryLines.push(...shown.map((e) => e.line));
       summaryLines.push('');
+      if (collector) collector.keyContextIds.push(...shown.map((e) => e.id));
     }
     if (keyContext.length > 0 && !quiet) {
+      const shown = keyContext.slice(0, 5);
       summaryLines.push('### Key Context');
-      summaryLines.push(...keyContext.slice(0, 5));
+      summaryLines.push(...shown.map((e) => e.line));
       summaryLines.push('');
+      if (collector) collector.keyContextIds.push(...shown.map((e) => e.id));
     }
   } else if (!latestSummary && !effectiveQuiet()) {
     // Fallback: no summary AND no key observations — show recent activity.

package/hook-handoff.mjs

@@ -13,6 +13,7 @@ import {
 // immutable in ESM and cannot be mocked after the fact.
 import * as gitStateModule from './lib/git-state.mjs';
 import * as taskReaderModule from './lib/task-reader.mjs';
+import { liveObsFilterSql } from './lib/inject-search-core.mjs';
 
 /**
  * Build and save a handoff snapshot to session_handoffs table.
@@ -76,8 +77,7 @@ export function buildAndSaveHandoff(db, sessionId, project, type, episodeSnapsho
   if (subjectPrompts.length === 0) {
     const fallback = db.prepare(`
       SELECT title FROM observations
-      WHERE project = ? AND COALESCE(compressed_into, 0) = 0
-        AND superseded_at IS NULL
+      WHERE project = ? AND ${liveObsFilterSql('')}
         AND COALESCE(importance, 1) >= 3
         AND ${notLowSignalTitleClause('')}
       ORDER BY created_at_epoch DESC LIMIT 1
@@ -185,8 +185,7 @@ export function buildAndSaveHandoff(db, sessionId, project, type, episodeSnapsho
   const decisions = db.prepare(`
     SELECT title FROM observations
     WHERE memory_session_id = ? AND COALESCE(importance, 1) >= 2
-      AND COALESCE(compressed_into, 0) = 0
-      AND superseded_at IS NULL ${obsWindowClause}
+      AND ${liveObsFilterSql('')} ${obsWindowClause}
     ORDER BY created_at_epoch DESC LIMIT 10
   `).all(sessionId, ...obsWindowParams).filter(d => d.title && !LOW_SIGNAL_TITLE.test(d.title)).slice(0, 5);
 

package/hook-memory.mjs

@@ -3,6 +3,7 @@
 
 import { sanitizeFtsQuery, relaxFtsQueryToOr, debugCatch, truncate, OBS_BM25, notLowSignalTitleClause, noisePenaltyClause, tokenizeHandoff, HANDOFF_STOP_WORDS, extractCjkKeywords, neutralizeContextDelimiters, basenameAnySep } from './utils.mjs';
 import { citeFactorJs } from './scoring-sql.mjs';
+import { liveObsFilterSql } from './lib/inject-search-core.mjs';
 import { recordMetric } from './lib/metrics.mjs';
 import { DB_DIR } from './schema.mjs';
 import { extractIdents } from './lib/lesson-idents.mjs';
@@ -218,8 +219,7 @@ export function searchRelevantMemories(db, userPrompt, project, excludeIds = [])
         AND o.project = ?
         AND o.importance >= 1
         AND o.created_at_epoch > ?
-        AND COALESCE(o.compressed_into, 0) = 0
-        AND o.superseded_at IS NULL
+        AND ${liveObsFilterSql('o')}
         AND ${notLowSignalTitleClause('o')}
       ORDER BY ${OBS_BM25}
       LIMIT 10
@@ -266,8 +266,7 @@ export function searchRelevantMemories(db, userPrompt, project, excludeIds = [])
           AND o.type IN ('decision', 'discovery')
           AND o.importance >= 2
           AND o.created_at_epoch > ?
-          AND COALESCE(o.compressed_into, 0) = 0
-          AND o.superseded_at IS NULL
+          AND ${liveObsFilterSql('o')}
           AND ${notLowSignalTitleClause('o')}
         ORDER BY ${OBS_BM25}
         LIMIT 5
@@ -316,7 +315,7 @@ export function searchRelevantMemories(db, userPrompt, project, excludeIds = [])
     // Adaptive threshold: scales with corpus size to filter noise.
     // Each result must individually exceed the threshold (not just the top one).
     const obsCount = db.prepare(
-      'SELECT COUNT(*) as c FROM observations WHERE project = ? AND COALESCE(compressed_into, 0) = 0 AND superseded_at IS NULL',
+      `SELECT COUNT(*) as c FROM observations WHERE project = ? AND ${liveObsFilterSql('')}`,
     ).get(project)?.c || 0;
     const { TINY, SMALL, MEDIUM, LARGE } = BM25_THRESHOLD;
     const threshold = obsCount < 5 ? TINY : obsCount < 100 ? SMALL : obsCount < 500 ? MEDIUM : LARGE;
@@ -389,8 +388,7 @@ export function recallForFile(db, filePath, project) {
       JOIN observation_files of2 ON of2.obs_id = o.id
       WHERE o.project = ?
         AND o.importance >= 2
-        AND COALESCE(o.compressed_into, 0) = 0
-        AND o.superseded_at IS NULL
+        AND ${liveObsFilterSql('o')}
         AND o.created_at_epoch > ?
         AND (of2.filename = ? OR of2.filename LIKE ? ESCAPE '\\')
       ORDER BY o.created_at_epoch DESC
@@ -431,8 +429,7 @@ export function rankImperativeCandidates(db, userPrompt, project, excludeIds = [
       SELECT id, title, lesson_learned, importance
       FROM observations
       WHERE project = ?
-        AND COALESCE(compressed_into, 0) = 0
-        AND superseded_at IS NULL
+        AND ${liveObsFilterSql('')}
         AND COALESCE(importance, 1) >= 2
         AND lesson_learned IS NOT NULL
         AND TRIM(lesson_learned) != ''

package/hook-optimize.mjs

@@ -20,6 +20,7 @@ import { getVocabulary, computeVector, cosineSimilarity, vecTextForRow } from '.
 import { MERGE_JACCARD_LOW, AUTO_MERGE_THRESHOLD } from './lib/dedup-constants.mjs';
 import { DB_DIR } from './schema.mjs';
 import { OBS_TYPE_SET } from './lib/obs-types.mjs';
+import { liveObsFilterSql } from './lib/inject-search-core.mjs';
 
 const RUNTIME_DIR = join(DB_DIR, 'runtime');
 
@@ -104,8 +105,7 @@ export function findReenrichCandidates(db, limit = 10, { scope = 'narrow', proje
     const stmt = db.prepare(`
       SELECT id, title, narrative, type, subtitle, concepts, facts, text, search_aliases, importance, project
       FROM observations
-      WHERE COALESCE(compressed_into, 0) = 0
-        AND superseded_at IS NULL
+      WHERE ${liveObsFilterSql('')}
         AND (search_aliases IS NULL OR search_aliases = '')
         AND LENGTH(COALESCE(narrative, '')) > 100
         AND ${notLowSignalTitleClause('')}
@@ -119,8 +119,7 @@ export function findReenrichCandidates(db, limit = 10, { scope = 'narrow', proje
     const stmt = db.prepare(`
       SELECT id, title, narrative, type, subtitle, concepts, facts, search_aliases, importance, project
       FROM observations
-      WHERE COALESCE(compressed_into, 0) = 0
-        AND superseded_at IS NULL
+      WHERE ${liveObsFilterSql('')}
         AND optimized_at IS NULL
         AND type IN ('bugfix','refactor','feature','decision')
         AND (lesson_learned IS NULL OR lesson_learned = '')
@@ -459,8 +458,7 @@ export function findMergeCandidates(db, maxClusters = 5, { project } = {}) {
   const stmt = db.prepare(`
     SELECT id, title, narrative, project, type, access_count, importance, created_at_epoch, minhash_sig, lesson_learned, concepts, facts
     FROM observations
-    WHERE COALESCE(compressed_into, 0) = 0
-      AND superseded_at IS NULL
+    WHERE ${liveObsFilterSql('')}
       AND optimized_at IS NULL
       AND title IS NOT NULL AND title != ''
       AND created_at_epoch > ?

package/hook-precompact.mjs

@@ -5,11 +5,17 @@
 // Differs from SessionStart-on-compact (which fires AFTER compaction):
 // PreCompact ensures memory survives the compaction step itself.
 
+import { writeFileSync } from 'fs';
+import { join } from 'path';
 import { buildSessionContextLines } from './hook-context.mjs';
 import { inferProject, debugCatch, debugLog } from './utils.mjs';
+import { RUNTIME_DIR } from './hook-shared.mjs';
+import { keyContextIdsFileName } from './lib/injected-ids.mjs';
 
 /**
- * Build + emit the memory context block on stdout. Pure read; no DB writes.
+ * Build + emit the memory context block on stdout. Pure read; no DB writes
+ * (one runtime marker file: the Key Context ids the re-emitted block renders,
+ * refreshing handleUserPrompt's exclude-set — see D#123 in hook.mjs).
  *
  * @param {object} ctx
  * @param {import('better-sqlite3').Database} ctx.db
@@ -19,9 +25,16 @@ import { inferProject, debugCatch, debugLog } from './utils.mjs';
  */
 export function handlePreCompact({ db, project, sessionId }) {
   try {
-    const body = buildSessionContextLines(db, project, new Date(), sessionId || null);
+    const collector = {};
+    const body = buildSessionContextLines(db, project, new Date(), sessionId || null, collector);
     if (!body || String(body).trim() === '') return;
     process.stdout.write(`<claude-mem-context>\n${body}\n</claude-mem-context>\n`);
+    try {
+      writeFileSync(
+        join(RUNTIME_DIR, keyContextIdsFileName(project, sessionId || null)),
+        JSON.stringify({ ids: collector.keyContextIds || [], ts: Date.now(), session: sessionId || null }),
+      );
+    } catch (e) { debugCatch(e, 'pre-compact-keyctx-marker'); }
   } catch (e) {
     debugCatch(e, 'handlePreCompact');
   }

package/hook-shared.mjs

@@ -32,6 +32,12 @@ export const STALE_LOCK_MS = 30000;                       // 30s
 export const DEDUP_WINDOW_MS = 5 * 60 * 1000;            // 5 min (title dedup)
 export const RELATED_OBS_WINDOW_MS = 7 * 86400000;       // 7 days
 export const FALLBACK_OBS_WINDOW_MS = RELATED_OBS_WINDOW_MS; // same window
+// Candidate rows the SessionStart Key Context surface considers (hook-context.mjs
+// keyObs; each of the two sections then renders at most 5). The user-prompt
+// exclude-set does NOT mirror this query — it reads the ids actually rendered
+// from the keyctx marker (D#123 review C-1: query-mirroring suppressed
+// <memory-context> injection on quiet/adopted projects where nothing renders).
+export const KEY_CONTEXT_LIMIT = 10;
 
 // Phase A (v2.31.3+): MEM_QUIET_HOOKS=1 drops descriptive hook/MCP-instruction
 // bodies (File Lessons / Key Context headers, MCP WHEN-TO-USE & decision rules,

package/hook.mjs

@@ -68,6 +68,8 @@ import { formatTaskImperative } from './lib/task-imperative.mjs';
 import { recordSkillAdoption, gcOldShadowShards } from './registry-recommend.mjs';
 import { gcOldMetricShards, recordMetric } from './lib/metrics.mjs';
 import { detectMemOverride } from './lib/mem-override.mjs';
+import { injectedIdsFileName, keyContextIdsFileName } from './lib/injected-ids.mjs';
+import { liveObsFilterSql, recencyDecaySql } from './lib/inject-search-core.mjs';
 import { buildAndSaveHandoff, detectContinuationIntent, renderHandoffInjection, pickHandoffToInject, extractUnfinishedSummary } from './hook-handoff.mjs';
 import { checkForUpdate, getCachedUpdateBanner, isUpdateCheckDue } from './hook-update.mjs';
 import { handleLLMOptimize } from './hook-optimize.mjs';
@@ -491,15 +493,12 @@ function triggerErrorRecall(db, toolInput, response) {
         -- only for symmetry: the block's own footer is a mem_get(ids=...) pointer, and a
         -- COMPRESSED_PENDING_PURGE row is queued for deletion by maintain purge_stale,
         -- so that pointer would resolve to nothing.
-        AND COALESCE(o.compressed_into, 0) = 0
-        AND o.superseded_at IS NULL
+        AND ${liveObsFilterSql('o')}
         AND ${notLowSignalTitleClause('o')}
-      -- MAX(0, …) clamps recency age to >= 0 (parity with search-engine FULL_SCORE):
-      -- a far-future created_at (reachable via restore/import-jsonl, which accept
-      -- arbitrary epochs) made the exponent large-positive → EXP overflow → that row
-      -- pinned #1 for every error until its "future" passed (audit 2026-08-14 M-1).
+      -- Decay via the shared core (P2-11): the M-1 MAX(0,…) age clamp lives there.
+      -- Fixed 14d half-life (error recency matters more than obs type here).
       ORDER BY ${OBS_BM25}
-        * (1.0 + EXP(-0.693 * MAX(0, ? - o.created_at_epoch) / 1209600000.0))
+        * ${recencyDecaySql({ tsExpr: 'o.created_at_epoch', halfLifeSql: '1209600000.0' })}
       LIMIT 3
     `).all(ftsQuery, project, nowR);
 
@@ -857,16 +856,22 @@ function buildCiteRecallNudge(project) {
   return libBuildCiteRecallNudge(project, RUNTIME_DIR);
 }
 
-// GC pre-recall cooldown files older than 24h. Pulled out of pre-tool-recall.js
-// (where it ran on every Edit, costing 15-30 disk stats per call on long-lived
-// projects) and consolidated here — once per SessionStart is enough to keep
-// RUNTIME_DIR from growing unbounded across stale sessions.
+// GC stale per-session runtime files older than 24h: pre-recall cooldowns AND
+// (D#120) the per-session injected-ids markers — both grow one file per session.
+// Pulled out of pre-tool-recall.js (where it ran on every Edit, costing 15-30
+// disk stats per call on long-lived projects) and consolidated here — once per
+// SessionStart is enough to keep RUNTIME_DIR from growing unbounded.
 const PRE_RECALL_COOLDOWN_STALE_MS = 24 * 60 * 60 * 1000;
 function gcStalePreRecallCooldowns() {
   try {
     const now = Date.now();
     for (const name of readdirSync(RUNTIME_DIR)) {
-      if (!name.startsWith('pre-recall-cooldown-') || !name.endsWith('.json')) continue;
+      // D#120: the injected-ids marker is also per-session now — same growth
+      // shape as the cooldown files, same 24h GC (dedup window is 5 min).
+      const isCooldown = name.startsWith('pre-recall-cooldown-') && name.endsWith('.json');
+      const isInjectedMarker = name.startsWith('.claude-mem-injected-')
+        || name.startsWith('.claude-mem-keyctx-'); // D#123 Key Context marker — same per-session growth, same 24h GC
+      if (!isCooldown && !isInjectedMarker) continue;
       try {
         const p = join(RUNTIME_DIR, name);
         const st = statSync(p);
@@ -1036,10 +1041,8 @@ function runSessionStartAutoMaintain(db) {
         JOIN observations b ON a.title = b.title AND a.project = b.project
           AND a.id < b.id
           AND ABS(a.created_at_epoch - b.created_at_epoch) < 3600000
-          AND COALESCE(a.compressed_into, 0) = 0
-          AND COALESCE(b.compressed_into, 0) = 0
-          AND a.superseded_at IS NULL
-          AND b.superseded_at IS NULL
+          AND ${liveObsFilterSql('a')}
+          AND ${liveObsFilterSql('b')}
         LIMIT 20
       `).all();
       if (dupPairs.length > 0) {
@@ -1062,8 +1065,7 @@ function runSessionStartAutoMaintain(db) {
         const recent = db.prepare(`
           SELECT id, title, importance, created_at_epoch, narrative, text
           FROM observations
-          WHERE COALESCE(compressed_into, 0) = 0
-            AND superseded_at IS NULL
+          WHERE ${liveObsFilterSql('')}
             AND created_at_epoch > ?
             AND title IS NOT NULL AND title != ''
           ORDER BY created_at_epoch DESC LIMIT ${SCAN_LIMIT}
@@ -1470,13 +1472,28 @@ async function handleSessionStart() {
     // token-budgeted observation pool directly from the DB.
     // Pass CC session id so the Working State block is scoped to this session,
     // preventing parallel sessions from seeing each other's /clear handoff.
-    const fullContext = buildSessionContextLines(db, project, now, ccSessionId);
+    const contextCollector = {};
+    const fullContext = buildSessionContextLines(db, project, now, ccSessionId, contextCollector);
 
     // Stdout is the sole context-delivery channel. The SessionStart hook output
     // is injected as a <system-reminder> at session start, giving Claude the
     // full summary + handoff state + observations table fresh from the DB.
     process.stdout.write(`<claude-mem-context>\n${fullContext}\n</claude-mem-context>\n`);
 
+    // D#123 (review C-1): persist the Key Context ids ACTUALLY rendered above so
+    // handleUserPrompt can exclude exactly those from <memory-context> — and
+    // nothing else. Under quiet/adopted the sections don't render, the id list is
+    // empty, and prompt-time injection is NOT suppressed (the old query-mirroring
+    // exclude-set blanked the same-project leg on adopted projects). Written
+    // unconditionally (even when empty) so a resumed session can't act on a
+    // previous session's stale marker semantics; 24h GC below.
+    try {
+      writeFileSync(
+        join(RUNTIME_DIR, keyContextIdsFileName(project, ccSessionId)),
+        JSON.stringify({ ids: contextCollector.keyContextIds || [], ts: Date.now(), session: ccSessionId || null }),
+      );
+    } catch (e) { debugCatch(e, 'session-start-keyctx-marker'); }
+
     // One-time migration: remove any stale <claude-mem-context> block left in
     // CLAUDE.md by pre-v2.30 installs. Idempotent no-op afterwards.
     cleanupClaudeMdLegacyBlock();
@@ -1650,23 +1667,33 @@ async function handleUserPrompt() {
     // (mirrors CC built-in memoryTypes.ts:215). Skip both Key Context lookup
     // and the <memory-context> emission for this turn.
     if (!detectMemOverride(promptText)) try {
-      const keyObs = db.prepare(`
-        SELECT id FROM observations
-        WHERE project = ? AND COALESCE(compressed_into, 0) = 0
-          AND COALESCE(importance, 1) >= 2
-        ORDER BY created_at_epoch DESC LIMIT 5
-      `).all(project);
-      const keyContextIds = keyObs.map(o => o.id);
+      // D#123 (review C-1): the exclude-set is the Key Context ids ACTUALLY
+      // rendered at SessionStart — read from the marker handleSessionStart wrote,
+      // not re-derived from a query. The old query-mirroring set excluded rows
+      // that were never shown (quiet/adopted projects render no Key Context at
+      // all), blanking the same-project <memory-context> leg outright. Missing
+      // or other-session marker → empty set: unknown injections must fail open
+      // (inject, maybe duplicate) rather than fail closed (suppress).
+      const keyContextIds = [];
+      try {
+        const raw = readFileSync(join(RUNTIME_DIR, keyContextIdsFileName(project, ccSessionId)), 'utf8');
+        const { ids, session } = JSON.parse(raw);
+        if (Array.isArray(ids) && !(session && ccSessionId && session !== ccSessionId)) {
+          keyContextIds.push(...ids);
+        }
+      } catch { /* no marker — nothing was injected, exclude nothing */ }
       const pathAInjectedIds = [];
 
       // Read IDs already injected by user-prompt-search.js to avoid duplicate injection
       try {
-        const injectedFile = join(RUNTIME_DIR, `.claude-mem-injected-${project}`);
+        // D#120: the marker file is session-keyed (no ccSessionId → legacy
+        // project-keyed name), so a concurrent session's write can no longer
+        // replace this session's payload between the UPS write and this read.
+        const injectedFile = join(RUNTIME_DIR, injectedIdsFileName(project, ccSessionId));
         const raw = readFileSync(injectedFile, 'utf8');
         const { ids, ts, session } = JSON.parse(raw);
         // Only use if written within last 10 seconds (same prompt cycle) AND by this
-        // CC session — the file is project-keyed, so a concurrent session's write
-        // would otherwise dedup-suppress OUR injection (M-6, audit 2026-08-14).
+        // CC session (M-6 payload gate, still load-bearing for legacy files).
         // Legacy payloads without `session` keep the old time-window-only behavior.
         if (ts && Date.now() - ts < 10000 && Array.isArray(ids)
             && !(session && ccSessionId && session !== ccSessionId)) {
@@ -1683,8 +1710,9 @@ async function handleUserPrompt() {
       const taskImperativeOn = process.env.CLAUDE_MEM_TASK_IMPERATIVE === 'on'
         || process.env.CLAUDE_MEM_TASK_IMPERATIVE === '1';
       // Exclude only ids path-A (user-prompt-search.js) already injected — NOT the
-      // key-context top-5, which overlaps the high-value lesson pool and would suppress
-      // the pick. The chosen id is excluded from the <memory-context> block below instead.
+      // SessionStart Key Context set, which overlaps the high-value lesson pool and
+      // would suppress the pick. The chosen id is excluded from the <memory-context>
+      // block below instead.
       const imperativePick = taskImperativeOn
         ? selectImperativeLesson(db, promptText, project, pathAInjectedIds)
         : null;

package/lib/browse-core.mjs

@@ -0,0 +1,67 @@
+// lib/browse-core.mjs — shared data collection for the CLI `browse` / MCP
+// `mem_browse` twin (P2-12, audit 2026-08-14). The tier count + row queries were
+// duplicated and had already drifted (the CLI SELECT carried `importance`, the
+// MCP one had dropped it). Collection lives here with the superset column shape;
+// each face keeps its own rendering (text dashboard vs --json vs MCP text).
+
+import { TIER_CASE_SQL, tierSqlParams } from '../tier.mjs';
+import { liveObsFilterSql } from './inject-search-core.mjs';
+
+export const BROWSE_TIERS = ['working', 'active', 'archive'];
+export const BROWSE_TIER_LABELS = { working: '🔴 Working Memory', active: '🟡 Active Memory', archive: '🔵 Archive' };
+
+/** Newest active memory_session_id for the project ('' when none) — the tier
+ *  classifier's "current session" input, needed identically by both faces. */
+export function getActiveMemorySessionId(db, project) {
+  const row = db.prepare(
+    "SELECT memory_session_id FROM sdk_sessions WHERE project = ? AND status = 'active' ORDER BY started_at_epoch DESC LIMIT 1"
+  ).get(project);
+  return row?.memory_session_id ?? '';
+}
+
+/**
+ * Collect per-tier counts + rows for the memory dashboard.
+ * Archive keeps its count but skips row fetch in the unfiltered view (both faces'
+ * documented behavior — the archive tail is reachable via `browse --tier archive`).
+ * @returns {{showTiers: string[], tierData: object, tierCounts: object, grandTotal: number}}
+ */
+export function collectBrowseTiers(db, { project, tierFilter, limit, now, currentSessionId }) {
+  const ctx = { now, currentProject: project, currentSessionId };
+  const params = tierSqlParams(ctx);
+  const showTiers = tierFilter ? [tierFilter] : BROWSE_TIERS;
+
+  const tierData = {};
+  const tierCounts = {};
+  let grandTotal = 0;
+
+  for (const tier of showTiers) {
+    const countRow = db.prepare(`
+      SELECT COUNT(*) as c FROM (
+        SELECT ${TIER_CASE_SQL} as tier FROM observations
+        WHERE project = ? AND ${liveObsFilterSql('')}
+      ) WHERE tier = ?
+    `).get(...params, project, tier);
+    const count = countRow?.c ?? 0;
+    tierCounts[tier] = count;
+    grandTotal += count;
+
+    const skipRows = tier === 'archive' && !tierFilter;
+    if (count === 0 || skipRows) {
+      tierData[tier] = { count, rows: [] };
+      continue;
+    }
+
+    const rows = db.prepare(`
+      SELECT * FROM (
+        SELECT id, type, title, importance, created_at, created_at_epoch, ${TIER_CASE_SQL} as tier
+        FROM observations
+        WHERE project = ? AND ${liveObsFilterSql('')}
+      ) WHERE tier = ?
+      ORDER BY created_at_epoch DESC
+      LIMIT ?
+    `).all(...params, project, tier, limit);
+    tierData[tier] = { count, rows };
+  }
+
+  return { showTiers, tierData, tierCounts, grandTotal };
+}

package/lib/delete-core.mjs

@@ -7,7 +7,7 @@
 // merged/compressed-child recovery, and the delete transaction.
 import { snapshotDb } from './db-backup.mjs';
 import { recoverChildrenOf } from './maintain-core.mjs';
-import { debugCatch } from '../utils.mjs';
+import { debugCatch, truncate } from '../utils.mjs';
 
 /**
  * Hard-delete the given observation ids with full orchestration. The CALLER owns
@@ -70,3 +70,20 @@ export function deleteObservations(db, ids, { snapshotTag = 'pre-delete' } = {})
   const result = deleteTx();
   return { deleted: result.changes, recoveredChildren: result.recovered, snapshotPath };
 }
+
+/**
+ * Shared delete-preview body (P2-12): fetch the doomed rows and format the
+ * per-row lines both faces print between their own header ("Preview: N …")
+ * and footer (--confirm vs confirm=true remedy). The SELECT and the row shape
+ * were duplicated in mem-cli.mjs + server.mjs and are the exact place a
+ * preview/execute drift would hide.
+ * @param {import('better-sqlite3').Database} db
+ * @param {number[]} ids
+ * @returns {{rows: Array<{id:number,type:string,title:string,project:string}>, lines: string[]}}
+ */
+export function previewDeleteRows(db, ids) {
+  const ph = ids.map(() => '?').join(',');
+  const rows = db.prepare(`SELECT id, type, title, project FROM observations WHERE id IN (${ph})`).all(...ids);
+  const lines = rows.map((r) => `  #${r.id} [${r.type}] ${truncate(r.title || '(untitled)', 80)} | ${r.project}`);
+  return { rows, lines };
+}

package/lib/get-core.mjs

@@ -0,0 +1,33 @@
+// lib/get-core.mjs — shared core for the CLI `get` / MCP `mem_get` twin (P2-12,
+// audit 2026-08-14). The 23-element OBS_FIELDS array was duplicated verbatim in
+// mem-cli.mjs and server.mjs (the 16-vs-24-column export data-loss incident's
+// precursor shape), and the session detail field sets had ALREADY diverged
+// (MCP 13 fields vs CLI 6 — a `remaining_items` FTS hit was a dead end in the
+// CLI detail view). Field sets + the access-bump fetch live here; each face
+// keeps its own header/label rendering conventions.
+
+import { autoBoostIfNeeded } from '../search-scoring.mjs';
+
+/** Every observation column `get --fields` accepts, in render order. */
+export const OBS_FIELDS = ['id', 'type', 'title', 'subtitle', 'narrative', 'text', 'facts', 'concepts', 'lesson_learned', 'search_aliases', 'files_read', 'files_modified', 'project', 'created_at', 'memory_session_id', 'prompt_number', 'importance', 'related_ids', 'access_count', 'branch', 'superseded_at', 'superseded_by', 'last_accessed_at'];
+
+/** Session-summary detail render set — the FULL set (both faces). The CLI's old
+ *  6-field subset made notes/remaining_items/files_* searchable-but-unrenderable. */
+export const SESSION_DETAIL_FIELDS = ['id', 'request', 'investigated', 'learned', 'completed', 'next_steps', 'remaining_items', 'files_read', 'files_edited', 'notes', 'project', 'created_at', 'memory_session_id', 'prompt_number'];
+
+/**
+ * Fetch observation detail rows: bump access_count/last_accessed_at (reading a
+ * detail IS an access signal — feeds noisePenalty's ratio guard), run the
+ * auto-boost heuristic, and return rows oldest-first.
+ * @param {import('better-sqlite3').Database} db
+ * @param {number[]} ids
+ * @returns {object[]} full observation rows (SELECT *), created order
+ */
+export function fetchObsDetail(db, ids) {
+  const ph = ids.map(() => '?').join(',');
+  try {
+    db.prepare(`UPDATE observations SET access_count = COALESCE(access_count, 0) + 1, last_accessed_at = ? WHERE id IN (${ph})`).run(Date.now(), ...ids);
+    autoBoostIfNeeded(db, ids);
+  } catch { /* non-critical: FTS5 trigger may fail on corrupted index */ }
+  return db.prepare(`SELECT * FROM observations WHERE id IN (${ph}) ORDER BY created_at_epoch ASC`).all(...ids);
+}