engrm 0.4.11 → 0.4.13

package/dist/hooks/post-tool-use.js

@@ -775,6 +775,18 @@ var MIGRATIONS = [
       CREATE INDEX IF NOT EXISTS idx_tool_events_created
         ON tool_events(created_at_epoch DESC, id DESC);
     `
+  },
+  {
+    version: 11,
+    description: "Add observation provenance from tool and prompt chronology",
+    sql: `
+      ALTER TABLE observations ADD COLUMN source_tool TEXT;
+      ALTER TABLE observations ADD COLUMN source_prompt_number INTEGER;
+      CREATE INDEX IF NOT EXISTS idx_observations_source_tool
+        ON observations(source_tool, created_at_epoch DESC);
+      CREATE INDEX IF NOT EXISTS idx_observations_source_prompt
+        ON observations(session_id, source_prompt_number DESC);
+    `
   }
 ];
 function isVecExtensionLoaded(db) {
@@ -828,6 +840,8 @@ function inferLegacySchemaVersion(db) {
     version = Math.max(version, 9);
   if (tableExists(db, "tool_events"))
     version = Math.max(version, 10);
+  if (columnExists(db, "observations", "source_tool"))
+    version = Math.max(version, 11);
   return version;
 }
 function runMigrations(db) {
@@ -910,6 +924,86 @@ var LATEST_SCHEMA_VERSION = MIGRATIONS.filter((m) => !m.condition).reduce((max,
 
 // src/storage/sqlite.ts
 import { createHash as createHash2 } from "node:crypto";
+
+// src/intelligence/summary-sections.ts
+function extractSummaryItems(section, limit) {
+  if (!section || !section.trim())
+    return [];
+  const rawLines = section.split(`
+`).map((line) => line.replace(/\s+/g, " ").trim()).filter(Boolean);
+  const items = [];
+  const seen = new Set;
+  let heading = null;
+  for (const rawLine of rawLines) {
+    const line = stripSectionPrefix(rawLine);
+    if (!line)
+      continue;
+    const headingOnly = parseHeading(line);
+    if (headingOnly) {
+      heading = headingOnly;
+      continue;
+    }
+    const isBullet = /^[-*•]\s+/.test(line);
+    const stripped = line.replace(/^[-*•]\s+/, "").trim();
+    if (!stripped)
+      continue;
+    const item = heading && isBullet ? `${heading}: ${stripped}` : stripped;
+    const normalized = normalizeItem(item);
+    if (!normalized || seen.has(normalized))
+      continue;
+    seen.add(normalized);
+    items.push(item);
+    if (limit && items.length >= limit)
+      break;
+  }
+  return items;
+}
+function formatSummaryItems(section, maxLen) {
+  const items = extractSummaryItems(section);
+  if (items.length === 0)
+    return null;
+  const cleaned = items.map((item) => `- ${item}`).join(`
+`);
+  if (cleaned.length <= maxLen)
+    return cleaned;
+  const truncated = cleaned.slice(0, maxLen).trimEnd();
+  const lastBreak = Math.max(truncated.lastIndexOf(`
+`), truncated.lastIndexOf(" "));
+  const safe = lastBreak > maxLen * 0.5 ? truncated.slice(0, lastBreak) : truncated;
+  return `${safe.trimEnd()}…`;
+}
+function normalizeSummarySection(section) {
+  const items = extractSummaryItems(section);
+  if (items.length === 0) {
+    const cleaned = section?.replace(/\s+/g, " ").trim() ?? "";
+    return cleaned || null;
+  }
+  return items.map((item) => `- ${item}`).join(`
+`);
+}
+function normalizeSummaryRequest(value) {
+  const cleaned = value?.replace(/\s+/g, " ").trim() ?? "";
+  return cleaned || null;
+}
+function stripSectionPrefix(value) {
+  return value.replace(/^(request|investigated|learned|completed|next steps|summary):\s*/i, "").trim();
+}
+function parseHeading(value) {
+  const boldMatch = value.match(/^\*{1,2}\s*(.+?)\s*:\*{1,2}$/);
+  if (boldMatch?.[1]) {
+    return boldMatch[1].trim().replace(/\s+/g, " ");
+  }
+  const plainMatch = value.match(/^(.+?):$/);
+  if (plainMatch?.[1]) {
+    return plainMatch[1].trim().replace(/\s+/g, " ");
+  }
+  return null;
+}
+function normalizeItem(value) {
+  return value.toLowerCase().replace(/\*+/g, "").replace(/\s+/g, " ").trim();
+}
+
+// src/storage/sqlite.ts
 var IS_BUN = typeof globalThis.Bun !== "undefined";
 function openDatabase(dbPath) {
   if (IS_BUN) {
@@ -946,6 +1040,7 @@ function openNodeDatabase(dbPath) {
   const BetterSqlite3 = __require("better-sqlite3");
   const raw = new BetterSqlite3(dbPath);
   return {
+    __raw: raw,
     query(sql) {
       const stmt = raw.prepare(sql);
       return {
@@ -983,7 +1078,7 @@ class MemDatabase {
   loadVecExtension() {
     try {
       const sqliteVec = __require("sqlite-vec");
-      sqliteVec.load(this.db);
+      sqliteVec.load(this.db.__raw ?? this.db);
       return true;
     } catch {
       return false;
@@ -1024,8 +1119,9 @@ class MemDatabase {
     const result = this.db.query(`INSERT INTO observations (
           session_id, project_id, type, title, narrative, facts, concepts,
           files_read, files_modified, quality, lifecycle, sensitivity,
-          user_id, device_id, agent, created_at, created_at_epoch
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(obs.session_id ?? null, obs.project_id, obs.type, obs.title, obs.narrative ?? null, obs.facts ?? null, obs.concepts ?? null, obs.files_read ?? null, obs.files_modified ?? null, obs.quality, obs.lifecycle ?? "active", obs.sensitivity ?? "shared", obs.user_id, obs.device_id, obs.agent ?? "claude-code", createdAt, now);
+          user_id, device_id, agent, source_tool, source_prompt_number,
+          created_at, created_at_epoch
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(obs.session_id ?? null, obs.project_id, obs.type, obs.title, obs.narrative ?? null, obs.facts ?? null, obs.concepts ?? null, obs.files_read ?? null, obs.files_modified ?? null, obs.quality, obs.lifecycle ?? "active", obs.sensitivity ?? "shared", obs.user_id, obs.device_id, obs.agent ?? "claude-code", obs.source_tool ?? null, obs.source_prompt_number ?? null, createdAt, now);
     const id = Number(result.lastInsertRowid);
     const row = this.getObservationById(id);
     this.ftsInsert(row);
@@ -1266,6 +1362,13 @@ class MemDatabase {
          ORDER BY prompt_number ASC
          LIMIT ?`).all(sessionId, limit);
   }
+  getLatestSessionPromptNumber(sessionId) {
+    const row = this.db.query(`SELECT prompt_number FROM user_prompts
+         WHERE session_id = ?
+         ORDER BY prompt_number DESC
+         LIMIT 1`).get(sessionId);
+    return row?.prompt_number ?? null;
+  }
   insertToolEvent(input) {
     const createdAt = input.created_at_epoch ?? Math.floor(Date.now() / 1000);
     const result = this.db.query(`INSERT INTO tool_events (
@@ -1375,8 +1478,15 @@ class MemDatabase {
   }
   insertSessionSummary(summary) {
     const now = Math.floor(Date.now() / 1000);
+    const normalized = {
+      request: normalizeSummaryRequest(summary.request),
+      investigated: normalizeSummarySection(summary.investigated),
+      learned: normalizeSummarySection(summary.learned),
+      completed: normalizeSummarySection(summary.completed),
+      next_steps: normalizeSummarySection(summary.next_steps)
+    };
     const result = this.db.query(`INSERT INTO session_summaries (session_id, project_id, user_id, request, investigated, learned, completed, next_steps, created_at_epoch)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(summary.session_id, summary.project_id, summary.user_id, summary.request, summary.investigated, summary.learned, summary.completed, summary.next_steps, now);
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(summary.session_id, summary.project_id, summary.user_id, normalized.request, normalized.investigated, normalized.learned, normalized.completed, normalized.next_steps, now);
     const id = Number(result.lastInsertRowid);
     return this.db.query("SELECT * FROM session_summaries WHERE id = ?").get(id);
   }
@@ -2319,6 +2429,7 @@ async function saveObservation(db, config, input) {
       reason: `Merged into existing observation #${duplicate.id}`
     };
   }
+  const sourcePromptNumber = input.source_prompt_number ?? (input.session_id ? db.getLatestSessionPromptNumber(input.session_id) : null);
   const obs = db.insertObservation({
     session_id: input.session_id ?? null,
     project_id: project.id,
@@ -2334,7 +2445,9 @@ async function saveObservation(db, config, input) {
     sensitivity,
     user_id: config.user_id,
     device_id: config.device_id,
-    agent: input.agent ?? "claude-code"
+    agent: input.agent ?? "claude-code",
+    source_tool: input.source_tool ?? null,
+    source_prompt_number: sourcePromptNumber
   });
   db.addToOutbox("observation", obs.id);
   if (db.vecAvailable) {
@@ -3147,7 +3260,8 @@ async function main() {
           files_read: extracted.files_read,
           files_modified: extracted.files_modified,
           session_id: event.session_id,
-          cwd: event.cwd
+          cwd: event.cwd,
+          source_tool: event.tool_name
         });
         incrementObserverSaveCount(event.session_id);
       }

package/dist/hooks/pre-compact.js

@@ -569,6 +569,18 @@ var MIGRATIONS = [
       CREATE INDEX IF NOT EXISTS idx_tool_events_created
         ON tool_events(created_at_epoch DESC, id DESC);
     `
+  },
+  {
+    version: 11,
+    description: "Add observation provenance from tool and prompt chronology",
+    sql: `
+      ALTER TABLE observations ADD COLUMN source_tool TEXT;
+      ALTER TABLE observations ADD COLUMN source_prompt_number INTEGER;
+      CREATE INDEX IF NOT EXISTS idx_observations_source_tool
+        ON observations(source_tool, created_at_epoch DESC);
+      CREATE INDEX IF NOT EXISTS idx_observations_source_prompt
+        ON observations(session_id, source_prompt_number DESC);
+    `
   }
 ];
 function isVecExtensionLoaded(db) {
@@ -622,6 +634,8 @@ function inferLegacySchemaVersion(db) {
     version = Math.max(version, 9);
   if (tableExists(db, "tool_events"))
     version = Math.max(version, 10);
+  if (columnExists(db, "observations", "source_tool"))
+    version = Math.max(version, 11);
   return version;
 }
 function runMigrations(db) {
@@ -704,6 +718,86 @@ var LATEST_SCHEMA_VERSION = MIGRATIONS.filter((m) => !m.condition).reduce((max,
 
 // src/storage/sqlite.ts
 import { createHash as createHash2 } from "node:crypto";
+
+// src/intelligence/summary-sections.ts
+function extractSummaryItems(section, limit) {
+  if (!section || !section.trim())
+    return [];
+  const rawLines = section.split(`
+`).map((line) => line.replace(/\s+/g, " ").trim()).filter(Boolean);
+  const items = [];
+  const seen = new Set;
+  let heading = null;
+  for (const rawLine of rawLines) {
+    const line = stripSectionPrefix(rawLine);
+    if (!line)
+      continue;
+    const headingOnly = parseHeading(line);
+    if (headingOnly) {
+      heading = headingOnly;
+      continue;
+    }
+    const isBullet = /^[-*•]\s+/.test(line);
+    const stripped = line.replace(/^[-*•]\s+/, "").trim();
+    if (!stripped)
+      continue;
+    const item = heading && isBullet ? `${heading}: ${stripped}` : stripped;
+    const normalized = normalizeItem(item);
+    if (!normalized || seen.has(normalized))
+      continue;
+    seen.add(normalized);
+    items.push(item);
+    if (limit && items.length >= limit)
+      break;
+  }
+  return items;
+}
+function formatSummaryItems(section, maxLen) {
+  const items = extractSummaryItems(section);
+  if (items.length === 0)
+    return null;
+  const cleaned = items.map((item) => `- ${item}`).join(`
+`);
+  if (cleaned.length <= maxLen)
+    return cleaned;
+  const truncated = cleaned.slice(0, maxLen).trimEnd();
+  const lastBreak = Math.max(truncated.lastIndexOf(`
+`), truncated.lastIndexOf(" "));
+  const safe = lastBreak > maxLen * 0.5 ? truncated.slice(0, lastBreak) : truncated;
+  return `${safe.trimEnd()}…`;
+}
+function normalizeSummarySection(section) {
+  const items = extractSummaryItems(section);
+  if (items.length === 0) {
+    const cleaned = section?.replace(/\s+/g, " ").trim() ?? "";
+    return cleaned || null;
+  }
+  return items.map((item) => `- ${item}`).join(`
+`);
+}
+function normalizeSummaryRequest(value) {
+  const cleaned = value?.replace(/\s+/g, " ").trim() ?? "";
+  return cleaned || null;
+}
+function stripSectionPrefix(value) {
+  return value.replace(/^(request|investigated|learned|completed|next steps|summary):\s*/i, "").trim();
+}
+function parseHeading(value) {
+  const boldMatch = value.match(/^\*{1,2}\s*(.+?)\s*:\*{1,2}$/);
+  if (boldMatch?.[1]) {
+    return boldMatch[1].trim().replace(/\s+/g, " ");
+  }
+  const plainMatch = value.match(/^(.+?):$/);
+  if (plainMatch?.[1]) {
+    return plainMatch[1].trim().replace(/\s+/g, " ");
+  }
+  return null;
+}
+function normalizeItem(value) {
+  return value.toLowerCase().replace(/\*+/g, "").replace(/\s+/g, " ").trim();
+}
+
+// src/storage/sqlite.ts
 var IS_BUN = typeof globalThis.Bun !== "undefined";
 function openDatabase(dbPath) {
   if (IS_BUN) {
@@ -740,6 +834,7 @@ function openNodeDatabase(dbPath) {
   const BetterSqlite3 = __require("better-sqlite3");
   const raw = new BetterSqlite3(dbPath);
   return {
+    __raw: raw,
     query(sql) {
       const stmt = raw.prepare(sql);
       return {
@@ -777,7 +872,7 @@ class MemDatabase {
   loadVecExtension() {
     try {
       const sqliteVec = __require("sqlite-vec");
-      sqliteVec.load(this.db);
+      sqliteVec.load(this.db.__raw ?? this.db);
       return true;
     } catch {
       return false;
@@ -818,8 +913,9 @@ class MemDatabase {
     const result = this.db.query(`INSERT INTO observations (
           session_id, project_id, type, title, narrative, facts, concepts,
           files_read, files_modified, quality, lifecycle, sensitivity,
-          user_id, device_id, agent, created_at, created_at_epoch
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(obs.session_id ?? null, obs.project_id, obs.type, obs.title, obs.narrative ?? null, obs.facts ?? null, obs.concepts ?? null, obs.files_read ?? null, obs.files_modified ?? null, obs.quality, obs.lifecycle ?? "active", obs.sensitivity ?? "shared", obs.user_id, obs.device_id, obs.agent ?? "claude-code", createdAt, now);
+          user_id, device_id, agent, source_tool, source_prompt_number,
+          created_at, created_at_epoch
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(obs.session_id ?? null, obs.project_id, obs.type, obs.title, obs.narrative ?? null, obs.facts ?? null, obs.concepts ?? null, obs.files_read ?? null, obs.files_modified ?? null, obs.quality, obs.lifecycle ?? "active", obs.sensitivity ?? "shared", obs.user_id, obs.device_id, obs.agent ?? "claude-code", obs.source_tool ?? null, obs.source_prompt_number ?? null, createdAt, now);
     const id = Number(result.lastInsertRowid);
     const row = this.getObservationById(id);
     this.ftsInsert(row);
@@ -1060,6 +1156,13 @@ class MemDatabase {
          ORDER BY prompt_number ASC
          LIMIT ?`).all(sessionId, limit);
   }
+  getLatestSessionPromptNumber(sessionId) {
+    const row = this.db.query(`SELECT prompt_number FROM user_prompts
+         WHERE session_id = ?
+         ORDER BY prompt_number DESC
+         LIMIT 1`).get(sessionId);
+    return row?.prompt_number ?? null;
+  }
   insertToolEvent(input) {
     const createdAt = input.created_at_epoch ?? Math.floor(Date.now() / 1000);
     const result = this.db.query(`INSERT INTO tool_events (
@@ -1169,8 +1272,15 @@ class MemDatabase {
   }
   insertSessionSummary(summary) {
     const now = Math.floor(Date.now() / 1000);
+    const normalized = {
+      request: normalizeSummaryRequest(summary.request),
+      investigated: normalizeSummarySection(summary.investigated),
+      learned: normalizeSummarySection(summary.learned),
+      completed: normalizeSummarySection(summary.completed),
+      next_steps: normalizeSummarySection(summary.next_steps)
+    };
     const result = this.db.query(`INSERT INTO session_summaries (session_id, project_id, user_id, request, investigated, learned, completed, next_steps, created_at_epoch)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(summary.session_id, summary.project_id, summary.user_id, summary.request, summary.investigated, summary.learned, summary.completed, summary.next_steps, now);
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(summary.session_id, summary.project_id, summary.user_id, normalized.request, normalized.investigated, normalized.learned, normalized.completed, normalized.next_steps, now);
     const id = Number(result.lastInsertRowid);
     return this.db.query("SELECT * FROM session_summaries WHERE id = ?").get(id);
   }
@@ -2042,23 +2152,7 @@ function chooseMeaningfulSessionHeadline(request, completed) {
   return request ?? completed ?? "(no summary)";
 }
 function formatSummarySection(value, maxLen) {
-  if (!value)
-    return null;
-  const cleaned = value.split(`
-`).map((line) => line.trim()).filter(Boolean).map((line) => line.startsWith("-") ? line : `- ${line}`).join(`
-`);
-  if (!cleaned)
-    return null;
-  return truncateMultilineText(cleaned, maxLen);
-}
-function truncateMultilineText(text, maxLen) {
-  if (text.length <= maxLen)
-    return text;
-  const truncated = text.slice(0, maxLen).trimEnd();
-  const lastBreak = Math.max(truncated.lastIndexOf(`
-`), truncated.lastIndexOf(" "));
-  const safe = lastBreak > maxLen * 0.5 ? truncated.slice(0, lastBreak) : truncated;
-  return `${safe.trimEnd()}…`;
+  return formatSummaryItems(value, maxLen);
 }
 function truncateText(text, maxLen) {
   if (text.length <= maxLen)
@@ -2082,8 +2176,7 @@ function stripInlineSectionLabel(value) {
 function extractMeaningfulLines(value, limit) {
   if (!value)
     return [];
-  return value.split(`
-`).map((line) => line.trim()).filter(Boolean).map((line) => line.replace(/^[-*]\s*/, "")).map((line) => stripInlineSectionLabel(line)).filter((line) => line.length > 0 && !looksLikeFileOperationTitle(line)).slice(0, limit);
+  return extractSummaryItems(value).map((line) => stripInlineSectionLabel(line)).filter((line) => line.length > 0 && !looksLikeFileOperationTitle(line)).slice(0, limit);
 }
 function formatObservationDetailFromContext(obs) {
   if (obs.facts) {

package/dist/hooks/sentinel.js

@@ -645,6 +645,18 @@ var MIGRATIONS = [
       CREATE INDEX IF NOT EXISTS idx_tool_events_created
         ON tool_events(created_at_epoch DESC, id DESC);
     `
+  },
+  {
+    version: 11,
+    description: "Add observation provenance from tool and prompt chronology",
+    sql: `
+      ALTER TABLE observations ADD COLUMN source_tool TEXT;
+      ALTER TABLE observations ADD COLUMN source_prompt_number INTEGER;
+      CREATE INDEX IF NOT EXISTS idx_observations_source_tool
+        ON observations(source_tool, created_at_epoch DESC);
+      CREATE INDEX IF NOT EXISTS idx_observations_source_prompt
+        ON observations(session_id, source_prompt_number DESC);
+    `
   }
 ];
 function isVecExtensionLoaded(db) {
@@ -698,6 +710,8 @@ function inferLegacySchemaVersion(db) {
     version = Math.max(version, 9);
   if (tableExists(db, "tool_events"))
     version = Math.max(version, 10);
+  if (columnExists(db, "observations", "source_tool"))
+    version = Math.max(version, 11);
   return version;
 }
 function runMigrations(db) {
@@ -780,6 +794,86 @@ var LATEST_SCHEMA_VERSION = MIGRATIONS.filter((m) => !m.condition).reduce((max,
 
 // src/storage/sqlite.ts
 import { createHash as createHash2 } from "node:crypto";
+
+// src/intelligence/summary-sections.ts
+function extractSummaryItems(section, limit) {
+  if (!section || !section.trim())
+    return [];
+  const rawLines = section.split(`
+`).map((line) => line.replace(/\s+/g, " ").trim()).filter(Boolean);
+  const items = [];
+  const seen = new Set;
+  let heading = null;
+  for (const rawLine of rawLines) {
+    const line = stripSectionPrefix(rawLine);
+    if (!line)
+      continue;
+    const headingOnly = parseHeading(line);
+    if (headingOnly) {
+      heading = headingOnly;
+      continue;
+    }
+    const isBullet = /^[-*•]\s+/.test(line);
+    const stripped = line.replace(/^[-*•]\s+/, "").trim();
+    if (!stripped)
+      continue;
+    const item = heading && isBullet ? `${heading}: ${stripped}` : stripped;
+    const normalized = normalizeItem(item);
+    if (!normalized || seen.has(normalized))
+      continue;
+    seen.add(normalized);
+    items.push(item);
+    if (limit && items.length >= limit)
+      break;
+  }
+  return items;
+}
+function formatSummaryItems(section, maxLen) {
+  const items = extractSummaryItems(section);
+  if (items.length === 0)
+    return null;
+  const cleaned = items.map((item) => `- ${item}`).join(`
+`);
+  if (cleaned.length <= maxLen)
+    return cleaned;
+  const truncated = cleaned.slice(0, maxLen).trimEnd();
+  const lastBreak = Math.max(truncated.lastIndexOf(`
+`), truncated.lastIndexOf(" "));
+  const safe = lastBreak > maxLen * 0.5 ? truncated.slice(0, lastBreak) : truncated;
+  return `${safe.trimEnd()}…`;
+}
+function normalizeSummarySection(section) {
+  const items = extractSummaryItems(section);
+  if (items.length === 0) {
+    const cleaned = section?.replace(/\s+/g, " ").trim() ?? "";
+    return cleaned || null;
+  }
+  return items.map((item) => `- ${item}`).join(`
+`);
+}
+function normalizeSummaryRequest(value) {
+  const cleaned = value?.replace(/\s+/g, " ").trim() ?? "";
+  return cleaned || null;
+}
+function stripSectionPrefix(value) {
+  return value.replace(/^(request|investigated|learned|completed|next steps|summary):\s*/i, "").trim();
+}
+function parseHeading(value) {
+  const boldMatch = value.match(/^\*{1,2}\s*(.+?)\s*:\*{1,2}$/);
+  if (boldMatch?.[1]) {
+    return boldMatch[1].trim().replace(/\s+/g, " ");
+  }
+  const plainMatch = value.match(/^(.+?):$/);
+  if (plainMatch?.[1]) {
+    return plainMatch[1].trim().replace(/\s+/g, " ");
+  }
+  return null;
+}
+function normalizeItem(value) {
+  return value.toLowerCase().replace(/\*+/g, "").replace(/\s+/g, " ").trim();
+}
+
+// src/storage/sqlite.ts
 var IS_BUN = typeof globalThis.Bun !== "undefined";
 function openDatabase(dbPath) {
   if (IS_BUN) {
@@ -816,6 +910,7 @@ function openNodeDatabase(dbPath) {
   const BetterSqlite3 = __require("better-sqlite3");
   const raw = new BetterSqlite3(dbPath);
   return {
+    __raw: raw,
     query(sql) {
       const stmt = raw.prepare(sql);
       return {
@@ -853,7 +948,7 @@ class MemDatabase {
   loadVecExtension() {
     try {
       const sqliteVec = __require("sqlite-vec");
-      sqliteVec.load(this.db);
+      sqliteVec.load(this.db.__raw ?? this.db);
       return true;
     } catch {
       return false;
@@ -894,8 +989,9 @@ class MemDatabase {
     const result = this.db.query(`INSERT INTO observations (
           session_id, project_id, type, title, narrative, facts, concepts,
           files_read, files_modified, quality, lifecycle, sensitivity,
-          user_id, device_id, agent, created_at, created_at_epoch
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(obs.session_id ?? null, obs.project_id, obs.type, obs.title, obs.narrative ?? null, obs.facts ?? null, obs.concepts ?? null, obs.files_read ?? null, obs.files_modified ?? null, obs.quality, obs.lifecycle ?? "active", obs.sensitivity ?? "shared", obs.user_id, obs.device_id, obs.agent ?? "claude-code", createdAt, now);
+          user_id, device_id, agent, source_tool, source_prompt_number,
+          created_at, created_at_epoch
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(obs.session_id ?? null, obs.project_id, obs.type, obs.title, obs.narrative ?? null, obs.facts ?? null, obs.concepts ?? null, obs.files_read ?? null, obs.files_modified ?? null, obs.quality, obs.lifecycle ?? "active", obs.sensitivity ?? "shared", obs.user_id, obs.device_id, obs.agent ?? "claude-code", obs.source_tool ?? null, obs.source_prompt_number ?? null, createdAt, now);
     const id = Number(result.lastInsertRowid);
     const row = this.getObservationById(id);
     this.ftsInsert(row);
@@ -1136,6 +1232,13 @@ class MemDatabase {
          ORDER BY prompt_number ASC
          LIMIT ?`).all(sessionId, limit);
   }
+  getLatestSessionPromptNumber(sessionId) {
+    const row = this.db.query(`SELECT prompt_number FROM user_prompts
+         WHERE session_id = ?
+         ORDER BY prompt_number DESC
+         LIMIT 1`).get(sessionId);
+    return row?.prompt_number ?? null;
+  }
   insertToolEvent(input) {
     const createdAt = input.created_at_epoch ?? Math.floor(Date.now() / 1000);
     const result = this.db.query(`INSERT INTO tool_events (
@@ -1245,8 +1348,15 @@ class MemDatabase {
   }
   insertSessionSummary(summary) {
     const now = Math.floor(Date.now() / 1000);
+    const normalized = {
+      request: normalizeSummaryRequest(summary.request),
+      investigated: normalizeSummarySection(summary.investigated),
+      learned: normalizeSummarySection(summary.learned),
+      completed: normalizeSummarySection(summary.completed),
+      next_steps: normalizeSummarySection(summary.next_steps)
+    };
     const result = this.db.query(`INSERT INTO session_summaries (session_id, project_id, user_id, request, investigated, learned, completed, next_steps, created_at_epoch)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(summary.session_id, summary.project_id, summary.user_id, summary.request, summary.investigated, summary.learned, summary.completed, summary.next_steps, now);
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(summary.session_id, summary.project_id, summary.user_id, normalized.request, normalized.investigated, normalized.learned, normalized.completed, normalized.next_steps, now);
     const id = Number(result.lastInsertRowid);
     return this.db.query("SELECT * FROM session_summaries WHERE id = ?").get(id);
   }