engrm 0.4.21 → 0.4.23

package/dist/hooks/stop.js

@@ -590,7 +590,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'
@@ -885,6 +885,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;
@@ -894,15 +906,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);
     `
   }
 ];
@@ -959,6 +1035,21 @@ function inferLegacySchemaVersion(db) {
     version = Math.max(version, 10);
   if (columnExists(db, "observations", "source_tool"))
     version = Math.max(version, 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")) {
+    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);
+  }
   return version;
 }
 function runMigrations(db) {
@@ -1037,6 +1128,93 @@ function ensureObservationTypes(db) {
     }
   }
 }
+function ensureSessionSummaryColumns(db) {
+  const required = [
+    "capture_state",
+    "recent_tool_names",
+    "hot_files",
+    "recent_outcomes",
+    "current_thread"
+  ];
+  for (const column of required) {
+    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 (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;
+}
 var LATEST_SCHEMA_VERSION = MIGRATIONS.filter((m) => !m.condition).reduce((max, m) => Math.max(max, m.version), 0);
 
 // src/storage/sqlite.ts
@@ -1111,6 +1289,9 @@ class MemDatabase {
     this.vecAvailable = this.loadVecExtension();
     runMigrations(this.db);
     ensureObservationTypes(this.db);
+    ensureSessionSummaryColumns(this.db);
+    ensureChatMessageColumns(this.db);
+    ensureSyncOutboxSupportsChatMessages(this.db);
   }
   loadVecExtension() {
     try {
@@ -1336,6 +1517,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,
@@ -1354,6 +1536,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,
@@ -1444,6 +1627,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)
@@ -1532,9 +1763,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);
   }
@@ -1550,6 +1781,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,
@@ -1563,12 +1795,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) {
@@ -1829,22 +2062,27 @@ function buildSourceId(config, localId, type = "obs") {
   return `${config.user_id}-${config.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
@@ -2001,7 +2239,106 @@ function computeSessionValueSignals(observations, securityFindings = []) {
   };
 }
 
+// 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) => [
+    ...parseJsonArray2(obs.files_modified),
+    ...parseJsonArray2(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 = compactLine(latestRequest);
+  const outcome = recentOutcomes.map((item) => compactLine(item)).find(Boolean);
+  const file = hotFiles[0] ? compactFileHint(hotFiles[0]) : null;
+  const tools = recentToolNames.slice(0, 2).join("/");
+  if (outcome && file) {
+    return `${outcome} · ${file}${tools ? ` · ${tools}` : ""}`;
+  }
+  if (request && file) {
+    return `${request} · ${file}${tools ? ` · ${tools}` : ""}`;
+  }
+  if (outcome) {
+    return `${outcome}${tools ? ` · ${tools}` : ""}`;
+  }
+  if (request) {
+    return `${request}${tools ? ` · ${tools}` : ""}`;
+  }
+  return null;
+}
+function compactLine(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 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 [];
+  }
+}
+
 // src/sync/push.ts
+function buildChatVectorDocument(chat, config, project) {
+  return {
+    site_id: config.site_id,
+    namespace: config.namespace,
+    source_type: "chat",
+    source_id: buildSourceId(config, 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, config, project) {
   const parts = [obs.title];
   if (obs.narrative)
@@ -2082,6 +2419,7 @@ function buildSummaryVectorDocument(summary, config, project, observations = [],
       learned: summary.learned,
       completed: summary.completed,
       next_steps: summary.next_steps,
+      current_thread: summary.current_thread,
       summary_sections_present: countPresentSections(summary),
       investigated_items: extractSectionItems(summary.investigated),
       learned_items: extractSectionItems(summary.learned),
@@ -2092,6 +2430,7 @@ function buildSummaryVectorDocument(summary, config, 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 ?? [],
@@ -2141,7 +2480,33 @@ async function pushOutbox(db, client, config, batchSize = 50) {
       const doc2 = buildSummaryVectorDocument(summary, config, {
         canonical_id: project2.canonical_id,
         name: project2.name
-      }, summaryObservations, buildSummaryCaptureContext(sessionPrompts, sessionToolEvents, summaryObservations));
+      }, summaryObservations, buildSessionHandoffMetadata(sessionPrompts, sessionToolEvents, summaryObservations));
+      batch.push({ entryId: entry.id, doc: doc2 });
+      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 doc2 = buildChatVectorDocument(chat, config, {
+        canonical_id: project2.canonical_id,
+        name: project2.name
+      });
       batch.push({ entryId: entry.id, doc: doc2 });
       continue;
     }
@@ -2182,7 +2547,13 @@ async function pushOutbox(db, client, config, batchSize = 50) {
     return { pushed, failed, skipped };
   try {
     await client.batchIngest(batch.map((b) => b.doc));
-    for (const { entryId } of batch) {
+    for (const { entryId, doc } of batch) {
+      if (doc.source_type === "chat") {
+        const localId = typeof doc.metadata?.local_id === "number" ? doc.metadata.local_id : null;
+        if (localId !== null) {
+          db.db.query("UPDATE chat_messages SET remote_source_id = ? WHERE id = ?").run(doc.source_id, localId);
+        }
+      }
       markSynced(db, entryId);
       pushed++;
     }
@@ -2190,6 +2561,12 @@ async function pushOutbox(db, client, config, batchSize = 50) {
     for (const { entryId, doc } of batch) {
       try {
         await client.ingest(doc);
+        if (doc.source_type === "chat") {
+          const localId = typeof doc.metadata?.local_id === "number" ? doc.metadata.local_id : null;
+          if (localId !== null) {
+            db.db.query("UPDATE chat_messages SET remote_source_id = ? WHERE id = ?").run(doc.source_id, localId);
+          }
+        }
         markSynced(db, entryId);
         pushed++;
       } catch (err) {
@@ -2212,48 +2589,6 @@ function countPresentSections(summary) {
 function extractSectionItems(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) => [
-    ...parseJsonArray2(obs.files_modified),
-    ...parseJsonArray2(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 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 [];
-  }
-}
 
 // src/embeddings/embedder.ts
 var _available = null;
@@ -2587,7 +2922,7 @@ function buildBeacon(db, config, sessionId, metrics) {
     sentinel_used: valueSignals.security_findings_count > 0,
     risk_score: riskScore,
     stacks_detected: stacks,
-    client_version: "0.4.21",
+    client_version: "0.4.23",
     context_observations_injected: metrics?.contextObsInjected ?? 0,
     context_total_available: metrics?.contextTotalAvailable ?? 0,
     recall_attempts: metrics?.recallAttempts ?? 0,
@@ -3612,6 +3947,26 @@ async function main() {
       db.completeSession(event.session_id);
       if (event.last_assistant_message) {
         try {
+          const detected = detectProject(event.cwd);
+          const project = db.getProjectByCanonicalId(detected.canonical_id) ?? db.upsertProject({
+            canonical_id: detected.canonical_id,
+            name: detected.name,
+            local_path: event.cwd,
+            remote_url: detected.remote_url ?? null
+          });
+          const compactAssistant = event.last_assistant_message.replace(/\s+/g, " ").trim();
+          if (compactAssistant.length >= 24) {
+            const chatMessage = db.insertChatMessage({
+              session_id: event.session_id,
+              project_id: project.id,
+              role: "assistant",
+              content: event.last_assistant_message,
+              user_id: config.user_id,
+              device_id: config.device_id,
+              agent: "claude-code"
+            });
+            db.addToOutbox("chat_message", chatMessage.id);
+          }
           createAssistantCheckpoint(db, event.session_id, event.cwd, event.last_assistant_message);
         } catch {}
       }
@@ -3623,7 +3978,7 @@ async function main() {
         const assistantSections = extractAssistantSummarySections(event.last_assistant_message);
         const summary = mergeSessionSummary(retrospective, assistantSections, event.session_id, session?.project_id ?? null, config.user_id) ?? mergeSessionSummary(buildFallbackSessionSummary(db, event.session_id, session?.project_id ?? null, config.user_id, event.last_assistant_message), assistantSections, event.session_id, session?.project_id ?? null, config.user_id) ?? buildFallbackSessionSummary(db, event.session_id, session?.project_id ?? null, config.user_id, event.last_assistant_message);
         if (summary) {
-          const row = db.insertSessionSummary(summary);
+          const row = db.upsertSessionSummary(summary);
           db.addToOutbox("summary", row.id);
           let securityFindings = [];
           try {
@@ -3969,7 +4324,7 @@ function pickAssistantCheckpointTitle(substantiveLines, bulletLines) {
 }
 function isGenericCheckpointLine(value) {
   const normalized = value.toLowerCase().replace(/\s+/g, " ").trim();
-  return normalized === "here's where things stand:" || normalized === "here's where things stand" || normalized === "where things stand:" || normalized === "where things stand" || normalized === "current status:" || normalized === "current status" || normalized === "status update:" || normalized === "status update";
+  return normalized === "here's where things stand:" || normalized === "here's where things stand" || normalized === "where things stand:" || normalized === "where things stand" || normalized === "current status:" || normalized === "current status" || normalized === "status update:" || normalized === "status update" || normalized.startsWith("all clean. here's a summary of what was fixed") || normalized.startsWith("all clean, here's a summary of what was fixed") || normalized.startsWith("now i have enough to give a clear, accurate assessment") || normalized.startsWith("here's the real picture") || normalized === "tl;dr:" || normalized.startsWith("tl;dr:");
 }
 function detectUnsavedPlans(message) {
   const hints = [];