engrm 0.4.23 → 0.4.26

package/dist/hooks/session-start.js

@@ -473,6 +473,125 @@ function normalizeItem(value) {
   return value.toLowerCase().replace(/\*+/g, "").replace(/\s+/g, " ").trim();
 }
 
+// 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 [...parseJsonArray(obs.files_modified), ...parseJsonArray(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 parseJsonArray(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/save.ts
 import { relative, isAbsolute } from "node:path";
 
@@ -1136,71 +1255,996 @@ async function saveObservation(db, config, input) {
       }
     } catch {}
   }
-  return {
-    success: true,
-    observation_id: obs.id,
-    quality_score: qualityScore,
-    recall_hint: recallHint,
-    conflict_warning: conflictWarning
-  };
+  return {
+    success: true,
+    observation_id: obs.id,
+    quality_score: qualityScore,
+    recall_hint: recallHint,
+    conflict_warning: conflictWarning
+  };
+}
+function toRelativePath(filePath, projectRoot) {
+  if (!isAbsolute(filePath))
+    return filePath;
+  const rel = relative(projectRoot, filePath);
+  if (rel.startsWith(".."))
+    return filePath;
+  return rel;
+}
+
+// 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 = parseJsonArray2(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 compactLine(chosen) ?? "Current work";
+}
+function buildHandoffNarrative(summary, story, options) {
+  const sections = [];
+  if (summary?.request || story.latest_request) {
+    sections.push(`Request: ${summary?.request ?? story.latest_request}`);
+  }
+  if (summary?.current_thread) {
+    sections.push(`Current thread: ${summary.current_thread}`);
+  }
+  if (summary?.investigated) {
+    sections.push(`Investigated: ${summary.investigated}`);
+  }
+  if (summary?.learned) {
+    sections.push(`Learned: ${summary.learned}`);
+  }
+  if (summary?.completed) {
+    sections.push(`Completed: ${summary.completed}`);
+  }
+  if (summary?.next_steps) {
+    sections.push(`Next Steps: ${summary.next_steps}`);
+  }
+  if (story.recent_outcomes.length > 0) {
+    sections.push(`Recent outcomes:
+${story.recent_outcomes.slice(0, 5).map((item) => `- ${item}`).join(`
+`)}`);
+  }
+  if (story.hot_files.length > 0) {
+    sections.push(`Hot files:
+${story.hot_files.slice(0, 5).map((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}] ${compactLine(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 = parseJsonArray2(obs.concepts);
+  return concepts.includes("handoff") || concepts.includes("session-handoff") || concepts.includes("draft-handoff");
+}
+function parseJsonArray2(value) {
+  if (!value)
+    return [];
+  try {
+    const parsed = JSON.parse(value);
+    return Array.isArray(parsed) ? parsed.filter((item) => typeof item === "string" && item.trim().length > 0) : [];
+  } catch {
+    return [];
+  }
+}
+function compactLine(value) {
+  const trimmed = value?.replace(/\s+/g, " ").trim();
+  if (!trimmed)
+    return null;
+  return trimmed.length > 120 ? `${trimmed.slice(0, 117)}...` : trimmed;
+}
+
+// src/context/inject.ts
+var FRESH_CONTINUITY_WINDOW_DAYS = 3;
+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),
+    ...tokenizeProjectHint(detected.canonical_id)
+  ]);
+  if (hints.size === 0)
+    return false;
+  const haystack = [
+    obs.title,
+    obs.narrative ?? "",
+    obs.facts ?? "",
+    obs.concepts ?? "",
+    obs.files_read ?? "",
+    obs.files_modified ?? "",
+    obs._source_project ?? ""
+  ].join(` 
+ `).toLowerCase();
+  for (const hint of hints) {
+    if (haystack.includes(hint))
+      return true;
+  }
+  return false;
+}
+function estimateTokens(text) {
+  if (!text)
+    return 0;
+  return Math.ceil(text.length / 4);
+}
+function buildSessionContext(db, cwd, options = {}) {
+  const opts = typeof options === "number" ? { maxCount: options } : options;
+  const tokenBudget = opts.tokenBudget ?? 3000;
+  const maxCount = opts.maxCount;
+  const visibilityClause = opts.userId ? " AND (sensitivity != 'personal' OR user_id = ?)" : "";
+  const visibilityParams = opts.userId ? [opts.userId] : [];
+  const detected = detectProject(cwd);
+  const project = db.getProjectByCanonicalId(detected.canonical_id);
+  const projectId = project?.id ?? -1;
+  const isNewProject = !project;
+  const totalActive = isNewProject ? (db.db.query(`SELECT COUNT(*) as c FROM observations
+             WHERE lifecycle IN ('active', 'aging', 'pinned')
+             ${visibilityClause}
+             AND superseded_by IS NULL`).get(...visibilityParams) ?? { c: 0 }).c : (db.db.query(`SELECT COUNT(*) as c FROM observations
+             WHERE project_id = ? AND lifecycle IN ('active', 'aging', 'pinned')
+             ${visibilityClause}
+             AND superseded_by IS NULL`).get(projectId, ...visibilityParams) ?? { c: 0 }).c;
+  const candidateLimit = maxCount ?? 50;
+  let pinned = [];
+  let recent = [];
+  let candidates = [];
+  if (!isNewProject) {
+    const MAX_PINNED = 5;
+    pinned = db.db.query(`SELECT * FROM observations
+         WHERE project_id = ? AND lifecycle = 'pinned'
+         AND superseded_by IS NULL
+         ${visibilityClause}
+         ORDER BY quality DESC, created_at_epoch DESC
+         LIMIT ?`).all(projectId, ...visibilityParams, MAX_PINNED);
+    const MAX_RECENT = 5;
+    recent = db.db.query(`SELECT * FROM observations
+         WHERE project_id = ? AND lifecycle IN ('active', 'aging')
+         AND superseded_by IS NULL
+         ${visibilityClause}
+         ORDER BY created_at_epoch DESC
+         LIMIT ?`).all(projectId, ...visibilityParams, MAX_RECENT);
+    candidates = db.db.query(`SELECT * FROM observations
+         WHERE project_id = ? AND lifecycle IN ('active', 'aging')
+         AND quality >= 0.3
+         AND superseded_by IS NULL
+         ${visibilityClause}
+         ORDER BY quality DESC, created_at_epoch DESC
+         LIMIT ?`).all(projectId, ...visibilityParams, candidateLimit);
+  }
+  let crossProjectCandidates = [];
+  if (opts.scope === "all" || isNewProject) {
+    const crossLimit = isNewProject ? Math.max(30, candidateLimit) : Math.max(10, Math.floor(candidateLimit / 3));
+    const qualityThreshold = isNewProject ? 0.3 : 0.5;
+    const rawCross = isNewProject ? db.db.query(`SELECT * FROM observations
+             WHERE lifecycle IN ('active', 'aging', 'pinned')
+             AND quality >= ?
+             AND superseded_by IS NULL
+             ${visibilityClause}
+             ORDER BY quality DESC, created_at_epoch DESC
+             LIMIT ?`).all(qualityThreshold, ...visibilityParams, crossLimit) : db.db.query(`SELECT * FROM observations
+             WHERE project_id != ? AND lifecycle IN ('active', 'aging')
+             AND quality >= ?
+             AND superseded_by IS NULL
+             ${visibilityClause}
+             ORDER BY quality DESC, created_at_epoch DESC
+             LIMIT ?`).all(projectId, qualityThreshold, ...visibilityParams, crossLimit);
+    const projectNameCache = new Map;
+    crossProjectCandidates = rawCross.map((obs) => {
+      if (!projectNameCache.has(obs.project_id)) {
+        const proj = db.getProjectById(obs.project_id);
+        if (proj)
+          projectNameCache.set(obs.project_id, proj.name);
+      }
+      return { ...obs, _source_project: projectNameCache.get(obs.project_id) };
+    });
+    if (isNewProject) {
+      crossProjectCandidates = crossProjectCandidates.filter((obs) => isObservationRelatedToProject(obs, detected));
+    }
+  }
+  const seenIds = new Set(pinned.map((o) => o.id));
+  const dedupedRecent = recent.filter((o) => {
+    if (seenIds.has(o.id))
+      return false;
+    seenIds.add(o.id);
+    return true;
+  });
+  const deduped = candidates.filter((o) => !seenIds.has(o.id));
+  for (const obs of crossProjectCandidates) {
+    if (!seenIds.has(obs.id)) {
+      seenIds.add(obs.id);
+      deduped.push(obs);
+    }
+  }
+  const nowEpoch = Math.floor(Date.now() / 1000);
+  const sorted = [...deduped].sort((a, b) => {
+    const scoreA = computeObservationPriority(a, nowEpoch);
+    const scoreB = computeObservationPriority(b, nowEpoch);
+    return scoreB - scoreA;
+  });
+  const projectName = project?.name ?? detected.name;
+  const canonicalId = project?.canonical_id ?? detected.canonical_id;
+  if (maxCount !== undefined) {
+    const remaining = Math.max(0, maxCount - pinned.length - dedupedRecent.length);
+    let all = [...pinned, ...dedupedRecent, ...sorted.slice(0, remaining)];
+    const recentPrompts2 = isNewProject ? [] : db.getRecentUserPrompts(projectId, 6, opts.userId);
+    const recentToolEvents2 = isNewProject ? [] : db.getRecentToolEvents(projectId, 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, recentSessions2);
+    const recentHandoffs2 = isNewProject ? [] : getRecentHandoffs(db, {
+      cwd,
+      project_scoped: true,
+      user_id: opts.userId,
+      current_device_id: opts.currentDeviceId,
+      limit: 3
+    }).handoffs;
+    const recentChatMessages2 = !isNewProject && project ? db.getRecentChatMessages(project.id, 4, opts.userId) : [];
+    all = filterAutoLoadedObservationsForContinuity(all, pinned, isNewProject, recentPrompts2, recentToolEvents2, recentSessions2, recentHandoffs2, recentChatMessages2, summariesFromRecentSessions(db, projectId, recentSessions2));
+    return {
+      project_name: projectName,
+      canonical_id: canonicalId,
+      observations: all.map(toContextObservation),
+      session_count: all.length,
+      total_active: totalActive,
+      recentPrompts: recentPrompts2.length > 0 ? recentPrompts2 : undefined,
+      recentToolEvents: recentToolEvents2.length > 0 ? recentToolEvents2 : undefined,
+      recentSessions: recentSessions2.length > 0 ? recentSessions2 : undefined,
+      projectTypeCounts: projectTypeCounts2,
+      recentOutcomes: recentOutcomes2,
+      recentHandoffs: recentHandoffs2.length > 0 ? recentHandoffs2 : undefined,
+      recentChatMessages: recentChatMessages2.length > 0 ? recentChatMessages2 : undefined
+    };
+  }
+  let remainingBudget = tokenBudget - 30;
+  const selected = [];
+  for (const obs of pinned) {
+    const cost = estimateObservationTokens(obs, selected.length);
+    remainingBudget -= cost;
+    selected.push(obs);
+  }
+  for (const obs of dedupedRecent) {
+    const cost = estimateObservationTokens(obs, selected.length);
+    remainingBudget -= cost;
+    selected.push(obs);
+  }
+  for (const obs of sorted) {
+    const cost = estimateObservationTokens(obs, selected.length);
+    if (remainingBudget - cost < 0 && selected.length > 0)
+      break;
+    remainingBudget -= cost;
+    selected.push(obs);
+  }
+  const summaries = isNewProject ? [] : db.getRecentSummaries(projectId, 5);
+  const recentPrompts = isNewProject ? [] : db.getRecentUserPrompts(projectId, 6, opts.userId);
+  const recentToolEvents = isNewProject ? [] : db.getRecentToolEvents(projectId, 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, recentSessions);
+  const recentHandoffs = isNewProject ? [] : getRecentHandoffs(db, {
+    cwd,
+    project_scoped: true,
+    user_id: opts.userId,
+    current_device_id: opts.currentDeviceId,
+    limit: 3
+  }).handoffs;
+  const recentChatMessages = !isNewProject ? db.getRecentChatMessages(projectId, 4, opts.userId) : [];
+  const filteredSelected = filterAutoLoadedObservationsForContinuity(selected, pinned, isNewProject, recentPrompts, recentToolEvents, recentSessions, recentHandoffs, recentChatMessages, summaries);
+  let securityFindings = [];
+  if (!isNewProject) {
+    try {
+      const weekAgo = Math.floor(Date.now() / 1000) - 7 * 86400;
+      securityFindings = db.db.query(`SELECT * FROM security_findings
+           WHERE project_id = ? AND created_at_epoch > ?
+           ORDER BY severity DESC, created_at_epoch DESC
+           LIMIT ?`).all(projectId, weekAgo, 10);
+    } catch {}
+  }
+  let recentProjects;
+  if (isNewProject) {
+    try {
+      const nowEpochSec = Math.floor(Date.now() / 1000);
+      const projectRows = db.db.query(`SELECT p.name, p.canonical_id, p.last_active_epoch,
+                  (SELECT COUNT(*) FROM observations o
+                   WHERE o.project_id = p.id
+                   AND o.lifecycle IN ('active', 'aging', 'pinned')
+                   ${opts.userId ? "AND (o.sensitivity != 'personal' OR o.user_id = ?)" : ""}
+                   AND o.superseded_by IS NULL) as obs_count
+           FROM projects p
+           ORDER BY p.last_active_epoch DESC
+           LIMIT 10`).all(...visibilityParams);
+      if (projectRows.length > 0) {
+        recentProjects = projectRows.map((r) => {
+          const daysAgo = Math.max(0, Math.floor((nowEpochSec - r.last_active_epoch) / 86400));
+          const lastActive = new Date(r.last_active_epoch * 1000).toISOString().split("T")[0];
+          return {
+            name: r.name,
+            canonical_id: r.canonical_id,
+            observation_count: r.obs_count,
+            last_active: lastActive,
+            days_ago: daysAgo
+          };
+        });
+      }
+    } catch {}
+  }
+  let staleDecisions;
+  try {
+    const stale = isNewProject ? findStaleDecisionsGlobal(db) : findStaleDecisions(db, projectId);
+    if (stale.length > 0)
+      staleDecisions = stale;
+  } catch {}
+  return {
+    project_name: projectName,
+    canonical_id: canonicalId,
+    observations: filteredSelected.map(toContextObservation),
+    session_count: filteredSelected.length,
+    total_active: totalActive,
+    summaries: summaries.length > 0 ? summaries : undefined,
+    securityFindings: securityFindings.length > 0 ? securityFindings : undefined,
+    recentProjects,
+    staleDecisions,
+    recentPrompts: recentPrompts.length > 0 ? recentPrompts : undefined,
+    recentToolEvents: recentToolEvents.length > 0 ? recentToolEvents : undefined,
+    recentSessions: recentSessions.length > 0 ? recentSessions : undefined,
+    projectTypeCounts,
+    recentOutcomes,
+    recentHandoffs: recentHandoffs.length > 0 ? recentHandoffs : undefined,
+    recentChatMessages: recentChatMessages.length > 0 ? recentChatMessages : undefined
+  };
+}
+function filterAutoLoadedObservationsForContinuity(observations, pinned, isNewProject, recentPrompts, recentToolEvents, recentSessions, recentHandoffs, recentChatMessages, summaries) {
+  if (isNewProject)
+    return observations;
+  if (hasFreshProjectContinuity(recentPrompts, recentToolEvents, recentSessions, recentHandoffs, recentChatMessages, summaries)) {
+    return observations;
+  }
+  const pinnedIds = new Set(pinned.map((obs) => obs.id));
+  return observations.filter((obs) => {
+    if (pinnedIds.has(obs.id))
+      return true;
+    return observationAgeDays(obs.created_at_epoch) <= FRESH_CONTINUITY_WINDOW_DAYS;
+  });
+}
+function hasFreshProjectContinuity(recentPrompts, recentToolEvents, recentSessions, recentHandoffs, recentChatMessages, summaries) {
+  const freshEnough = (epoch) => typeof epoch === "number" && observationAgeDays(epoch) <= FRESH_CONTINUITY_WINDOW_DAYS;
+  return recentPrompts.some((item) => freshEnough(item.created_at_epoch)) || recentToolEvents.some((item) => freshEnough(item.created_at_epoch)) || recentSessions.some((item) => freshEnough(item.completed_at_epoch ?? item.started_at_epoch)) || recentHandoffs.some((item) => freshEnough(item.created_at_epoch)) || recentChatMessages.some((item) => freshEnough(item.created_at_epoch)) || summaries.some((item) => freshEnough(item.created_at_epoch));
+}
+function summariesFromRecentSessions(db, projectId, recentSessions) {
+  const seen = new Set;
+  const rows = [];
+  for (const session of recentSessions) {
+    if (seen.has(session.session_id))
+      continue;
+    seen.add(session.session_id);
+    const summary = db.getSessionSummary(session.session_id);
+    if (summary && summary.project_id === projectId)
+      rows.push(summary);
+  }
+  return rows;
+}
+function observationAgeDays(createdAtEpoch) {
+  return Math.max(0, (Math.floor(Date.now() / 1000) - createdAtEpoch) / 86400);
+}
+function estimateObservationTokens(obs, index) {
+  const DETAILED_THRESHOLD = 5;
+  const titleCost = estimateTokens(`- **[${obs.type}]** ${obs.title} (2026-01-01, q=0.5)`);
+  if (index >= DETAILED_THRESHOLD) {
+    return titleCost;
+  }
+  const detailText = formatObservationDetail(obs);
+  return titleCost + estimateTokens(detailText);
+}
+function formatContextForInjection(context) {
+  if (context.observations.length === 0 && (!context.recentPrompts || context.recentPrompts.length === 0) && (!context.recentToolEvents || context.recentToolEvents.length === 0) && (!context.recentSessions || context.recentSessions.length === 0) && (!context.projectTypeCounts || Object.keys(context.projectTypeCounts).length === 0)) {
+    return `Project: ${context.project_name} (no prior observations)`;
+  }
+  const DETAILED_COUNT = 5;
+  const isCrossProject = context.recentProjects && context.recentProjects.length > 0;
+  const lines = [];
+  if (isCrossProject) {
+    lines.push(`## Engrm Memory — Workspace Overview`);
+    lines.push(`This is a new project folder. Here is context from your recent work:`);
+    lines.push("");
+    lines.push("**Active projects in memory:**");
+    for (const rp of context.recentProjects) {
+      const activity = rp.days_ago === 0 ? "today" : rp.days_ago === 1 ? "yesterday" : `${rp.days_ago}d ago`;
+      lines.push(`- **${rp.name}** — ${rp.observation_count} observations, last active ${activity}`);
+    }
+    lines.push("");
+    lines.push(`${context.session_count} relevant observation(s) from across projects:`);
+    lines.push("");
+  } else {
+    lines.push(`## Project Memory: ${context.project_name}`);
+    lines.push(`${context.session_count} relevant observation(s) from prior sessions:`);
+    lines.push("");
+  }
+  if (context.recentHandoffs && context.recentHandoffs.length > 0) {
+    lines.push("## Recent Handoffs");
+    for (const handoff of context.recentHandoffs.slice(0, 3)) {
+      const title = handoff.title.replace(/^Handoff(?: Draft)?:\s*/i, "").replace(/\s+·\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}Z$/, "").trim();
+      if (title) {
+        lines.push(`- ${truncateText(`${title} (${formatHandoffSource(handoff)})`, 160)}`);
+      }
+      const narrative = handoff.narrative?.split(/\n{2,}/).map((part) => part.replace(/\s+/g, " ").trim()).find((part) => /^(Current thread:|Completed:|Next Steps:)/i.test(part));
+      if (narrative) {
+        lines.push(`  ${truncateText(narrative, 180)}`);
+      }
+    }
+    lines.push("");
+  }
+  if (context.recentChatMessages && context.recentChatMessages.length > 0) {
+    lines.push("## Recent Chat");
+    for (const message of context.recentChatMessages.slice(0, 4).reverse()) {
+      lines.push(`- [${message.role}] ${truncateText(message.content.replace(/\s+/g, " ").trim(), 160)}`);
+    }
+    lines.push("");
+  }
+  if (context.recentPrompts && context.recentPrompts.length > 0) {
+    const promptLines = context.recentPrompts.filter((prompt) => isMeaningfulPrompt(prompt.prompt)).slice(0, 5);
+    if (promptLines.length > 0) {
+      lines.push("## Recent Requests");
+      for (const prompt of promptLines) {
+        const label = prompt.prompt_number > 0 ? `#${prompt.prompt_number}` : new Date(prompt.created_at_epoch * 1000).toISOString().split("T")[0];
+        lines.push(`- ${label}: ${truncateText(prompt.prompt.replace(/\s+/g, " "), 160)}`);
+      }
+      lines.push("");
+    }
+  }
+  if (context.recentToolEvents && context.recentToolEvents.length > 0) {
+    lines.push("## Recent Tools");
+    for (const tool of context.recentToolEvents.slice(0, 5)) {
+      lines.push(`- ${tool.tool_name}: ${formatToolEventDetail(tool)}`);
+    }
+    lines.push("");
+  }
+  if (context.recentSessions && context.recentSessions.length > 0) {
+    const recentSessionLines = context.recentSessions.slice(0, 4).map((session) => {
+      const summary = chooseMeaningfulSessionHeadline(session.request, session.completed);
+      if (summary === "(no summary)")
+        return null;
+      return `- ${session.session_id}: ${truncateText(summary.replace(/\s+/g, " "), 140)} ` + `(prompts ${session.prompt_count}, tools ${session.tool_event_count}, obs ${session.observation_count})`;
+    }).filter((line) => Boolean(line));
+    if (recentSessionLines.length > 0) {
+      lines.push("## Recent Sessions");
+      lines.push(...recentSessionLines);
+      lines.push("");
+    }
+  }
+  if (context.recentOutcomes && context.recentOutcomes.length > 0) {
+    lines.push("## Recent Outcomes");
+    for (const outcome of context.recentOutcomes.slice(0, 5)) {
+      lines.push(`- ${truncateText(outcome, 160)}`);
+    }
+    lines.push("");
+  }
+  if (context.projectTypeCounts && Object.keys(context.projectTypeCounts).length > 0) {
+    const topTypes = Object.entries(context.projectTypeCounts).sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).slice(0, 5).map(([type, count]) => `${type} ${count}`).join(" · ");
+    if (topTypes) {
+      lines.push(`## Project Signals`);
+      lines.push(`Top memory types: ${topTypes}`);
+      lines.push("");
+    }
+  }
+  for (let i = 0;i < context.observations.length; i++) {
+    const obs = context.observations[i];
+    const date = obs.created_at.split("T")[0];
+    const fromLabel = obs.source_project ? ` [from: ${obs.source_project}]` : "";
+    const fileLabel = formatObservationFiles(obs);
+    lines.push(`- **#${obs.id} [${obs.type}]** ${obs.title} (${date}, q=${obs.quality.toFixed(1)})${fromLabel}${fileLabel}`);
+    if (i < DETAILED_COUNT) {
+      const detail = formatObservationDetailFromContext(obs);
+      if (detail) {
+        lines.push(detail);
+      }
+    }
+  }
+  if (context.summaries && context.summaries.length > 0) {
+    lines.push("");
+    lines.push("## Recent Project Briefs");
+    for (const summary of context.summaries.slice(0, 3)) {
+      lines.push(...formatSessionBrief(summary));
+      lines.push("");
+    }
+  }
+  if (context.securityFindings && context.securityFindings.length > 0) {
+    lines.push("");
+    lines.push("Security findings (recent):");
+    for (const finding of context.securityFindings) {
+      const date = new Date(finding.created_at_epoch * 1000).toISOString().split("T")[0];
+      const file = finding.file_path ? ` in ${finding.file_path}` : finding.tool_name ? ` via ${finding.tool_name}` : "";
+      lines.push(`- [${finding.severity.toUpperCase()}] ${finding.pattern_name}${file} (${date})`);
+    }
+  }
+  if (context.staleDecisions && context.staleDecisions.length > 0) {
+    lines.push("");
+    lines.push("Stale commitments (decided but no implementation observed):");
+    for (const sd of context.staleDecisions) {
+      const date = sd.created_at.split("T")[0];
+      lines.push(`- [DECISION] ${sd.title} (${date}, ${sd.days_ago}d ago)`);
+      if (sd.best_match_title) {
+        lines.push(`  Closest match: "${sd.best_match_title}" (${Math.round((sd.best_match_similarity ?? 0) * 100)}% similar — not enough to count as done)`);
+      }
+    }
+  }
+  const remaining = context.total_active - context.session_count;
+  if (remaining > 0) {
+    lines.push("");
+    lines.push(`${remaining} more observation(s) available via search tool.`);
+  }
+  return lines.join(`
+`);
+}
+function formatSessionBrief(summary) {
+  const lines = [];
+  const heading = summary.request ? `### ${truncateText(summary.request, 120)}` : `### Session ${summary.session_id.slice(0, 8)}`;
+  lines.push(heading);
+  const sections = [
+    ["Investigated", summary.investigated, 180],
+    ["Learned", summary.learned, 180],
+    ["Completed", summary.completed, 180],
+    ["Next Steps", summary.next_steps, 140]
+  ];
+  for (const [label, value, maxLen] of sections) {
+    const formatted = formatSummarySection(value, maxLen);
+    if (formatted) {
+      lines.push(`${label}:`);
+      lines.push(formatted);
+    }
+  }
+  return lines;
+}
+function chooseMeaningfulSessionHeadline(request, completed) {
+  if (request && !looksLikeFileOperationTitle2(request))
+    return request;
+  const completedItems = extractMeaningfulLines(completed, 1);
+  if (completedItems.length > 0)
+    return completedItems[0];
+  return request ?? completed ?? "(no summary)";
+}
+function formatSummarySection(value, maxLen) {
+  return formatSummaryItems(value, maxLen);
+}
+function truncateText(text, maxLen) {
+  if (text.length <= maxLen)
+    return text;
+  return text.slice(0, maxLen - 3) + "...";
+}
+function isMeaningfulPrompt(value) {
+  if (!value)
+    return false;
+  const compact = value.replace(/\s+/g, " ").trim();
+  if (compact.length < 8)
+    return false;
+  return /[a-z]{3,}/i.test(compact);
+}
+function looksLikeFileOperationTitle2(value) {
+  return /^(modified|updated|edited|touched|changed|extended|refactored|redesigned)\s+[A-Za-z0-9_.\-\/]+(?:\s*\([^)]*\))?$/i.test(value.trim());
+}
+function stripInlineSectionLabel(value) {
+  return value.replace(/^(request|investigated|learned|completed|next steps|digest|summary):\s*/i, "").trim();
+}
+function extractMeaningfulLines(value, limit) {
+  if (!value)
+    return [];
+  return extractSummaryItems(value).map((line) => stripInlineSectionLabel(line)).filter((line) => line.length > 0 && !looksLikeFileOperationTitle2(line)).slice(0, limit);
+}
+function formatObservationDetailFromContext(obs) {
+  if (obs.facts) {
+    const bullets = parseFacts(obs.facts);
+    if (bullets.length > 0) {
+      return bullets.slice(0, 4).map((f) => `  - ${f}`).join(`
+`);
+    }
+  }
+  if (obs.narrative) {
+    const snippet = obs.narrative.length > 120 ? obs.narrative.slice(0, 117) + "..." : obs.narrative;
+    return `  ${snippet}`;
+  }
+  return null;
+}
+function formatObservationDetail(obs) {
+  if (obs.facts) {
+    const bullets = parseFacts(obs.facts);
+    if (bullets.length > 0) {
+      return bullets.slice(0, 4).map((f) => `  - ${f}`).join(`
+`);
+    }
+  }
+  if (obs.narrative) {
+    const snippet = obs.narrative.length > 120 ? obs.narrative.slice(0, 117) + "..." : obs.narrative;
+    return `  ${snippet}`;
+  }
+  return "";
+}
+function parseFacts(facts) {
+  if (!facts)
+    return [];
+  try {
+    const parsed = JSON.parse(facts);
+    if (Array.isArray(parsed)) {
+      return parsed.filter((f) => typeof f === "string" && f.length > 0);
+    }
+  } catch {
+    if (facts.trim().length > 0) {
+      return [facts.trim()];
+    }
+  }
+  return [];
+}
+function toContextObservation(obs) {
+  return {
+    id: obs.id,
+    type: obs.type,
+    title: obs.title,
+    narrative: obs.narrative,
+    facts: obs.facts,
+    files_read: obs.files_read,
+    files_modified: obs.files_modified,
+    quality: obs.quality,
+    created_at: obs.created_at,
+    ...obs._source_project ? { source_project: obs._source_project } : {}
+  };
+}
+function formatObservationFiles(obs) {
+  const modified = parseJsonStringArray(obs.files_modified);
+  if (modified.length > 0) {
+    return ` · files: ${truncateText(modified.slice(0, 2).join(", "), 60)}`;
+  }
+  const read = parseJsonStringArray(obs.files_read);
+  if (read.length > 0) {
+    return ` · read: ${truncateText(read.slice(0, 2).join(", "), 60)}`;
+  }
+  return "";
+}
+function parseJsonStringArray(value) {
+  if (!value)
+    return [];
+  try {
+    const parsed = JSON.parse(value);
+    if (!Array.isArray(parsed))
+      return [];
+    return parsed.filter((item) => typeof item === "string" && item.trim().length > 0);
+  } catch {
+    return [];
+  }
 }
-function toRelativePath(filePath, projectRoot) {
-  if (!isAbsolute(filePath))
-    return filePath;
-  const rel = relative(projectRoot, filePath);
-  if (rel.startsWith(".."))
-    return filePath;
-  return rel;
+function formatToolEventDetail(tool) {
+  const detail = tool.file_path ?? tool.command ?? tool.tool_response_preview ?? "";
+  return truncateText(detail || "recent tool execution", 160);
 }
-
-// src/tools/handoffs.ts
-function getRecentHandoffs(db, input) {
-  const limit = Math.max(1, Math.min(input.limit ?? 10, 25));
-  const projectScoped = input.project_scoped !== false;
-  let projectId = null;
-  let projectName;
-  if (projectScoped) {
-    const cwd = input.cwd ?? process.cwd();
-    const detected = detectProject(cwd);
-    const project = db.getProjectByCanonicalId(detected.canonical_id);
-    if (project) {
-      projectId = project.id;
-      projectName = project.name;
+function getProjectTypeCounts(db, projectId, userId) {
+  const visibilityClause = userId ? " AND (sensitivity != 'personal' OR user_id = ?)" : "";
+  const rows = db.db.query(`SELECT type, COUNT(*) as count
+       FROM observations
+       WHERE project_id = ?
+         AND lifecycle IN ('active', 'aging', 'pinned')
+         AND superseded_by IS NULL
+         ${visibilityClause}
+       GROUP BY type`).all(projectId, ...userId ? [userId] : []);
+  const counts = {};
+  for (const row of rows) {
+    counts[row.type] = row.count;
+  }
+  return counts;
+}
+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
+       WHERE project_id = ?
+       ORDER BY created_at_epoch DESC
+       LIMIT 6`).all(projectId);
+  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)
+    ]) {
+      const normalized = line.toLowerCase().replace(/\s+/g, " ").trim();
+      if (!normalized || seen.has(normalized))
+        continue;
+      seen.add(normalized);
+      picked.push(line);
+      if (picked.length >= 5)
+        return picked;
     }
   }
-  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);
+  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;
+    }
   }
-  if (projectId !== null) {
-    conditions.push("o.project_id = ?");
-    params.push(projectId);
+  const rows = db.db.query(`SELECT * FROM observations
+       WHERE project_id = ?
+         AND lifecycle IN ('active', 'aging', 'pinned')
+         AND superseded_by IS NULL
+         ${visibilityClause}
+       ORDER BY created_at_epoch DESC
+       LIMIT 20`).all(projectId, ...visibilityParams);
+  for (const obs of rows) {
+    if (!["bugfix", "feature", "refactor", "change", "decision"].includes(obs.type))
+      continue;
+    const title = stripInlineSectionLabel(obs.title);
+    const normalized = title.toLowerCase().replace(/\s+/g, " ").trim();
+    if (!normalized || seen.has(normalized) || looksLikeFileOperationTitle2(title))
+      continue;
+    seen.add(normalized);
+    picked.push(title);
+    if (picked.length >= 5)
+      break;
   }
-  params.push(limit);
-  const handoffs = db.db.query(`SELECT o.*, p.name AS project_name
-       FROM observations o
-       LEFT JOIN projects p ON p.id = o.project_id
-       WHERE ${conditions.join(" AND ")}
-       ORDER BY o.created_at_epoch DESC, o.id DESC
-       LIMIT ?`).all(...params);
-  return {
-    handoffs,
-    project: projectName
-  };
+  return picked;
+}
+
+// src/tools/handoffs.ts
+function formatHandoffSource2(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}`;
 }
 
 // src/context/inject.ts
-function tokenizeProjectHint(text) {
+var FRESH_CONTINUITY_WINDOW_DAYS2 = 3;
+function tokenizeProjectHint2(text) {
   return Array.from(new Set((text.toLowerCase().match(/[a-z0-9_+-]{4,}/g) ?? []).filter(Boolean)));
 }
-function parseSummaryJsonList(value) {
+function parseSummaryJsonList2(value) {
   if (!value)
     return [];
   try {
@@ -1210,10 +2254,10 @@ function parseSummaryJsonList(value) {
     return [];
   }
 }
-function isObservationRelatedToProject(obs, detected) {
+function isObservationRelatedToProject2(obs, detected) {
   const hints = new Set([
-    ...tokenizeProjectHint(detected.name),
-    ...tokenizeProjectHint(detected.canonical_id)
+    ...tokenizeProjectHint2(detected.name),
+    ...tokenizeProjectHint2(detected.canonical_id)
   ]);
   if (hints.size === 0)
     return false;
@@ -1233,12 +2277,12 @@ function isObservationRelatedToProject(obs, detected) {
   }
   return false;
 }
-function estimateTokens(text) {
+function estimateTokens2(text) {
   if (!text)
     return 0;
   return Math.ceil(text.length / 4);
 }
-function buildSessionContext(db, cwd, options = {}) {
+function buildSessionContext2(db, cwd, options = {}) {
   const opts = typeof options === "number" ? { maxCount: options } : options;
   const tokenBudget = opts.tokenBudget ?? 3000;
   const maxCount = opts.maxCount;
@@ -1309,7 +2353,7 @@ function buildSessionContext(db, cwd, options = {}) {
       return { ...obs, _source_project: projectNameCache.get(obs.project_id) };
     });
     if (isNewProject) {
-      crossProjectCandidates = crossProjectCandidates.filter((obs) => isObservationRelatedToProject(obs, detected));
+      crossProjectCandidates = crossProjectCandidates.filter((obs) => isObservationRelatedToProject2(obs, detected));
     }
   }
   const seenIds = new Set(pinned.map((o) => o.id));
@@ -1336,22 +2380,25 @@ function buildSessionContext(db, cwd, options = {}) {
   const canonicalId = project?.canonical_id ?? detected.canonical_id;
   if (maxCount !== undefined) {
     const remaining = Math.max(0, maxCount - pinned.length - dedupedRecent.length);
-    const all = [...pinned, ...dedupedRecent, ...sorted.slice(0, remaining)];
-    const recentPrompts2 = db.getRecentUserPrompts(isNewProject ? null : projectId, isNewProject ? 8 : 6, opts.userId);
-    const recentToolEvents2 = db.getRecentToolEvents(isNewProject ? null : projectId, isNewProject ? 8 : 6, opts.userId);
+    let all = [...pinned, ...dedupedRecent, ...sorted.slice(0, remaining)];
+    const recentPrompts2 = isNewProject ? [] : db.getRecentUserPrompts(projectId, 6, opts.userId);
+    const recentToolEvents2 = isNewProject ? [] : db.getRecentToolEvents(projectId, 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, recentSessions2);
-    const recentHandoffs2 = getRecentHandoffs(db, {
+    const projectTypeCounts2 = isNewProject ? undefined : getProjectTypeCounts2(db, projectId, opts.userId);
+    const recentOutcomes2 = isNewProject ? undefined : getRecentOutcomes2(db, projectId, opts.userId, recentSessions2);
+    const recentHandoffs2 = isNewProject ? [] : getRecentHandoffs(db, {
       cwd,
-      project_scoped: !isNewProject,
+      project_scoped: true,
       user_id: opts.userId,
+      current_device_id: opts.currentDeviceId,
       limit: 3
     }).handoffs;
+    const recentChatMessages2 = !isNewProject && project ? db.getRecentChatMessages(project.id, 4, opts.userId) : [];
+    all = filterAutoLoadedObservationsForContinuity2(all, pinned, isNewProject, recentPrompts2, recentToolEvents2, recentSessions2, recentHandoffs2, recentChatMessages2, summariesFromRecentSessions2(db, projectId, recentSessions2));
     return {
       project_name: projectName,
       canonical_id: canonicalId,
-      observations: all.map(toContextObservation),
+      observations: all.map(toContextObservation2),
       session_count: all.length,
       total_active: totalActive,
       recentPrompts: recentPrompts2.length > 0 ? recentPrompts2 : undefined,
@@ -1359,40 +2406,44 @@ function buildSessionContext(db, cwd, options = {}) {
       recentSessions: recentSessions2.length > 0 ? recentSessions2 : undefined,
       projectTypeCounts: projectTypeCounts2,
       recentOutcomes: recentOutcomes2,
-      recentHandoffs: recentHandoffs2.length > 0 ? recentHandoffs2 : undefined
+      recentHandoffs: recentHandoffs2.length > 0 ? recentHandoffs2 : undefined,
+      recentChatMessages: recentChatMessages2.length > 0 ? recentChatMessages2 : undefined
     };
   }
   let remainingBudget = tokenBudget - 30;
   const selected = [];
   for (const obs of pinned) {
-    const cost = estimateObservationTokens(obs, selected.length);
+    const cost = estimateObservationTokens2(obs, selected.length);
     remainingBudget -= cost;
     selected.push(obs);
   }
   for (const obs of dedupedRecent) {
-    const cost = estimateObservationTokens(obs, selected.length);
+    const cost = estimateObservationTokens2(obs, selected.length);
     remainingBudget -= cost;
     selected.push(obs);
   }
   for (const obs of sorted) {
-    const cost = estimateObservationTokens(obs, selected.length);
+    const cost = estimateObservationTokens2(obs, selected.length);
     if (remainingBudget - cost < 0 && selected.length > 0)
       break;
     remainingBudget -= cost;
     selected.push(obs);
   }
   const summaries = isNewProject ? [] : db.getRecentSummaries(projectId, 5);
-  const recentPrompts = db.getRecentUserPrompts(isNewProject ? null : projectId, isNewProject ? 8 : 6, opts.userId);
-  const recentToolEvents = db.getRecentToolEvents(isNewProject ? null : projectId, isNewProject ? 8 : 6, opts.userId);
+  const recentPrompts = isNewProject ? [] : db.getRecentUserPrompts(projectId, 6, opts.userId);
+  const recentToolEvents = isNewProject ? [] : db.getRecentToolEvents(projectId, 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, recentSessions);
-  const recentHandoffs = getRecentHandoffs(db, {
+  const projectTypeCounts = isNewProject ? undefined : getProjectTypeCounts2(db, projectId, opts.userId);
+  const recentOutcomes = isNewProject ? undefined : getRecentOutcomes2(db, projectId, opts.userId, recentSessions);
+  const recentHandoffs = isNewProject ? [] : getRecentHandoffs(db, {
     cwd,
-    project_scoped: !isNewProject,
+    project_scoped: true,
     user_id: opts.userId,
+    current_device_id: opts.currentDeviceId,
     limit: 3
   }).handoffs;
+  const recentChatMessages = !isNewProject ? db.getRecentChatMessages(projectId, 4, opts.userId) : [];
+  const filteredSelected = filterAutoLoadedObservationsForContinuity2(selected, pinned, isNewProject, recentPrompts, recentToolEvents, recentSessions, recentHandoffs, recentChatMessages, summaries);
   let securityFindings = [];
   if (!isNewProject) {
     try {
@@ -1440,8 +2491,8 @@ function buildSessionContext(db, cwd, options = {}) {
   return {
     project_name: projectName,
     canonical_id: canonicalId,
-    observations: selected.map(toContextObservation),
-    session_count: selected.length,
+    observations: filteredSelected.map(toContextObservation2),
+    session_count: filteredSelected.length,
     total_active: totalActive,
     summaries: summaries.length > 0 ? summaries : undefined,
     securityFindings: securityFindings.length > 0 ? securityFindings : undefined,
@@ -1452,19 +2503,53 @@ function buildSessionContext(db, cwd, options = {}) {
     recentSessions: recentSessions.length > 0 ? recentSessions : undefined,
     projectTypeCounts,
     recentOutcomes,
-    recentHandoffs: recentHandoffs.length > 0 ? recentHandoffs : undefined
+    recentHandoffs: recentHandoffs.length > 0 ? recentHandoffs : undefined,
+    recentChatMessages: recentChatMessages.length > 0 ? recentChatMessages : undefined
   };
 }
-function estimateObservationTokens(obs, index) {
+function filterAutoLoadedObservationsForContinuity2(observations, pinned, isNewProject, recentPrompts, recentToolEvents, recentSessions, recentHandoffs, recentChatMessages, summaries) {
+  if (isNewProject)
+    return observations;
+  if (hasFreshProjectContinuity2(recentPrompts, recentToolEvents, recentSessions, recentHandoffs, recentChatMessages, summaries)) {
+    return observations;
+  }
+  const pinnedIds = new Set(pinned.map((obs) => obs.id));
+  return observations.filter((obs) => {
+    if (pinnedIds.has(obs.id))
+      return true;
+    return observationAgeDays2(obs.created_at_epoch) <= FRESH_CONTINUITY_WINDOW_DAYS2;
+  });
+}
+function hasFreshProjectContinuity2(recentPrompts, recentToolEvents, recentSessions, recentHandoffs, recentChatMessages, summaries) {
+  const freshEnough = (epoch) => typeof epoch === "number" && observationAgeDays2(epoch) <= FRESH_CONTINUITY_WINDOW_DAYS2;
+  return recentPrompts.some((item) => freshEnough(item.created_at_epoch)) || recentToolEvents.some((item) => freshEnough(item.created_at_epoch)) || recentSessions.some((item) => freshEnough(item.completed_at_epoch ?? item.started_at_epoch)) || recentHandoffs.some((item) => freshEnough(item.created_at_epoch)) || recentChatMessages.some((item) => freshEnough(item.created_at_epoch)) || summaries.some((item) => freshEnough(item.created_at_epoch));
+}
+function summariesFromRecentSessions2(db, projectId, recentSessions) {
+  const seen = new Set;
+  const rows = [];
+  for (const session of recentSessions) {
+    if (seen.has(session.session_id))
+      continue;
+    seen.add(session.session_id);
+    const summary = db.getSessionSummary(session.session_id);
+    if (summary && summary.project_id === projectId)
+      rows.push(summary);
+  }
+  return rows;
+}
+function observationAgeDays2(createdAtEpoch) {
+  return Math.max(0, (Math.floor(Date.now() / 1000) - createdAtEpoch) / 86400);
+}
+function estimateObservationTokens2(obs, index) {
   const DETAILED_THRESHOLD = 5;
-  const titleCost = estimateTokens(`- **[${obs.type}]** ${obs.title} (2026-01-01, q=0.5)`);
+  const titleCost = estimateTokens2(`- **[${obs.type}]** ${obs.title} (2026-01-01, q=0.5)`);
   if (index >= DETAILED_THRESHOLD) {
     return titleCost;
   }
-  const detailText = formatObservationDetail(obs);
-  return titleCost + estimateTokens(detailText);
+  const detailText = formatObservationDetail2(obs);
+  return titleCost + estimateTokens2(detailText);
 }
-function formatContextForInjection(context) {
+function formatContextForInjection2(context) {
   if (context.observations.length === 0 && (!context.recentPrompts || context.recentPrompts.length === 0) && (!context.recentToolEvents || context.recentToolEvents.length === 0) && (!context.recentSessions || context.recentSessions.length === 0) && (!context.projectTypeCounts || Object.keys(context.projectTypeCounts).length === 0)) {
     return `Project: ${context.project_name} (no prior observations)`;
   }
@@ -1488,13 +2573,34 @@ function formatContextForInjection(context) {
     lines.push(`${context.session_count} relevant observation(s) from prior sessions:`);
     lines.push("");
   }
+  if (context.recentHandoffs && context.recentHandoffs.length > 0) {
+    lines.push("## Recent Handoffs");
+    for (const handoff of context.recentHandoffs.slice(0, 3)) {
+      const title = handoff.title.replace(/^Handoff(?: Draft)?:\s*/i, "").replace(/\s+·\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}Z$/, "").trim();
+      if (title) {
+        lines.push(`- ${truncateText2(`${title} (${formatHandoffSource(handoff)})`, 160)}`);
+      }
+      const narrative = handoff.narrative?.split(/\n{2,}/).map((part) => part.replace(/\s+/g, " ").trim()).find((part) => /^(Current thread:|Completed:|Next Steps:)/i.test(part));
+      if (narrative) {
+        lines.push(`  ${truncateText2(narrative, 180)}`);
+      }
+    }
+    lines.push("");
+  }
+  if (context.recentChatMessages && context.recentChatMessages.length > 0) {
+    lines.push("## Recent Chat");
+    for (const message of context.recentChatMessages.slice(0, 4).reverse()) {
+      lines.push(`- [${message.role}] ${truncateText2(message.content.replace(/\s+/g, " ").trim(), 160)}`);
+    }
+    lines.push("");
+  }
   if (context.recentPrompts && context.recentPrompts.length > 0) {
-    const promptLines = context.recentPrompts.filter((prompt) => isMeaningfulPrompt(prompt.prompt)).slice(0, 5);
+    const promptLines = context.recentPrompts.filter((prompt) => isMeaningfulPrompt2(prompt.prompt)).slice(0, 5);
     if (promptLines.length > 0) {
       lines.push("## Recent Requests");
       for (const prompt of promptLines) {
         const label = prompt.prompt_number > 0 ? `#${prompt.prompt_number}` : new Date(prompt.created_at_epoch * 1000).toISOString().split("T")[0];
-        lines.push(`- ${label}: ${truncateText(prompt.prompt.replace(/\s+/g, " "), 160)}`);
+        lines.push(`- ${label}: ${truncateText2(prompt.prompt.replace(/\s+/g, " "), 160)}`);
       }
       lines.push("");
     }
@@ -1502,16 +2608,16 @@ function formatContextForInjection(context) {
   if (context.recentToolEvents && context.recentToolEvents.length > 0) {
     lines.push("## Recent Tools");
     for (const tool of context.recentToolEvents.slice(0, 5)) {
-      lines.push(`- ${tool.tool_name}: ${formatToolEventDetail(tool)}`);
+      lines.push(`- ${tool.tool_name}: ${formatToolEventDetail2(tool)}`);
     }
     lines.push("");
   }
   if (context.recentSessions && context.recentSessions.length > 0) {
     const recentSessionLines = context.recentSessions.slice(0, 4).map((session) => {
-      const summary = chooseMeaningfulSessionHeadline(session.request, session.completed);
+      const summary = chooseMeaningfulSessionHeadline2(session.request, session.completed);
       if (summary === "(no summary)")
         return null;
-      return `- ${session.session_id}: ${truncateText(summary.replace(/\s+/g, " "), 140)} ` + `(prompts ${session.prompt_count}, tools ${session.tool_event_count}, obs ${session.observation_count})`;
+      return `- ${session.session_id}: ${truncateText2(summary.replace(/\s+/g, " "), 140)} ` + `(prompts ${session.prompt_count}, tools ${session.tool_event_count}, obs ${session.observation_count})`;
     }).filter((line) => Boolean(line));
     if (recentSessionLines.length > 0) {
       lines.push("## Recent Sessions");
@@ -1522,7 +2628,7 @@ function formatContextForInjection(context) {
   if (context.recentOutcomes && context.recentOutcomes.length > 0) {
     lines.push("## Recent Outcomes");
     for (const outcome of context.recentOutcomes.slice(0, 5)) {
-      lines.push(`- ${truncateText(outcome, 160)}`);
+      lines.push(`- ${truncateText2(outcome, 160)}`);
     }
     lines.push("");
   }
@@ -1538,10 +2644,10 @@ function formatContextForInjection(context) {
     const obs = context.observations[i];
     const date = obs.created_at.split("T")[0];
     const fromLabel = obs.source_project ? ` [from: ${obs.source_project}]` : "";
-    const fileLabel = formatObservationFiles(obs);
+    const fileLabel = formatObservationFiles2(obs);
     lines.push(`- **#${obs.id} [${obs.type}]** ${obs.title} (${date}, q=${obs.quality.toFixed(1)})${fromLabel}${fileLabel}`);
     if (i < DETAILED_COUNT) {
-      const detail = formatObservationDetailFromContext(obs);
+      const detail = formatObservationDetailFromContext2(obs);
       if (detail) {
         lines.push(detail);
       }
@@ -1551,7 +2657,7 @@ function formatContextForInjection(context) {
     lines.push("");
     lines.push("## Recent Project Briefs");
     for (const summary of context.summaries.slice(0, 3)) {
-      lines.push(...formatSessionBrief(summary));
+      lines.push(...formatSessionBrief2(summary));
       lines.push("");
     }
   }
@@ -1583,9 +2689,9 @@ function formatContextForInjection(context) {
   return lines.join(`
 `);
 }
-function formatSessionBrief(summary) {
+function formatSessionBrief2(summary) {
   const lines = [];
-  const heading = summary.request ? `### ${truncateText(summary.request, 120)}` : `### Session ${summary.session_id.slice(0, 8)}`;
+  const heading = summary.request ? `### ${truncateText2(summary.request, 120)}` : `### Session ${summary.session_id.slice(0, 8)}`;
   lines.push(heading);
   const sections = [
     ["Investigated", summary.investigated, 180],
@@ -1594,7 +2700,7 @@ function formatSessionBrief(summary) {
     ["Next Steps", summary.next_steps, 140]
   ];
   for (const [label, value, maxLen] of sections) {
-    const formatted = formatSummarySection(value, maxLen);
+    const formatted = formatSummarySection2(value, maxLen);
     if (formatted) {
       lines.push(`${label}:`);
       lines.push(formatted);
@@ -1602,23 +2708,23 @@ function formatSessionBrief(summary) {
   }
   return lines;
 }
-function chooseMeaningfulSessionHeadline(request, completed) {
-  if (request && !looksLikeFileOperationTitle(request))
+function chooseMeaningfulSessionHeadline2(request, completed) {
+  if (request && !looksLikeFileOperationTitle3(request))
     return request;
-  const completedItems = extractMeaningfulLines(completed, 1);
+  const completedItems = extractMeaningfulLines2(completed, 1);
   if (completedItems.length > 0)
     return completedItems[0];
   return request ?? completed ?? "(no summary)";
 }
-function formatSummarySection(value, maxLen) {
+function formatSummarySection2(value, maxLen) {
   return formatSummaryItems(value, maxLen);
 }
-function truncateText(text, maxLen) {
+function truncateText2(text, maxLen) {
   if (text.length <= maxLen)
     return text;
   return text.slice(0, maxLen - 3) + "...";
 }
-function isMeaningfulPrompt(value) {
+function isMeaningfulPrompt2(value) {
   if (!value)
     return false;
   const compact = value.replace(/\s+/g, " ").trim();
@@ -1626,20 +2732,20 @@ function isMeaningfulPrompt(value) {
     return false;
   return /[a-z]{3,}/i.test(compact);
 }
-function looksLikeFileOperationTitle(value) {
+function looksLikeFileOperationTitle3(value) {
   return /^(modified|updated|edited|touched|changed|extended|refactored|redesigned)\s+[A-Za-z0-9_.\-\/]+(?:\s*\([^)]*\))?$/i.test(value.trim());
 }
-function stripInlineSectionLabel(value) {
+function stripInlineSectionLabel2(value) {
   return value.replace(/^(request|investigated|learned|completed|next steps|digest|summary):\s*/i, "").trim();
 }
-function extractMeaningfulLines(value, limit) {
+function extractMeaningfulLines2(value, limit) {
   if (!value)
     return [];
-  return extractSummaryItems(value).map((line) => stripInlineSectionLabel(line)).filter((line) => line.length > 0 && !looksLikeFileOperationTitle(line)).slice(0, limit);
+  return extractSummaryItems(value).map((line) => stripInlineSectionLabel2(line)).filter((line) => line.length > 0 && !looksLikeFileOperationTitle3(line)).slice(0, limit);
 }
-function formatObservationDetailFromContext(obs) {
+function formatObservationDetailFromContext2(obs) {
   if (obs.facts) {
-    const bullets = parseFacts(obs.facts);
+    const bullets = parseFacts2(obs.facts);
     if (bullets.length > 0) {
       return bullets.slice(0, 4).map((f) => `  - ${f}`).join(`
 `);
@@ -1651,9 +2757,9 @@ function formatObservationDetailFromContext(obs) {
   }
   return null;
 }
-function formatObservationDetail(obs) {
+function formatObservationDetail2(obs) {
   if (obs.facts) {
-    const bullets = parseFacts(obs.facts);
+    const bullets = parseFacts2(obs.facts);
     if (bullets.length > 0) {
       return bullets.slice(0, 4).map((f) => `  - ${f}`).join(`
 `);
@@ -1665,7 +2771,7 @@ function formatObservationDetail(obs) {
   }
   return "";
 }
-function parseFacts(facts) {
+function parseFacts2(facts) {
   if (!facts)
     return [];
   try {
@@ -1680,7 +2786,7 @@ function parseFacts(facts) {
   }
   return [];
 }
-function toContextObservation(obs) {
+function toContextObservation2(obs) {
   return {
     id: obs.id,
     type: obs.type,
@@ -1694,18 +2800,18 @@ function toContextObservation(obs) {
     ...obs._source_project ? { source_project: obs._source_project } : {}
   };
 }
-function formatObservationFiles(obs) {
-  const modified = parseJsonStringArray(obs.files_modified);
+function formatObservationFiles2(obs) {
+  const modified = parseJsonStringArray2(obs.files_modified);
   if (modified.length > 0) {
-    return ` · files: ${truncateText(modified.slice(0, 2).join(", "), 60)}`;
+    return ` · files: ${truncateText2(modified.slice(0, 2).join(", "), 60)}`;
   }
-  const read = parseJsonStringArray(obs.files_read);
+  const read = parseJsonStringArray2(obs.files_read);
   if (read.length > 0) {
-    return ` · read: ${truncateText(read.slice(0, 2).join(", "), 60)}`;
+    return ` · read: ${truncateText2(read.slice(0, 2).join(", "), 60)}`;
   }
   return "";
 }
-function parseJsonStringArray(value) {
+function parseJsonStringArray2(value) {
   if (!value)
     return [];
   try {
@@ -1717,11 +2823,11 @@ function parseJsonStringArray(value) {
     return [];
   }
 }
-function formatToolEventDetail(tool) {
+function formatToolEventDetail2(tool) {
   const detail = tool.file_path ?? tool.command ?? tool.tool_response_preview ?? "";
-  return truncateText(detail || "recent tool execution", 160);
+  return truncateText2(detail || "recent tool execution", 160);
 }
-function getProjectTypeCounts(db, projectId, userId) {
+function getProjectTypeCounts2(db, projectId, userId) {
   const visibilityClause = userId ? " AND (sensitivity != 'personal' OR user_id = ?)" : "";
   const rows = db.db.query(`SELECT type, COUNT(*) as count
        FROM observations
@@ -1736,7 +2842,7 @@ function getProjectTypeCounts(db, projectId, userId) {
   }
   return counts;
 }
-function getRecentOutcomes(db, projectId, userId, recentSessions) {
+function getRecentOutcomes2(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
@@ -1746,7 +2852,7 @@ function getRecentOutcomes(db, projectId, userId, recentSessions) {
   const picked = [];
   const seen = new Set;
   for (const summary of summaries) {
-    for (const item of parseSummaryJsonList(summary.recent_outcomes)) {
+    for (const item of parseSummaryJsonList2(summary.recent_outcomes)) {
       const normalized = item.toLowerCase().replace(/\s+/g, " ").trim();
       if (!normalized || seen.has(normalized))
         continue;
@@ -1756,8 +2862,8 @@ function getRecentOutcomes(db, projectId, userId, recentSessions) {
         return picked;
     }
     for (const line of [
-      ...extractMeaningfulLines(summary.completed, 2),
-      ...extractMeaningfulLines(summary.learned, 1)
+      ...extractMeaningfulLines2(summary.completed, 2),
+      ...extractMeaningfulLines2(summary.learned, 1)
     ]) {
       const normalized = line.toLowerCase().replace(/\s+/g, " ").trim();
       if (!normalized || seen.has(normalized))
@@ -1769,7 +2875,7 @@ function getRecentOutcomes(db, projectId, userId, recentSessions) {
     }
   }
   for (const session of recentSessions ?? []) {
-    for (const item of parseSummaryJsonList(session.recent_outcomes)) {
+    for (const item of parseSummaryJsonList2(session.recent_outcomes)) {
       const normalized = item.toLowerCase().replace(/\s+/g, " ").trim();
       if (!normalized || seen.has(normalized))
         continue;
@@ -1789,9 +2895,9 @@ function getRecentOutcomes(db, projectId, userId, recentSessions) {
   for (const obs of rows) {
     if (!["bugfix", "feature", "refactor", "change", "decision"].includes(obs.type))
       continue;
-    const title = stripInlineSectionLabel(obs.title);
+    const title = stripInlineSectionLabel2(obs.title);
     const normalized = title.toLowerCase().replace(/\s+/g, " ").trim();
-    if (!normalized || seen.has(normalized) || looksLikeFileOperationTitle(title))
+    if (!normalized || seen.has(normalized) || looksLikeFileOperationTitle3(title))
       continue;
     seen.add(normalized);
     picked.push(title);
@@ -1801,6 +2907,28 @@ function getRecentOutcomes(db, projectId, userId, recentSessions) {
   return picked;
 }
 
+// src/tools/project-memory-index.ts
+function classifyContinuityState(recentRequestsCount, recentToolsCount, recentHandoffsCount, recentChatCount, recentSessions, recentOutcomesCount) {
+  const hasRaw = recentRequestsCount > 0 || recentToolsCount > 0;
+  const hasResume = recentHandoffsCount > 0 || recentChatCount > 0;
+  const hasSessionThread = recentSessions.length > 0 || recentOutcomesCount > 0;
+  if (hasRaw && (hasResume || hasSessionThread))
+    return "fresh";
+  if (hasRaw || hasResume || hasSessionThread)
+    return "thin";
+  return "cold";
+}
+function describeContinuityState(state) {
+  switch (state) {
+    case "fresh":
+      return "Fresh repo-local continuity is available.";
+    case "thin":
+      return "Only partial continuity is available; recent prompts/chat are safer than older memory.";
+    default:
+      return "No fresh repo-local continuity yet; older memory should be treated cautiously.";
+  }
+}
+
 // src/telemetry/stack-detect.ts
 import { existsSync as existsSync2 } from "node:fs";
 import { join as join2, extname } from "node:path";
@@ -1921,7 +3049,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.23";
+var CLIENT_VERSION = "0.4.26";
 function hashFile(filePath) {
   try {
     if (!existsSync3(filePath))
@@ -2448,7 +3576,9 @@ function mergeRemoteChat(db, config, change, projectId) {
     device_id: (typeof change.metadata?.device_id === "string" ? change.metadata.device_id : null) ?? "remote",
     agent: typeof change.metadata?.agent === "string" ? change.metadata.agent : "unknown",
     created_at_epoch: typeof change.metadata?.created_at_epoch === "number" ? change.metadata.created_at_epoch : undefined,
-    remote_source_id: change.source_id
+    remote_source_id: change.source_id,
+    source_kind: change.metadata?.source_kind === "transcript" ? "transcript" : "hook",
+    transcript_index: typeof change.metadata?.transcript_index === "number" ? change.metadata.transcript_index : null
   });
   return true;
 }
@@ -3101,6 +4231,19 @@ var MIGRATIONS = [
       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;
+    `
   }
 ];
 function isVecExtensionLoaded(db) {
@@ -3171,6 +4314,9 @@ function inferLegacySchemaVersion(db) {
   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) {
@@ -3274,9 +4420,17 @@ function ensureChatMessageColumns(db) {
     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 < 15) {
-    db.exec("PRAGMA user_version = 15");
+  if (current < 17) {
+    db.exec("PRAGMA user_version = 17");
   }
 }
 function ensureSyncOutboxSupportsChatMessages(db) {
@@ -3481,6 +4635,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 [];
@@ -3752,8 +4922,8 @@ class MemDatabase {
     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);
+          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) {
@@ -3765,7 +4935,17 @@ class MemDatabase {
   getSessionChatMessages(sessionId, limit = 50) {
     return this.db.query(`SELECT * FROM chat_messages
          WHERE session_id = ?
-         ORDER BY created_at_epoch ASC, id ASC
+           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) {
@@ -3773,11 +4953,27 @@ class MemDatabase {
     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);
   }
@@ -3788,14 +4984,33 @@ class MemDatabase {
       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)
@@ -4094,7 +5309,8 @@ async function main() {
     const context = buildSessionContext(db, event.cwd, {
       tokenBudget: 800,
       scope: config.search.scope,
-      userId: config.user_id
+      userId: config.user_id,
+      currentDeviceId: config.device_id
     });
     if (context) {
       try {
@@ -4249,10 +5465,12 @@ function formatSplashScreen(data) {
 }
 function formatVisibleStartupBrief(context) {
   const lines = [];
+  const continuityState = getStartupContinuityState(context);
   const latest = pickPrimarySummary(context);
   const observationFallbacks = buildObservationFallbacks(context);
   const promptFallback = buildPromptFallback(context);
   const promptLines = buildPromptLines(context);
+  const recentChatLines = buildRecentChatLines(context);
   const latestPromptLine = promptLines[0] ?? null;
   const currentRequest = latest ? chooseRequest(latest.request, promptFallback ?? sessionFallbacksFromContext(context)[0] ?? observationFallbacks.request) : promptFallback;
   const toolFallbacks = buildToolFallbacks(context);
@@ -4262,6 +5480,7 @@ function formatVisibleStartupBrief(context) {
   const projectSignals = buildProjectSignalLine(context);
   const shownItems = new Set;
   const latestHandoffLines = buildLatestHandoffLines(context);
+  const freshContinuity = hasFreshContinuitySignal(context);
   if (latestHandoffLines.length > 0) {
     lines.push(`${c2.cyan}Latest handoff:${c2.reset}`);
     for (const item of latestHandoffLines) {
@@ -4269,6 +5488,7 @@ function formatVisibleStartupBrief(context) {
       rememberShownItem(shownItems, item);
     }
   }
+  lines.push(`${c2.cyan}Continuity:${c2.reset} ${continuityState} \u2014 ${truncateInline(describeContinuityState(continuityState), 160)}`);
   if (promptLines.length > 0) {
     lines.push(`${c2.cyan}Asked recently:${c2.reset}`);
     for (const item of promptLines) {
@@ -4276,6 +5496,13 @@ function formatVisibleStartupBrief(context) {
       rememberShownItem(shownItems, item);
     }
   }
+  if (promptLines.length === 0 && recentChatLines.length > 0) {
+    lines.push(`${c2.cyan}Chat trail:${c2.reset}`);
+    for (const item of recentChatLines) {
+      lines.push(`  - ${truncateInline(item, 160)}`);
+      rememberShownItem(shownItems, item);
+    }
+  }
   if (latest) {
     const sanitizedNextSteps = sanitizeNextSteps(latest.next_steps, {
       request: currentRequest,
@@ -4353,12 +5580,15 @@ function formatVisibleStartupBrief(context) {
     lines.push(`${c2.cyan}Signal mix:${c2.reset}`);
     lines.push(`  - ${truncateInline(projectSignals, 160)}`);
   }
+  if (!freshContinuity && lines.length > 0 && (promptLines.length > 0 || recentChatLines.length > 0)) {
+    lines.push(`${c2.dim}Fresh repo-local handoff is still thin; recent prompts/chat are more trustworthy than older memory here.${c2.reset}`);
+  }
   const stale = pickRelevantStaleDecision(context, latest);
   if (stale) {
     lines.push(`${c2.yellow}Watch:${c2.reset} ${truncateInline(`Decision still looks unfinished: ${stale.title}`, 170)}`);
   }
   if (lines.length === 0 && context.observations.length > 0) {
-    const top = context.observations.filter((obs) => obs.type !== "digest").filter((obs) => obs.type !== "decision").filter((obs) => !looksLikeFileOperationTitle2(obs.title)).slice(0, 3);
+    const top = context.observations.filter((obs) => obs.type !== "digest").filter((obs) => obs.type !== "decision").filter((obs) => !looksLikeFileOperationTitle4(obs.title)).slice(0, 3);
     for (const obs of top) {
       lines.push(`${c2.cyan}${capitalize(obs.type)}:${c2.reset} ${truncateInline(obs.title, 170)}`);
     }
@@ -4370,9 +5600,9 @@ function buildLatestHandoffLines(context) {
   if (!latest)
     return [];
   const lines = [];
-  const title = latest.title.replace(/^Handoff:\s*/i, "").replace(/\s+\u00B7\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}Z$/, "").trim();
+  const title = latest.title.replace(/^Handoff(?: Draft)?:\s*/i, "").replace(/\s+\u00B7\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}Z$/, "").trim();
   if (title)
-    lines.push(title);
+    lines.push(`${title} (${formatHandoffSource2(latest)})`);
   const narrative = latest.narrative?.split(/\n{2,}/).map((part) => part.replace(/\s+/g, " ").trim()).find((part) => /^(Current thread:|Completed:|Next Steps:)/i.test(part));
   if (narrative) {
     lines.push(narrative.replace(/^(Current thread:|Completed:|Next Steps:)\s*/i, ""));
@@ -4402,6 +5632,9 @@ function formatLegend() {
 }
 function formatContextIndex(context, shownItems) {
   const selected = pickContextIndexObservations(context, shownItems);
+  if (!hasFreshContinuitySignal(context)) {
+    return { lines: [], observationIds: [] };
+  }
   const rows = selected.map((obs) => {
     const icon = observationIcon(obs.type);
     const fileHint = extractPrimaryFileHint(obs);
@@ -4419,19 +5652,29 @@ function formatContextIndex(context, shownItems) {
 }
 function formatInspectHints(context, visibleObservationIds = []) {
   const hints = [];
+  const continuityState = getStartupContinuityState(context);
   if ((context.recentSessions?.length ?? 0) > 0) {
     hints.push("recent_sessions");
     hints.push("session_story");
     hints.push("create_handoff");
   }
-  if ((context.recentPrompts?.length ?? 0) > 0 || (context.recentToolEvents?.length ?? 0) > 0) {
+  if ((context.recentPrompts?.length ?? 0) > 0 || (context.recentToolEvents?.length ?? 0) > 0 || (context.recentChatMessages?.length ?? 0) > 0) {
     hints.push("activity_feed");
   }
   if (context.observations.length > 0) {
     hints.push("memory_console");
   }
-  if ((context.recentSessions?.length ?? 0) > 0) {
+  if ((context.recentHandoffs?.length ?? 0) > 0) {
+    hints.push("load_handoff");
+    hints.push("recent_handoffs");
+  }
+  if ((context.recentChatMessages?.length ?? 0) > 0) {
+    hints.push("recent_chat");
+  }
+  if (continuityState !== "fresh") {
+    hints.push("recent_chat");
     hints.push("recent_handoffs");
+    hints.push("refresh_chat_recall");
   }
   const unique = Array.from(new Set(hints)).slice(0, 4);
   if (unique.length === 0)
@@ -4484,17 +5727,25 @@ function filterAdditiveToolFallbacks(toolFallbacks, shownItems) {
   });
 }
 function buildPromptFallback(context) {
-  const latest = (context.recentPrompts ?? []).find((prompt) => isMeaningfulPrompt2(prompt.prompt));
+  const latest = (context.recentPrompts ?? []).find((prompt) => isMeaningfulPrompt3(prompt.prompt));
   if (!latest?.prompt)
     return null;
   return latest.prompt.replace(/\s+/g, " ").trim();
 }
 function buildPromptLines(context) {
-  return (context.recentPrompts ?? []).filter((prompt) => isMeaningfulPrompt2(prompt.prompt)).slice(0, 2).map((prompt) => {
+  return (context.recentPrompts ?? []).filter((prompt) => isMeaningfulPrompt3(prompt.prompt)).slice(0, 2).map((prompt) => {
     const prefix = prompt.prompt_number > 0 ? `#${prompt.prompt_number}` : "request";
     return `${prefix}: ${prompt.prompt.replace(/\s+/g, " ").trim()}`;
   }).filter((item) => item.length > 0);
 }
+function buildRecentChatLines(context) {
+  return (context.recentChatMessages ?? []).slice(0, 2).map((message) => {
+    const content = message.content.replace(/\s+/g, " ").trim();
+    if (!content)
+      return null;
+    return `[${message.role}] ${content}`;
+  }).filter((item) => Boolean(item));
+}
 function duplicatesPromptLine(request, promptLine) {
   if (!request || !promptLine)
     return false;
@@ -4548,11 +5799,11 @@ function buildRecentOutcomeLines(context, summary) {
     }
   }
   if (picked.length < 2) {
-    for (const obs of context.observations) {
+    for (const obs of getFreshStartupObservations(context)) {
       if (!["bugfix", "feature", "refactor", "change", "decision"].includes(obs.type))
         continue;
-      const title = stripInlineSectionLabel2(obs.title);
-      if (!title || looksLikeFileOperationTitle2(title))
+      const title = stripInlineSectionLabel3(obs.title);
+      if (!title || looksLikeFileOperationTitle4(title))
         continue;
       const normalized = normalizeStartupItem(title);
       if (!normalized || seen.has(normalized))
@@ -4567,26 +5818,29 @@ function buildRecentOutcomeLines(context, summary) {
 }
 function buildCurrentThreadLine(context, summary) {
   const explicit = summary?.current_thread ?? null;
-  if (explicit && !looksLikeFileOperationTitle2(explicit))
+  if (explicit && !looksLikeFileOperationTitle4(explicit))
     return explicit;
   for (const session of context.recentSessions ?? []) {
-    if (session.current_thread && !looksLikeFileOperationTitle2(session.current_thread)) {
+    if (session.current_thread && !looksLikeFileOperationTitle4(session.current_thread)) {
       return session.current_thread;
     }
   }
   const request = buildPromptFallback(context);
   const outcome = buildRecentOutcomeLines(context, summary)[0] ?? null;
   const tool = buildToolFallbacks(context)[0] ?? null;
+  const hasContinuity = hasFreshContinuitySignal(context);
   if (outcome && tool)
     return `${outcome} \xB7 ${tool}`;
+  if (!hasContinuity && !outcome)
+    return request;
   return outcome ?? request ?? null;
 }
 function chooseMeaningfulSessionSummary(request, completed) {
-  if (request && !looksLikeFileOperationTitle2(request))
+  if (request && !looksLikeFileOperationTitle4(request))
     return request;
   if (completed) {
     const lines = completed.split(`
-`).map((line) => line.trim().replace(/^[-*]\s*/, "")).filter(Boolean).map((line) => stripInlineSectionLabel2(line)).filter((line) => !looksLikeFileOperationTitle2(line));
+`).map((line) => line.trim().replace(/^[-*]\s*/, "")).filter(Boolean).map((line) => stripInlineSectionLabel3(line)).filter((line) => !looksLikeFileOperationTitle4(line));
     if (lines.length > 0)
       return lines[0] ?? null;
   }
@@ -4695,7 +5949,7 @@ function pickContextIndexObservations(context, shownItems) {
       score += 2.5;
     return score;
   };
-  for (const obs of context.observations.filter((obs2) => obs2.type !== "digest").filter((obs2) => {
+  for (const obs of getFreshStartupObservations(context).filter((obs2) => obs2.type !== "digest").filter((obs2) => {
     const normalized = normalizeStartupItem(obs2.title);
     return normalized && !hidden.has(normalized);
   }).sort((a, b) => {
@@ -4726,7 +5980,7 @@ function toSplashLines(value, maxItems) {
   if (!value)
     return [];
   const lines = value.split(`
-`).map((line) => line.trim()).filter(Boolean).map((line) => line.replace(/^[-*]\s*/, "")).map((line) => stripInlineSectionLabel2(line)).map((line) => dedupeFragments(line)).filter(Boolean).sort((a, b) => scoreSplashLine(b) - scoreSplashLine(a)).slice(0, maxItems).map((line) => `- ${truncateInline(line, 140)}`);
+`).map((line) => line.trim()).filter(Boolean).map((line) => line.replace(/^[-*]\s*/, "")).map((line) => stripInlineSectionLabel3(line)).map((line) => dedupeFragments(line)).filter(Boolean).sort((a, b) => scoreSplashLine(b) - scoreSplashLine(a)).slice(0, maxItems).map((line) => `- ${truncateInline(line, 140)}`);
   return dedupeFragmentsInLines(lines);
 }
 function pickPrimarySummary(context) {
@@ -4737,7 +5991,7 @@ function pickPrimarySummary(context) {
     const request = summary.request?.trim();
     const learned = summary.learned?.trim();
     const completed = summary.completed?.trim();
-    return Boolean(request && !looksLikeFileOperationTitle2(request) || learned || hasMeaningfulCompleted(completed));
+    return Boolean(request && !looksLikeFileOperationTitle4(request) || learned || hasMeaningfulCompleted(completed));
   });
   return meaningfulRecent ?? summaries[0] ?? null;
 }
@@ -4745,7 +5999,7 @@ function hasMeaningfulCompleted(value) {
   if (!value)
     return false;
   return value.split(`
-`).map((line) => line.trim().replace(/^[-*]\s*/, "")).filter(Boolean).some((line) => !looksLikeFileOperationTitle2(stripInlineSectionLabel2(line)));
+`).map((line) => line.trim().replace(/^[-*]\s*/, "")).filter(Boolean).some((line) => !looksLikeFileOperationTitle4(stripInlineSectionLabel3(line)));
 }
 function sectionItemCount(value) {
   if (!value)
@@ -4770,7 +6024,7 @@ function dedupeFragmentsInLines(lines) {
   const seen = new Set;
   const deduped = [];
   for (const line of lines) {
-    const normalized = stripInlineSectionLabel2(line).toLowerCase().replace(/\s+/g, " ").trim();
+    const normalized = stripInlineSectionLabel3(line).toLowerCase().replace(/\s+/g, " ").trim();
     if (!normalized || seen.has(normalized))
       continue;
     seen.add(normalized);
@@ -4782,7 +6036,7 @@ function hasRequestSection(lines) {
   return lines.some((line) => line.includes("Request:"));
 }
 function normalizeStartupItem(value) {
-  return stripInlineSectionLabel2(value).replace(/^#?\d+:\s*/, "").replace(/^-\s*/, "").replace(/\([^)]*\)/g, " ").replace(/[^a-z0-9\s]/gi, " ").toLowerCase().replace(/\s+/g, " ").trim();
+  return stripInlineSectionLabel3(value).replace(/^#?\d+:\s*/, "").replace(/^-\s*/, "").replace(/\([^)]*\)/g, " ").replace(/[^a-z0-9\s]/gi, " ").toLowerCase().replace(/\s+/g, " ").trim();
 }
 function titlesRoughlyMatch(left, right) {
   const a = normalizeStartupItem(left ?? "");
@@ -4801,7 +6055,7 @@ function titlesRoughlyMatch(left, right) {
   const minSize = Math.min(aTokens.length, bTokens.length);
   return shared.length >= Math.max(3, Math.ceil(minSize * 0.6));
 }
-function isMeaningfulPrompt2(value) {
+function isMeaningfulPrompt3(value) {
   if (!value)
     return false;
   const compact = value.replace(/\s+/g, " ").trim();
@@ -4810,7 +6064,7 @@ function isMeaningfulPrompt2(value) {
   return /[a-z]{3,}/i.test(compact);
 }
 function chooseRequest(primary, fallback) {
-  if (primary && !looksLikeFileOperationTitle2(primary))
+  if (primary && !looksLikeFileOperationTitle4(primary))
     return primary;
   return fallback;
 }
@@ -4828,10 +6082,10 @@ function isWeakCompletedSection(value) {
 `).map((line) => line.trim().replace(/^[-*]\s*/, "")).filter(Boolean);
   if (!items.length)
     return true;
-  const weakCount = items.filter((item) => looksLikeFileOperationTitle2(item)).length;
+  const weakCount = items.filter((item) => looksLikeFileOperationTitle4(item)).length;
   return weakCount === items.length;
 }
-function looksLikeFileOperationTitle2(value) {
+function looksLikeFileOperationTitle4(value) {
   const trimmed = value.trim();
   if (/^(modified|updated|edited|touched|changed|extended|refactored|redesigned)\s+[A-Za-z0-9_.\-\/]+(?:\s*\([^)]*\))?$/i.test(trimmed)) {
     return true;
@@ -4844,7 +6098,7 @@ function looksLikeGenericSummaryWrapper(value) {
 }
 function scoreSplashLine(value) {
   let score = 0;
-  if (!looksLikeFileOperationTitle2(value))
+  if (!looksLikeFileOperationTitle4(value))
     score += 2;
   if (/[:;]/.test(value))
     score += 1;
@@ -4853,9 +6107,9 @@ function scoreSplashLine(value) {
   return score;
 }
 function buildObservationFallbacks(context) {
-  const request = context.observations.find((obs) => obs.type !== "decision" && !looksLikeFileOperationTitle2(obs.title))?.title ?? null;
+  const request = getFreshStartupObservations(context).find((obs) => obs.type !== "decision" && !looksLikeFileOperationTitle4(obs.title))?.title ?? null;
   const investigated = collectObservationTitles(context, (obs) => obs.type === "discovery", 2);
-  const completed = collectObservationTitles(context, (obs) => ["bugfix", "feature", "refactor", "change"].includes(obs.type) && !looksLikeFileOperationTitle2(obs.title), 2);
+  const completed = collectObservationTitles(context, (obs) => ["bugfix", "feature", "refactor", "change"].includes(obs.type) && !looksLikeFileOperationTitle4(obs.title), 2);
   return {
     request,
     investigated,
@@ -4865,21 +6119,38 @@ function buildObservationFallbacks(context) {
 function collectObservationTitles(context, predicate, limit) {
   const seen = new Set;
   const picked = [];
-  for (const obs of context.observations) {
+  for (const obs of getFreshStartupObservations(context)) {
     if (!predicate(obs))
       continue;
-    const normalized = stripInlineSectionLabel2(obs.title).toLowerCase().replace(/\s+/g, " ").trim();
+    const normalized = stripInlineSectionLabel3(obs.title).toLowerCase().replace(/\s+/g, " ").trim();
     if (!normalized || seen.has(normalized))
       continue;
     seen.add(normalized);
-    picked.push(`- ${stripInlineSectionLabel2(obs.title)}`);
+    picked.push(`- ${stripInlineSectionLabel3(obs.title)}`);
     if (picked.length >= limit)
       break;
   }
   return picked.length ? picked.join(`
 `) : null;
 }
-function stripInlineSectionLabel2(value) {
+function getFreshStartupObservations(context) {
+  if (hasFreshContinuitySignal(context))
+    return context.observations;
+  return context.observations.filter((obs) => observationAgeDays3(obs) <= 3);
+}
+function hasFreshContinuitySignal(context) {
+  return getStartupContinuityState(context) === "fresh";
+}
+function getStartupContinuityState(context) {
+  return classifyContinuityState(context.recentPrompts?.length ?? 0, context.recentToolEvents?.length ?? 0, context.recentHandoffs?.length ?? 0, context.recentChatMessages?.length ?? 0, context.recentSessions ?? [], context.recentOutcomes?.length ?? 0);
+}
+function observationAgeDays3(obs) {
+  const createdAt = new Date(obs.created_at).getTime();
+  if (!Number.isFinite(createdAt))
+    return Number.POSITIVE_INFINITY;
+  return Math.max(0, (Date.now() - createdAt) / 86400000);
+}
+function stripInlineSectionLabel3(value) {
   return value.replace(/^(request|investigated|learned|completed|next steps|digest|summary):\s*/i, "").trim();
 }
 function pickRelevantStaleDecision(context, summary) {
@@ -4970,7 +6241,8 @@ function capitalize(value) {
 }
 var __testables = {
   formatSplashScreen,
-  formatVisibleStartupBrief
+  formatVisibleStartupBrief,
+  getStartupContinuityState
 };
 runHook("session-start", main);
 export {