engrm 0.4.18 → 0.4.21

package/dist/hooks/session-start.js

@@ -477,6 +477,16 @@ function normalizeItem(value) {
 function tokenizeProjectHint(text) {
   return Array.from(new Set((text.toLowerCase().match(/[a-z0-9_+-]{4,}/g) ?? []).filter(Boolean)));
 }
+function parseSummaryJsonList(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 isObservationRelatedToProject(obs, detected) {
   const hints = new Set([
     ...tokenizeProjectHint(detected.name),
@@ -608,7 +618,7 @@ function buildSessionContext(db, cwd, options = {}) {
     const recentToolEvents2 = db.getRecentToolEvents(isNewProject ? null : projectId, isNewProject ? 8 : 6, opts.userId);
     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);
+    const recentOutcomes2 = isNewProject ? undefined : getRecentOutcomes(db, projectId, opts.userId, recentSessions2);
     return {
       project_name: projectName,
       canonical_id: canonicalId,
@@ -646,7 +656,7 @@ function buildSessionContext(db, cwd, options = {}) {
   const recentToolEvents = db.getRecentToolEvents(isNewProject ? null : projectId, isNewProject ? 8 : 6, opts.userId);
   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);
+  const recentOutcomes = isNewProject ? undefined : getRecentOutcomes(db, projectId, opts.userId, recentSessions);
   let securityFindings = [];
   if (!isNewProject) {
     try {
@@ -989,7 +999,7 @@ function getProjectTypeCounts(db, projectId, userId) {
   }
   return counts;
 }
-function getRecentOutcomes(db, projectId, userId) {
+function getRecentOutcomes(db, projectId, userId, recentSessions) {
   const visibilityClause = userId ? " AND (sensitivity != 'personal' OR user_id = ?)" : "";
   const visibilityParams = userId ? [userId] : [];
   const summaries = db.db.query(`SELECT * FROM session_summaries
@@ -999,6 +1009,15 @@ function getRecentOutcomes(db, projectId, userId) {
   const picked = [];
   const seen = new Set;
   for (const summary of summaries) {
+    for (const item of parseSummaryJsonList(summary.recent_outcomes)) {
+      const normalized = item.toLowerCase().replace(/\s+/g, " ").trim();
+      if (!normalized || seen.has(normalized))
+        continue;
+      seen.add(normalized);
+      picked.push(item);
+      if (picked.length >= 5)
+        return picked;
+    }
     for (const line of [
       ...extractMeaningfulLines(summary.completed, 2),
       ...extractMeaningfulLines(summary.learned, 1)
@@ -1012,6 +1031,17 @@ function getRecentOutcomes(db, projectId, userId) {
         return picked;
     }
   }
+  for (const session of recentSessions ?? []) {
+    for (const item of parseSummaryJsonList(session.recent_outcomes)) {
+      const normalized = item.toLowerCase().replace(/\s+/g, " ").trim();
+      if (!normalized || seen.has(normalized))
+        continue;
+      seen.add(normalized);
+      picked.push(item);
+      if (picked.length >= 5)
+        return picked;
+    }
+  }
   const rows = db.db.query(`SELECT * FROM observations
        WHERE project_id = ?
          AND lifecycle IN ('active', 'aging', 'pinned')
@@ -1154,7 +1184,7 @@ import { existsSync as existsSync3, readFileSync as readFileSync2, writeFileSync
 import { join as join3 } from "node:path";
 import { homedir } from "node:os";
 var STATE_PATH = join3(homedir(), ".engrm", "config-fingerprint.json");
-var CLIENT_VERSION = "0.4.18";
+var CLIENT_VERSION = "0.4.21";
 function hashFile(filePath) {
   try {
     if (!existsSync3(filePath))
@@ -1696,10 +1726,20 @@ function mergeRemoteSummary(db, config, change, projectId) {
     investigated: typeof change.metadata?.investigated === "string" ? change.metadata.investigated : null,
     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
+    next_steps: typeof change.metadata?.next_steps === "string" ? change.metadata.next_steps : 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),
+    recent_outcomes: encodeStringArray(change.metadata?.recent_outcomes)
   });
   return Boolean(summary);
 }
+function encodeStringArray(value) {
+  if (!Array.isArray(value))
+    return null;
+  const normalized = value.filter((item) => typeof item === "string").map((item) => item.trim()).filter(Boolean);
+  return normalized.length > 0 ? JSON.stringify(normalized) : null;
+}
 function normalizeRemoteObservationType(rawType, sourceId) {
   const type = typeof rawType === "string" ? rawType.trim().toLowerCase() : "";
   if (type === "bugfix" || type === "discovery" || type === "decision" || type === "pattern" || type === "change" || type === "feature" || type === "refactor" || type === "digest" || type === "standard" || type === "message") {
@@ -2246,6 +2286,16 @@ var MIGRATIONS = [
         ON tool_events(created_at_epoch DESC, id DESC);
     `
   },
+  {
+    version: 11,
+    description: "Add synced handoff metadata to session summaries",
+    sql: `
+      ALTER TABLE session_summaries ADD COLUMN capture_state TEXT;
+      ALTER TABLE session_summaries ADD COLUMN recent_tool_names TEXT;
+      ALTER TABLE session_summaries ADD COLUMN hot_files TEXT;
+      ALTER TABLE session_summaries ADD COLUMN recent_outcomes TEXT;
+    `
+  },
   {
     version: 11,
     description: "Add observation provenance from tool and prompt chronology",
@@ -2689,6 +2739,10 @@ class MemDatabase {
              p.name AS project_name,
              ss.request AS request,
              ss.completed AS completed,
+             ss.capture_state AS capture_state,
+             ss.recent_tool_names AS recent_tool_names,
+             ss.hot_files AS hot_files,
+             ss.recent_outcomes AS recent_outcomes,
              (SELECT COUNT(*) FROM user_prompts up WHERE up.session_id = s.session_id) AS prompt_count,
              (SELECT COUNT(*) FROM tool_events te WHERE te.session_id = s.session_id) AS tool_event_count
            FROM sessions s
@@ -2703,6 +2757,10 @@ class MemDatabase {
            p.name AS project_name,
            ss.request AS request,
            ss.completed AS completed,
+           ss.capture_state AS capture_state,
+           ss.recent_tool_names AS recent_tool_names,
+           ss.hot_files AS hot_files,
+           ss.recent_outcomes AS recent_outcomes,
            (SELECT COUNT(*) FROM user_prompts up WHERE up.session_id = s.session_id) AS prompt_count,
            (SELECT COUNT(*) FROM tool_events te WHERE te.session_id = s.session_id) AS tool_event_count
          FROM sessions s
@@ -2875,8 +2933,11 @@ class MemDatabase {
       completed: normalizeSummarySection(summary.completed),
       next_steps: normalizeSummarySection(summary.next_steps)
     };
-    const result = this.db.query(`INSERT INTO session_summaries (session_id, project_id, user_id, request, investigated, learned, completed, next_steps, 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, now);
+    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
+        )
+        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);
     const id = Number(result.lastInsertRowid);
     return this.db.query("SELECT * FROM session_summaries WHERE id = ?").get(id);
   }
@@ -2891,7 +2952,11 @@ class MemDatabase {
       investigated: normalizeSummarySection(summary.investigated ?? existing.investigated),
       learned: normalizeSummarySection(summary.learned ?? existing.learned),
       completed: normalizeSummarySection(summary.completed ?? existing.completed),
-      next_steps: normalizeSummarySection(summary.next_steps ?? existing.next_steps)
+      next_steps: normalizeSummarySection(summary.next_steps ?? existing.next_steps),
+      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,
+      recent_outcomes: summary.recent_outcomes ?? existing.recent_outcomes
     };
     this.db.query(`UPDATE session_summaries
          SET project_id = ?,
@@ -2901,8 +2966,12 @@ class MemDatabase {
              learned = ?,
              completed = ?,
              next_steps = ?,
+             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, 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.capture_state, normalized.recent_tool_names, normalized.hot_files, normalized.recent_outcomes, now, summary.session_id);
     return this.getSessionSummary(summary.session_id);
   }
   getSessionSummary(sessionId) {
@@ -3210,13 +3279,13 @@ function formatSplashScreen(data) {
     }
   }
   const contextIndex = formatContextIndex(data.context, handoffShownItems);
-  if (contextIndex.length > 0) {
+  if (contextIndex.lines.length > 0) {
     lines.push("");
-    for (const line of contextIndex) {
+    for (const line of contextIndex.lines) {
       lines.push(`  ${line}`);
     }
   }
-  const inspectHints = formatInspectHints(data.context);
+  const inspectHints = formatInspectHints(data.context, contextIndex.observationIds);
   if (inspectHints.length > 0) {
     lines.push("");
     for (const line of inspectHints) {
@@ -3353,19 +3422,23 @@ function formatLegend() {
   ];
 }
 function formatContextIndex(context, shownItems) {
-  const rows = pickContextIndexObservations(context, shownItems).map((obs) => {
+  const selected = pickContextIndexObservations(context, shownItems);
+  const rows = selected.map((obs) => {
     const icon = observationIcon(obs.type);
     const fileHint = extractPrimaryFileHint(obs);
     return `${icon} #${obs.id} ${truncateInline(obs.title, 110)}${fileHint ? ` ${c2.dim}(${fileHint})${c2.reset}` : ""}`;
   });
   if (rows.length === 0)
-    return [];
-  return [
-    `${c2.dim}Handoff index:${c2.reset} use IDs when you want the deeper thread`,
-    ...rows
-  ];
+    return { lines: [], observationIds: [] };
+  return {
+    lines: [
+      `${c2.dim}Handoff index:${c2.reset} use IDs when you want the deeper thread`,
+      ...rows
+    ],
+    observationIds: selected.map((obs) => obs.id)
+  };
 }
-function formatInspectHints(context) {
+function formatInspectHints(context, visibleObservationIds = []) {
   const hints = [];
   if ((context.recentSessions?.length ?? 0) > 0) {
     hints.push("recent_sessions");
@@ -3380,7 +3453,7 @@ function formatInspectHints(context) {
   const unique = Array.from(new Set(hints)).slice(0, 4);
   if (unique.length === 0)
     return [];
-  const ids = context.observations.slice(0, 5).map((obs) => obs.id);
+  const ids = visibleObservationIds.slice(0, 5);
   const fetchHint = ids.length > 0 ? `get_observations([${ids.join(", ")}])` : null;
   return [
     `${c2.dim}Next look:${c2.reset} ${unique.join(" \xB7 ")}`,
@@ -3446,10 +3519,13 @@ function duplicatesPromptLine(request, promptLine) {
   return normalizeStartupItem(request) === normalizeStartupItem(promptBody);
 }
 function buildToolFallbacks(context) {
-  return (context.recentToolEvents ?? []).slice(0, 3).map((tool) => {
+  const fromEvents = (context.recentToolEvents ?? []).slice(0, 3).map((tool) => {
     const detail = tool.file_path ?? tool.command ?? tool.tool_response_preview ?? "";
     return `${tool.tool_name}${detail ? `: ${detail}` : ""}`.trim();
   }).filter((item) => item.length > 0);
+  if (fromEvents.length > 0)
+    return fromEvents;
+  return (context.recentSessions ?? []).flatMap((session) => parseSessionJsonList(session.recent_tool_names)).slice(0, 3).filter((item) => item.length > 0);
 }
 function sessionFallbacksFromContext(context) {
   return (context.recentSessions ?? []).slice(0, 2).map((session) => {
@@ -3475,6 +3551,19 @@ function buildRecentOutcomeLines(context, summary) {
   };
   push(summary?.completed);
   push(summary?.learned);
+  if (picked.length < 2) {
+    for (const session of context.recentSessions ?? []) {
+      for (const item of parseSessionJsonList(session.recent_outcomes)) {
+        const normalized = normalizeStartupItem(item);
+        if (!normalized || seen.has(normalized))
+          continue;
+        seen.add(normalized);
+        picked.push(item);
+        if (picked.length >= 2)
+          return picked;
+      }
+    }
+  }
   if (picked.length < 2) {
     for (const obs of context.observations) {
       if (!["bugfix", "feature", "refactor", "change", "decision"].includes(obs.type))
@@ -3504,6 +3593,16 @@ function chooseMeaningfulSessionSummary(request, completed) {
   }
   return request ?? completed ?? null;
 }
+function parseSessionJsonList(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 buildProjectSignalLine(context) {
   if (!context.projectTypeCounts)
     return null;

package/dist/hooks/stop.js

@@ -237,6 +237,84 @@ function normalizeObservationKey(value) {
   return value.toLowerCase().replace(/\([^)]*\)/g, "").replace(/\b(modified|updated|edited|touched|changed)\b/g, "").replace(/\s+/g, " ").trim();
 }
 
+// src/intelligence/summary-sections.ts
+function extractSummaryItems(section, limit) {
+  if (!section || !section.trim())
+    return [];
+  const rawLines = section.split(`
+`).map((line) => line.replace(/\s+/g, " ").trim()).filter(Boolean);
+  const items = [];
+  const seen = new Set;
+  let heading = null;
+  for (const rawLine of rawLines) {
+    const line = stripSectionPrefix(rawLine);
+    if (!line)
+      continue;
+    const headingOnly = parseHeading(line);
+    if (headingOnly) {
+      heading = headingOnly;
+      continue;
+    }
+    const isBullet = /^[-*•]\s+/.test(line);
+    const stripped = line.replace(/^[-*•]\s+/, "").trim();
+    if (!stripped)
+      continue;
+    const item = heading && isBullet ? `${heading}: ${stripped}` : stripped;
+    const normalized = normalizeItem(item);
+    if (!normalized || seen.has(normalized))
+      continue;
+    seen.add(normalized);
+    items.push(item);
+    if (limit && items.length >= limit)
+      break;
+  }
+  return items;
+}
+function formatSummaryItems(section, maxLen) {
+  const items = extractSummaryItems(section);
+  if (items.length === 0)
+    return null;
+  const cleaned = items.map((item) => `- ${item}`).join(`
+`);
+  if (cleaned.length <= maxLen)
+    return cleaned;
+  const truncated = cleaned.slice(0, maxLen).trimEnd();
+  const lastBreak = Math.max(truncated.lastIndexOf(`
+`), truncated.lastIndexOf(" "));
+  const safe = lastBreak > maxLen * 0.5 ? truncated.slice(0, lastBreak) : truncated;
+  return `${safe.trimEnd()}…`;
+}
+function normalizeSummarySection(section) {
+  const items = extractSummaryItems(section);
+  if (items.length === 0) {
+    const cleaned = section?.replace(/\s+/g, " ").trim() ?? "";
+    return cleaned || null;
+  }
+  return items.map((item) => `- ${item}`).join(`
+`);
+}
+function normalizeSummaryRequest(value) {
+  const cleaned = value?.replace(/\s+/g, " ").trim() ?? "";
+  return cleaned || null;
+}
+function stripSectionPrefix(value) {
+  return value.replace(/^(request|investigated|learned|completed|next steps|summary):\s*/i, "").trim();
+}
+function parseHeading(value) {
+  const boldMatch = value.match(/^\*{1,2}\s*(.+?)\s*:\*{1,2}$/);
+  if (boldMatch?.[1]) {
+    return boldMatch[1].trim().replace(/\s+/g, " ");
+  }
+  const plainMatch = value.match(/^(.+?):$/);
+  if (plainMatch?.[1]) {
+    return plainMatch[1].trim().replace(/\s+/g, " ");
+  }
+  return null;
+}
+function normalizeItem(value) {
+  return value.toLowerCase().replace(/\*+/g, "").replace(/\s+/g, " ").trim();
+}
+
 // src/config.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir, hostname, networkInterfaces } from "node:os";
@@ -805,6 +883,16 @@ var MIGRATIONS = [
         ON tool_events(created_at_epoch DESC, id DESC);
     `
   },
+  {
+    version: 11,
+    description: "Add synced handoff metadata to session summaries",
+    sql: `
+      ALTER TABLE session_summaries ADD COLUMN capture_state TEXT;
+      ALTER TABLE session_summaries ADD COLUMN recent_tool_names TEXT;
+      ALTER TABLE session_summaries ADD COLUMN hot_files TEXT;
+      ALTER TABLE session_summaries ADD COLUMN recent_outcomes TEXT;
+    `
+  },
   {
     version: 11,
     description: "Add observation provenance from tool and prompt chronology",
@@ -953,86 +1041,6 @@ var LATEST_SCHEMA_VERSION = MIGRATIONS.filter((m) => !m.condition).reduce((max,
 
 // src/storage/sqlite.ts
 import { createHash as createHash2 } from "node:crypto";
-
-// src/intelligence/summary-sections.ts
-function extractSummaryItems(section, limit) {
-  if (!section || !section.trim())
-    return [];
-  const rawLines = section.split(`
-`).map((line) => line.replace(/\s+/g, " ").trim()).filter(Boolean);
-  const items = [];
-  const seen = new Set;
-  let heading = null;
-  for (const rawLine of rawLines) {
-    const line = stripSectionPrefix(rawLine);
-    if (!line)
-      continue;
-    const headingOnly = parseHeading(line);
-    if (headingOnly) {
-      heading = headingOnly;
-      continue;
-    }
-    const isBullet = /^[-*•]\s+/.test(line);
-    const stripped = line.replace(/^[-*•]\s+/, "").trim();
-    if (!stripped)
-      continue;
-    const item = heading && isBullet ? `${heading}: ${stripped}` : stripped;
-    const normalized = normalizeItem(item);
-    if (!normalized || seen.has(normalized))
-      continue;
-    seen.add(normalized);
-    items.push(item);
-    if (limit && items.length >= limit)
-      break;
-  }
-  return items;
-}
-function formatSummaryItems(section, maxLen) {
-  const items = extractSummaryItems(section);
-  if (items.length === 0)
-    return null;
-  const cleaned = items.map((item) => `- ${item}`).join(`
-`);
-  if (cleaned.length <= maxLen)
-    return cleaned;
-  const truncated = cleaned.slice(0, maxLen).trimEnd();
-  const lastBreak = Math.max(truncated.lastIndexOf(`
-`), truncated.lastIndexOf(" "));
-  const safe = lastBreak > maxLen * 0.5 ? truncated.slice(0, lastBreak) : truncated;
-  return `${safe.trimEnd()}…`;
-}
-function normalizeSummarySection(section) {
-  const items = extractSummaryItems(section);
-  if (items.length === 0) {
-    const cleaned = section?.replace(/\s+/g, " ").trim() ?? "";
-    return cleaned || null;
-  }
-  return items.map((item) => `- ${item}`).join(`
-`);
-}
-function normalizeSummaryRequest(value) {
-  const cleaned = value?.replace(/\s+/g, " ").trim() ?? "";
-  return cleaned || null;
-}
-function stripSectionPrefix(value) {
-  return value.replace(/^(request|investigated|learned|completed|next steps|summary):\s*/i, "").trim();
-}
-function parseHeading(value) {
-  const boldMatch = value.match(/^\*{1,2}\s*(.+?)\s*:\*{1,2}$/);
-  if (boldMatch?.[1]) {
-    return boldMatch[1].trim().replace(/\s+/g, " ");
-  }
-  const plainMatch = value.match(/^(.+?):$/);
-  if (plainMatch?.[1]) {
-    return plainMatch[1].trim().replace(/\s+/g, " ");
-  }
-  return null;
-}
-function normalizeItem(value) {
-  return value.toLowerCase().replace(/\*+/g, "").replace(/\s+/g, " ").trim();
-}
-
-// src/storage/sqlite.ts
 var IS_BUN = typeof globalThis.Bun !== "undefined";
 function openDatabase(dbPath) {
   if (IS_BUN) {
@@ -1328,6 +1336,10 @@ class MemDatabase {
              p.name AS project_name,
              ss.request AS request,
              ss.completed AS completed,
+             ss.capture_state AS capture_state,
+             ss.recent_tool_names AS recent_tool_names,
+             ss.hot_files AS hot_files,
+             ss.recent_outcomes AS recent_outcomes,
              (SELECT COUNT(*) FROM user_prompts up WHERE up.session_id = s.session_id) AS prompt_count,
              (SELECT COUNT(*) FROM tool_events te WHERE te.session_id = s.session_id) AS tool_event_count
            FROM sessions s
@@ -1342,6 +1354,10 @@ class MemDatabase {
            p.name AS project_name,
            ss.request AS request,
            ss.completed AS completed,
+           ss.capture_state AS capture_state,
+           ss.recent_tool_names AS recent_tool_names,
+           ss.hot_files AS hot_files,
+           ss.recent_outcomes AS recent_outcomes,
            (SELECT COUNT(*) FROM user_prompts up WHERE up.session_id = s.session_id) AS prompt_count,
            (SELECT COUNT(*) FROM tool_events te WHERE te.session_id = s.session_id) AS tool_event_count
          FROM sessions s
@@ -1514,8 +1530,11 @@ class MemDatabase {
       completed: normalizeSummarySection(summary.completed),
       next_steps: normalizeSummarySection(summary.next_steps)
     };
-    const result = this.db.query(`INSERT INTO session_summaries (session_id, project_id, user_id, request, investigated, learned, completed, next_steps, 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, now);
+    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
+        )
+        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);
     const id = Number(result.lastInsertRowid);
     return this.db.query("SELECT * FROM session_summaries WHERE id = ?").get(id);
   }
@@ -1530,7 +1549,11 @@ class MemDatabase {
       investigated: normalizeSummarySection(summary.investigated ?? existing.investigated),
       learned: normalizeSummarySection(summary.learned ?? existing.learned),
       completed: normalizeSummarySection(summary.completed ?? existing.completed),
-      next_steps: normalizeSummarySection(summary.next_steps ?? existing.next_steps)
+      next_steps: normalizeSummarySection(summary.next_steps ?? existing.next_steps),
+      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,
+      recent_outcomes: summary.recent_outcomes ?? existing.recent_outcomes
     };
     this.db.query(`UPDATE session_summaries
          SET project_id = ?,
@@ -1540,8 +1563,12 @@ class MemDatabase {
              learned = ?,
              completed = ?,
              next_steps = ?,
+             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, 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.capture_state, normalized.recent_tool_names, normalized.hot_files, normalized.recent_outcomes, now, summary.session_id);
     return this.getSessionSummary(summary.session_id);
   }
   getSessionSummary(sessionId) {
@@ -2560,7 +2587,7 @@ function buildBeacon(db, config, sessionId, metrics) {
     sentinel_used: valueSignals.security_findings_count > 0,
     risk_score: riskScore,
     stacks_detected: stacks,
-    client_version: "0.4.18",
+    client_version: "0.4.21",
     context_observations_injected: metrics?.contextObsInjected ?? 0,
     context_total_available: metrics?.contextTotalAvailable ?? 0,
     recall_attempts: metrics?.recallAttempts ?? 0,
@@ -3592,7 +3619,9 @@ async function main() {
       if (!existing) {
         const observations = db.getObservationsBySession(event.session_id);
         const session = db.getSessionMetrics(event.session_id);
-        const summary = extractRetrospective(observations, 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);
+        const retrospective = extractRetrospective(observations, event.session_id, session?.project_id ?? null, config.user_id);
+        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);
           db.addToOutbox("summary", row.id);
@@ -3701,6 +3730,85 @@ function buildCheckpointCompleted(checkpoint) {
   return lines.join(`
 `);
 }
+function mergeSessionSummary(base, extra, sessionId, projectId, userId) {
+  if (!base && !extra)
+    return null;
+  return {
+    session_id: sessionId,
+    project_id: projectId,
+    user_id: userId,
+    request: chooseRicherSummaryValue(base?.request ?? null, extra?.request ?? null, true),
+    investigated: chooseRicherSummaryValue(base?.investigated ?? null, extra?.investigated ?? null, false),
+    learned: chooseRicherSummaryValue(base?.learned ?? null, extra?.learned ?? null, false),
+    completed: chooseRicherSummaryValue(base?.completed ?? null, extra?.completed ?? null, false),
+    next_steps: chooseRicherSummaryValue(base?.next_steps ?? null, extra?.next_steps ?? null, false)
+  };
+}
+function chooseRicherSummaryValue(base, extra, isRequest) {
+  const normalizedBase = isRequest ? normalizeSummaryRequest(base) : normalizeSummarySection(base);
+  const normalizedExtra = isRequest ? normalizeSummaryRequest(extra) : normalizeSummarySection(extra);
+  if (!normalizedBase)
+    return normalizedExtra;
+  if (!normalizedExtra)
+    return normalizedBase;
+  if (normalizedExtra.length > normalizedBase.length + 24)
+    return normalizedExtra;
+  if (isRequest && isGenericCheckpointLine(normalizedBase) && !isGenericCheckpointLine(normalizedExtra)) {
+    return normalizedExtra;
+  }
+  return normalizedBase;
+}
+function extractAssistantSummarySections(message) {
+  const compact = message?.replace(/\r/g, "").trim();
+  if (!compact || compact.length < 80)
+    return null;
+  const sections = new Map;
+  let current = null;
+  for (const rawLine of compact.split(`
+`)) {
+    const line = rawLine.trim();
+    if (!line)
+      continue;
+    const heading = parseAssistantSectionHeading(line);
+    if (heading) {
+      current = heading;
+      if (!sections.has(current))
+        sections.set(current, []);
+      continue;
+    }
+    if (!current)
+      continue;
+    if (current === "request" && isGenericCheckpointLine(line))
+      continue;
+    sections.get(current)?.push(line);
+  }
+  const request = normalizeSummaryRequest(sections.get("request")?.join(" ") ?? null);
+  const investigated = normalizeSummarySection(sections.get("investigated")?.join(`
+`) ?? null);
+  const learned = normalizeSummarySection(sections.get("learned")?.join(`
+`) ?? null);
+  const completed = normalizeSummarySection(sections.get("completed")?.join(`
+`) ?? null);
+  const next_steps = normalizeSummarySection(sections.get("next_steps")?.join(`
+`) ?? null);
+  if (!request && !investigated && !learned && !completed && !next_steps)
+    return null;
+  return { request, investigated, learned, completed, next_steps };
+}
+function parseAssistantSectionHeading(value) {
+  const normalized = value.toLowerCase().replace(/\*+/g, "").trim();
+  if (/^request:/.test(normalized))
+    return "request";
+  if (/^investigated:/.test(normalized))
+    return "investigated";
+  if (/^learned:/.test(normalized))
+    return "learned";
+  if (/^completed:/.test(normalized))
+    return "completed";
+  if (/^next steps?:/.test(normalized))
+    return "next_steps";
+  return null;
+}
 function createSessionDigest(db, sessionId, cwd) {
   const observations = db.getObservationsBySession(sessionId);
   if (observations.length < 2)
@@ -3856,9 +3964,13 @@ function extractAssistantCheckpoint(message) {
   };
 }
 function pickAssistantCheckpointTitle(substantiveLines, bulletLines) {
-  const candidates = [...bulletLines, ...substantiveLines].map((line) => line.replace(/^Completed:\s*/i, "").trim()).filter((line) => line.length > 20).filter((line) => !/^Next Steps?:/i.test(line)).filter((line) => !/^Investigated:/i.test(line)).filter((line) => !/^Learned:/i.test(line));
+  const candidates = [...bulletLines, ...substantiveLines].map((line) => line.replace(/^Completed:\s*/i, "").trim()).filter((line) => line.length > 20).filter((line) => !isGenericCheckpointLine(line)).filter((line) => !/^Next Steps?:/i.test(line)).filter((line) => !/^Investigated:/i.test(line)).filter((line) => !/^Learned:/i.test(line));
   return candidates[0] ?? null;
 }
+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";
+}
 function detectUnsavedPlans(message) {
   const hints = [];
   const lower = message.toLowerCase();