engrm 0.4.22 → 0.4.25

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'
@@ -883,6 +883,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",
@@ -894,15 +906,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;
     `
   }
 ];
@@ -962,6 +1051,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) {
@@ -1045,7 +1149,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))
@@ -1053,10 +1158,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;
@@ -1136,6 +1314,8 @@ class MemDatabase {
     runMigrations(this.db);
     ensureObservationTypes(this.db);
     ensureSessionSummaryColumns(this.db);
+    ensureChatMessageColumns(this.db);
+    ensureSyncOutboxSupportsChatMessages(this.db);
   }
   loadVecExtension() {
     try {
@@ -1204,6 +1384,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 [];
@@ -1361,6 +1557,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,
@@ -1379,6 +1576,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,
@@ -1469,6 +1667,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)
@@ -1557,9 +1848,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);
   }
@@ -1575,6 +1866,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,
@@ -1588,12 +1880,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) {
@@ -1854,22 +2147,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
@@ -2045,11 +2343,13 @@ function buildSessionHandoffMetadata(prompts, toolEvents, observations) {
     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,
@@ -2059,6 +2359,37 @@ function buildSessionHandoffMetadata(prompts, toolEvents, observations) {
     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 [];
@@ -2071,6 +2402,30 @@ function parseJsonArray2(value) {
 }
 
 // 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,
+      source_kind: chat.source_kind,
+      transcript_index: chat.transcript_index
+    }
+  };
+}
 function buildVectorDocument(obs, config, project) {
   const parts = [obs.title];
   if (obs.narrative)
@@ -2151,6 +2506,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),
@@ -2161,6 +2517,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 ?? [],
@@ -2214,6 +2571,32 @@ async function pushOutbox(db, client, config, batchSize = 50) {
       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;
+    }
     if (entry.record_type !== "observation") {
       skipped++;
       continue;
@@ -2251,7 +2634,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++;
     }
@@ -2259,6 +2648,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) {
@@ -2614,7 +3009,7 @@ function buildBeacon(db, config, sessionId, metrics) {
     sentinel_used: valueSignals.security_findings_count > 0,
     risk_score: riskScore,
     stacks_detected: stacks,
-    client_version: "0.4.22",
+    client_version: "0.4.25",
     context_observations_injected: metrics?.contextObsInjected ?? 0,
     context_total_available: metrics?.contextTotalAvailable ?? 0,
     recall_attempts: metrics?.recallAttempts ?? 0,
@@ -3515,6 +3910,40 @@ function readTranscript(sessionId, cwd, transcriptPath) {
   }
   return messages;
 }
+function syncTranscriptChat(db, config, sessionId, cwd, transcriptPath) {
+  const messages = readTranscript(sessionId, cwd, transcriptPath).map((message) => ({
+    ...message,
+    text: message.text.trim()
+  })).filter((message) => message.text.length > 0);
+  if (messages.length === 0)
+    return { imported: 0, total: 0 };
+  const session = db.getSessionById(sessionId);
+  const projectId = session?.project_id ?? null;
+  const now = Math.floor(Date.now() / 1000);
+  let imported = 0;
+  for (let index = 0;index < messages.length; index++) {
+    const transcriptIndex = index + 1;
+    if (db.getTranscriptChatMessage(sessionId, transcriptIndex))
+      continue;
+    const message = messages[index];
+    const createdAtEpoch = Math.max(0, now - (messages.length - transcriptIndex));
+    const row = db.insertChatMessage({
+      session_id: sessionId,
+      project_id: projectId,
+      role: message.role,
+      content: message.text,
+      user_id: config.user_id,
+      device_id: config.device_id,
+      agent: "claude-code",
+      created_at_epoch: createdAtEpoch,
+      source_kind: "transcript",
+      transcript_index: transcriptIndex
+    });
+    db.addToOutbox("chat_message", row.id);
+    imported++;
+  }
+  return { imported, total: messages.length };
+}
 function truncateTranscript(messages, maxBytes = 50000) {
   const lines = [];
   for (const msg of messages) {
@@ -3590,6 +4019,417 @@ async function saveTranscriptResults(db, config, results, sessionId, cwd) {
   return saved;
 }
 
+// src/tools/session-story.ts
+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 allObservations = db.getObservationsBySession(input.session_id);
+  const handoffs = allObservations.filter((obs) => looksLikeHandoff(obs));
+  const rollingHandoffDrafts = handoffs.filter((obs) => isDraftHandoff(obs));
+  const savedHandoffs = handoffs.filter((obs) => !isDraftHandoff(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;
+  return {
+    session,
+    project_name: projectName,
+    summary,
+    prompts,
+    chat_messages: chatMessages,
+    tool_events: toolEvents,
+    observations,
+    handoffs,
+    saved_handoffs: savedHandoffs,
+    rolling_handoff_drafts: rollingHandoffDrafts,
+    metrics,
+    capture_state: classifyCaptureState({
+      hasSummary: Boolean(summary?.request || summary?.completed),
+      promptCount: prompts.length,
+      toolEventCount: toolEvents.length
+    }),
+    capture_gaps: buildCaptureGaps({
+      promptCount: prompts.length,
+      toolEventCount: toolEvents.length,
+      toolCallsCount: metrics?.tool_calls_count ?? 0,
+      observationCount: observations.length,
+      hasSummary: Boolean(summary?.request || summary?.completed)
+    }),
+    latest_request: latestRequest,
+    recent_outcomes: collectRecentOutcomes(observations),
+    hot_files: collectHotFiles(observations),
+    provenance_summary: collectProvenanceSummary(observations)
+  };
+}
+function classifyCaptureState(input) {
+  if (input.promptCount > 0 && input.toolEventCount > 0)
+    return "rich";
+  if (input.promptCount > 0 || input.toolEventCount > 0)
+    return "partial";
+  if (input.hasSummary)
+    return "summary-only";
+  return "legacy";
+}
+function buildCaptureGaps(input) {
+  const gaps = [];
+  if (input.promptCount === 0)
+    gaps.push("missing prompts");
+  if (input.toolCallsCount > 0 && input.toolEventCount === 0) {
+    gaps.push("missing raw tool chronology");
+  } else if (input.toolEventCount === 0) {
+    gaps.push("no tool events");
+  }
+  if (input.observationCount === 0 && input.hasSummary) {
+    gaps.push("summary without reusable observations");
+  }
+  return gaps;
+}
+function collectRecentOutcomes(observations) {
+  const seen = new Set;
+  const outcomes = [];
+  for (const obs of observations) {
+    if (!["bugfix", "feature", "refactor", "change", "decision"].includes(obs.type))
+      continue;
+    const title = obs.title.trim();
+    if (!title || looksLikeFileOperationTitle(title))
+      continue;
+    const normalized = title.toLowerCase().replace(/\s+/g, " ").trim();
+    if (seen.has(normalized))
+      continue;
+    seen.add(normalized);
+    outcomes.push(title);
+    if (outcomes.length >= 6)
+      break;
+  }
+  return outcomes;
+}
+function collectHotFiles(observations) {
+  const counts = new Map;
+  for (const obs of observations) {
+    for (const path of [...parseJsonArray3(obs.files_modified), ...parseJsonArray3(obs.files_read)]) {
+      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, 8);
+}
+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 [];
+  }
+}
+function looksLikeFileOperationTitle(value) {
+  return /^(modified|updated|edited|touched|changed|extended|refactored|redesigned)\s+[A-Za-z0-9_.\-\/]+(?:\s*\([^)]*\))?$/i.test(value.trim());
+}
+function collectProvenanceSummary(observations) {
+  const counts = new Map;
+  for (const obs of observations) {
+    if (!obs.source_tool)
+      continue;
+    counts.set(obs.source_tool, (counts.get(obs.source_tool) ?? 0) + 1);
+  }
+  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 upsertRollingHandoff(db, config, input) {
+  const resolved = resolveTargetSession(db, input.cwd, config.user_id, input.session_id);
+  if (!resolved.session) {
+    return {
+      success: false,
+      reason: "No recent session found to draft a handoff 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 || input.include_chat !== false && shouldAutoIncludeChat(story);
+  const chatLimit = Math.max(1, Math.min(input.chat_limit ?? 3, 6));
+  const title = `Handoff Draft: ${buildHandoffTitle(story.summary, story.latest_request)}`;
+  const narrative = buildHandoffNarrative(story.summary, story, {
+    includeChat,
+    chatLimit
+  });
+  const facts = buildHandoffFacts(story.summary, story);
+  const concepts = buildDraftHandoffConcepts(story.project_name, story.capture_state);
+  const existing = getSessionRollingHandoff(db, story.session.session_id);
+  const now = Math.floor(Date.now() / 1000);
+  if (existing) {
+    const nextFacts = JSON.stringify(facts);
+    const nextConcepts = JSON.stringify(concepts);
+    const shouldRefresh = existing.title !== title || (existing.narrative ?? null) !== narrative || (existing.facts ?? null) !== nextFacts || (existing.concepts ?? null) !== nextConcepts || now - existing.created_at_epoch >= 120;
+    if (!shouldRefresh) {
+      return {
+        success: true,
+        observation_id: existing.id,
+        session_id: story.session.session_id,
+        title: existing.title
+      };
+    }
+    const updated = db.updateObservationContent(existing.id, {
+      title,
+      narrative,
+      facts: nextFacts,
+      concepts: nextConcepts,
+      created_at_epoch: now
+    });
+    if (!updated) {
+      return {
+        success: false,
+        reason: "Failed to update rolling handoff draft"
+      };
+    }
+    db.addToOutbox("observation", updated.id);
+    return {
+      success: true,
+      observation_id: updated.id,
+      session_id: story.session.session_id,
+      title: updated.title
+    };
+  }
+  const result = await saveObservation(db, config, {
+    type: "message",
+    title,
+    narrative,
+    facts,
+    concepts,
+    session_id: story.session.session_id,
+    cwd: input.cwd,
+    agent: "engrm-handoff",
+    source_tool: "rolling_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 queryLimit = input.current_device_id ? Math.max(limit, Math.min(limit * 5, 50)) : limit;
+  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(queryLimit);
+  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);
+  handoffs.sort((a, b) => compareHandoffs(a, b, input.current_device_id));
+  return {
+    handoffs: handoffs.slice(0, limit),
+    project: projectName
+  };
+}
+function formatHandoffSource(handoff) {
+  const ageSeconds = Math.max(0, Math.floor(Date.now() / 1000) - handoff.created_at_epoch);
+  const ageLabel = ageSeconds < 3600 ? `${Math.max(1, Math.floor(ageSeconds / 60) || 1)}m ago` : ageSeconds < 86400 ? `${Math.floor(ageSeconds / 3600)}h ago` : `${Math.floor(ageSeconds / 86400)}d ago`;
+  return `from ${handoff.device_id} · ${ageLabel}`;
+}
+function isDraftHandoff(obs) {
+  if (obs.title.startsWith("Handoff Draft:"))
+    return true;
+  const concepts = parseJsonArray4(obs.concepts);
+  return concepts.includes("draft-handoff") || concepts.includes("auto-handoff");
+}
+function getSessionRollingHandoff(db, sessionId) {
+  return db.db.query(`SELECT o.*, p.name AS project_name
+       FROM observations o
+       LEFT JOIN projects p ON p.id = o.project_id
+       WHERE o.session_id = ?
+         AND o.type = 'message'
+         AND o.lifecycle IN ('active', 'aging', 'pinned')
+         AND o.superseded_by IS NULL
+         AND (o.title LIKE 'Handoff Draft:%' OR o.concepts LIKE '%"draft-handoff"%')
+       ORDER BY o.created_at_epoch DESC, o.id DESC
+       LIMIT 1`).get(sessionId) ?? null;
+}
+function compareHandoffs(a, b, currentDeviceId) {
+  const aDraft = isDraftHandoff(a) ? 1 : 0;
+  const bDraft = isDraftHandoff(b) ? 1 : 0;
+  if (aDraft !== bDraft)
+    return aDraft - bDraft;
+  if (currentDeviceId) {
+    const aOther = a.device_id !== currentDeviceId ? 1 : 0;
+    const bOther = b.device_id !== currentDeviceId ? 1 : 0;
+    if (aOther !== bOther)
+      return bOther - aOther;
+  }
+  if (b.created_at_epoch !== a.created_at_epoch) {
+    return b.created_at_epoch - a.created_at_epoch;
+  }
+  return b.id - a.id;
+}
+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 compactLine2(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((file) => `- ${file.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}] ${compactLine2(msg.content) ?? msg.content.slice(0, 120)}`);
+    sections.push(`Chat snippets:
+${chatLines.join(`
+`)}`);
+  }
+  return sections.filter(Boolean).join(`
+
+`);
+}
+function shouldAutoIncludeChat(story) {
+  if (story.chat_messages.length === 0)
+    return false;
+  const summary = story.summary;
+  const thinSummary = !summary?.completed && !summary?.current_thread && story.recent_outcomes.length < 2;
+  const thinChronology = story.capture_state !== "rich" || story.tool_events.length === 0;
+  return thinSummary || thinChronology;
+}
+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 buildDraftHandoffConcepts(projectName, captureState) {
+  return [
+    "handoff",
+    "draft-handoff",
+    "auto-handoff",
+    `capture:${captureState}`,
+    ...projectName ? [projectName] : []
+  ];
+}
+function looksLikeHandoff(obs) {
+  if (obs.title.startsWith("Handoff:") || obs.title.startsWith("Handoff Draft:"))
+    return true;
+  const concepts = parseJsonArray4(obs.concepts);
+  return concepts.includes("handoff") || concepts.includes("session-handoff") || concepts.includes("draft-handoff");
+}
+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 [];
+  }
+}
+function compactLine2(value) {
+  const trimmed = value?.replace(/\s+/g, " ").trim();
+  if (!trimmed)
+    return null;
+  return trimmed.length > 120 ? `${trimmed.slice(0, 117)}...` : trimmed;
+}
+
 // hooks/stop.ts
 function printRetrospective(summary) {
   const lines = [];
@@ -3637,8 +4477,30 @@ async function main() {
   try {
     if (event.session_id) {
       db.completeSession(event.session_id);
+      syncTranscriptChat(db, config, event.session_id, event.cwd, event.transcript_path);
       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",
+              source_kind: "hook"
+            });
+            db.addToOutbox("chat_message", chatMessage.id);
+          }
           createAssistantCheckpoint(db, event.session_id, event.cwd, event.last_assistant_message);
         } catch {}
       }
@@ -3652,6 +4514,10 @@ async function main() {
         if (summary) {
           const row = db.upsertSessionSummary(summary);
           db.addToOutbox("summary", row.id);
+          await upsertRollingHandoff(db, config, {
+            session_id: event.session_id,
+            cwd: event.cwd
+          });
           let securityFindings = [];
           try {
             if (session?.project_id) {