engrm 0.4.27 → 0.4.29

package/README.md

@@ -227,7 +227,7 @@ The MCP server exposes tools that supported agents can call directly:
 | `load_handoff` | Open a saved handoff as a resume point for a new session |
 | `refresh_chat_recall` | Rehydrate the separate chat lane from a Claude transcript when a long session feels under-captured |
 | `recent_chat` | Inspect the separate synced chat lane without mixing it into durable memory |
-| `search_chat` | Search recent chat recall separately from reusable memory observations |
+| `search_chat` | Search recent chat recall with hybrid lexical + semantic matching, separately from reusable memory observations |
 | `search_recall` | Search durable memory and chat recall together when you do not want to guess the right lane |
 | `plugin_catalog` | Inspect Engrm plugin manifests for memory-aware integrations |
 | `save_plugin_memory` | Save reduced plugin output with stable Engrm provenance |
@@ -362,6 +362,8 @@ What each tool is good for:
 - `memory_console` gives the quickest project snapshot, including whether continuity is `fresh`, `thin`, or `cold`
 - `memory_console`, `project_memory_index`, and `session_context` now also show whether project chat recall is transcript-backed or only hook-captured
 - when chat continuity is only hook-captured, the workbench and startup hints now prefer `refresh_chat_recall`
+- the workbench and startup hints now also prefer `search_recall` as the first “what were we just talking about?” path when recent prompts/chat/observations exist
+- `search_chat` now uses hybrid lexical + semantic ranking when sqlite-vec and local embeddings are available, so recent conversation recall is less dependent on exact wording
 - `activity_feed` shows the merged chronology across prompts, tools, chat, handoffs, observations, and summaries
 - `recent_sessions` helps you pick a session worth opening
 - `session_story` reconstructs one session in detail, including handoffs and chat recall
@@ -369,7 +371,7 @@ What each tool is good for:
 - `session_tool_memory` shows which tool calls in one session turned into reusable memory and which did not
 - `project_memory_index` shows typed memory by repo, including continuity state and hot files
 - `workspace_memory_index` shows coverage across all repos on the machine
-- `recent_chat` / `search_chat` now report transcript-vs-hook coverage too, so weak OpenClaw recall is easier to diagnose and refresh
+- `recent_chat` / `search_chat` now report transcript-vs-hook coverage too, and `search_chat` will also mark when semantic ranking was available, so weak OpenClaw recall is easier to diagnose and refresh
 
 ### Thin Tool Workflow
 

package/dist/cli.js

@@ -708,6 +708,17 @@ var MIGRATIONS = [
         ON chat_messages(session_id, transcript_index)
         WHERE transcript_index IS NOT NULL;
     `
+  },
+  {
+    version: 18,
+    description: "Add sqlite-vec semantic search for chat recall",
+    condition: (db) => isVecExtensionLoaded(db),
+    sql: `
+      CREATE VIRTUAL TABLE IF NOT EXISTS vec_chat_messages USING vec0(
+        chat_message_id INTEGER PRIMARY KEY,
+        embedding FLOAT[384]
+      );
+    `
   }
 ];
 function isVecExtensionLoaded(db) {
@@ -781,6 +792,9 @@ function inferLegacySchemaVersion(db) {
   if (columnExists(db, "chat_messages", "source_kind") && columnExists(db, "chat_messages", "transcript_index")) {
     version = Math.max(version, 17);
   }
+  if (tableExists(db, "vec_chat_messages")) {
+    version = Math.max(version, 18);
+  }
   return version;
 }
 function runMigrations(db) {
@@ -897,6 +911,20 @@ function ensureChatMessageColumns(db) {
     db.exec("PRAGMA user_version = 17");
   }
 }
+function ensureChatVectorTable(db) {
+  if (!isVecExtensionLoaded(db))
+    return;
+  db.exec(`
+    CREATE VIRTUAL TABLE IF NOT EXISTS vec_chat_messages USING vec0(
+      chat_message_id INTEGER PRIMARY KEY,
+      embedding FLOAT[384]
+    );
+  `);
+  const current = getSchemaVersion(db);
+  if (current < 18) {
+    db.exec("PRAGMA user_version = 18");
+  }
+}
 function ensureSyncOutboxSupportsChatMessages(db) {
   if (syncOutboxSupportsChatMessages(db)) {
     const current = getSchemaVersion(db);
@@ -1110,6 +1138,7 @@ class MemDatabase {
     ensureObservationTypes(this.db);
     ensureSessionSummaryColumns(this.db);
     ensureChatMessageColumns(this.db);
+    ensureChatVectorTable(this.db);
     ensureSyncOutboxSupportsChatMessages(this.db);
   }
   loadVecExtension() {
@@ -1476,6 +1505,14 @@ class MemDatabase {
   getChatMessageByRemoteSourceId(remoteSourceId) {
     return this.db.query("SELECT * FROM chat_messages WHERE remote_source_id = ?").get(remoteSourceId) ?? null;
   }
+  getChatMessagesByIds(ids) {
+    if (ids.length === 0)
+      return [];
+    const placeholders = ids.map(() => "?").join(",");
+    const rows = this.db.query(`SELECT * FROM chat_messages WHERE id IN (${placeholders})`).all(...ids);
+    const order = new Map(ids.map((id, index) => [id, index]));
+    return rows.sort((a, b) => (order.get(a.id) ?? 0) - (order.get(b.id) ?? 0));
+  }
   getSessionChatMessages(sessionId, limit = 50) {
     return this.db.query(`SELECT * FROM chat_messages
          WHERE session_id = ?
@@ -1552,6 +1589,39 @@ class MemDatabase {
          ORDER BY created_at_epoch DESC, id DESC
          LIMIT ?`).all(needle, ...userId ? [userId] : [], limit);
   }
+  vecChatInsert(chatMessageId, embedding) {
+    if (!this.vecAvailable)
+      return;
+    this.db.query("INSERT OR REPLACE INTO vec_chat_messages (chat_message_id, embedding) VALUES (?, ?)").run(chatMessageId, new Uint8Array(embedding.buffer));
+  }
+  searchChatVec(queryEmbedding, projectId, limit = 20, userId) {
+    if (!this.vecAvailable)
+      return [];
+    const embeddingBlob = new Uint8Array(queryEmbedding.buffer);
+    const visibilityClause = userId ? " AND c.user_id = ?" : "";
+    const transcriptPreference = `
+      AND (
+        c.source_kind = 'transcript'
+        OR NOT EXISTS (
+          SELECT 1 FROM chat_messages t2
+          WHERE t2.session_id = c.session_id
+            AND t2.source_kind = 'transcript'
+        )
+      )`;
+    if (projectId !== null) {
+      return this.db.query(`SELECT v.chat_message_id, v.distance
+           FROM vec_chat_messages v
+           JOIN chat_messages c ON c.id = v.chat_message_id
+           WHERE v.embedding MATCH ?
+             AND k = ?
+             AND c.project_id = ?` + visibilityClause + transcriptPreference).all(embeddingBlob, limit, projectId, ...userId ? [userId] : []);
+    }
+    return this.db.query(`SELECT v.chat_message_id, v.distance
+         FROM vec_chat_messages v
+         JOIN chat_messages c ON c.id = v.chat_message_id
+         WHERE v.embedding MATCH ?
+           AND k = ?` + visibilityClause + transcriptPreference).all(embeddingBlob, limit, ...userId ? [userId] : []);
+  }
   getTranscriptChatMessage(sessionId, transcriptIndex) {
     return this.db.query("SELECT * FROM chat_messages WHERE session_id = ? AND transcript_index = ?").get(sessionId, transcriptIndex) ?? null;
   }
@@ -2296,6 +2366,17 @@ var MIGRATIONS2 = [
         ON chat_messages(session_id, transcript_index)
         WHERE transcript_index IS NOT NULL;
     `
+  },
+  {
+    version: 18,
+    description: "Add sqlite-vec semantic search for chat recall",
+    condition: (db) => isVecExtensionLoaded2(db),
+    sql: `
+      CREATE VIRTUAL TABLE IF NOT EXISTS vec_chat_messages USING vec0(
+        chat_message_id INTEGER PRIMARY KEY,
+        embedding FLOAT[384]
+      );
+    `
   }
 ];
 function isVecExtensionLoaded2(db) {
@@ -3288,6 +3369,9 @@ function composeEmbeddingText(obs) {
 
 `);
 }
+function composeChatEmbeddingText(text) {
+  return text.replace(/\s+/g, " ").trim().slice(0, 2000);
+}
 async function getPipeline() {
   if (_pipeline)
     return _pipeline;

package/dist/hooks/elicitation-result.js

@@ -510,6 +510,9 @@ function composeEmbeddingText(obs) {
 
 `);
 }
+function composeChatEmbeddingText(text) {
+  return text.replace(/\s+/g, " ").trim().slice(0, 2000);
+}
 async function getPipeline() {
   if (_pipeline)
     return _pipeline;
@@ -1541,6 +1544,17 @@ var MIGRATIONS = [
         ON chat_messages(session_id, transcript_index)
         WHERE transcript_index IS NOT NULL;
     `
+  },
+  {
+    version: 18,
+    description: "Add sqlite-vec semantic search for chat recall",
+    condition: (db) => isVecExtensionLoaded(db),
+    sql: `
+      CREATE VIRTUAL TABLE IF NOT EXISTS vec_chat_messages USING vec0(
+        chat_message_id INTEGER PRIMARY KEY,
+        embedding FLOAT[384]
+      );
+    `
   }
 ];
 function isVecExtensionLoaded(db) {
@@ -1614,6 +1628,9 @@ function inferLegacySchemaVersion(db) {
   if (columnExists(db, "chat_messages", "source_kind") && columnExists(db, "chat_messages", "transcript_index")) {
     version = Math.max(version, 17);
   }
+  if (tableExists(db, "vec_chat_messages")) {
+    version = Math.max(version, 18);
+  }
   return version;
 }
 function runMigrations(db) {
@@ -1730,6 +1747,20 @@ function ensureChatMessageColumns(db) {
     db.exec("PRAGMA user_version = 17");
   }
 }
+function ensureChatVectorTable(db) {
+  if (!isVecExtensionLoaded(db))
+    return;
+  db.exec(`
+    CREATE VIRTUAL TABLE IF NOT EXISTS vec_chat_messages USING vec0(
+      chat_message_id INTEGER PRIMARY KEY,
+      embedding FLOAT[384]
+    );
+  `);
+  const current = getSchemaVersion(db);
+  if (current < 18) {
+    db.exec("PRAGMA user_version = 18");
+  }
+}
 function ensureSyncOutboxSupportsChatMessages(db) {
   if (syncOutboxSupportsChatMessages(db)) {
     const current = getSchemaVersion(db);
@@ -1943,6 +1974,7 @@ class MemDatabase {
     ensureObservationTypes(this.db);
     ensureSessionSummaryColumns(this.db);
     ensureChatMessageColumns(this.db);
+    ensureChatVectorTable(this.db);
     ensureSyncOutboxSupportsChatMessages(this.db);
   }
   loadVecExtension() {
@@ -2309,6 +2341,14 @@ class MemDatabase {
   getChatMessageByRemoteSourceId(remoteSourceId) {
     return this.db.query("SELECT * FROM chat_messages WHERE remote_source_id = ?").get(remoteSourceId) ?? null;
   }
+  getChatMessagesByIds(ids) {
+    if (ids.length === 0)
+      return [];
+    const placeholders = ids.map(() => "?").join(",");
+    const rows = this.db.query(`SELECT * FROM chat_messages WHERE id IN (${placeholders})`).all(...ids);
+    const order = new Map(ids.map((id, index) => [id, index]));
+    return rows.sort((a, b) => (order.get(a.id) ?? 0) - (order.get(b.id) ?? 0));
+  }
   getSessionChatMessages(sessionId, limit = 50) {
     return this.db.query(`SELECT * FROM chat_messages
          WHERE session_id = ?
@@ -2385,6 +2425,39 @@ class MemDatabase {
          ORDER BY created_at_epoch DESC, id DESC
          LIMIT ?`).all(needle, ...userId ? [userId] : [], limit);
   }
+  vecChatInsert(chatMessageId, embedding) {
+    if (!this.vecAvailable)
+      return;
+    this.db.query("INSERT OR REPLACE INTO vec_chat_messages (chat_message_id, embedding) VALUES (?, ?)").run(chatMessageId, new Uint8Array(embedding.buffer));
+  }
+  searchChatVec(queryEmbedding, projectId, limit = 20, userId) {
+    if (!this.vecAvailable)
+      return [];
+    const embeddingBlob = new Uint8Array(queryEmbedding.buffer);
+    const visibilityClause = userId ? " AND c.user_id = ?" : "";
+    const transcriptPreference = `
+      AND (
+        c.source_kind = 'transcript'
+        OR NOT EXISTS (
+          SELECT 1 FROM chat_messages t2
+          WHERE t2.session_id = c.session_id
+            AND t2.source_kind = 'transcript'
+        )
+      )`;
+    if (projectId !== null) {
+      return this.db.query(`SELECT v.chat_message_id, v.distance
+           FROM vec_chat_messages v
+           JOIN chat_messages c ON c.id = v.chat_message_id
+           WHERE v.embedding MATCH ?
+             AND k = ?
+             AND c.project_id = ?` + visibilityClause + transcriptPreference).all(embeddingBlob, limit, projectId, ...userId ? [userId] : []);
+    }
+    return this.db.query(`SELECT v.chat_message_id, v.distance
+         FROM vec_chat_messages v
+         JOIN chat_messages c ON c.id = v.chat_message_id
+         WHERE v.embedding MATCH ?
+           AND k = ?` + visibilityClause + transcriptPreference).all(embeddingBlob, limit, ...userId ? [userId] : []);
+  }
   getTranscriptChatMessage(sessionId, transcriptIndex) {
     return this.db.query("SELECT * FROM chat_messages WHERE session_id = ? AND transcript_index = ?").get(sessionId, transcriptIndex) ?? null;
   }

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

@@ -886,6 +886,17 @@ var MIGRATIONS = [
         ON chat_messages(session_id, transcript_index)
         WHERE transcript_index IS NOT NULL;
     `
+  },
+  {
+    version: 18,
+    description: "Add sqlite-vec semantic search for chat recall",
+    condition: (db) => isVecExtensionLoaded(db),
+    sql: `
+      CREATE VIRTUAL TABLE IF NOT EXISTS vec_chat_messages USING vec0(
+        chat_message_id INTEGER PRIMARY KEY,
+        embedding FLOAT[384]
+      );
+    `
   }
 ];
 function isVecExtensionLoaded(db) {
@@ -959,6 +970,9 @@ function inferLegacySchemaVersion(db) {
   if (columnExists(db, "chat_messages", "source_kind") && columnExists(db, "chat_messages", "transcript_index")) {
     version = Math.max(version, 17);
   }
+  if (tableExists(db, "vec_chat_messages")) {
+    version = Math.max(version, 18);
+  }
   return version;
 }
 function runMigrations(db) {
@@ -1075,6 +1089,20 @@ function ensureChatMessageColumns(db) {
     db.exec("PRAGMA user_version = 17");
   }
 }
+function ensureChatVectorTable(db) {
+  if (!isVecExtensionLoaded(db))
+    return;
+  db.exec(`
+    CREATE VIRTUAL TABLE IF NOT EXISTS vec_chat_messages USING vec0(
+      chat_message_id INTEGER PRIMARY KEY,
+      embedding FLOAT[384]
+    );
+  `);
+  const current = getSchemaVersion(db);
+  if (current < 18) {
+    db.exec("PRAGMA user_version = 18");
+  }
+}
 function ensureSyncOutboxSupportsChatMessages(db) {
   if (syncOutboxSupportsChatMessages(db)) {
     const current = getSchemaVersion(db);
@@ -1288,6 +1316,7 @@ class MemDatabase {
     ensureObservationTypes(this.db);
     ensureSessionSummaryColumns(this.db);
     ensureChatMessageColumns(this.db);
+    ensureChatVectorTable(this.db);
     ensureSyncOutboxSupportsChatMessages(this.db);
   }
   loadVecExtension() {
@@ -1654,6 +1683,14 @@ class MemDatabase {
   getChatMessageByRemoteSourceId(remoteSourceId) {
     return this.db.query("SELECT * FROM chat_messages WHERE remote_source_id = ?").get(remoteSourceId) ?? null;
   }
+  getChatMessagesByIds(ids) {
+    if (ids.length === 0)
+      return [];
+    const placeholders = ids.map(() => "?").join(",");
+    const rows = this.db.query(`SELECT * FROM chat_messages WHERE id IN (${placeholders})`).all(...ids);
+    const order = new Map(ids.map((id, index) => [id, index]));
+    return rows.sort((a, b) => (order.get(a.id) ?? 0) - (order.get(b.id) ?? 0));
+  }
   getSessionChatMessages(sessionId, limit = 50) {
     return this.db.query(`SELECT * FROM chat_messages
          WHERE session_id = ?
@@ -1730,6 +1767,39 @@ class MemDatabase {
          ORDER BY created_at_epoch DESC, id DESC
          LIMIT ?`).all(needle, ...userId ? [userId] : [], limit);
   }
+  vecChatInsert(chatMessageId, embedding) {
+    if (!this.vecAvailable)
+      return;
+    this.db.query("INSERT OR REPLACE INTO vec_chat_messages (chat_message_id, embedding) VALUES (?, ?)").run(chatMessageId, new Uint8Array(embedding.buffer));
+  }
+  searchChatVec(queryEmbedding, projectId, limit = 20, userId) {
+    if (!this.vecAvailable)
+      return [];
+    const embeddingBlob = new Uint8Array(queryEmbedding.buffer);
+    const visibilityClause = userId ? " AND c.user_id = ?" : "";
+    const transcriptPreference = `
+      AND (
+        c.source_kind = 'transcript'
+        OR NOT EXISTS (
+          SELECT 1 FROM chat_messages t2
+          WHERE t2.session_id = c.session_id
+            AND t2.source_kind = 'transcript'
+        )
+      )`;
+    if (projectId !== null) {
+      return this.db.query(`SELECT v.chat_message_id, v.distance
+           FROM vec_chat_messages v
+           JOIN chat_messages c ON c.id = v.chat_message_id
+           WHERE v.embedding MATCH ?
+             AND k = ?
+             AND c.project_id = ?` + visibilityClause + transcriptPreference).all(embeddingBlob, limit, projectId, ...userId ? [userId] : []);
+    }
+    return this.db.query(`SELECT v.chat_message_id, v.distance
+         FROM vec_chat_messages v
+         JOIN chat_messages c ON c.id = v.chat_message_id
+         WHERE v.embedding MATCH ?
+           AND k = ?` + visibilityClause + transcriptPreference).all(embeddingBlob, limit, ...userId ? [userId] : []);
+  }
   getTranscriptChatMessage(sessionId, transcriptIndex) {
     return this.db.query("SELECT * FROM chat_messages WHERE session_id = ? AND transcript_index = ?").get(sessionId, transcriptIndex) ?? null;
   }
@@ -2514,6 +2584,9 @@ function composeEmbeddingText(obs) {
 
 `);
 }
+function composeChatEmbeddingText(text) {
+  return text.replace(/\s+/g, " ").trim().slice(0, 2000);
+}
 async function getPipeline() {
   if (_pipeline)
     return _pipeline;
@@ -3648,6 +3721,7 @@ function parseJsonArray(value) {
 }
 
 // src/capture/transcript.ts
+import { createHash as createHash3 } from "node:crypto";
 import { readFileSync as readFileSync4, existsSync as existsSync4 } from "node:fs";
 import { join as join4 } from "node:path";
 import { homedir as homedir3 } from "node:os";
@@ -3701,23 +3775,109 @@ function readTranscript(sessionId, cwd, transcriptPath) {
   }
   return messages;
 }
-function syncTranscriptChat(db, config, sessionId, cwd, transcriptPath) {
-  const messages = readTranscript(sessionId, cwd, transcriptPath).map((message) => ({
+function resolveHistoryPath(historyPath) {
+  if (historyPath)
+    return historyPath;
+  const override = process.env["ENGRM_CLAUDE_HISTORY_PATH"];
+  if (override)
+    return override;
+  return join4(homedir3(), ".claude", "history.jsonl");
+}
+function readHistoryFallback(sessionId, cwd, opts) {
+  const path = resolveHistoryPath(opts?.historyPath);
+  if (!existsSync4(path))
+    return [];
+  let raw;
+  try {
+    raw = readFileSync4(path, "utf-8");
+  } catch {
+    return [];
+  }
+  const targetCanonical = detectProject(cwd).canonical_id;
+  const windowStart = Math.max(0, (opts?.startedAtEpoch ?? Math.floor(Date.now() / 1000) - 6 * 3600) - 600);
+  const windowEnd = (opts?.completedAtEpoch ?? Math.floor(Date.now() / 1000)) + 600;
+  const entries = [];
+  for (const line of raw.split(`
+`)) {
+    if (!line.trim())
+      continue;
+    let entry;
+    try {
+      entry = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    if (typeof entry?.display !== "string" || typeof entry?.timestamp !== "number")
+      continue;
+    const createdAtEpoch = Math.floor(entry.timestamp / 1000);
+    entries.push({
+      display: entry.display.trim(),
+      project: typeof entry.project === "string" ? entry.project : "",
+      sessionId: typeof entry.sessionId === "string" ? entry.sessionId : "",
+      timestamp: createdAtEpoch
+    });
+  }
+  const bySession = entries.filter((entry) => entry.display.length > 0 && entry.sessionId === sessionId).sort((a, b) => a.timestamp - b.timestamp);
+  if (bySession.length > 0) {
+    return dedupeHistoryMessages(bySession.map((entry) => ({
+      role: "user",
+      text: entry.display,
+      createdAtEpoch: entry.timestamp
+    })));
+  }
+  const byProjectAndWindow = entries.filter((entry) => {
+    if (entry.display.length === 0)
+      return false;
+    if (entry.timestamp < windowStart || entry.timestamp > windowEnd)
+      return false;
+    if (!entry.project)
+      return false;
+    return detectProject(entry.project).canonical_id === targetCanonical;
+  }).sort((a, b) => a.timestamp - b.timestamp);
+  return dedupeHistoryMessages(byProjectAndWindow.map((entry) => ({
+    role: "user",
+    text: entry.display,
+    createdAtEpoch: entry.timestamp
+  })));
+}
+async function syncTranscriptChat(db, config, sessionId, cwd, transcriptPath) {
+  const session = db.getSessionById(sessionId);
+  const transcriptMessages = readTranscript(sessionId, cwd, transcriptPath).map((message) => ({
     ...message,
     text: message.text.trim()
   })).filter((message) => message.text.length > 0);
+  const messages = transcriptMessages.length > 0 ? transcriptMessages.map((message, index) => ({
+    ...message,
+    sourceKind: "transcript",
+    transcriptIndex: index + 1,
+    createdAtEpoch: null,
+    remoteSourceId: null
+  })) : readHistoryFallback(sessionId, cwd, {
+    startedAtEpoch: session?.started_at_epoch ?? null,
+    completedAtEpoch: session?.completed_at_epoch ?? null
+  }).map((message) => ({
+    role: message.role,
+    text: message.text,
+    sourceKind: "hook",
+    transcriptIndex: null,
+    createdAtEpoch: message.createdAtEpoch,
+    remoteSourceId: buildHistorySourceId(sessionId, message.createdAtEpoch, message.text)
+  }));
   if (messages.length === 0)
     return { imported: 0, total: 0 };
-  const session = db.getSessionById(sessionId);
   const projectId = session?.project_id ?? null;
   const now = Math.floor(Date.now() / 1000);
   let imported = 0;
   for (let index = 0;index < messages.length; index++) {
-    const transcriptIndex = index + 1;
-    if (db.getTranscriptChatMessage(sessionId, transcriptIndex))
-      continue;
     const message = messages[index];
-    const createdAtEpoch = Math.max(0, now - (messages.length - transcriptIndex));
+    const transcriptIndex = message.transcriptIndex ?? index + 1;
+    if (message.sourceKind === "transcript" && db.getTranscriptChatMessage(sessionId, transcriptIndex)) {
+      continue;
+    }
+    if (message.remoteSourceId && db.getChatMessageByRemoteSourceId(message.remoteSourceId)) {
+      continue;
+    }
+    const createdAtEpoch = message.createdAtEpoch ?? Math.max(0, now - (messages.length - transcriptIndex));
     const row = db.insertChatMessage({
       session_id: sessionId,
       project_id: projectId,
@@ -3727,14 +3887,50 @@ function syncTranscriptChat(db, config, sessionId, cwd, transcriptPath) {
       device_id: config.device_id,
       agent: "claude-code",
       created_at_epoch: createdAtEpoch,
-      source_kind: "transcript",
-      transcript_index: transcriptIndex
+      remote_source_id: message.remoteSourceId,
+      source_kind: message.sourceKind,
+      transcript_index: message.transcriptIndex
     });
     db.addToOutbox("chat_message", row.id);
+    if (message.role === "user") {
+      db.insertUserPrompt({
+        session_id: sessionId,
+        project_id: projectId,
+        prompt: message.text,
+        cwd,
+        user_id: config.user_id,
+        device_id: config.device_id,
+        agent: "claude-code",
+        created_at_epoch: createdAtEpoch
+      });
+    }
+    if (db.vecAvailable) {
+      const embedding = await embedText(composeChatEmbeddingText(message.text));
+      if (embedding) {
+        db.vecChatInsert(row.id, embedding);
+      }
+    }
     imported++;
   }
   return { imported, total: messages.length };
 }
+function dedupeHistoryMessages(messages) {
+  const deduped = [];
+  for (const message of messages) {
+    const compact = message.text.replace(/\s+/g, " ").trim();
+    if (!compact)
+      continue;
+    const previous = deduped[deduped.length - 1];
+    if (previous && previous.text.replace(/\s+/g, " ").trim() === compact)
+      continue;
+    deduped.push({ ...message, text: compact });
+  }
+  return deduped;
+}
+function buildHistorySourceId(sessionId, createdAtEpoch, text) {
+  const digest = createHash3("sha1").update(text).digest("hex").slice(0, 12);
+  return `history:${sessionId}:${createdAtEpoch}:${digest}`;
+}
 function truncateTranscript(messages, maxBytes = 50000) {
   const lines = [];
   for (const msg of messages) {
@@ -3810,6 +4006,16 @@ async function saveTranscriptResults(db, config, results, sessionId, cwd) {
   return saved;
 }
 
+// src/tools/recent-chat.ts
+function getChatCaptureOrigin(message) {
+  if (message.source_kind === "transcript")
+    return "transcript";
+  if (typeof message.remote_source_id === "string" && message.remote_source_id.startsWith("history:")) {
+    return "history";
+  }
+  return "hook";
+}
+
 // src/tools/session-story.ts
 function getSessionStory(db, input) {
   const session = db.getSessionById(input.session_id);
@@ -3932,9 +4138,9 @@ function collectProvenanceSummary(observations) {
 }
 function summarizeChatSources(messages) {
   return messages.reduce((summary, message) => {
-    summary[message.source_kind] += 1;
+    summary[getChatCaptureOrigin(message)] += 1;
     return summary;
-  }, { transcript: 0, hook: 0 });
+  }, { transcript: 0, history: 0, hook: 0 });
 }
 
 // src/tools/handoffs.ts
@@ -4256,7 +4462,7 @@ async function main() {
   try {
     if (event.session_id) {
       persistRawToolChronology(event, config.user_id, config.device_id);
-      syncTranscriptChat(db, config, event.session_id, event.cwd);
+      await syncTranscriptChat(db, config, event.session_id, event.cwd);
     }
     const textToScan = extractScanText(event);
     if (textToScan) {