claude-mem-lite 3.63.0 → 3.65.0

package/scripts/user-prompt-search.js

@@ -4,14 +4,15 @@
 // Lightweight: only imports schema.mjs and utils.mjs, no MCP SDK
 
 import { ensureDb, DB_DIR, REGISTRY_DB_PATH } from '../schema.mjs';
-import { sanitizeFtsQuery, relaxFtsQueryToOr, truncate, typeIcon, inferProject, OBS_BM25, TYPE_DECAY_CASE, TYPE_QUALITY_CASE, notLowSignalTitleClause, noisePenaltyClause, stripPrivate, neutralizeContextDelimiters, MAX_UPS_PROMPT_BYTES } from '../utils.mjs';
-import { citeFactorClause } from '../scoring-sql.mjs';
+import { sanitizeFtsQuery, relaxFtsQueryToOr, truncate, typeIcon, inferProject, OBS_BM25, notLowSignalTitleClause, stripPrivate, neutralizeContextDelimiters, MAX_UPS_PROMPT_BYTES } from '../utils.mjs';
+import { liveObsFilterSql, injectionRelevanceSql } from '../lib/inject-search-core.mjs';
 import { cjkPrecisionOk } from '../nlp.mjs';
 import { writeFileSync, readFileSync, existsSync, renameSync } from 'fs';
 import { join, sep } from 'path';
 import { pathToFileURL } from 'url';
 import Database from 'better-sqlite3';
 import { shouldSkip, computeEffectiveLen, detectIntent, shouldSkipByDedup, extractFiles, extractErrorSignature, extractDeferredRefs, DEDUP_STALE_MS, matchRegistrySkillName, detectMemOverride } from './prompt-search-utils.mjs';
+import { injectedIdsFileName } from '../lib/injected-ids.mjs';
 import { getDeferredByIds } from '../lib/deferred-work.mjs';
 import { recommendSkill } from '../registry-recommend.mjs';
 import { recordHookError } from '../lib/hook-telemetry.mjs';
@@ -22,7 +23,12 @@ import { atomicWriteFileSync } from '../lib/atomic-write.mjs';
 // Telemetry sink (lib/hook-telemetry.mjs contract): env override for tests, else
 // <data-dir>/runtime — the same dir the sibling hook scripts + `stats` read.
 const RUNTIME_DIR = process.env.CLAUDE_MEM_RUNTIME_DIR || join(DB_DIR, 'runtime');
-const INJECTED_IDS_FILE = join(DB_DIR, 'runtime', `.claude-mem-injected-${inferProject()}`);
+// D#120: one marker file per CC session — payload-only session keying (M-6) let
+// two concurrent windows full-replace each other's marker, killing dedup between
+// them and resetting `count` on every alternation. Derived per invocation once
+// the session id is parsed from stdin; no session id → legacy project-keyed file.
+const injectedIdsFileFor = (sessionId) =>
+  join(DB_DIR, 'runtime', injectedIdsFileName(inferProject(), sessionId));
 // Per-prompt UPS cap. Cut from 5 → 3 after the 2026-05-09 per-hook recall
 // scan (#8255): UPS contributed 74% of silent injected IDs (131/177) at 26%
 // recall, vs PreToolUse:Read at 94% recall on a tighter file-keyed set.
@@ -66,7 +72,7 @@ const PROMPT_MIN_LENGTH = 15;
 // v2.33.1: follow-up prompts ("前面那个", "继续 X", "再看看 Y") are short by
 // nature but semantically depend on prior turns. Once a session has injected
 // memory at least once, relax gates so short follow-ups still get recall.
-// Detection: INJECTED_IDS_FILE count > 0 within DEDUP_STALE_MS window.
+// Detection: injected-ids marker count > 0 within DEDUP_STALE_MS window.
 const FOLLOWUP_PROMPT_MIN_LENGTH = 8;
 const FOLLOWUP_BM25_MIN_SCORE = Number(process.env.CLAUDE_MEM_UPS_BM25_MIN_FOLLOWUP || 5e-6);
 
@@ -173,9 +179,9 @@ export function corpusFloorScale(db) {
   }
 }
 
-function isFollowUpSession() {
+function isFollowUpSession(injectedIdsFile) {
   try {
-    const raw = readFileSync(INJECTED_IDS_FILE, 'utf8');
+    const raw = readFileSync(injectedIdsFile, 'utf8');
     const { ts, count = 0 } = JSON.parse(raw);
     if (!ts || Date.now() - ts > DEDUP_STALE_MS) return false;
     return count > 0;
@@ -348,12 +354,7 @@ export function searchByFts(db, queryText, project, limit, typeFilter,
   const sql = `
     SELECT o.id, o.type, o.title, o.lesson_learned,
            ${OBS_BM25} as bm25_raw,
-           ${OBS_BM25}
-             * (1.0 + EXP(-0.693 * MAX(0, ? - o.created_at_epoch) / ${TYPE_DECAY_CASE}))
-             * ${TYPE_QUALITY_CASE}
-             * (0.5 + 0.5 * COALESCE(o.importance, 1))
-             * ${noisePenaltyClause('o')}
-             * ${citeFactorClause('o')} as relevance
+           ${injectionRelevanceSql('o')} as relevance
     FROM observations_fts
     JOIN observations o ON o.id = observations_fts.rowid
     WHERE observations_fts MATCH ?
@@ -361,8 +362,7 @@ export function searchByFts(db, queryText, project, limit, typeFilter,
       AND o.importance >= 1
       AND o.created_at_epoch > ?
       AND (? IS NULL OR o.created_at_epoch <= ?)
-      AND COALESCE(o.compressed_into, 0) = 0
-      AND o.superseded_at IS NULL
+      AND ${liveObsFilterSql('o')}
       AND ${notLowSignalTitleClause('o')}
       ${typeClause}
     ORDER BY relevance
@@ -408,8 +408,7 @@ function searchByFile(db, files, project, limit) {
       JOIN observation_files of2 ON of2.obs_id = o.id
       WHERE o.project = ?
         AND o.importance >= 1
-        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 '\\')
         AND ${notLowSignalTitleClause('o')}
@@ -484,8 +483,7 @@ function searchRecent(db, project, limit) {
     FROM observations
     WHERE project = ?
       AND importance >= 1
-      AND COALESCE(compressed_into, 0) = 0
-      AND superseded_at IS NULL
+      AND ${liveObsFilterSql('')}
       AND created_at_epoch > ?
       AND ${notLowSignalTitleClause('')}
     ORDER BY created_at_epoch DESC
@@ -636,6 +634,9 @@ async function main() {
   // would never legitimately be wrapped in <private>).
   if (rawPrompt.startsWith('<task-notification>')) return;
 
+  // D#120: session-keyed dedup marker — every read/write below uses this path.
+  const injectedIdsFile = injectedIdsFileFor(hookData.session_id);
+
   // Strip <private>...</private> blocks before length gates and FTS query
   // construction — private content must not pad effective length nor leak
   // into the FTS MATCH query terms. Mirrors hook.mjs handleUserPrompt.
@@ -665,7 +666,7 @@ async function main() {
       // Namespace dedup ids as "D<id>" (parity with the "P<id>" prompt-corpus
       // convention) so obs ids can't collide in the shared injected-ids file.
       const dedupIds = openRows.map(r => `D${r.id}`);
-      if (openRows.length > 0 && !shouldSkipByDedup(dedupIds, INJECTED_IDS_FILE, hookData.session_id)) {
+      if (openRows.length > 0 && !shouldSkipByDedup(dedupIds, injectedIdsFile, hookData.session_id)) {
         const lines = ['[mem] Deferred work referenced in prompt (open items, full detail):'];
         for (const r of openRows) {
           const pTag = r.priority === 3 ? '🔴' : r.priority === 1 ? '⚪' : '🟡';
@@ -684,7 +685,7 @@ async function main() {
           let prevIds = [];
           let prevCount = 0;
           try {
-            const prev = JSON.parse(readFileSync(INJECTED_IDS_FILE, 'utf8'));
+            const prev = JSON.parse(readFileSync(injectedIdsFile, 'utf8'));
             // M-6: inherit only same-session (or legacy) state — another session's
             // ids/count must not carry over. Atomic write below: a torn concurrent
             // write left the shared marker as invalid JSON (dedup silently off).
@@ -694,7 +695,7 @@ async function main() {
               prevCount = prev.count || 0;
             }
           } catch {}
-          atomicWriteFileSync(INJECTED_IDS_FILE, JSON.stringify({
+          atomicWriteFileSync(injectedIdsFile, JSON.stringify({
             ids: [...new Set([...prevIds.map(String), ...dedupIds])],
             ts: Date.now(),
             count: prevCount + 1,
@@ -713,7 +714,7 @@ async function main() {
   // "fix bug now") that carry too few content tokens for a meaningful FTS lookup.
   // v2.33.1: follow-up prompts in an already-active session get a lower gate —
   // short continuations ("前面那个?", "does it work?") depend on prior context.
-  const followUp = isFollowUpSession();
+  const followUp = isFollowUpSession(injectedIdsFile);
   const promptMinLen = followUp ? FOLLOWUP_PROMPT_MIN_LENGTH : PROMPT_MIN_LENGTH;
   if (computeEffectiveLen(promptText.trim()) < promptMinLen) { try { db?.close(); } catch {} return; }
   const bm25Floor = followUp ? FOLLOWUP_BM25_MIN_SCORE : BM25_MIN_SCORE;
@@ -870,7 +871,7 @@ async function main() {
     const candidateIds = rows.length > 0
       ? rows.map(r => r.id)
       : promptRows.map(r => `P${r.id}`);
-    const dedupSkip = shouldSkipByDedup(candidateIds, INJECTED_IDS_FILE, hookData.session_id);
+    const dedupSkip = shouldSkipByDedup(candidateIds, injectedIdsFile, hookData.session_id);
 
     const output = !dedupSkip
       ? (rows.length > 0 ? formatResults(rows) : formatPromptResults(promptRows))
@@ -881,14 +882,14 @@ async function main() {
       try {
         let prevCount = 0;
         try {
-          const prev = JSON.parse(readFileSync(INJECTED_IDS_FILE, 'utf8'));
+          const prev = JSON.parse(readFileSync(injectedIdsFile, 'utf8'));
           // M-6: same-session (or legacy) count only; atomic write (torn-write guard).
           if (prev.ts && Date.now() - prev.ts < DEDUP_STALE_MS
               && !(prev.session && hookData.session_id && prev.session !== hookData.session_id)) {
             prevCount = prev.count || 0;
           }
         } catch {}
-        atomicWriteFileSync(INJECTED_IDS_FILE, JSON.stringify({
+        atomicWriteFileSync(injectedIdsFile, JSON.stringify({
           ids: candidateIds,
           ts: Date.now(),
           count: prevCount + 1,

package/search-engine.mjs

@@ -6,7 +6,7 @@
 // module exists to eliminate.
 
 import {
-  OBS_BM25, TYPE_DECAY_CASE, TYPE_QUALITY_CASE,
+  OBS_BM25, TYPE_QUALITY_CASE,
   DEFAULT_DECAY_HALF_LIFE_MS,
   notLowSignalTitleClause, LOW_SIGNAL_TITLE,
   relaxFtsQueryToOr, debugLog, debugCatch, estimateTokens,
@@ -15,6 +15,7 @@ import {
 import { citeFactorClause } from './scoring-sql.mjs';
 import { getVocabulary, computeVector, vectorSearch, rrfMerge, vectorsEnabled } from './tfidf.mjs';
 import { extractPRFTerms, expandQueryByConcepts } from './search-scoring.mjs';
+import { liveObsFilterSql, recencyDecaySql } from './lib/inject-search-core.mjs';
 
 // Scoring expressions — full adds project boost + access bonus; simple is for
 // expansion paths where boost would over-amplify already-loose matches.
@@ -35,7 +36,7 @@ import { extractPRFTerms, expandQueryByConcepts } from './search-scoring.mjs';
 // carry zero cite/noise state); the behavioral pin lives in
 // tests/audit-fixes-20260816.test.mjs (M-3).
 const FULL_SCORE = `${OBS_BM25}
-  * (1.0 + EXP(-0.693 * MAX(0, ? - MAX(o.created_at_epoch, COALESCE(o.last_accessed_at, o.created_at_epoch))) / ${TYPE_DECAY_CASE}))
+  * ${recencyDecaySql({ tsExpr: 'MAX(o.created_at_epoch, COALESCE(o.last_accessed_at, o.created_at_epoch))' })}
   * ${TYPE_QUALITY_CASE}
   * (CASE WHEN ? IS NOT NULL AND o.project = ? THEN 2.0 ELSE 1.0 END)
   * (0.5 + 0.5 * COALESCE(o.importance, 1))
@@ -44,11 +45,16 @@ const FULL_SCORE = `${OBS_BM25}
   * ${noisePenaltyClause('o')}
   * ${citeFactorClause('o')}`;
 
+// D#121: noisePenalty joins SIMPLE (an entrenched-noise row demoted 0.2× on every
+// direct surface re-entered concept/PRF expansion at full magnitude); citeFactor
+// stays OUT deliberately — it can amplify 3×, and SIMPLE exists precisely to avoid
+// amplifying already-loose expansion matches. Noise only shrinks: safe direction.
 const SIMPLE_SCORE = `${OBS_BM25}
-  * (1.0 + EXP(-0.693 * MAX(0, ? - MAX(o.created_at_epoch, COALESCE(o.last_accessed_at, o.created_at_epoch))) / ${TYPE_DECAY_CASE}))
+  * ${recencyDecaySql({ tsExpr: 'MAX(o.created_at_epoch, COALESCE(o.last_accessed_at, o.created_at_epoch))' })}
   * ${TYPE_QUALITY_CASE}
   * (0.5 + 0.5 * COALESCE(o.importance, 1))
-  * (1.0 + 0.3 * (o.lesson_learned IS NOT NULL AND o.lesson_learned NOT IN ('', 'none')))`;
+  * (1.0 + 0.3 * (o.lesson_learned IS NOT NULL AND o.lesson_learned NOT IN ('', 'none')))
+  * ${noisePenaltyClause('o')}`;
 
 // Shared column set for fetching an observation surfaced by the vector arm — used by BOTH
 // the RRF-merge branch (FTS also had results) and the FTS-empty fallback branch. Single
@@ -71,8 +77,7 @@ export function buildObsFtsQuery(scoring, { multiplier, withSnippet, withOffset,
     FROM observations_fts
     JOIN observations o ON observations_fts.rowid = o.id
     WHERE observations_fts MATCH ?
-      AND COALESCE(o.compressed_into, 0) = 0
-      AND o.superseded_at IS NULL
+      AND ${liveObsFilterSql('o')}
       AND (? IS NULL OR o.project = ?)
       AND (? IS NULL OR o.type = ?)
       AND (? IS NULL OR o.created_at_epoch >= ?)
@@ -123,8 +128,7 @@ export function countObsFtsMatches(db, { ftsQuery, args = {}, epochFrom = null,
       FROM observations_fts
       JOIN observations o ON observations_fts.rowid = o.id
       WHERE observations_fts MATCH ?
-        AND COALESCE(o.compressed_into, 0) = 0
-        AND o.superseded_at IS NULL
+        AND ${liveObsFilterSql('o')}
         AND (? IS NULL OR o.project = ?)
         AND (? IS NULL OR o.type = ?)
         AND (? IS NULL OR o.created_at_epoch >= ?)
@@ -316,8 +320,7 @@ function expandObsByPRF(db, ctx, now, primaryCount, existingIds, results, includ
   const topResults = db.prepare(`
     SELECT o.title, o.narrative FROM observations_fts
     JOIN observations o ON observations_fts.rowid = o.id
-    WHERE observations_fts MATCH ? AND COALESCE(o.compressed_into, 0) = 0
-      AND o.superseded_at IS NULL
+    WHERE observations_fts MATCH ? AND ${liveObsFilterSql('o')}
       AND (? IS NULL OR o.project = ?)
     ORDER BY ${OBS_BM25}
     LIMIT 8
@@ -384,10 +387,9 @@ export function findFtsAnchor(db, { ftsQuery, project = null, nowT = null, halfL
     JOIN observations o ON observations_fts.rowid = o.id
     WHERE observations_fts MATCH ?
       AND (? IS NULL OR o.project = ?)
-      AND COALESCE(o.compressed_into, 0) = 0
-      AND o.superseded_at IS NULL
+      AND ${liveObsFilterSql('o')}
     ORDER BY ${OBS_BM25}
-      * (1.0 + EXP(-0.693 * MAX(0, ? - o.created_at_epoch) / ${halfLifeMs}.0))
+      * ${recencyDecaySql({ tsExpr: 'o.created_at_epoch', halfLifeSql: `${halfLifeMs}.0` })}
     LIMIT 1
   `;
   const stmt = db.prepare(sql);
@@ -412,7 +414,7 @@ export function searchObservationsHybrid(db, ctx) {
 
   if (!ftsQuery) {
     const params = [];
-    const wheres = ['COALESCE(compressed_into, 0) = 0', 'superseded_at IS NULL'];
+    const wheres = [liveObsFilterSql('')];
     if (args.project) { wheres.push('project = ?'); params.push(args.project); }
     if (args.obs_type) { wheres.push('type = ?'); params.push(args.obs_type); }
     if (epochFrom !== null) { wheres.push('created_at_epoch >= ?'); params.push(epochFrom); }
@@ -467,8 +469,12 @@ export function searchObservationsHybrid(db, ctx) {
   // rescued rows now (they are the only relevance evidence available).
   if (results.length > 0 && results.length < Math.ceil(limit / 2)) {
     const existingIds = new Set(results.map(r => r.id));
+    // D#122 ②: capture the PRIMARY count before concept expansion mutates
+    // `results` — PRF's >=3 gate is meant to read direct-match evidence, not
+    // rows the concept pass just added.
+    const primaryCount = results.length;
     expandObsByConceptCo(db, ctx, now, existingIds, results, includeNoise);
-    expandObsByPRF(db, ctx, now, results.length, existingIds, results, includeNoise);
+    expandObsByPRF(db, ctx, now, primaryCount, existingIds, results, includeNoise);
   }
 
   // Vector search + RRF hybrid merge

package/search-scoring.mjs

@@ -9,6 +9,7 @@ import { debugCatch, COMPRESSED_AUTO, COMPRESSED_PENDING_PURGE, OBS_BM25 } from
 import { BASE_STOP_WORDS } from './stop-words.mjs';
 import { porterStem } from './tfidf.mjs';
 import { CLI_INVOKE } from './cli-path.mjs';
+import { liveObsFilterSql } from './lib/inject-search-core.mjs';
 
 // ─── MCP Server Instructions Builder ───────────────────────────────────────
 // Phase A (v2.31.3+): when quiet=true, drops WHEN-TO-USE proactive-trigger and
@@ -225,8 +226,7 @@ export function expandQueryByConcepts(db, ftsQuery, project) {
     rows = db.prepare(`
       SELECT o.concepts FROM observations_fts
       JOIN observations o ON observations_fts.rowid = o.id
-      WHERE observations_fts MATCH ? AND COALESCE(o.compressed_into, 0) = 0
-        AND o.superseded_at IS NULL
+      WHERE observations_fts MATCH ? AND ${liveObsFilterSql('o')}
         AND (? IS NULL OR o.project = ?)
       ORDER BY ${OBS_BM25}
       LIMIT 20

package/server.mjs

@@ -5,10 +5,10 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
-import { truncate, typeIcon, inferProject, scrubSecrets, fmtDate, debugLog, debugCatch, isPathConfined } from './utils.mjs';
+import { truncate, typeIcon, inferProject, fmtDate, debugLog, debugCatch, isPathConfined } from './utils.mjs';
 import { resolveProject as _resolveProjectShared } from './project-utils.mjs';
 import { ensureDbWithWalRecovery, DB_PATH, DB_DIR, REGISTRY_DB_PATH } from './schema.mjs';
-import { reRankWithContext, autoBoostIfNeeded, runIdleCleanup, buildServerInstructions } from './search-scoring.mjs';
+import { reRankWithContext, runIdleCleanup, buildServerInstructions } from './search-scoring.mjs';
 import { searchObservationsHybrid } from './search-engine.mjs';
 import { deepSearch, resolveDeepMode, shouldEscalateToDeep, autoDeepLlmReady } from './deep-search.mjs';
 import { selectCompressionCandidates, groupByProjectWeek, compressGroup } from './lib/compress-core.mjs';
@@ -22,9 +22,10 @@ import {
   OP_CAP, STALE_AGE_MS,
 } from './lib/maintain-core.mjs';
 import { snapshotDb } from './lib/db-backup.mjs';
-import { deleteObservations } from './lib/delete-core.mjs';
+import { deleteObservations, previewDeleteRows } from './lib/delete-core.mjs';
+import { fetchObsDetail, OBS_FIELDS, SESSION_DETAIL_FIELDS } from './lib/get-core.mjs';
+import { collectBrowseTiers, getActiveMemorySessionId, BROWSE_TIERS, BROWSE_TIER_LABELS } from './lib/browse-core.mjs';
 import { effectiveQuiet, RUNTIME_DIR } from './hook-shared.mjs';
-import { TIER_CASE_SQL, tierSqlParams } from './tier.mjs';
 import { computeStatsFeed } from './lib/stats-core.mjs';
 import { buildLessonNudge } from './lib/save-nudge.mjs';
 import { formatObsFieldValue, obsFieldLabel, formatPendingPurgeLine } from './cli/common.mjs';
@@ -45,11 +46,11 @@ function descriptionOf(name) {
 import { optimizePreview, optimizeRun } from './hook-optimize.mjs';
 import { join, sep } from 'path';
 import { homedir } from 'os';
-import { ensureRegistryDb, upsertResource } from './registry.mjs';
+import { ensureRegistryDb, upsertResource, collectRegistryStats, listResourcesRanked, formatRegistryListLine } from './registry.mjs';
 import { searchResources } from './registry-retriever.mjs';
 import { probeOtherSources as probeIdSources, bucketIdTokens, splitDeferredTokens } from './lib/id-routing.mjs';
 import { saveObservation } from './lib/save-observation.mjs';
-import { rebuildObservationDerived } from './lib/observation-write.mjs';
+import { applyObsUpdate } from './lib/observation-write.mjs';
 import { EXPORT_COLUMNS_SQL } from './lib/export-columns.mjs';
 import { recallByFile } from './lib/recall-core.mjs';
 import { fetchRecent } from './lib/recent-core.mjs';
@@ -599,8 +600,6 @@ server.registerTool(
       return { content: [{ type: 'text', text: 'No valid IDs provided.' }] };
     }
 
-    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'];
-
     // `fields` filter only makes sense for obs rows; session/prompt ignore it.
     // Validate when obs is queried — throw on all-invalid, note on partial-invalid.
     let fieldsNote = '';
@@ -622,12 +621,8 @@ server.registerTool(
     const foundBySource = { obs: new Set(), session: new Set(), prompt: new Set(), event: new Set() };
 
     if (bySrc.obs.length > 0) {
-      const ph = bySrc.obs.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(), ...bySrc.obs);
-        autoBoostIfNeeded(db, bySrc.obs);
-      } catch { /* non-critical: FTS5 trigger may fail on corrupted index */ }
-      const rows = db.prepare(`SELECT * FROM observations WHERE id IN (${ph}) ORDER BY created_at_epoch ASC`).all(...bySrc.obs);
+      // Access-bump + fetch via the shared get-core (P2-12) — single source with CLI get.
+      const rows = fetchObsDetail(db, bySrc.obs);
       const renderFields = obsFieldFilter || OBS_FIELDS;
       for (const row of rows) {
         foundBySource.obs.add(row.id);
@@ -650,7 +645,9 @@ server.registerTool(
     if (bySrc.session.length > 0) {
       const ph = bySrc.session.map(() => '?').join(',');
       const rows = db.prepare(`SELECT * FROM session_summaries WHERE id IN (${ph}) ORDER BY created_at_epoch ASC`).all(...bySrc.session);
-      const sessFields = ['id', 'request', 'investigated', 'learned', 'completed', 'next_steps', 'files_read', 'files_edited', 'notes', 'project', 'created_at', 'memory_session_id', 'prompt_number'];
+      // SESSION_DETAIL_FIELDS (get-core, P2-12): shared full set — adds remaining_items
+      // (searchable via FTS but previously unrendered on BOTH detail faces).
+      const sessFields = SESSION_DETAIL_FIELDS;
       for (const row of rows) {
         foundBySource.session.add(row.id);
         const lines = [`── S#${row.id} ──`];
@@ -765,21 +762,15 @@ server.registerTool(
     inputSchema: memDeleteSchema,
   },
   safeHandler(async (args) => {
-    const placeholders = args.ids.map(() => '?').join(',');
-    const rows = db.prepare(`
-      SELECT id, type, title, project FROM observations WHERE id IN (${placeholders})
-    `).all(...args.ids);
+    // Shared preview body (lib/delete-core, P2-12) — single source with CLI delete.
+    const { rows, lines: previewLines } = previewDeleteRows(db, args.ids);
 
     if (rows.length === 0) {
       return { content: [{ type: 'text', text: 'No observations found for given IDs.' }] };
     }
 
     if (!args.confirm) {
-      // Preview mode
-      const lines = [`Preview: ${rows.length} observation(s) will be deleted:\n`];
-      for (const r of rows) {
-        lines.push(`  #${r.id} [${r.type}] ${truncate(r.title || '(untitled)', 80)} | ${r.project}`);
-      }
+      const lines = [`Preview: ${rows.length} observation(s) will be deleted:\n`, ...previewLines];
       lines.push(`\nCall mem_delete(ids=[...], confirm=true) to execute.`);
       return { content: [{ type: 'text', text: lines.join('\n') }] };
     }
@@ -1425,51 +1416,27 @@ server.registerTool(
     }
 
     if (action === 'list') {
-      const typeFilter = args.type;
-      const where = typeFilter ? 'WHERE type = ? AND status = ?' : 'WHERE status = ?';
-      const params = typeFilter ? [typeFilter, 'active'] : ['active'];
-      // T3-P2-A: order by adoption then recommendation (CLI parity), and coalesce NULL counts
-      // so the output shows "adopt:0" rather than the jarring "adopt:null".
-      const resources = rdb.prepare(`
-        SELECT name, type, invocation_name, recommend_count, adopt_count, capability_summary
-        FROM resources ${where}
-        ORDER BY COALESCE(adopt_count, 0) DESC, COALESCE(recommend_count, 0) DESC, type, name
-      `).all(...params);
-
+      // Shared ranked query + row line (registry.mjs, P2-12) — single source with CLI list.
+      const resources = listResourcesRanked(rdb, { type: args.type });
       if (resources.length === 0) return { content: [{ type: 'text', text: 'No resources found.' }] };
-
-      const lines = resources.map(r =>
-        `${r.type === 'skill' ? 'S' : 'A'} ${r.name}${r.invocation_name ? ` (${r.invocation_name})` : ''} — rec:${r.recommend_count ?? 0} adopt:${r.adopt_count ?? 0} — ${truncate(r.capability_summary || '', 80)}`
-      );
+      const lines = resources.map(formatRegistryListLine);
       return { content: [{ type: 'text', text: `Resources (${resources.length}):\n${lines.join('\n')}` }] };
     }
 
     if (action === 'stats') {
-      const total = rdb.prepare('SELECT COUNT(*) as c FROM resources WHERE status = ?').get('active');
-      const byType = rdb.prepare('SELECT type, COUNT(*) as c FROM resources WHERE status = ? GROUP BY type').all('active');
-      const topAdopted = rdb.prepare(`
-        SELECT name, type, adopt_count, recommend_count
-        FROM resources WHERE status = ? AND adopt_count > 0
-        ORDER BY adopt_count DESC LIMIT 10
-      `).all('active');
-      const zeroAdopt = rdb.prepare(`
-        SELECT COUNT(*) as c FROM resources
-        WHERE status = ? AND recommend_count > 0 AND adopt_count = 0
-      `).get('active');
-      const userAdded = rdb.prepare(`
-        SELECT COUNT(*) as c FROM resources WHERE status = ? AND source = 'user'
-      `).get('active');
-
+      // Shared collection (registry.mjs collectRegistryStats, P2-12) — single
+      // source with the CLI registry stats action.
+      const s = collectRegistryStats(rdb);
       const lines = [
         `Registry Stats:`,
-        `  Total active: ${total.c}`,
-        ...byType.map(t => `  ${t.type}: ${t.c}`),
-        `  User-added: ${userAdded.c}`,
-        `  Zero adoption (recommended but never adopted): ${zeroAdopt.c}`,
+        `  Total active: ${s.total}`,
+        ...s.byType.map(t => `  ${t.type}: ${t.c}`),
+        `  User-added: ${s.userAdded}`,
+        `  Zero adoption (recommended but never adopted): ${s.zeroAdopt}`,
       ];
-      if (topAdopted.length > 0) {
+      if (s.topAdopted.length > 0) {
         lines.push('', 'Top adopted:');
-        for (const r of topAdopted) {
+        for (const r of s.topAdopted) {
           lines.push(`  ${r.name} (${r.type}): ${r.adopt_count}/${r.recommend_count}`);
         }
       }
@@ -1696,26 +1663,15 @@ server.registerTool(
     const obs = db.prepare('SELECT id, title FROM observations WHERE id = ?').get(args.id);
     if (!obs) return { content: [{ type: 'text', text: `Observation #${args.id} not found` }], isError: true };
 
-    const updates = [];
-    const params = [];
-    for (const [key, col] of [['title','title'],['narrative','narrative'],['type','type'],['importance','importance'],['lesson_learned','lesson_learned'],['concepts','concepts']]) {
-      if (args[key] !== undefined) {
-        updates.push(`${col} = ?`);
-        params.push(typeof args[key] === 'string' ? scrubSecrets(args[key]) : args[key]);
-      }
-    }
-    if (updates.length === 0) return { content: [{ type: 'text', text: 'No fields to update' }], isError: true };
-
-    params.push(args.id);
-
-    // Atomic: update fields + rebuild derived columns (FTS text + vector) via the
-    // shared core — single source with CLI cmdUpdate (lib/observation-write.mjs).
-    db.transaction(() => {
-      db.prepare(`UPDATE observations SET ${updates.join(', ')} WHERE id = ?`).run(...params);
-      rebuildObservationDerived(db, args.id);
-    })();
+    // Shared mutation (lib/observation-write applyObsUpdate, P2-12): scrub + UPDATE +
+    // derived-column rebuild in one transaction — single source with CLI cmdUpdate.
+    const updatedCols = applyObsUpdate(db, args.id, {
+      title: args.title, narrative: args.narrative, type: args.type,
+      importance: args.importance, lesson_learned: args.lesson_learned, concepts: args.concepts,
+    });
+    if (updatedCols.length === 0) return { content: [{ type: 'text', text: 'No fields to update' }], isError: true };
 
-    return { content: [{ type: 'text', text: `Updated observation #${args.id}: ${updates.map(u => u.split(' =')[0]).join(', ')}` }] };
+    return { content: [{ type: 'text', text: `Updated observation #${args.id}: ${updatedCols.join(', ')}` }] };
   })
 );
 
@@ -1869,33 +1825,18 @@ server.registerTool(
     const limit = args.limit ?? (tierFilter ? 20 : 5);
     const now = Date.now();
 
-    // Get active session for tier classification
-    const activeSession = db.prepare(
-      "SELECT memory_session_id FROM sdk_sessions WHERE project = ? AND status = 'active' ORDER BY started_at_epoch DESC LIMIT 1"
-    ).get(project);
-
-    const ctx = { now, currentProject: project, currentSessionId: activeSession?.memory_session_id ?? '' };
-    const params = tierSqlParams(ctx);
-
-    const tiers = ['working', 'active', 'archive'];
-    const tierLabels = { working: '🔴 Working Memory', active: '🟡 Active Memory', archive: '🔵 Archive' };
-    const showTiers = tierFilter ? [tierFilter] : tiers;
+    // Shared collection (lib/browse-core, P2-12) — single source with CLI browse.
+    const { showTiers, tierData, tierCounts, grandTotal } = collectBrowseTiers(db, {
+      project, tierFilter, limit, now,
+      currentSessionId: getActiveMemorySessionId(db, project),
+    });
+    const tiers = BROWSE_TIERS;
+    const tierLabels = BROWSE_TIER_LABELS;
 
     const lines = [`Memory Dashboard (${project})\n`];
-    let grandTotal = 0;
-    const tierCounts = {};
 
     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 COALESCE(compressed_into, 0) = 0 AND superseded_at IS NULL
-        ) WHERE tier = ?
-      `).get(...params, project, tier);
-      const count = countRow?.c ?? 0;
-      tierCounts[tier] = count;
-      grandTotal += count;
-
+      const { count, rows } = tierData[tier];
       lines.push(`${tierLabels[tier]} (${count})`);
 
       if (tier === 'archive' && !tierFilter) {
@@ -1905,16 +1846,6 @@ server.registerTool(
 
       if (count === 0) { lines.push(''); continue; }
 
-      const rows = db.prepare(`
-        SELECT * FROM (
-          SELECT id, type, title, created_at, created_at_epoch, ${TIER_CASE_SQL} as tier
-          FROM observations
-          WHERE project = ? AND COALESCE(compressed_into, 0) = 0 AND superseded_at IS NULL
-        ) WHERE tier = ?
-        ORDER BY created_at_epoch DESC
-        LIMIT ?
-      `).all(...params, project, tier, limit);
-
       for (const r of rows) {
         lines.push(`  #${r.id} ${typeIcon(r.type)} [${r.type}] ${truncate(r.title || '(untitled)', 80)} | ${fmtDate(r.created_at)}`);
       }

package/source-files.mjs

@@ -119,6 +119,20 @@ export const SOURCE_FILES = [
   // colliding with the scripts/ directory rename in installExtractedRelease
   // — see the SWITCHABLE_PATHS loop in hook-update.mjs.
   'lib/mem-override.mjs',
+  // D#120: injected-ids marker file-name derivation, shared by hook.mjs +
+  // scripts/user-prompt-search.js + scripts/pre-tool-recall.js. Under lib/ for
+  // the same scripts-dir-rename reason as mem-override.mjs above.
+  'lib/injected-ids.mjs',
+  // P2-11: injection-side shared SQL core (live-row filter / clamped decay /
+  // injection relevance chain). Statically imported by hook.mjs, hook-memory.mjs,
+  // search-engine.mjs AND the standalone hook scripts — missing it from the
+  // manifest kills every retrieval surface on auto-update.
+  'lib/inject-search-core.mjs',
+  // P2-12 twin cores: get/browse shared data collection for the CLI/MCP pairs
+  // (update lives in observation-write, delete-preview in delete-core, registry
+  // stats/list in registry.mjs — all already listed).
+  'lib/get-core.mjs',
+  'lib/browse-core.mjs',
   // v2.61 dedup refactor: shared "save one observation" pipeline used by both
   // mem-cli.mjs::cmdSave and server.mjs::mem_save. Statically imported from both
   // entry points; missing it from the manifest broke MCP saves on auto-update.

package/tfidf.mjs

@@ -7,6 +7,7 @@ import { cjkBigrams } from './utils.mjs';
 import { BASE_STOP_WORDS } from './stop-words.mjs';
 import { createHash } from 'crypto';
 import { rrfAccumulate } from './lib/rrf.mjs';
+import { liveObsFilterSql } from './lib/inject-search-core.mjs';
 
 export const VOCAB_DIM = 512;
 // Fraction of the vocab dimension reserved for the highest-IDF (rarest) terms when the
@@ -240,7 +241,7 @@ export function vecTextForRow(row) {
 export function buildVocabulary(db, { dim = VOCAB_DIM } = {}) {
   const rows = db.prepare(`
     SELECT title, narrative, concepts, lesson_learned, search_aliases FROM observations
-    WHERE COALESCE(compressed_into, 0) = 0 AND superseded_at IS NULL
+    WHERE ${liveObsFilterSql('')}
   `).all();
 
   const N = rows.length;
@@ -444,8 +445,7 @@ export function vectorSearch(db, queryVec, { project, type, vocabVersion, limit
   const now = Date.now();
 
   const wheres = [
-    'COALESCE(o.compressed_into, 0) = 0',
-    'o.superseded_at IS NULL',
+    liveObsFilterSql('o'),
     'ov.vocab_version = ?',
   ];
   const params = [vocabVersion];