engrm 0.4.22 → 0.4.25

package/README.md

@@ -211,7 +211,7 @@ The MCP server exposes tools that supported agents can call directly:
 | `recent_activity` | Inspect what Engrm captured most recently |
 | `memory_stats` | View high-level capture and sync health |
 | `capture_status` | Check whether local hooks are registered and raw prompt/tool chronology is actually being captured |
-| `activity_feed` | Inspect one chronological local feed across prompts, tools, observations, and summaries |
+| `activity_feed` | Inspect one chronological local feed across prompts, tools, chat, handoffs, observations, and summaries |
 | `memory_console` | Show a high-signal local memory console for the current project |
 | `project_memory_index` | Show typed local memory by project, including hot files and recent sessions |
 | `workspace_memory_index` | Show cross-project local memory coverage across the whole workspace |
@@ -221,6 +221,13 @@ The MCP server exposes tools that supported agents can call directly:
 | `recent_tools` | Inspect captured raw tool chronology |
 | `recent_sessions` | List recent local sessions to inspect further |
 | `session_story` | Show prompts, tools, observations, and summary for one session |
+| `create_handoff` | Save an explicit syncable handoff so you can resume work on another device |
+| `refresh_handoff` | Refresh the rolling live handoff draft for the current session without creating a new saved handoff |
+| `recent_handoffs` | List recent saved handoffs for the current project or workspace |
+| `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 |
 | `plugin_catalog` | Inspect Engrm plugin manifests for memory-aware integrations |
 | `save_plugin_memory` | Save reduced plugin output with stable Engrm provenance |
 | `capture_git_diff` | Reduce a git diff into a durable memory object and save it |
@@ -273,6 +280,61 @@ These tools are intentionally small:
 - reduced durable memory output
 - visible in Engrm's local inspection tools so we can judge tool value honestly
 
+### Explicit Handoffs
+
+For long-running work across devices, Engrm now has an explicit handoff flow:
+
+- `create_handoff`
+  - snapshot the active thread into a syncable handoff message
+- `refresh_handoff`
+  - refresh the rolling live handoff draft for the current session
+- `recent_handoffs`
+  - list the latest saved handoffs
+- `load_handoff`
+  - reopen a saved handoff as a clear resume point in a new session
+
+Recent handoffs now carry:
+
+- source machine
+- freshness
+- current thread / recent outcomes
+- optional chat snippets when the session is still thin
+
+Rolling handoff drafts:
+
+- are kept as one updatable syncable draft per session
+- refresh during prompt-time and tool-time summary updates
+- let another machine resume live work even before you save a deliberate handoff
+- are refreshed again before Claude compacts, so the active thread survives context compression better
+
+The local workbench now shows handoff split too:
+
+- saved handoffs
+- rolling drafts
+
+`activity_feed` and `session_story` now keep that distinction visible too, so a live rolling draft does not masquerade as a deliberate saved handoff.
+
+When Engrm knows your current device, handoff tools also prefer resume points from another machine before showing the newest local handoff again.
+
+This is the deliberate version of multi-device continuity: useful when you want to move from laptop to home machine without waiting for an end-of-session summary.
+
+The separate chat lane is still kept distinct from durable observations, but it can now sync too, so recent user/assistant conversation is recoverable on another machine without polluting the main memory feed.
+
+For long sessions, Engrm now also supports transcript-backed chat hydration:
+
+- `refresh_chat_recall`
+  - reads the Claude transcript for the current session
+  - fills gaps in the separate chat lane with transcript-backed messages
+  - keeps those rows marked separately from hook-edge chat so recall can prefer the fuller thread
+
+Before Claude compacts, Engrm now also:
+
+- refreshes transcript-backed chat recall for the active session
+- refreshes the rolling handoff draft
+- then injects the preserved thread into the compacted context
+
+So compaction should reduce prompt-window pressure without making the memory layer act like the conversation never happened.
+
 ### Local Memory Inspection
 
 For local testing, Engrm now exposes a small inspection set that lets you see
@@ -296,9 +358,9 @@ What each tool is good for:
 
 - `capture_status` tells you whether prompt/tool hooks are live on this machine
 - `memory_console` gives the quickest project snapshot
-- `activity_feed` shows the merged chronology across prompts, tools, observations, and summaries
+- `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
+- `session_story` reconstructs one session in detail, including handoffs and chat recall
 - `tool_memory_index` shows which tools and plugins are actually producing durable memory
 - `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

package/dist/cli.js

@@ -305,7 +305,7 @@ var MIGRATIONS = [
       -- Sync outbox (offline-first queue)
       CREATE TABLE sync_outbox (
           id              INTEGER PRIMARY KEY AUTOINCREMENT,
-          record_type     TEXT NOT NULL CHECK (record_type IN ('observation', 'summary')),
+          record_type     TEXT NOT NULL CHECK (record_type IN ('observation', 'summary', 'chat_message')),
           record_id       INTEGER NOT NULL,
           status          TEXT DEFAULT 'pending' CHECK (status IN (
               'pending', 'syncing', 'synced', 'failed'
@@ -598,6 +598,18 @@ var MIGRATIONS = [
         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);
+    `
+  },
   {
     version: 12,
     description: "Add synced handoff metadata to session summaries",
@@ -609,15 +621,92 @@ var MIGRATIONS = [
     `
   },
   {
-    version: 11,
-    description: "Add observation provenance from tool and prompt chronology",
+    version: 13,
+    description: "Add current_thread to session summaries",
     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);
+      ALTER TABLE session_summaries ADD COLUMN current_thread TEXT;
+    `
+  },
+  {
+    version: 14,
+    description: "Add chat_messages lane for raw conversation recall",
+    sql: `
+      CREATE TABLE IF NOT EXISTS chat_messages (
+          id                INTEGER PRIMARY KEY AUTOINCREMENT,
+          session_id        TEXT NOT NULL,
+          project_id        INTEGER REFERENCES projects(id),
+          role              TEXT NOT NULL CHECK (role IN ('user', 'assistant')),
+          content           TEXT NOT NULL,
+          user_id           TEXT NOT NULL,
+          device_id         TEXT NOT NULL,
+          agent             TEXT DEFAULT 'claude-code',
+          created_at_epoch  INTEGER NOT NULL
+      );
+
+      CREATE INDEX IF NOT EXISTS idx_chat_messages_session
+        ON chat_messages(session_id, created_at_epoch DESC, id DESC);
+      CREATE INDEX IF NOT EXISTS idx_chat_messages_project
+        ON chat_messages(project_id, created_at_epoch DESC, id DESC);
+      CREATE INDEX IF NOT EXISTS idx_chat_messages_created
+        ON chat_messages(created_at_epoch DESC, id DESC);
+    `
+  },
+  {
+    version: 15,
+    description: "Add remote_source_id for chat message sync deduplication",
+    sql: `
+      ALTER TABLE chat_messages ADD COLUMN remote_source_id TEXT;
+      CREATE UNIQUE INDEX IF NOT EXISTS idx_chat_messages_remote_source
+        ON chat_messages(remote_source_id)
+        WHERE remote_source_id IS NOT NULL;
+    `
+  },
+  {
+    version: 16,
+    description: "Allow chat_message records in sync_outbox",
+    sql: `
+      CREATE TABLE sync_outbox_new (
+          id              INTEGER PRIMARY KEY AUTOINCREMENT,
+          record_type     TEXT NOT NULL CHECK (record_type IN ('observation', 'summary', 'chat_message')),
+          record_id       INTEGER NOT NULL,
+          status          TEXT DEFAULT 'pending' CHECK (status IN (
+              'pending', 'syncing', 'synced', 'failed'
+          )),
+          retry_count     INTEGER DEFAULT 0,
+          max_retries     INTEGER DEFAULT 10,
+          last_error      TEXT,
+          created_at_epoch INTEGER NOT NULL,
+          synced_at_epoch  INTEGER,
+          next_retry_epoch INTEGER
+      );
+
+      INSERT INTO sync_outbox_new (
+        id, record_type, record_id, status, retry_count, max_retries,
+        last_error, created_at_epoch, synced_at_epoch, next_retry_epoch
+      )
+      SELECT
+        id, record_type, record_id, status, retry_count, max_retries,
+        last_error, created_at_epoch, synced_at_epoch, next_retry_epoch
+      FROM sync_outbox;
+
+      DROP TABLE sync_outbox;
+      ALTER TABLE sync_outbox_new RENAME TO sync_outbox;
+
+      CREATE INDEX idx_outbox_status ON sync_outbox(status, next_retry_epoch);
+      CREATE INDEX idx_outbox_record ON sync_outbox(record_type, record_id);
+    `
+  },
+  {
+    version: 17,
+    description: "Track transcript-backed chat messages separately from hook chat",
+    sql: `
+      ALTER TABLE chat_messages ADD COLUMN source_kind TEXT DEFAULT 'hook';
+      ALTER TABLE chat_messages ADD COLUMN transcript_index INTEGER;
+      CREATE INDEX IF NOT EXISTS idx_chat_messages_source_kind
+        ON chat_messages(session_id, source_kind, transcript_index, created_at_epoch DESC, id DESC);
+      CREATE UNIQUE INDEX IF NOT EXISTS idx_chat_messages_session_transcript
+        ON chat_messages(session_id, transcript_index)
+        WHERE transcript_index IS NOT NULL;
     `
   }
 ];
@@ -677,6 +766,21 @@ function inferLegacySchemaVersion(db) {
   if (columnExists(db, "session_summaries", "capture_state") && columnExists(db, "session_summaries", "recent_tool_names") && columnExists(db, "session_summaries", "hot_files") && columnExists(db, "session_summaries", "recent_outcomes")) {
     version = Math.max(version, 12);
   }
+  if (columnExists(db, "session_summaries", "current_thread")) {
+    version = Math.max(version, 13);
+  }
+  if (tableExists(db, "chat_messages")) {
+    version = Math.max(version, 14);
+  }
+  if (columnExists(db, "chat_messages", "remote_source_id")) {
+    version = Math.max(version, 15);
+  }
+  if (syncOutboxSupportsChatMessages(db)) {
+    version = Math.max(version, 16);
+  }
+  if (columnExists(db, "chat_messages", "source_kind") && columnExists(db, "chat_messages", "transcript_index")) {
+    version = Math.max(version, 17);
+  }
   return version;
 }
 function runMigrations(db) {
@@ -760,7 +864,8 @@ function ensureSessionSummaryColumns(db) {
     "capture_state",
     "recent_tool_names",
     "hot_files",
-    "recent_outcomes"
+    "recent_outcomes",
+    "current_thread"
   ];
   for (const column of required) {
     if (columnExists(db, "session_summaries", column))
@@ -768,10 +873,83 @@ function ensureSessionSummaryColumns(db) {
     db.exec(`ALTER TABLE session_summaries ADD COLUMN ${column} TEXT`);
   }
   const current = getSchemaVersion(db);
-  if (current < 12) {
-    db.exec("PRAGMA user_version = 12");
+  if (current < 13) {
+    db.exec("PRAGMA user_version = 13");
+  }
+}
+function ensureChatMessageColumns(db) {
+  if (!tableExists(db, "chat_messages"))
+    return;
+  if (!columnExists(db, "chat_messages", "remote_source_id")) {
+    db.exec("ALTER TABLE chat_messages ADD COLUMN remote_source_id TEXT");
+  }
+  db.exec("CREATE UNIQUE INDEX IF NOT EXISTS idx_chat_messages_remote_source ON chat_messages(remote_source_id) WHERE remote_source_id IS NOT NULL");
+  if (!columnExists(db, "chat_messages", "source_kind")) {
+    db.exec("ALTER TABLE chat_messages ADD COLUMN source_kind TEXT DEFAULT 'hook'");
+  }
+  if (!columnExists(db, "chat_messages", "transcript_index")) {
+    db.exec("ALTER TABLE chat_messages ADD COLUMN transcript_index INTEGER");
+  }
+  db.exec("CREATE INDEX IF NOT EXISTS idx_chat_messages_source_kind ON chat_messages(session_id, source_kind, transcript_index, created_at_epoch DESC, id DESC)");
+  db.exec("CREATE UNIQUE INDEX IF NOT EXISTS idx_chat_messages_session_transcript ON chat_messages(session_id, transcript_index) WHERE transcript_index IS NOT NULL");
+  const current = getSchemaVersion(db);
+  if (current < 17) {
+    db.exec("PRAGMA user_version = 17");
   }
 }
+function ensureSyncOutboxSupportsChatMessages(db) {
+  if (syncOutboxSupportsChatMessages(db)) {
+    const current = getSchemaVersion(db);
+    if (current < 16) {
+      db.exec("PRAGMA user_version = 16");
+    }
+    return;
+  }
+  db.exec("BEGIN TRANSACTION");
+  try {
+    db.exec(`
+      CREATE TABLE sync_outbox_new (
+          id              INTEGER PRIMARY KEY AUTOINCREMENT,
+          record_type     TEXT NOT NULL CHECK (record_type IN ('observation', 'summary', 'chat_message')),
+          record_id       INTEGER NOT NULL,
+          status          TEXT DEFAULT 'pending' CHECK (status IN (
+              'pending', 'syncing', 'synced', 'failed'
+          )),
+          retry_count     INTEGER DEFAULT 0,
+          max_retries     INTEGER DEFAULT 10,
+          last_error      TEXT,
+          created_at_epoch INTEGER NOT NULL,
+          synced_at_epoch  INTEGER,
+          next_retry_epoch INTEGER
+      );
+
+      INSERT INTO sync_outbox_new (
+        id, record_type, record_id, status, retry_count, max_retries,
+        last_error, created_at_epoch, synced_at_epoch, next_retry_epoch
+      )
+      SELECT
+        id, record_type, record_id, status, retry_count, max_retries,
+        last_error, created_at_epoch, synced_at_epoch, next_retry_epoch
+      FROM sync_outbox;
+
+      DROP TABLE sync_outbox;
+      ALTER TABLE sync_outbox_new RENAME TO sync_outbox;
+
+      CREATE INDEX idx_outbox_status ON sync_outbox(status, next_retry_epoch);
+      CREATE INDEX idx_outbox_record ON sync_outbox(record_type, record_id);
+    `);
+    db.exec("PRAGMA user_version = 16");
+    db.exec("COMMIT");
+  } catch (error) {
+    db.exec("ROLLBACK");
+    throw new Error(`sync_outbox repair failed: ${error instanceof Error ? error.message : String(error)}`);
+  }
+}
+function syncOutboxSupportsChatMessages(db) {
+  const row = db.query("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = ?").get("sync_outbox");
+  const sql = row?.sql ?? "";
+  return sql.includes("'chat_message'");
+}
 function getSchemaVersion(db) {
   const result = db.query("PRAGMA user_version").get();
   return result.user_version;
@@ -931,6 +1109,8 @@ class MemDatabase {
     runMigrations(this.db);
     ensureObservationTypes(this.db);
     ensureSessionSummaryColumns(this.db);
+    ensureChatMessageColumns(this.db);
+    ensureSyncOutboxSupportsChatMessages(this.db);
   }
   loadVecExtension() {
     try {
@@ -999,6 +1179,22 @@ class MemDatabase {
   getObservationById(id) {
     return this.db.query("SELECT * FROM observations WHERE id = ?").get(id) ?? null;
   }
+  updateObservationContent(id, update) {
+    const existing = this.getObservationById(id);
+    if (!existing)
+      return null;
+    const createdAtEpoch = update.created_at_epoch ?? existing.created_at_epoch;
+    const createdAt = new Date(createdAtEpoch * 1000).toISOString();
+    this.db.query(`UPDATE observations
+         SET title = ?, narrative = ?, facts = ?, concepts = ?, created_at = ?, created_at_epoch = ?
+         WHERE id = ?`).run(update.title, update.narrative ?? null, update.facts ?? null, update.concepts ?? null, createdAt, createdAtEpoch, id);
+    this.ftsDelete(existing);
+    const refreshed = this.getObservationById(id);
+    if (!refreshed)
+      return null;
+    this.ftsInsert(refreshed);
+    return refreshed;
+  }
   getObservationsByIds(ids, userId) {
     if (ids.length === 0)
       return [];
@@ -1156,6 +1352,7 @@ class MemDatabase {
              p.name AS project_name,
              ss.request AS request,
              ss.completed AS completed,
+             ss.current_thread AS current_thread,
              ss.capture_state AS capture_state,
              ss.recent_tool_names AS recent_tool_names,
              ss.hot_files AS hot_files,
@@ -1174,6 +1371,7 @@ class MemDatabase {
            p.name AS project_name,
            ss.request AS request,
            ss.completed AS completed,
+           ss.current_thread AS current_thread,
            ss.capture_state AS capture_state,
            ss.recent_tool_names AS recent_tool_names,
            ss.hot_files AS hot_files,
@@ -1264,6 +1462,99 @@ class MemDatabase {
          ORDER BY created_at_epoch DESC, id DESC
          LIMIT ?`).all(...userId ? [userId] : [], limit);
   }
+  insertChatMessage(input) {
+    const createdAt = input.created_at_epoch ?? Math.floor(Date.now() / 1000);
+    const content = input.content.trim();
+    const result = this.db.query(`INSERT INTO chat_messages (
+          session_id, project_id, role, content, user_id, device_id, agent, created_at_epoch, remote_source_id, source_kind, transcript_index
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(input.session_id, input.project_id, input.role, content, input.user_id, input.device_id, input.agent ?? "claude-code", createdAt, input.remote_source_id ?? null, input.source_kind ?? "hook", input.transcript_index ?? null);
+    return this.getChatMessageById(Number(result.lastInsertRowid));
+  }
+  getChatMessageById(id) {
+    return this.db.query("SELECT * FROM chat_messages WHERE id = ?").get(id) ?? null;
+  }
+  getChatMessageByRemoteSourceId(remoteSourceId) {
+    return this.db.query("SELECT * FROM chat_messages WHERE remote_source_id = ?").get(remoteSourceId) ?? null;
+  }
+  getSessionChatMessages(sessionId, limit = 50) {
+    return this.db.query(`SELECT * FROM chat_messages
+         WHERE session_id = ?
+           AND (
+             source_kind = 'transcript'
+             OR NOT EXISTS (
+               SELECT 1 FROM chat_messages t2
+               WHERE t2.session_id = chat_messages.session_id
+                 AND t2.source_kind = 'transcript'
+             )
+           )
+         ORDER BY
+           CASE WHEN transcript_index IS NULL THEN created_at_epoch ELSE transcript_index END ASC,
+           id ASC
+         LIMIT ?`).all(sessionId, limit);
+  }
+  getRecentChatMessages(projectId, limit = 20, userId) {
+    const visibilityClause = userId ? " AND user_id = ?" : "";
+    if (projectId !== null) {
+      return this.db.query(`SELECT * FROM chat_messages
+           WHERE project_id = ?${visibilityClause}
+             AND (
+               source_kind = 'transcript'
+               OR NOT EXISTS (
+                 SELECT 1 FROM chat_messages t2
+                 WHERE t2.session_id = chat_messages.session_id
+                   AND t2.source_kind = 'transcript'
+               )
+             )
+           ORDER BY created_at_epoch DESC, id DESC
+           LIMIT ?`).all(projectId, ...userId ? [userId] : [], limit);
+    }
+    return this.db.query(`SELECT * FROM chat_messages
+         WHERE 1 = 1${visibilityClause}
+           AND (
+             source_kind = 'transcript'
+             OR NOT EXISTS (
+               SELECT 1 FROM chat_messages t2
+               WHERE t2.session_id = chat_messages.session_id
+                 AND t2.source_kind = 'transcript'
+             )
+           )
+         ORDER BY created_at_epoch DESC, id DESC
+         LIMIT ?`).all(...userId ? [userId] : [], limit);
+  }
+  searchChatMessages(query, projectId, limit = 20, userId) {
+    const needle = `%${query.toLowerCase()}%`;
+    const visibilityClause = userId ? " AND user_id = ?" : "";
+    if (projectId !== null) {
+      return this.db.query(`SELECT * FROM chat_messages
+           WHERE project_id = ?
+             AND lower(content) LIKE ?${visibilityClause}
+             AND (
+               source_kind = 'transcript'
+               OR NOT EXISTS (
+                 SELECT 1 FROM chat_messages t2
+                 WHERE t2.session_id = chat_messages.session_id
+                   AND t2.source_kind = 'transcript'
+               )
+             )
+           ORDER BY created_at_epoch DESC, id DESC
+           LIMIT ?`).all(projectId, needle, ...userId ? [userId] : [], limit);
+    }
+    return this.db.query(`SELECT * FROM chat_messages
+         WHERE lower(content) LIKE ?${visibilityClause}
+           AND (
+             source_kind = 'transcript'
+             OR NOT EXISTS (
+               SELECT 1 FROM chat_messages t2
+               WHERE t2.session_id = chat_messages.session_id
+                 AND t2.source_kind = 'transcript'
+             )
+           )
+         ORDER BY created_at_epoch DESC, id DESC
+         LIMIT ?`).all(needle, ...userId ? [userId] : [], limit);
+  }
+  getTranscriptChatMessage(sessionId, transcriptIndex) {
+    return this.db.query("SELECT * FROM chat_messages WHERE session_id = ? AND transcript_index = ?").get(sessionId, transcriptIndex) ?? null;
+  }
   addToOutbox(recordType, recordId) {
     const now = Math.floor(Date.now() / 1000);
     this.db.query(`INSERT INTO sync_outbox (record_type, record_id, created_at_epoch)
@@ -1352,9 +1643,9 @@ class MemDatabase {
     };
     const result = this.db.query(`INSERT INTO session_summaries (
           session_id, project_id, user_id, request, investigated, learned, completed, next_steps,
-          capture_state, recent_tool_names, hot_files, recent_outcomes, created_at_epoch
+          current_thread, capture_state, recent_tool_names, hot_files, recent_outcomes, created_at_epoch
         )
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(summary.session_id, summary.project_id, summary.user_id, normalized.request, normalized.investigated, normalized.learned, normalized.completed, normalized.next_steps, summary.capture_state ?? null, summary.recent_tool_names ?? null, summary.hot_files ?? null, summary.recent_outcomes ?? null, now);
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(summary.session_id, summary.project_id, summary.user_id, normalized.request, normalized.investigated, normalized.learned, normalized.completed, normalized.next_steps, summary.current_thread ?? null, summary.capture_state ?? null, summary.recent_tool_names ?? null, summary.hot_files ?? null, summary.recent_outcomes ?? null, now);
     const id = Number(result.lastInsertRowid);
     return this.db.query("SELECT * FROM session_summaries WHERE id = ?").get(id);
   }
@@ -1370,6 +1661,7 @@ class MemDatabase {
       learned: normalizeSummarySection(summary.learned ?? existing.learned),
       completed: normalizeSummarySection(summary.completed ?? existing.completed),
       next_steps: normalizeSummarySection(summary.next_steps ?? existing.next_steps),
+      current_thread: summary.current_thread ?? existing.current_thread,
       capture_state: summary.capture_state ?? existing.capture_state,
       recent_tool_names: summary.recent_tool_names ?? existing.recent_tool_names,
       hot_files: summary.hot_files ?? existing.hot_files,
@@ -1383,12 +1675,13 @@ class MemDatabase {
              learned = ?,
              completed = ?,
              next_steps = ?,
+             current_thread = ?,
              capture_state = ?,
              recent_tool_names = ?,
              hot_files = ?,
              recent_outcomes = ?,
              created_at_epoch = ?
-         WHERE session_id = ?`).run(summary.project_id ?? existing.project_id, summary.user_id, normalized.request, normalized.investigated, normalized.learned, normalized.completed, normalized.next_steps, normalized.capture_state, normalized.recent_tool_names, normalized.hot_files, normalized.recent_outcomes, now, summary.session_id);
+         WHERE session_id = ?`).run(summary.project_id ?? existing.project_id, summary.user_id, normalized.request, normalized.investigated, normalized.learned, normalized.completed, normalized.next_steps, normalized.current_thread, normalized.capture_state, normalized.recent_tool_names, normalized.hot_files, normalized.recent_outcomes, now, summary.session_id);
     return this.getSessionSummary(summary.session_id);
   }
   getSessionSummary(sessionId) {
@@ -1600,7 +1893,7 @@ var MIGRATIONS2 = [
       -- Sync outbox (offline-first queue)
       CREATE TABLE sync_outbox (
           id              INTEGER PRIMARY KEY AUTOINCREMENT,
-          record_type     TEXT NOT NULL CHECK (record_type IN ('observation', 'summary')),
+          record_type     TEXT NOT NULL CHECK (record_type IN ('observation', 'summary', 'chat_message')),
           record_id       INTEGER NOT NULL,
           status          TEXT DEFAULT 'pending' CHECK (status IN (
               'pending', 'syncing', 'synced', 'failed'
@@ -1893,6 +2186,18 @@ var MIGRATIONS2 = [
         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);
+    `
+  },
   {
     version: 12,
     description: "Add synced handoff metadata to session summaries",
@@ -1904,15 +2209,92 @@ var MIGRATIONS2 = [
     `
   },
   {
-    version: 11,
-    description: "Add observation provenance from tool and prompt chronology",
+    version: 13,
+    description: "Add current_thread to session summaries",
     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);
+      ALTER TABLE session_summaries ADD COLUMN current_thread TEXT;
+    `
+  },
+  {
+    version: 14,
+    description: "Add chat_messages lane for raw conversation recall",
+    sql: `
+      CREATE TABLE IF NOT EXISTS chat_messages (
+          id                INTEGER PRIMARY KEY AUTOINCREMENT,
+          session_id        TEXT NOT NULL,
+          project_id        INTEGER REFERENCES projects(id),
+          role              TEXT NOT NULL CHECK (role IN ('user', 'assistant')),
+          content           TEXT NOT NULL,
+          user_id           TEXT NOT NULL,
+          device_id         TEXT NOT NULL,
+          agent             TEXT DEFAULT 'claude-code',
+          created_at_epoch  INTEGER NOT NULL
+      );
+
+      CREATE INDEX IF NOT EXISTS idx_chat_messages_session
+        ON chat_messages(session_id, created_at_epoch DESC, id DESC);
+      CREATE INDEX IF NOT EXISTS idx_chat_messages_project
+        ON chat_messages(project_id, created_at_epoch DESC, id DESC);
+      CREATE INDEX IF NOT EXISTS idx_chat_messages_created
+        ON chat_messages(created_at_epoch DESC, id DESC);
+    `
+  },
+  {
+    version: 15,
+    description: "Add remote_source_id for chat message sync deduplication",
+    sql: `
+      ALTER TABLE chat_messages ADD COLUMN remote_source_id TEXT;
+      CREATE UNIQUE INDEX IF NOT EXISTS idx_chat_messages_remote_source
+        ON chat_messages(remote_source_id)
+        WHERE remote_source_id IS NOT NULL;
+    `
+  },
+  {
+    version: 16,
+    description: "Allow chat_message records in sync_outbox",
+    sql: `
+      CREATE TABLE sync_outbox_new (
+          id              INTEGER PRIMARY KEY AUTOINCREMENT,
+          record_type     TEXT NOT NULL CHECK (record_type IN ('observation', 'summary', 'chat_message')),
+          record_id       INTEGER NOT NULL,
+          status          TEXT DEFAULT 'pending' CHECK (status IN (
+              'pending', 'syncing', 'synced', 'failed'
+          )),
+          retry_count     INTEGER DEFAULT 0,
+          max_retries     INTEGER DEFAULT 10,
+          last_error      TEXT,
+          created_at_epoch INTEGER NOT NULL,
+          synced_at_epoch  INTEGER,
+          next_retry_epoch INTEGER
+      );
+
+      INSERT INTO sync_outbox_new (
+        id, record_type, record_id, status, retry_count, max_retries,
+        last_error, created_at_epoch, synced_at_epoch, next_retry_epoch
+      )
+      SELECT
+        id, record_type, record_id, status, retry_count, max_retries,
+        last_error, created_at_epoch, synced_at_epoch, next_retry_epoch
+      FROM sync_outbox;
+
+      DROP TABLE sync_outbox;
+      ALTER TABLE sync_outbox_new RENAME TO sync_outbox;
+
+      CREATE INDEX idx_outbox_status ON sync_outbox(status, next_retry_epoch);
+      CREATE INDEX idx_outbox_record ON sync_outbox(record_type, record_id);
+    `
+  },
+  {
+    version: 17,
+    description: "Track transcript-backed chat messages separately from hook chat",
+    sql: `
+      ALTER TABLE chat_messages ADD COLUMN source_kind TEXT DEFAULT 'hook';
+      ALTER TABLE chat_messages ADD COLUMN transcript_index INTEGER;
+      CREATE INDEX IF NOT EXISTS idx_chat_messages_source_kind
+        ON chat_messages(session_id, source_kind, transcript_index, created_at_epoch DESC, id DESC);
+      CREATE UNIQUE INDEX IF NOT EXISTS idx_chat_messages_session_transcript
+        ON chat_messages(session_id, transcript_index)
+        WHERE transcript_index IS NOT NULL;
     `
   }
 ];