engrm 0.4.21 → 0.4.23

package/dist/server.js

@@ -13827,7 +13827,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'
@@ -14122,6 +14122,18 @@ var MIGRATIONS = [
   },
   {
     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",
     sql: `
       ALTER TABLE session_summaries ADD COLUMN capture_state TEXT;
@@ -14131,15 +14143,79 @@ 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);
     `
   }
 ];
@@ -14196,6 +14272,21 @@ function inferLegacySchemaVersion(db) {
     version2 = Math.max(version2, 10);
   if (columnExists(db, "observations", "source_tool"))
     version2 = Math.max(version2, 11);
+  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")) {
+    version2 = Math.max(version2, 12);
+  }
+  if (columnExists(db, "session_summaries", "current_thread")) {
+    version2 = Math.max(version2, 13);
+  }
+  if (tableExists(db, "chat_messages")) {
+    version2 = Math.max(version2, 14);
+  }
+  if (columnExists(db, "chat_messages", "remote_source_id")) {
+    version2 = Math.max(version2, 15);
+  }
+  if (syncOutboxSupportsChatMessages(db)) {
+    version2 = Math.max(version2, 16);
+  }
   return version2;
 }
 function runMigrations(db) {
@@ -14274,6 +14365,89 @@ function ensureObservationTypes(db) {
     }
   }
 }
+function ensureSessionSummaryColumns(db) {
+  const required2 = [
+    "capture_state",
+    "recent_tool_names",
+    "hot_files",
+    "recent_outcomes",
+    "current_thread"
+  ];
+  for (const column of required2) {
+    if (columnExists(db, "session_summaries", column))
+      continue;
+    db.exec(`ALTER TABLE session_summaries ADD COLUMN ${column} TEXT`);
+  }
+  const current = getSchemaVersion(db);
+  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");
+  const current = getSchemaVersion(db);
+  if (current < 15) {
+    db.exec("PRAGMA user_version = 15");
+  }
+}
+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 (error48) {
+    db.exec("ROLLBACK");
+    throw new Error(`sync_outbox repair failed: ${error48 instanceof Error ? error48.message : String(error48)}`);
+  }
+}
+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;
@@ -14432,6 +14606,9 @@ class MemDatabase {
     this.vecAvailable = this.loadVecExtension();
     runMigrations(this.db);
     ensureObservationTypes(this.db);
+    ensureSessionSummaryColumns(this.db);
+    ensureChatMessageColumns(this.db);
+    ensureSyncOutboxSupportsChatMessages(this.db);
   }
   loadVecExtension() {
     try {
@@ -14657,6 +14834,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,
@@ -14675,6 +14853,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,
@@ -14765,6 +14944,54 @@ 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
+        ) 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);
+    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 = ?
+         ORDER BY created_at_epoch 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}
+           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}
+         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}
+           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}
+         ORDER BY created_at_epoch DESC, id DESC
+         LIMIT ?`).all(needle, ...userId ? [userId] : [], limit);
+  }
   addToOutbox(recordType, recordId) {
     const now = Math.floor(Date.now() / 1000);
     this.db.query(`INSERT INTO sync_outbox (record_type, record_id, created_at_epoch)
@@ -14853,9 +15080,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);
   }
@@ -14871,6 +15098,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,
@@ -14884,12 +15112,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) {
@@ -16140,12 +16369,12 @@ function getRecentRequests(db, input) {
   };
 }
 
-// src/tools/recent-tools.ts
-function getRecentTools(db, input) {
-  const limit = Math.max(1, Math.min(input.limit ?? 10, 50));
+// src/tools/recent-chat.ts
+function getRecentChat(db, input) {
+  const limit = Math.max(1, Math.min(input.limit ?? 20, 100));
   if (input.session_id) {
     return {
-      tool_events: db.getSessionToolEvents(input.session_id, limit).slice(-limit).reverse()
+      messages: db.getSessionChatMessages(input.session_id, limit).slice(-limit).reverse()
     };
   }
   const projectScoped = input.project_scoped !== false;
@@ -16161,7 +16390,28 @@ function getRecentTools(db, input) {
     }
   }
   return {
-    tool_events: db.getRecentToolEvents(projectId, limit, input.user_id),
+    messages: db.getRecentChatMessages(projectId, limit, input.user_id),
+    project: projectName
+  };
+}
+
+// src/tools/search-chat.ts
+function searchChat(db, input) {
+  const limit = Math.max(1, Math.min(input.limit ?? 20, 100));
+  const projectScoped = input.project_scoped !== false;
+  let projectId = null;
+  let projectName;
+  if (projectScoped) {
+    const cwd = input.cwd ?? process.cwd();
+    const detected = detectProject(cwd);
+    const project = db.getProjectByCanonicalId(detected.canonical_id);
+    if (project) {
+      projectId = project.id;
+      projectName = project.name;
+    }
+  }
+  return {
+    messages: db.searchChatMessages(input.query, projectId, limit, input.user_id),
     project: projectName
   };
 }
@@ -16171,8 +16421,11 @@ function getSessionStory(db, input) {
   const session = db.getSessionById(input.session_id);
   const summary = db.getSessionSummary(input.session_id);
   const prompts = db.getSessionUserPrompts(input.session_id, 50);
+  const chatMessages = db.getSessionChatMessages(input.session_id, 50);
   const toolEvents = db.getSessionToolEvents(input.session_id, 100);
-  const observations = db.getObservationsBySession(input.session_id);
+  const allObservations = db.getObservationsBySession(input.session_id);
+  const handoffs = allObservations.filter((obs) => looksLikeHandoff(obs));
+  const observations = allObservations.filter((obs) => !looksLikeHandoff(obs));
   const metrics = db.getSessionMetrics(input.session_id);
   const projectName = session?.project_id !== null && session?.project_id !== undefined ? db.getProjectById(session.project_id)?.name ?? null : null;
   const latestRequest = prompts[prompts.length - 1]?.prompt?.trim() || summary?.request?.trim() || null;
@@ -16181,8 +16434,10 @@ function getSessionStory(db, input) {
     project_name: projectName,
     summary,
     prompts,
+    chat_messages: chatMessages,
     tool_events: toolEvents,
     observations,
+    handoffs,
     metrics,
     capture_state: classifyCaptureState({
       hasSummary: Boolean(summary?.request || summary?.completed),
@@ -16276,6 +16531,269 @@ function collectProvenanceSummary(observations) {
   return Array.from(counts.entries()).map(([tool, count]) => ({ tool, count })).sort((a, b) => b.count - a.count || a.tool.localeCompare(b.tool)).slice(0, 6);
 }
 
+// src/tools/handoffs.ts
+async function createHandoff(db, config2, input) {
+  const resolved = resolveTargetSession(db, input.cwd, config2.user_id, input.session_id);
+  if (!resolved.session) {
+    return {
+      success: false,
+      reason: "No recent session found to hand off yet"
+    };
+  }
+  const story = getSessionStory(db, { session_id: resolved.session.session_id });
+  if (!story.session) {
+    return {
+      success: false,
+      reason: `Session ${resolved.session.session_id} not found`
+    };
+  }
+  const includeChat = input.include_chat === true;
+  const chatLimit = Math.max(1, Math.min(input.chat_limit ?? 4, 8));
+  const generatedTitle = buildHandoffTitle(story.summary, story.latest_request, input.title);
+  const title = `Handoff: ${generatedTitle} · ${formatTimestamp(Date.now())}`;
+  const narrative = buildHandoffNarrative(story.summary, story, {
+    includeChat,
+    chatLimit
+  });
+  const facts = buildHandoffFacts(story.summary, story);
+  const concepts = buildHandoffConcepts(story.project_name, story.capture_state);
+  const result = await saveObservation(db, config2, {
+    type: "message",
+    title,
+    narrative,
+    facts,
+    concepts,
+    session_id: story.session.session_id,
+    cwd: input.cwd,
+    agent: "engrm-handoff",
+    source_tool: "create_handoff"
+  });
+  return {
+    success: result.success,
+    observation_id: result.observation_id,
+    session_id: story.session.session_id,
+    title,
+    reason: result.reason
+  };
+}
+function getRecentHandoffs(db, input) {
+  const limit = Math.max(1, Math.min(input.limit ?? 10, 25));
+  const projectScoped = input.project_scoped !== false;
+  let projectId = null;
+  let projectName;
+  if (projectScoped) {
+    const cwd = input.cwd ?? process.cwd();
+    const detected = detectProject(cwd);
+    const project = db.getProjectByCanonicalId(detected.canonical_id);
+    if (project) {
+      projectId = project.id;
+      projectName = project.name;
+    }
+  }
+  const conditions = [
+    "o.type = 'message'",
+    "o.lifecycle IN ('active', 'aging', 'pinned')",
+    "o.superseded_by IS NULL",
+    `(o.title LIKE 'Handoff:%' OR o.concepts LIKE '%"handoff"%')`
+  ];
+  const params = [];
+  if (input.user_id) {
+    conditions.push("(o.sensitivity != 'personal' OR o.user_id = ?)");
+    params.push(input.user_id);
+  }
+  if (projectId !== null) {
+    conditions.push("o.project_id = ?");
+    params.push(projectId);
+  }
+  params.push(limit);
+  const handoffs = db.db.query(`SELECT o.*, p.name AS project_name
+       FROM observations o
+       LEFT JOIN projects p ON p.id = o.project_id
+       WHERE ${conditions.join(" AND ")}
+       ORDER BY o.created_at_epoch DESC, o.id DESC
+       LIMIT ?`).all(...params);
+  return {
+    handoffs,
+    project: projectName
+  };
+}
+function loadHandoff(db, input) {
+  if (typeof input.id === "number") {
+    const obs = db.getObservationById(input.id);
+    if (!obs || obs.type !== "message" || !looksLikeHandoff(obs)) {
+      return { handoff: null };
+    }
+    const projectName = obs.project_id ? db.getProjectById(obs.project_id)?.name ?? null : null;
+    return { handoff: { ...obs, project_name: projectName } };
+  }
+  const recent = getRecentHandoffs(db, {
+    limit: 1,
+    project_scoped: input.project_scoped,
+    cwd: input.cwd,
+    user_id: input.user_id
+  });
+  return {
+    handoff: recent.handoffs[0] ?? null,
+    project: recent.project
+  };
+}
+function resolveTargetSession(db, cwd, userId, sessionId) {
+  if (sessionId) {
+    const session = db.getSessionById(sessionId);
+    if (!session)
+      return { session: null };
+    const projectName = session.project_id ? db.getProjectById(session.project_id)?.name : undefined;
+    return {
+      session: {
+        ...session,
+        project_name: projectName ?? null,
+        request: db.getSessionSummary(sessionId)?.request ?? null,
+        completed: db.getSessionSummary(sessionId)?.completed ?? null,
+        current_thread: db.getSessionSummary(sessionId)?.current_thread ?? null,
+        capture_state: db.getSessionSummary(sessionId)?.capture_state ?? null,
+        recent_tool_names: db.getSessionSummary(sessionId)?.recent_tool_names ?? null,
+        hot_files: db.getSessionSummary(sessionId)?.hot_files ?? null,
+        recent_outcomes: db.getSessionSummary(sessionId)?.recent_outcomes ?? null,
+        prompt_count: db.getSessionUserPrompts(sessionId, 200).length,
+        tool_event_count: db.getSessionToolEvents(sessionId, 200).length
+      },
+      projectName: projectName ?? undefined
+    };
+  }
+  const detected = detectProject(cwd ?? process.cwd());
+  const project = db.getProjectByCanonicalId(detected.canonical_id);
+  const sessions = db.getRecentSessions(project?.id ?? null, 10, userId);
+  return {
+    session: sessions[0] ?? null,
+    projectName: project?.name
+  };
+}
+function buildHandoffTitle(summary, latestRequest, explicit) {
+  const chosen = explicit?.trim() || summary?.current_thread?.trim() || summary?.completed?.trim() || latestRequest?.trim() || "Current work";
+  return compactLine(chosen) ?? "Current work";
+}
+function buildHandoffNarrative(summary, story, options) {
+  const sections = [];
+  if (summary?.request || story.latest_request) {
+    sections.push(`Request: ${summary?.request ?? story.latest_request}`);
+  }
+  if (summary?.current_thread) {
+    sections.push(`Current thread: ${summary.current_thread}`);
+  }
+  if (summary?.investigated) {
+    sections.push(`Investigated: ${summary.investigated}`);
+  }
+  if (summary?.learned) {
+    sections.push(`Learned: ${summary.learned}`);
+  }
+  if (summary?.completed) {
+    sections.push(`Completed: ${summary.completed}`);
+  }
+  if (summary?.next_steps) {
+    sections.push(`Next Steps: ${summary.next_steps}`);
+  }
+  if (story.recent_outcomes.length > 0) {
+    sections.push(`Recent outcomes:
+${story.recent_outcomes.slice(0, 5).map((item) => `- ${item}`).join(`
+`)}`);
+  }
+  if (story.hot_files.length > 0) {
+    sections.push(`Hot files:
+${story.hot_files.slice(0, 5).map((file2) => `- ${file2.path}`).join(`
+`)}`);
+  }
+  if (story.provenance_summary.length > 0) {
+    sections.push(`Tool trail:
+${story.provenance_summary.slice(0, 5).map((item) => `- ${item.tool}: ${item.count}`).join(`
+`)}`);
+  }
+  if (options.includeChat && story.chat_messages.length > 0) {
+    const chatLines = story.chat_messages.slice(-options.chatLimit).map((msg) => `- [${msg.role}] ${compactLine(msg.content) ?? msg.content.slice(0, 120)}`);
+    sections.push(`Chat snippets:
+${chatLines.join(`
+`)}`);
+  }
+  return sections.filter(Boolean).join(`
+
+`);
+}
+function buildHandoffFacts(summary, story) {
+  const facts = [
+    `session_id=${story.session?.session_id ?? "unknown"}`,
+    `capture_state=${story.capture_state}`,
+    story.project_name ? `project=${story.project_name}` : null,
+    summary?.current_thread ? `current_thread=${summary.current_thread}` : null,
+    story.hot_files[0] ? `hot_file=${story.hot_files[0].path}` : null,
+    story.provenance_summary[0] ? `primary_tool=${story.provenance_summary[0].tool}` : null
+  ];
+  return facts.filter((item) => Boolean(item));
+}
+function buildHandoffConcepts(projectName, captureState) {
+  return [
+    "handoff",
+    "session-handoff",
+    `capture:${captureState}`,
+    ...projectName ? [projectName] : []
+  ];
+}
+function looksLikeHandoff(obs) {
+  if (obs.title.startsWith("Handoff:"))
+    return true;
+  const concepts = parseJsonArray2(obs.concepts);
+  return concepts.includes("handoff") || concepts.includes("session-handoff");
+}
+function parseJsonArray2(value) {
+  if (!value)
+    return [];
+  try {
+    const parsed = JSON.parse(value);
+    return Array.isArray(parsed) ? parsed.filter((item) => typeof item === "string" && item.trim().length > 0) : [];
+  } catch {
+    return [];
+  }
+}
+function formatTimestamp(nowMs) {
+  const d = new Date(nowMs);
+  const yyyy = d.getUTCFullYear();
+  const mm = String(d.getUTCMonth() + 1).padStart(2, "0");
+  const dd = String(d.getUTCDate()).padStart(2, "0");
+  const hh = String(d.getUTCHours()).padStart(2, "0");
+  const mi = String(d.getUTCMinutes()).padStart(2, "0");
+  return `${yyyy}-${mm}-${dd} ${hh}:${mi}Z`;
+}
+function compactLine(value) {
+  const trimmed = value?.replace(/\s+/g, " ").trim();
+  if (!trimmed)
+    return null;
+  return trimmed.length > 120 ? `${trimmed.slice(0, 117)}...` : trimmed;
+}
+
+// src/tools/recent-tools.ts
+function getRecentTools(db, input) {
+  const limit = Math.max(1, Math.min(input.limit ?? 10, 50));
+  if (input.session_id) {
+    return {
+      tool_events: db.getSessionToolEvents(input.session_id, limit).slice(-limit).reverse()
+    };
+  }
+  const projectScoped = input.project_scoped !== false;
+  let projectId = null;
+  let projectName;
+  if (projectScoped) {
+    const cwd = input.cwd ?? process.cwd();
+    const detected = detectProject(cwd);
+    const project = db.getProjectByCanonicalId(detected.canonical_id);
+    if (project) {
+      projectId = project.id;
+      projectName = project.name;
+    }
+  }
+  return {
+    tool_events: db.getRecentToolEvents(projectId, limit, input.user_id),
+    project: projectName
+  };
+}
+
 // src/tools/recent-sessions.ts
 function getRecentSessions(db, input) {
   const limit = Math.max(1, Math.min(input.limit ?? 10, 50));
@@ -16631,6 +17149,12 @@ function buildSessionContext(db, cwd, options = {}) {
     const recentSessions2 = isNewProject ? [] : db.getRecentSessions(projectId, 5, opts.userId);
     const projectTypeCounts2 = isNewProject ? undefined : getProjectTypeCounts(db, projectId, opts.userId);
     const recentOutcomes2 = isNewProject ? undefined : getRecentOutcomes(db, projectId, opts.userId, recentSessions2);
+    const recentHandoffs2 = getRecentHandoffs(db, {
+      cwd,
+      project_scoped: !isNewProject,
+      user_id: opts.userId,
+      limit: 3
+    }).handoffs;
     return {
       project_name: projectName,
       canonical_id: canonicalId,
@@ -16641,7 +17165,8 @@ function buildSessionContext(db, cwd, options = {}) {
       recentToolEvents: recentToolEvents2.length > 0 ? recentToolEvents2 : undefined,
       recentSessions: recentSessions2.length > 0 ? recentSessions2 : undefined,
       projectTypeCounts: projectTypeCounts2,
-      recentOutcomes: recentOutcomes2
+      recentOutcomes: recentOutcomes2,
+      recentHandoffs: recentHandoffs2.length > 0 ? recentHandoffs2 : undefined
     };
   }
   let remainingBudget = tokenBudget - 30;
@@ -16669,6 +17194,12 @@ function buildSessionContext(db, cwd, options = {}) {
   const recentSessions = isNewProject ? [] : db.getRecentSessions(projectId, 5, opts.userId);
   const projectTypeCounts = isNewProject ? undefined : getProjectTypeCounts(db, projectId, opts.userId);
   const recentOutcomes = isNewProject ? undefined : getRecentOutcomes(db, projectId, opts.userId, recentSessions);
+  const recentHandoffs = getRecentHandoffs(db, {
+    cwd,
+    project_scoped: !isNewProject,
+    user_id: opts.userId,
+    limit: 3
+  }).handoffs;
   let securityFindings = [];
   if (!isNewProject) {
     try {
@@ -16727,7 +17258,8 @@ function buildSessionContext(db, cwd, options = {}) {
     recentToolEvents: recentToolEvents.length > 0 ? recentToolEvents : undefined,
     recentSessions: recentSessions.length > 0 ? recentSessions : undefined,
     projectTypeCounts,
-    recentOutcomes
+    recentOutcomes,
+    recentHandoffs: recentHandoffs.length > 0 ? recentHandoffs : undefined
   };
 }
 function estimateObservationTokens(obs, index) {
@@ -17220,6 +17752,9 @@ function buildSuggestedTools(sessions, requestCount, toolCount, observationCount
   if (observationCount > 0) {
     suggested.push("tool_memory_index", "capture_git_worktree");
   }
+  if (sessions.length > 0) {
+    suggested.push("create_handoff", "recent_handoffs");
+  }
   return Array.from(new Set(suggested)).slice(0, 4);
 }
 
@@ -17283,6 +17818,8 @@ function buildFallbackSuggestedTools(sessionCount, requestCount, toolCount, obse
     suggested.push("activity_feed");
   if (observationCount > 0)
     suggested.push("tool_memory_index", "capture_git_worktree");
+  if (sessionCount > 0)
+    suggested.push("create_handoff", "recent_handoffs");
   return Array.from(new Set(suggested)).slice(0, 4);
 }
 
@@ -17499,6 +18036,17 @@ function toToolEvent(tool) {
   };
 }
 function toObservationEvent(obs) {
+  if (looksLikeHandoff(obs)) {
+    return {
+      kind: "handoff",
+      created_at_epoch: obs.created_at_epoch,
+      session_id: obs.session_id,
+      id: obs.id,
+      title: obs.title,
+      detail: obs.narrative?.replace(/\s+/g, " ").trim().slice(0, 220),
+      observation_type: obs.type
+    };
+  }
   const detailBits = [];
   if (obs.source_tool)
     detailBits.push(`via ${obs.source_tool}`);
@@ -17542,9 +18090,10 @@ function compareEvents(a, b) {
   }
   const kindOrder = {
     summary: 0,
-    observation: 1,
-    tool: 2,
-    prompt: 3
+    handoff: 1,
+    observation: 2,
+    tool: 3,
+    prompt: 4
   };
   if (kindOrder[a.kind] !== kindOrder[b.kind]) {
     return kindOrder[a.kind] - kindOrder[b.kind];
@@ -17565,6 +18114,7 @@ function getActivityFeed(db, input) {
       })].filter((event) => event !== null) : [],
       ...story.prompts.map(toPromptEvent),
       ...story.tool_events.map(toToolEvent),
+      ...story.handoffs.map(toObservationEvent),
       ...story.observations.map(toObservationEvent)
     ].sort(compareEvents).slice(0, limit);
     return { events: events2, project };
@@ -18014,13 +18564,13 @@ function getSessionContext(db, input) {
 function buildHotFiles(context) {
   const counts = new Map;
   for (const obs of context.observations) {
-    for (const path of [...parseJsonArray2(obs.files_read), ...parseJsonArray2(obs.files_modified)]) {
+    for (const path of [...parseJsonArray3(obs.files_read), ...parseJsonArray3(obs.files_modified)]) {
       counts.set(path, (counts.get(path) ?? 0) + 1);
     }
   }
   return Array.from(counts.entries()).map(([path, count]) => ({ path, count })).sort((a, b) => b.count - a.count || a.path.localeCompare(b.path)).slice(0, 6);
 }
-function parseJsonArray2(value) {
+function parseJsonArray3(value) {
   if (!value)
     return [];
   try {
@@ -18041,6 +18591,9 @@ function buildSuggestedTools2(context) {
   if (context.observations.length > 0) {
     tools.push("tool_memory_index", "capture_git_worktree");
   }
+  if ((context.recentSessions?.length ?? 0) > 0) {
+    tools.push("create_handoff", "recent_handoffs");
+  }
   return Array.from(new Set(tools)).slice(0, 4);
 }
 
@@ -18591,22 +19144,27 @@ function buildSourceId(config2, localId, type = "obs") {
   return `${config2.user_id}-${config2.device_id}-${type}-${localId}`;
 }
 function parseSourceId(sourceId) {
-  const obsIndex = sourceId.lastIndexOf("-obs-");
-  if (obsIndex === -1)
-    return null;
-  const prefix = sourceId.slice(0, obsIndex);
-  const localIdStr = sourceId.slice(obsIndex + 5);
-  const localId = parseInt(localIdStr, 10);
-  if (isNaN(localId))
-    return null;
-  const firstDash = prefix.indexOf("-");
-  if (firstDash === -1)
-    return null;
-  return {
-    userId: prefix.slice(0, firstDash),
-    deviceId: prefix.slice(firstDash + 1),
-    localId
-  };
+  for (const type of ["obs", "summary", "chat"]) {
+    const marker = `-${type}-`;
+    const idx = sourceId.lastIndexOf(marker);
+    if (idx === -1)
+      continue;
+    const prefix = sourceId.slice(0, idx);
+    const localIdStr = sourceId.slice(idx + marker.length);
+    const localId = parseInt(localIdStr, 10);
+    if (isNaN(localId))
+      return null;
+    const firstDash = prefix.indexOf("-");
+    if (firstDash === -1)
+      return null;
+    return {
+      userId: prefix.slice(0, firstDash),
+      deviceId: prefix.slice(firstDash + 1),
+      localId,
+      type
+    };
+  }
+  return null;
 }
 
 // src/sync/client.ts
@@ -18712,7 +19270,106 @@ class VectorApiError extends Error {
   }
 }
 
+// src/capture/session-handoff.ts
+function buildSessionHandoffMetadata(prompts, toolEvents, observations) {
+  const latestRequest = prompts.length > 0 ? prompts[prompts.length - 1]?.prompt ?? null : null;
+  const recentRequestPrompts = prompts.slice(-3).map((prompt) => prompt.prompt.trim()).filter(Boolean);
+  const recentToolNames = [...new Set(toolEvents.slice(-8).map((tool) => tool.tool_name).filter(Boolean))];
+  const recentToolCommands = [...new Set(toolEvents.slice(-5).map((tool) => (tool.command ?? tool.file_path ?? "").trim()).filter(Boolean))];
+  const hotFiles = [...new Set(observations.flatMap((obs) => [
+    ...parseJsonArray4(obs.files_modified),
+    ...parseJsonArray4(obs.files_read)
+  ]).filter(Boolean))].slice(0, 6);
+  const recentOutcomes = observations.filter((obs) => ["bugfix", "feature", "refactor", "change", "decision"].includes(obs.type)).map((obs) => obs.title.trim()).filter((title) => title.length > 0).slice(0, 6);
+  const captureState = prompts.length > 0 && toolEvents.length > 0 ? "rich" : prompts.length > 0 || toolEvents.length > 0 ? "partial" : "summary-only";
+  const observationSourceTools = Array.from(observations.reduce((acc, obs) => {
+    if (!obs.source_tool)
+      return acc;
+    acc.set(obs.source_tool, (acc.get(obs.source_tool) ?? 0) + 1);
+    return acc;
+  }, new Map).entries()).map(([tool, count]) => ({ tool, count })).sort((a, b) => b.count - a.count || a.tool.localeCompare(b.tool)).slice(0, 6);
+  const latestObservationPromptNumber = observations.map((obs) => obs.source_prompt_number).filter((value) => typeof value === "number").sort((a, b) => b - a)[0] ?? null;
+  const currentThread = buildCurrentThread(latestRequest, recentOutcomes, hotFiles, recentToolNames);
+  return {
+    prompt_count: prompts.length,
+    tool_event_count: toolEvents.length,
+    recent_request_prompts: recentRequestPrompts,
+    latest_request: latestRequest,
+    current_thread: currentThread,
+    recent_tool_names: recentToolNames,
+    recent_tool_commands: recentToolCommands,
+    capture_state: captureState,
+    hot_files: hotFiles,
+    recent_outcomes: recentOutcomes,
+    observation_source_tools: observationSourceTools,
+    latest_observation_prompt_number: latestObservationPromptNumber
+  };
+}
+function buildCurrentThread(latestRequest, recentOutcomes, hotFiles, recentToolNames) {
+  const request = compactLine2(latestRequest);
+  const outcome = recentOutcomes.map((item) => compactLine2(item)).find(Boolean);
+  const file2 = hotFiles[0] ? compactFileHint(hotFiles[0]) : null;
+  const tools = recentToolNames.slice(0, 2).join("/");
+  if (outcome && file2) {
+    return `${outcome} · ${file2}${tools ? ` · ${tools}` : ""}`;
+  }
+  if (request && file2) {
+    return `${request} · ${file2}${tools ? ` · ${tools}` : ""}`;
+  }
+  if (outcome) {
+    return `${outcome}${tools ? ` · ${tools}` : ""}`;
+  }
+  if (request) {
+    return `${request}${tools ? ` · ${tools}` : ""}`;
+  }
+  return null;
+}
+function compactLine2(value) {
+  const trimmed = value?.replace(/\s+/g, " ").trim();
+  if (!trimmed)
+    return null;
+  return trimmed.length > 120 ? `${trimmed.slice(0, 117)}...` : trimmed;
+}
+function compactFileHint(value) {
+  const parts = value.split("/");
+  if (parts.length <= 2)
+    return value;
+  return parts.slice(-2).join("/");
+}
+function parseJsonArray4(value) {
+  if (!value)
+    return [];
+  try {
+    const parsed = JSON.parse(value);
+    return Array.isArray(parsed) ? parsed.filter((item) => typeof item === "string" && item.trim().length > 0) : [];
+  } catch {
+    return [];
+  }
+}
+
 // src/sync/push.ts
+function buildChatVectorDocument(chat, config2, project) {
+  return {
+    site_id: config2.site_id,
+    namespace: config2.namespace,
+    source_type: "chat",
+    source_id: buildSourceId(config2, chat.id, "chat"),
+    content: chat.content,
+    metadata: {
+      project_canonical: project.canonical_id,
+      project_name: project.name,
+      user_id: chat.user_id,
+      device_id: chat.device_id,
+      device_name: __require("node:os").hostname(),
+      agent: chat.agent,
+      type: "chat",
+      role: chat.role,
+      session_id: chat.session_id,
+      created_at_epoch: chat.created_at_epoch,
+      local_id: chat.id
+    }
+  };
+}
 function buildVectorDocument(obs, config2, project) {
   const parts = [obs.title];
   if (obs.narrative)
@@ -18793,6 +19450,7 @@ function buildSummaryVectorDocument(summary, config2, project, observations = []
       learned: summary.learned,
       completed: summary.completed,
       next_steps: summary.next_steps,
+      current_thread: summary.current_thread,
       summary_sections_present: countPresentSections2(summary),
       investigated_items: extractSectionItems2(summary.investigated),
       learned_items: extractSectionItems2(summary.learned),
@@ -18803,6 +19461,7 @@ function buildSummaryVectorDocument(summary, config2, project, observations = []
       capture_state: captureContext?.capture_state ?? "summary-only",
       recent_request_prompts: captureContext?.recent_request_prompts ?? [],
       latest_request: captureContext?.latest_request ?? null,
+      current_thread: captureContext?.current_thread ?? null,
       recent_tool_names: captureContext?.recent_tool_names ?? [],
       recent_tool_commands: captureContext?.recent_tool_commands ?? [],
       hot_files: captureContext?.hot_files ?? [],
@@ -18852,7 +19511,33 @@ async function pushOutbox(db, client, config2, batchSize = 50) {
       const doc3 = buildSummaryVectorDocument(summary, config2, {
         canonical_id: project2.canonical_id,
         name: project2.name
-      }, summaryObservations, buildSummaryCaptureContext(sessionPrompts, sessionToolEvents, summaryObservations));
+      }, summaryObservations, buildSessionHandoffMetadata(sessionPrompts, sessionToolEvents, summaryObservations));
+      batch.push({ entryId: entry.id, doc: doc3 });
+      continue;
+    }
+    if (entry.record_type === "chat_message") {
+      const chat = db.getChatMessageById(entry.record_id);
+      if (!chat || chat.remote_source_id) {
+        markSynced(db, entry.id);
+        skipped++;
+        continue;
+      }
+      if (!chat.project_id) {
+        markSynced(db, entry.id);
+        skipped++;
+        continue;
+      }
+      const project2 = db.getProjectById(chat.project_id);
+      if (!project2) {
+        markSynced(db, entry.id);
+        skipped++;
+        continue;
+      }
+      markSyncing(db, entry.id);
+      const doc3 = buildChatVectorDocument(chat, config2, {
+        canonical_id: project2.canonical_id,
+        name: project2.name
+      });
       batch.push({ entryId: entry.id, doc: doc3 });
       continue;
     }
@@ -18893,7 +19578,13 @@ async function pushOutbox(db, client, config2, batchSize = 50) {
     return { pushed, failed, skipped };
   try {
     await client.batchIngest(batch.map((b) => b.doc));
-    for (const { entryId } of batch) {
+    for (const { entryId, doc: doc2 } of batch) {
+      if (doc2.source_type === "chat") {
+        const localId = typeof doc2.metadata?.local_id === "number" ? doc2.metadata.local_id : null;
+        if (localId !== null) {
+          db.db.query("UPDATE chat_messages SET remote_source_id = ? WHERE id = ?").run(doc2.source_id, localId);
+        }
+      }
       markSynced(db, entryId);
       pushed++;
     }
@@ -18901,6 +19592,12 @@ async function pushOutbox(db, client, config2, batchSize = 50) {
     for (const { entryId, doc: doc2 } of batch) {
       try {
         await client.ingest(doc2);
+        if (doc2.source_type === "chat") {
+          const localId = typeof doc2.metadata?.local_id === "number" ? doc2.metadata.local_id : null;
+          if (localId !== null) {
+            db.db.query("UPDATE chat_messages SET remote_source_id = ? WHERE id = ?").run(doc2.source_id, localId);
+          }
+        }
         markSynced(db, entryId);
         pushed++;
       } catch (err) {
@@ -18923,48 +19620,6 @@ function countPresentSections2(summary) {
 function extractSectionItems2(section) {
   return extractSummaryItems(section, 4);
 }
-function buildSummaryCaptureContext(prompts, toolEvents, observations) {
-  const latestRequest = prompts.length > 0 ? prompts[prompts.length - 1]?.prompt ?? null : null;
-  const recentRequestPrompts = prompts.slice(-3).map((prompt) => prompt.prompt.trim()).filter(Boolean);
-  const recentToolNames = [...new Set(toolEvents.slice(-8).map((tool) => tool.tool_name).filter(Boolean))];
-  const recentToolCommands = [...new Set(toolEvents.slice(-5).map((tool) => (tool.command ?? tool.file_path ?? "").trim()).filter(Boolean))];
-  const hotFiles = [...new Set(observations.flatMap((obs) => [
-    ...parseJsonArray3(obs.files_modified),
-    ...parseJsonArray3(obs.files_read)
-  ]).filter(Boolean))].slice(0, 6);
-  const recentOutcomes = observations.filter((obs) => ["bugfix", "feature", "refactor", "change", "decision"].includes(obs.type)).map((obs) => obs.title.trim()).filter((title) => title.length > 0).slice(0, 6);
-  const captureState = prompts.length > 0 && toolEvents.length > 0 ? "rich" : prompts.length > 0 || toolEvents.length > 0 ? "partial" : "summary-only";
-  const observationSourceTools = Array.from(observations.reduce((acc, obs) => {
-    if (!obs.source_tool)
-      return acc;
-    acc.set(obs.source_tool, (acc.get(obs.source_tool) ?? 0) + 1);
-    return acc;
-  }, new Map).entries()).map(([tool, count]) => ({ tool, count })).sort((a, b) => b.count - a.count || a.tool.localeCompare(b.tool)).slice(0, 6);
-  const latestObservationPromptNumber = observations.map((obs) => obs.source_prompt_number).filter((value) => typeof value === "number").sort((a, b) => b - a)[0] ?? null;
-  return {
-    prompt_count: prompts.length,
-    tool_event_count: toolEvents.length,
-    recent_request_prompts: recentRequestPrompts,
-    latest_request: latestRequest,
-    recent_tool_names: recentToolNames,
-    recent_tool_commands: recentToolCommands,
-    capture_state: captureState,
-    hot_files: hotFiles,
-    recent_outcomes: recentOutcomes,
-    observation_source_tools: observationSourceTools,
-    latest_observation_prompt_number: latestObservationPromptNumber
-  };
-}
-function parseJsonArray3(value) {
-  if (!value)
-    return [];
-  try {
-    const parsed = JSON.parse(value);
-    return Array.isArray(parsed) ? parsed.filter((item) => typeof item === "string" && item.trim().length > 0) : [];
-  } catch {
-    return [];
-  }
-}
 
 // src/sync/pull.ts
 var PULL_CURSOR_KEY = "pull_cursor";
@@ -18995,6 +19650,7 @@ function mergeChanges(db, config2, changes) {
   for (const change of changes) {
     const parsed = parseSourceId(change.source_id);
     const remoteSummary = isRemoteSummary(change);
+    const remoteChat = isRemoteChat(change);
     if (parsed && parsed.deviceId === config2.device_id) {
       skipped++;
       continue;
@@ -19017,6 +19673,15 @@ function mergeChanges(db, config2, changes) {
         merged++;
       }
     }
+    if (remoteChat) {
+      const mergedChat = mergeRemoteChat(db, config2, change, project.id);
+      if (mergedChat) {
+        merged++;
+      } else {
+        skipped++;
+      }
+      continue;
+    }
     const existing = db.db.query("SELECT id FROM observations WHERE remote_source_id = ?").get(change.source_id);
     if (existing) {
       if (!remoteSummary)
@@ -19058,6 +19723,10 @@ function isRemoteSummary(change) {
   const rawType = typeof change.metadata?.type === "string" ? change.metadata.type.toLowerCase() : "";
   return rawType === "summary" || change.source_id.includes("-summary-");
 }
+function isRemoteChat(change) {
+  const rawType = typeof change.metadata?.type === "string" ? change.metadata.type.toLowerCase() : "";
+  return rawType === "chat" || change.source_id.includes("-chat-");
+}
 function mergeRemoteSummary(db, config2, change, projectId) {
   const sessionId = typeof change.metadata?.session_id === "string" ? change.metadata.session_id : null;
   if (!sessionId)
@@ -19071,6 +19740,7 @@ function mergeRemoteSummary(db, config2, change, projectId) {
     learned: typeof change.metadata?.learned === "string" ? change.metadata.learned : null,
     completed: typeof change.metadata?.completed === "string" ? change.metadata.completed : null,
     next_steps: typeof change.metadata?.next_steps === "string" ? change.metadata.next_steps : null,
+    current_thread: typeof change.metadata?.current_thread === "string" ? change.metadata.current_thread : null,
     capture_state: typeof change.metadata?.capture_state === "string" ? change.metadata.capture_state : null,
     recent_tool_names: encodeStringArray(change.metadata?.recent_tool_names),
     hot_files: encodeStringArray(change.metadata?.hot_files),
@@ -19078,6 +19748,26 @@ function mergeRemoteSummary(db, config2, change, projectId) {
   });
   return Boolean(summary);
 }
+function mergeRemoteChat(db, config2, change, projectId) {
+  if (db.getChatMessageByRemoteSourceId(change.source_id))
+    return false;
+  const sessionId = typeof change.metadata?.session_id === "string" ? change.metadata.session_id : null;
+  const role = change.metadata?.role === "assistant" ? "assistant" : "user";
+  if (!sessionId || typeof change.content !== "string" || !change.content.trim())
+    return false;
+  db.insertChatMessage({
+    session_id: sessionId,
+    project_id: projectId,
+    role,
+    content: change.content,
+    user_id: (typeof change.metadata?.user_id === "string" ? change.metadata.user_id : null) ?? config2.user_id,
+    device_id: (typeof change.metadata?.device_id === "string" ? change.metadata.device_id : null) ?? "remote",
+    agent: typeof change.metadata?.agent === "string" ? change.metadata.agent : "unknown",
+    created_at_epoch: typeof change.metadata?.created_at_epoch === "number" ? change.metadata.created_at_epoch : undefined,
+    remote_source_id: change.source_id
+  });
+  return true;
+}
 function encodeStringArray(value) {
   if (!Array.isArray(value))
     return null;
@@ -19886,7 +20576,7 @@ process.on("SIGTERM", () => {
 });
 var server = new McpServer({
   name: "engrm",
-  version: "0.4.21"
+  version: "0.4.23"
 });
 server.tool("save_observation", "Save an observation to memory", {
   type: exports_external.enum([
@@ -20973,6 +21663,143 @@ ${projectLines}`
     ]
   };
 });
+server.tool("create_handoff", "Capture an explicit cross-device handoff from the current or specified session into syncable memory", {
+  session_id: exports_external.string().optional().describe("Optional session ID to hand off; defaults to the latest recent session"),
+  cwd: exports_external.string().optional().describe("Repo path used to scope the handoff when no session ID is provided"),
+  title: exports_external.string().optional().describe("Optional short handoff title"),
+  include_chat: exports_external.boolean().optional().describe("Include a few recent chat snippets in the handoff"),
+  chat_limit: exports_external.number().optional().describe("How many recent chat snippets to include when include_chat is true")
+}, async (params) => {
+  const result = await createHandoff(db, config2, params);
+  if (!result.success) {
+    return {
+      content: [{ type: "text", text: `Handoff not created: ${result.reason}` }]
+    };
+  }
+  return {
+    content: [
+      {
+        type: "text",
+        text: `Created handoff #${result.observation_id} for session ${result.session_id}
+Title: ${result.title}`
+      }
+    ]
+  };
+});
+server.tool("recent_handoffs", "List recent explicit handoffs so you can resume work on another device or in a new session", {
+  limit: exports_external.number().optional(),
+  project_scoped: exports_external.boolean().optional(),
+  cwd: exports_external.string().optional(),
+  user_id: exports_external.string().optional()
+}, async (params) => {
+  const result = getRecentHandoffs(db, {
+    ...params,
+    user_id: params.user_id ?? config2.user_id
+  });
+  const projectLine = result.project ? `Project: ${result.project}
+` : "";
+  const rows = result.handoffs.length > 0 ? result.handoffs.map((handoff) => {
+    const stamp = new Date(handoff.created_at_epoch * 1000).toISOString().replace("T", " ").slice(0, 16);
+    return `- #${handoff.id} (${stamp}) ${handoff.title}${handoff.project_name ? ` [${handoff.project_name}]` : ""}`;
+  }).join(`
+`) : "- (none)";
+  return {
+    content: [{ type: "text", text: `${projectLine}Recent handoffs:
+${rows}` }]
+  };
+});
+server.tool("load_handoff", "Open a saved handoff and turn it back into a clear resume point for a new session", {
+  id: exports_external.number().optional().describe("Optional handoff observation ID; defaults to the latest recent handoff"),
+  cwd: exports_external.string().optional(),
+  project_scoped: exports_external.boolean().optional(),
+  user_id: exports_external.string().optional()
+}, async (params) => {
+  const result = loadHandoff(db, {
+    ...params,
+    user_id: params.user_id ?? config2.user_id
+  });
+  if (!result.handoff) {
+    return {
+      content: [{ type: "text", text: "No matching handoff found" }]
+    };
+  }
+  const facts = result.handoff.facts ? (() => {
+    try {
+      const parsed = JSON.parse(result.handoff.facts);
+      return Array.isArray(parsed) ? parsed : [];
+    } catch {
+      return [];
+    }
+  })() : [];
+  const factLines = facts.length > 0 ? `
+
+Facts:
+${facts.map((fact) => `- ${fact}`).join(`
+`)}` : "";
+  const projectLine = result.handoff.project_name ? `Project: ${result.handoff.project_name}
+` : "";
+  return {
+    content: [
+      {
+        type: "text",
+        text: `${projectLine}Handoff #${result.handoff.id}
+` + `Title: ${result.handoff.title}
+
+` + `${result.handoff.narrative ?? "(no handoff narrative stored)"}${factLines}`
+      }
+    ]
+  };
+});
+server.tool("recent_chat", "Inspect recently captured chat messages in the separate chat lane", {
+  limit: exports_external.number().optional(),
+  project_scoped: exports_external.boolean().optional(),
+  session_id: exports_external.string().optional(),
+  cwd: exports_external.string().optional(),
+  user_id: exports_external.string().optional()
+}, async (params) => {
+  const result = getRecentChat(db, params);
+  const projectLine = result.project ? `Project: ${result.project}
+` : "";
+  const rows = result.messages.length > 0 ? result.messages.map((msg) => {
+    const stamp = new Date(msg.created_at_epoch * 1000).toISOString().split("T")[0];
+    return `- ${stamp} [${msg.role}] ${msg.content.replace(/\s+/g, " ").trim().slice(0, 200)}`;
+  }).join(`
+`) : "- (none)";
+  return {
+    content: [
+      {
+        type: "text",
+        text: `${projectLine}Recent chat:
+${rows}`
+      }
+    ]
+  };
+});
+server.tool("search_chat", "Search the separate chat lane without mixing it into durable memory observations", {
+  query: exports_external.string().describe("Text to search for in captured chat"),
+  limit: exports_external.number().optional(),
+  project_scoped: exports_external.boolean().optional(),
+  cwd: exports_external.string().optional(),
+  user_id: exports_external.string().optional()
+}, async (params) => {
+  const result = searchChat(db, params);
+  const projectLine = result.project ? `Project: ${result.project}
+` : "";
+  const rows = result.messages.length > 0 ? result.messages.map((msg) => {
+    const stamp = new Date(msg.created_at_epoch * 1000).toISOString().split("T")[0];
+    return `- ${stamp} [${msg.role}] ${msg.content.replace(/\s+/g, " ").trim().slice(0, 200)}`;
+  }).join(`
+`) : "- (none)";
+  return {
+    content: [
+      {
+        type: "text",
+        text: `${projectLine}Chat search for "${params.query}":
+${rows}`
+      }
+    ]
+  };
+});
 server.tool("recent_requests", "Inspect recently captured raw user requests and prompt chronology", {
   limit: exports_external.number().optional(),
   project_scoped: exports_external.boolean().optional(),
@@ -21068,6 +21895,8 @@ server.tool("session_story", "Show the full local memory story for one session",
   ].filter(Boolean).join(`
 `) : "(none)";
   const promptLines = result.prompts.length > 0 ? result.prompts.map((prompt) => `- #${prompt.prompt_number} ${prompt.prompt.replace(/\s+/g, " ").trim()}`).join(`
+`) : "- (none)";
+  const chatLines = result.chat_messages.length > 0 ? result.chat_messages.slice(-12).map((msg) => `- [${msg.role}] ${msg.content.replace(/\s+/g, " ").trim().slice(0, 200)}`).join(`
 `) : "- (none)";
   const toolLines = result.tool_events.length > 0 ? result.tool_events.slice(-15).map((tool) => {
     const detail = tool.file_path ?? tool.command ?? tool.tool_response_preview ?? "";
@@ -21082,6 +21911,8 @@ server.tool("session_story", "Show the full local memory story for one session",
       provenance.push(`#${obs.source_prompt_number}`);
     return `- #${obs.id} [${obs.type}] ${obs.title}${provenance.length ? ` (${provenance.join(" · ")})` : ""}`;
   }).join(`
+`) : "- (none)";
+  const handoffLines = result.handoffs.length > 0 ? result.handoffs.slice(-8).map((obs) => `- #${obs.id} ${obs.title}`).join(`
 `) : "- (none)";
   const metrics = result.metrics ? `files=${result.metrics.files_touched_count}, searches=${result.metrics.searches_performed}, tools=${result.metrics.tool_calls_count}, observations=${result.metrics.observation_count}` : "metrics unavailable";
   const captureGaps = result.capture_gaps.length > 0 ? result.capture_gaps.map((gap) => `- ${gap}`).join(`
@@ -21103,9 +21934,15 @@ ${summaryLines}
 ` + `Prompts:
 ${promptLines}
 
+` + `Chat:
+${chatLines}
+
 ` + `Tools:
 ${toolLines}
 
+` + `Handoffs:
+${handoffLines}
+
 ` + `Provenance:
 ${provenanceSummary}