engrm 0.4.33 → 0.4.35

package/README.md

@@ -226,6 +226,7 @@ The MCP server exposes tools that supported agents can call directly:
 | `recent_handoffs` | List recent saved handoffs for the current project or workspace |
 | `load_handoff` | Open a saved handoff as a resume point for a new session |
 | `refresh_chat_recall` | Rehydrate the separate chat lane from a Claude transcript when a long session feels under-captured |
+| `agent_memory_index` | Compare continuity and capture health across Claude Code, Codex, OpenClaw, and other agents |
 | `repair_recall` | Use when continuity feels thin; rehydrate recent recall from transcript or Claude history fallback |
 | `list_recall_items` | Use first when continuity feels fuzzy; list the best current handoffs, threads, chat snippets, and memory entries |
 | `load_recall_item` | Use after `list_recall_items`; load one exact recall item key |
@@ -402,8 +403,14 @@ What each tool is good for:
 
 - `capture_status` tells you whether prompt/tool hooks are live on this machine
 - `capture_quality` shows whether chat recall is transcript-backed, history-backed, or still hook-only across the workspace
+- `agent_memory_index` lets you compare Claude Code, Codex, and other agent sessions on the same repo, so cross-agent validation stops being guesswork
+- when multiple agents are active on the same repo, startup plus the MCP workbench now surface the active agent set and suggest `agent_memory_index` automatically
+- `agent_memory_index` now also gives the best exact recall jump per agent, so you can compare agents and open the right handoff/thread immediately
+- recall previews and `load_recall_item` now show source-agent provenance too, so exact recall stays readable when Claude, Codex, and OpenClaw all touch the same project
 - `memory_console` gives the quickest project snapshot, including whether continuity is `fresh`, `thin`, or `cold`
 - `resume_thread` is the fastest “get me back into the live thread” path when you want freshness, source, next actions, tool trail, chat, and one exact `load_recall_item(...)` suggestion in one place
+- `resume_thread(agent="claude-code")` lets you deliberately recover one agent's thread on a shared repo instead of only taking the blended repo-level default
+- startup and the MCP workbench now surface a direct `resume_thread(agent="...")` hint when multiple agents are active on one repo
 - `list_recall_items` is the deterministic directory-first path when you want to inspect the best candidate handoffs/threads before opening one exact item
 - `load_recall_item` completes that protocol by letting agents open one exact recall key directly after listing
 - `memory_console`, `project_memory_index`, and `session_context` now also surface one best exact `load_recall_item(...)` jump, so the workbench can hand you the right deterministic next step instead of only showing recall counts

package/dist/hooks/session-start.js

@@ -2297,6 +2297,61 @@ function formatHandoffSource2(handoff) {
   return `from ${handoff.device_id} · ${ageLabel}`;
 }
 
+// src/tools/inbox-messages.ts
+function buildHandoffMessageFilterSql(lifecycle) {
+  return `
+  type = 'message'
+  AND lifecycle IN (${lifecycle})
+  AND (
+    COALESCE(source_tool, '') IN ('create_handoff', 'rolling_handoff')
+    OR title LIKE 'Handoff:%'
+    OR title LIKE 'Handoff Draft:%'
+    OR (
+      concepts IS NOT NULL AND (
+        concepts LIKE '%"handoff"%'
+        OR concepts LIKE '%"session-handoff"%'
+        OR concepts LIKE '%"draft-handoff"%'
+      )
+    )
+  )
+`;
+}
+var HANDOFF_MESSAGE_FILTER_SQL = buildHandoffMessageFilterSql("'active', 'pinned'");
+var INBOX_MESSAGE_FILTER_SQL = `
+  type = 'message'
+  AND lifecycle IN ('active', 'pinned')
+  AND NOT (${HANDOFF_MESSAGE_FILTER_SQL})
+`;
+function classifyMessageObservation(observation) {
+  if (observation.type !== "message")
+    return null;
+  const concepts = parseConcepts(observation.concepts);
+  const isDraft = observation.title.startsWith("Handoff Draft:") || observation.source_tool === "rolling_handoff" || concepts.includes("draft-handoff") || concepts.includes("auto-handoff");
+  if (isDraft)
+    return "draft-handoff";
+  const isHandoff = observation.title.startsWith("Handoff:") || observation.source_tool === "create_handoff" || concepts.includes("handoff") || concepts.includes("session-handoff");
+  if (isHandoff)
+    return "handoff";
+  return "inbox-note";
+}
+function parseConcepts(value) {
+  if (!value)
+    return [];
+  try {
+    const parsed = JSON.parse(value);
+    return Array.isArray(parsed) ? parsed.filter((item) => typeof item === "string") : [];
+  } catch {
+    return [];
+  }
+}
+function getUnreadInboxMessageCount(db, currentDeviceId, userId, lastReadId) {
+  return db.db.query(`SELECT COUNT(*) as c FROM observations
+       WHERE ${INBOX_MESSAGE_FILTER_SQL}
+         AND id > ?
+         AND device_id != ?
+         AND (sensitivity != 'personal' OR user_id = ?)`).get(lastReadId, currentDeviceId, userId)?.c ?? 0;
+}
+
 // src/context/inject.ts
 var FRESH_CONTINUITY_WINDOW_DAYS2 = 3;
 function tokenizeProjectHint2(text) {
@@ -2992,6 +3047,32 @@ function getRecentOutcomes2(db, projectId, userId, recentSessions) {
   return picked;
 }
 
+// src/tools/inbox-messages.ts
+function buildHandoffMessageFilterSql2(lifecycle) {
+  return `
+  type = 'message'
+  AND lifecycle IN (${lifecycle})
+  AND (
+    COALESCE(source_tool, '') IN ('create_handoff', 'rolling_handoff')
+    OR title LIKE 'Handoff:%'
+    OR title LIKE 'Handoff Draft:%'
+    OR (
+      concepts IS NOT NULL AND (
+        concepts LIKE '%"handoff"%'
+        OR concepts LIKE '%"session-handoff"%'
+        OR concepts LIKE '%"draft-handoff"%'
+      )
+    )
+  )
+`;
+}
+var HANDOFF_MESSAGE_FILTER_SQL2 = buildHandoffMessageFilterSql2("'active', 'pinned'");
+var INBOX_MESSAGE_FILTER_SQL2 = `
+  type = 'message'
+  AND lifecycle IN ('active', 'pinned')
+  AND NOT (${HANDOFF_MESSAGE_FILTER_SQL2})
+`;
+
 // src/tools/project-memory-index.ts
 function classifyResumeFreshness(sourceTimestamp) {
   if (!sourceTimestamp)
@@ -3144,7 +3225,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.33";
+var CLIENT_VERSION = "0.4.35";
 function hashFile(filePath) {
   try {
     if (!existsSync3(filePath))
@@ -5494,12 +5575,7 @@ async function main() {
       try {
         const readKey = `messages_read_${config.device_id}`;
         const lastReadId = parseInt(db.getSyncState(readKey) ?? "0", 10);
-        msgCount = db.db.query(`SELECT COUNT(*) as c FROM observations
-             WHERE type = 'message'
-               AND id > ?
-               AND lifecycle IN ('active', 'pinned')
-               AND device_id != ?
-               AND (sensitivity != 'personal' OR user_id = ?)`).get(lastReadId, config.device_id, config.user_id)?.c ?? 0;
+        msgCount = getUnreadInboxMessageCount(db, config.device_id, config.user_id, lastReadId);
       } catch {}
       const splash = formatSplashScreen({
         projectName: context.project_name,
@@ -5653,6 +5729,7 @@ function formatVisibleStartupBrief(context) {
   const projectSignals = buildProjectSignalLine(context);
   const shownItems = new Set;
   const latestHandoffLines = buildLatestHandoffLines(context);
+  const inboxNoteLines = buildRecentInboxNoteLines(context);
   const freshContinuity = hasFreshContinuitySignal(context);
   if (latestHandoffLines.length > 0) {
     lines.push(`${c2.cyan}Latest handoff:${c2.reset}`);
@@ -5661,6 +5738,13 @@ function formatVisibleStartupBrief(context) {
       rememberShownItem(shownItems, item);
     }
   }
+  if (inboxNoteLines.length > 0) {
+    lines.push(`${c2.cyan}Inbox notes:${c2.reset}`);
+    for (const item of inboxNoteLines) {
+      lines.push(`  - ${truncateInline(item, 160)}`);
+      rememberShownItem(shownItems, item);
+    }
+  }
   lines.push(`${c2.cyan}Continuity:${c2.reset} ${continuityState} \u2014 ${truncateInline(describeContinuityState(continuityState), 160)}`);
   const resumeReadiness = buildResumeReadinessLine(context);
   if (resumeReadiness) {
@@ -5786,6 +5870,10 @@ function buildLatestHandoffLines(context) {
   }
   return Array.from(new Set(lines.filter(Boolean))).slice(0, 2);
 }
+function buildRecentInboxNoteLines(context) {
+  const notes = context.observations.filter((obs) => classifyMessageObservation(obs) === "inbox-note").slice(0, 2);
+  return Array.from(new Set(notes.map((obs) => obs.title.trim()).filter((title) => title.length > 0)));
+}
 function buildResumeReadinessLine(context) {
   const latestSession = context.recentSessions?.[0] ?? null;
   const latestHandoff = context.recentHandoffs?.[0] ?? null;
@@ -5847,11 +5935,15 @@ function formatContextIndex(context, shownItems) {
 function formatInspectHints(context, visibleObservationIds = [], recallItems = []) {
   const hints = [];
   const continuityState = getStartupContinuityState(context);
+  const activeAgents = collectStartupAgents(context);
   if ((context.recentSessions?.length ?? 0) > 0) {
     hints.push("recent_sessions");
     hints.push("session_story");
     hints.push("create_handoff");
   }
+  if (activeAgents.length > 1) {
+    hints.push("agent_memory_index");
+  }
   if ((context.recentPrompts?.length ?? 0) > 0 || (context.recentToolEvents?.length ?? 0) > 0 || (context.recentChatMessages?.length ?? 0) > 0) {
     hints.push("activity_feed");
   }
@@ -5884,20 +5976,25 @@ function formatInspectHints(context, visibleObservationIds = [], recallItems = [
     return [];
   const ids = visibleObservationIds.slice(0, 5);
   const openNowItem = recallItems.find((item) => item.kind !== "memory") ?? null;
+  const resumeAgent = activeAgents.length > 1 ? context.recentSessions?.[0]?.agent ?? null : null;
   const fetchHint = ids.length > 0 ? `get_observations([${ids.join(", ")}])` : null;
   return [
     `${c2.dim}Next look:${c2.reset} ${unique.join(" \xB7 ")}`,
     ...openNowItem ? [`${c2.dim}Open now:${c2.reset} load_recall_item("${openNowItem.key}")`] : [],
+    ...resumeAgent ? [`${c2.dim}Resume agent:${c2.reset} resume_thread(agent="${resumeAgent}")`] : [],
     ...fetchHint ? [`${c2.dim}Pull detail:${c2.reset} ${fetchHint}`] : []
   ];
 }
+function collectStartupAgents(context) {
+  return Array.from(new Set((context.recentSessions ?? []).map((session) => session.agent?.trim()).filter((agent) => Boolean(agent) && !agent.startsWith("engrm-")))).sort();
+}
 function formatStartupRecallPreview(recallItems) {
   const items = recallItems.slice(0, 3);
   if (items.length === 0)
     return [];
   return [
     `${c2.dim}Recall preview:${c2.reset} exact keys you can open now`,
-    ...items.map((item) => `${item.key} [${item.kind} \xB7 ${item.freshness}] ${truncateInline(item.title, 110)}`)
+    ...items.map((item) => `${item.key} [${item.kind} \xB7 ${item.freshness}${item.source_agent ? ` \xB7 ${item.source_agent}` : ""}] ${truncateInline(item.title, 110)}`)
   ];
 }
 function buildStartupRecallItems(context) {
@@ -5912,6 +6009,7 @@ function buildStartupRecallItems(context) {
       kind: "handoff",
       freshness,
       title,
+      source_agent: (context.recentSessions ?? []).find((session) => session.session_id === handoff.session_id)?.agent ?? null,
       score: freshnessScore(freshness) + 40
     });
   }
@@ -5926,6 +6024,7 @@ function buildStartupRecallItems(context) {
       kind: "thread",
       freshness,
       title,
+      source_agent: session.agent ?? null,
       score: freshnessScore(freshness) + 30
     });
   }
@@ -5938,6 +6037,7 @@ function buildStartupRecallItems(context) {
       kind: "chat",
       freshness,
       title: `[${message.role}] ${message.content.replace(/\s+/g, " ").trim()}`,
+      source_agent: message.agent ?? null,
       score: freshnessScore(freshness) + 20
     });
   }

package/dist/hooks/stop.js

@@ -3082,7 +3082,7 @@ function buildBeacon(db, config, sessionId, metrics) {
     sentinel_used: valueSignals.security_findings_count > 0,
     risk_score: riskScore,
     stacks_detected: stacks,
-    client_version: "0.4.33",
+    client_version: "0.4.35",
     context_observations_injected: metrics?.contextObsInjected ?? 0,
     context_total_available: metrics?.contextTotalAvailable ?? 0,
     recall_attempts: metrics?.recallAttempts ?? 0,

package/dist/server.js

@@ -16827,6 +16827,69 @@ function pinObservation(db, input) {
   return { success: true };
 }
 
+// src/tools/inbox-messages.ts
+function buildHandoffMessageFilterSql(lifecycle) {
+  return `
+  type = 'message'
+  AND lifecycle IN (${lifecycle})
+  AND (
+    COALESCE(source_tool, '') IN ('create_handoff', 'rolling_handoff')
+    OR title LIKE 'Handoff:%'
+    OR title LIKE 'Handoff Draft:%'
+    OR (
+      concepts IS NOT NULL AND (
+        concepts LIKE '%"handoff"%'
+        OR concepts LIKE '%"session-handoff"%'
+        OR concepts LIKE '%"draft-handoff"%'
+      )
+    )
+  )
+`;
+}
+var HANDOFF_MESSAGE_FILTER_SQL = buildHandoffMessageFilterSql("'active', 'pinned'");
+var INBOX_MESSAGE_FILTER_SQL = `
+  type = 'message'
+  AND lifecycle IN ('active', 'pinned')
+  AND NOT (${HANDOFF_MESSAGE_FILTER_SQL})
+`;
+function getHandoffMessageFilterSql(options) {
+  return buildHandoffMessageFilterSql(options?.include_aging ? "'active', 'aging', 'pinned'" : "'active', 'pinned'");
+}
+function classifyMessageObservation(observation) {
+  if (observation.type !== "message")
+    return null;
+  const concepts = parseConcepts(observation.concepts);
+  const isDraft = observation.title.startsWith("Handoff Draft:") || observation.source_tool === "rolling_handoff" || concepts.includes("draft-handoff") || concepts.includes("auto-handoff");
+  if (isDraft)
+    return "draft-handoff";
+  const isHandoff = observation.title.startsWith("Handoff:") || observation.source_tool === "create_handoff" || concepts.includes("handoff") || concepts.includes("session-handoff");
+  if (isHandoff)
+    return "handoff";
+  return "inbox-note";
+}
+function parseConcepts(value) {
+  if (!value)
+    return [];
+  try {
+    const parsed = JSON.parse(value);
+    return Array.isArray(parsed) ? parsed.filter((item) => typeof item === "string") : [];
+  } catch {
+    return [];
+  }
+}
+function getInboxMessageCount(db) {
+  return db.db.query(`SELECT COUNT(*) as c FROM observations
+       WHERE ${INBOX_MESSAGE_FILTER_SQL}`).get()?.c ?? 0;
+}
+function getUnreadInboxMessages(db, currentDeviceId, userId, lastReadId, limit = 20) {
+  return db.db.query(`SELECT id, title, narrative, user_id, device_id, created_at FROM observations
+       WHERE ${INBOX_MESSAGE_FILTER_SQL}
+         AND id > ?
+         AND device_id != ?
+         AND (sensitivity != 'personal' OR user_id = ?)
+       ORDER BY created_at_epoch DESC LIMIT ?`).all(lastReadId, currentDeviceId, userId, limit);
+}
+
 // src/tools/recent.ts
 function getRecentActivity(db, input) {
   const limit = Math.max(1, Math.min(input.limit ?? 10, 50));
@@ -16865,7 +16928,10 @@ function getRecentActivity(db, input) {
        LEFT JOIN projects ON projects.id = observations.project_id
        WHERE ${conditions.join(" AND ")}
        ORDER BY observations.created_at_epoch DESC
-       LIMIT ?`).all(...params);
+       LIMIT ?`).all(...params).map((observation) => ({
+    ...observation,
+    message_kind: classifyMessageObservation(observation)
+  }));
   return {
     observations,
     project: projectName
@@ -18359,6 +18425,7 @@ function listRecallItems(db, input) {
     user_id: input.user_id,
     limit: Math.min(limit * 2, 24)
   }).observations;
+  const sessionAgentById = new Map(sessions.filter((session) => Boolean(session.session_id)).map((session) => [session.session_id, session.agent ?? null]));
   const items = [
     ...handoffs.map((handoff) => ({
       key: `handoff:${handoff.id}`,
@@ -18368,7 +18435,8 @@ function listRecallItems(db, input) {
       created_at_epoch: handoff.created_at_epoch,
       freshness: classifyFreshness(handoff.created_at_epoch),
       session_id: handoff.session_id,
-      source_device_id: handoff.device_id ?? null
+      source_device_id: handoff.device_id ?? null,
+      source_agent: handoff.session_id ? sessionAgentById.get(handoff.session_id) ?? null : null
     })),
     ...sessions.filter((session) => Boolean(session.request || session.completed || session.current_thread)).map((session) => ({
       key: `session:${session.session_id}`,
@@ -18378,7 +18446,8 @@ function listRecallItems(db, input) {
       created_at_epoch: session.completed_at_epoch ?? session.started_at_epoch ?? 0,
       freshness: classifyFreshness(session.completed_at_epoch ?? session.started_at_epoch ?? null),
       session_id: session.session_id,
-      source_device_id: session.device_id ?? null
+      source_device_id: session.device_id ?? null,
+      source_agent: session.agent ?? null
     })),
     ...dedupeChatIndex(chat).map((message) => {
       const origin = getChatCaptureOrigin(message);
@@ -18390,7 +18459,8 @@ function listRecallItems(db, input) {
         created_at_epoch: message.created_at_epoch,
         freshness: classifyFreshness(message.created_at_epoch),
         session_id: message.session_id,
-        source_device_id: message.device_id ?? null
+        source_device_id: message.device_id ?? null,
+        source_agent: message.agent ?? null
       };
     }),
     ...observations.filter((obs) => obs.type !== "message").filter((obs) => !looksLikeFileOperationTitle3(obs.title)).map((obs) => ({
@@ -18401,7 +18471,8 @@ function listRecallItems(db, input) {
       created_at_epoch: obs.created_at_epoch,
       freshness: classifyFreshness(obs.created_at_epoch),
       session_id: obs.session_id ?? null,
-      source_device_id: obs.device_id ?? null
+      source_device_id: obs.device_id ?? null,
+      source_agent: null
     }))
   ];
   const deduped = dedupeRecallItems(items).sort((a, b) => compareRecallItems(a, b, input.current_device_id)).slice(0, limit);
@@ -18572,6 +18643,7 @@ function getProjectMemoryIndex(db, input) {
   }).handoffs;
   const rollingHandoffDraftsCount = recentHandoffsCount.filter((handoff) => isDraftHandoff(handoff)).length;
   const savedHandoffsCount = recentHandoffsCount.length - rollingHandoffDraftsCount;
+  const recentInboxNotes = observations.filter((obs) => classifyMessageObservation(obs) === "inbox-note").slice(0, 5);
   const recentChat = getRecentChat(db, {
     cwd,
     project_scoped: true,
@@ -18589,8 +18661,9 @@ function getProjectMemoryIndex(db, input) {
   const latestSummary = latestSession ? db.getSessionSummary(latestSession.session_id) : null;
   const recentOutcomes = observations.filter((obs) => ["bugfix", "feature", "refactor", "change", "decision"].includes(obs.type)).map((obs) => obs.title.trim()).filter((title) => title.length > 0 && !looksLikeFileOperationTitle4(title)).slice(0, 8);
   const captureSummary = summarizeCaptureState(recentSessions);
+  const activeAgents = collectActiveAgents(recentSessions);
   const topTypes = Object.entries(counts).map(([type, count]) => ({ type, count })).sort((a, b) => b.count - a.count || a.type.localeCompare(b.type)).slice(0, 5);
-  const suggestedTools = buildSuggestedTools(recentSessions, recentRequestsCount, recentToolsCount, observations.length, recentChatCount, recentChat.coverage_state);
+  const suggestedTools = buildSuggestedTools(recentSessions, recentRequestsCount, recentToolsCount, observations.length, recentChatCount, recentChat.coverage_state, activeAgents);
   const estimatedReadTokens = estimateTokens([
     recentOutcomes.join(`
 `),
@@ -18606,6 +18679,8 @@ function getProjectMemoryIndex(db, input) {
   return {
     project: project.name,
     canonical_id: project.canonical_id,
+    active_agents: activeAgents,
+    cross_agent_active: activeAgents.length > 1,
     continuity_state: continuityState,
     continuity_summary: describeContinuityState(continuityState),
     recall_mode: recallIndex.continuity_mode,
@@ -18614,11 +18689,13 @@ function getProjectMemoryIndex(db, input) {
       key: item.key,
       kind: item.kind,
       freshness: item.freshness,
-      title: item.title
+      title: item.title,
+      source_agent: item.source_agent
     })),
     best_recall_key: bestRecallItem?.key ?? null,
     best_recall_title: bestRecallItem?.title ?? null,
     best_recall_kind: bestRecallItem?.kind ?? null,
+    best_agent_resume_agent: activeAgents.length > 1 ? latestSession?.agent ?? null : null,
     resume_freshness: classifyResumeFreshness(sourceTimestamp),
     resume_source_session_id: latestSession?.session_id ?? null,
     resume_source_device_id: latestSession?.device_id ?? null,
@@ -18631,6 +18708,8 @@ function getProjectMemoryIndex(db, input) {
     recent_handoffs_count: recentHandoffsCount.length,
     rolling_handoff_drafts_count: rollingHandoffDraftsCount,
     saved_handoffs_count: savedHandoffsCount,
+    recent_inbox_notes_count: recentInboxNotes.length,
+    latest_inbox_note_title: recentInboxNotes[0]?.title ?? null,
     recent_chat_count: recentChatCount,
     recent_chat_sessions: recentChat.session_count,
     chat_source_summary: recentChat.source_summary,
@@ -18732,11 +18811,17 @@ function summarizeCaptureState(sessions) {
   }
   return summary;
 }
-function buildSuggestedTools(sessions, requestCount, toolCount, observationCount, recentChatCount, chatCoverageState) {
+function collectActiveAgents(sessions) {
+  return Array.from(new Set(sessions.map((session) => session.agent?.trim()).filter((agent) => Boolean(agent) && !agent.startsWith("engrm-")))).sort();
+}
+function buildSuggestedTools(sessions, requestCount, toolCount, observationCount, recentChatCount, chatCoverageState, activeAgents) {
   const suggested = [];
   if (sessions.length > 0) {
     suggested.push("recent_sessions");
   }
+  if (activeAgents.length > 1) {
+    suggested.push("agent_memory_index");
+  }
   if (requestCount > 0 || toolCount > 0) {
     suggested.push("activity_feed");
   }
@@ -18761,7 +18846,7 @@ function buildSuggestedTools(sessions, requestCount, toolCount, observationCount
   if (recentChatCount > 0) {
     suggested.push("recent_chat", "search_chat");
   }
-  return Array.from(new Set(suggested)).slice(0, 5);
+  return Array.from(new Set(suggested)).slice(0, 6);
 }
 
 // src/tools/memory-console.ts
@@ -18802,6 +18887,7 @@ function getMemoryConsole(db, input) {
   }).handoffs;
   const rollingHandoffDrafts = recentHandoffs.filter((handoff) => isDraftHandoff(handoff)).length;
   const savedHandoffs = recentHandoffs.length - rollingHandoffDrafts;
+  const recentInboxNotes = observations.filter((obs) => obs.message_kind === "inbox-note").slice(0, 3).map((obs) => ({ id: obs.id, title: obs.title, created_at_epoch: obs.created_at_epoch }));
   const recentChat = getRecentChat(db, {
     cwd,
     project_scoped: projectScoped,
@@ -18819,8 +18905,11 @@ function getMemoryConsole(db, input) {
     user_id: input.user_id
   }) : null;
   const continuityState = projectIndex?.continuity_state ?? classifyContinuityState(requests.length, tools.length, recentHandoffs.length, recentChat.messages.length, sessions, (projectIndex?.recent_outcomes ?? []).length);
+  const activeAgents = projectIndex?.active_agents ?? collectActiveAgents(sessions);
   return {
     project: project?.name,
+    active_agents: activeAgents,
+    cross_agent_active: projectIndex?.cross_agent_active ?? activeAgents.length > 1,
     capture_mode: requests.length > 0 || tools.length > 0 ? "rich" : "observations-only",
     continuity_state: continuityState,
     continuity_summary: projectIndex?.continuity_summary ?? describeContinuityState(continuityState),
@@ -18830,11 +18919,13 @@ function getMemoryConsole(db, input) {
       key: item.key,
       kind: item.kind,
       freshness: item.freshness,
-      title: item.title
+      title: item.title,
+      source_agent: item.source_agent
     })),
     best_recall_key: projectIndex?.best_recall_key ?? (recallIndex.items.find((item) => item.kind !== "memory") ?? recallIndex.items[0] ?? null)?.key ?? null,
     best_recall_title: projectIndex?.best_recall_title ?? (recallIndex.items.find((item) => item.kind !== "memory") ?? recallIndex.items[0] ?? null)?.title ?? null,
     best_recall_kind: projectIndex?.best_recall_kind ?? (recallIndex.items.find((item) => item.kind !== "memory") ?? recallIndex.items[0] ?? null)?.kind ?? null,
+    best_agent_resume_agent: projectIndex?.best_agent_resume_agent ?? (activeAgents.length > 1 ? sessions[0]?.agent ?? null : null),
     resume_freshness: projectIndex?.resume_freshness ?? "stale",
     resume_source_session_id: projectIndex?.resume_source_session_id ?? sessions[0]?.session_id ?? null,
     resume_source_device_id: projectIndex?.resume_source_device_id ?? sessions[0]?.device_id ?? null,
@@ -18845,6 +18936,8 @@ function getMemoryConsole(db, input) {
     recent_handoffs: recentHandoffs,
     rolling_handoff_drafts: rollingHandoffDrafts,
     saved_handoffs: savedHandoffs,
+    recent_inbox_notes: recentInboxNotes,
+    latest_inbox_note_title: recentInboxNotes[0]?.title ?? null,
     recent_chat: recentChat.messages,
     recent_chat_sessions: projectIndex?.recent_chat_sessions ?? recentChat.session_count,
     chat_source_summary: projectIndex?.chat_source_summary ?? recentChat.source_summary,
@@ -18858,13 +18951,15 @@ function getMemoryConsole(db, input) {
     assistant_checkpoint_types: projectIndex?.assistant_checkpoint_types ?? [],
     top_types: projectIndex?.top_types ?? [],
     estimated_read_tokens: projectIndex?.estimated_read_tokens,
-    suggested_tools: projectIndex?.suggested_tools ?? buildFallbackSuggestedTools(sessions.length, requests.length, tools.length, observations.length, recentHandoffs.length, recentChat.messages.length, recentChat.coverage_state)
+    suggested_tools: projectIndex?.suggested_tools ?? buildFallbackSuggestedTools(sessions.length, requests.length, tools.length, observations.length, recentHandoffs.length, recentChat.messages.length, recentChat.coverage_state, activeAgents.length)
   };
 }
-function buildFallbackSuggestedTools(sessionCount, requestCount, toolCount, observationCount, handoffCount, chatCount, chatCoverageState) {
+function buildFallbackSuggestedTools(sessionCount, requestCount, toolCount, observationCount, handoffCount, chatCount, chatCoverageState, activeAgentCount) {
   const suggested = [];
   if (sessionCount > 0)
     suggested.push("recent_sessions");
+  if (activeAgentCount > 1)
+    suggested.push("agent_memory_index");
   if (requestCount > 0 || toolCount > 0)
     suggested.push("activity_feed");
   if (requestCount > 0 || chatCount > 0 || observationCount > 0)
@@ -18883,7 +18978,7 @@ function buildFallbackSuggestedTools(sessionCount, requestCount, toolCount, obse
     suggested.push("refresh_chat_recall");
   if (chatCount > 0)
     suggested.push("recent_chat", "search_chat");
-  return Array.from(new Set(suggested)).slice(0, 5);
+  return Array.from(new Set(suggested)).slice(0, 6);
 }
 
 // src/tools/workspace-memory-index.ts
@@ -19111,6 +19206,7 @@ function toChatEvent(message) {
   };
 }
 function toObservationEvent(obs) {
+  const messageKind = classifyMessageObservation(obs);
   if (looksLikeHandoff(obs)) {
     const handoffKind = isDraftHandoff(obs) ? "draft" : "saved";
     return {
@@ -19125,6 +19221,8 @@ function toObservationEvent(obs) {
     };
   }
   const detailBits = [];
+  if (messageKind === "inbox-note")
+    detailBits.push("inbox note");
   if (obs.source_tool)
     detailBits.push(`via ${obs.source_tool}`);
   if (typeof obs.source_prompt_number === "number") {
@@ -19529,8 +19627,214 @@ function getCaptureQuality(db, input = {}) {
   };
 }
 
+// src/tools/agent-memory-index.ts
+function getAgentMemoryIndex(db, input) {
+  const cwd = input.cwd ?? process.cwd();
+  const projectScoped = input.project_scoped !== false;
+  let projectId = null;
+  let projectName;
+  if (projectScoped) {
+    const detected = detectProject(cwd);
+    const project = db.getProjectByCanonicalId(detected.canonical_id);
+    if (project) {
+      projectId = project.id;
+      projectName = project.name;
+    }
+  }
+  const userFilter = input.user_id ? " AND s.user_id = ?" : "";
+  const userArgs = input.user_id ? [input.user_id] : [];
+  const projectFilter = projectId !== null ? " AND s.project_id = ?" : "";
+  const projectArgs = projectId !== null ? [projectId] : [];
+  const sessionRows = db.db.query(`SELECT
+         s.agent as agent,
+         COUNT(*) as session_count,
+         SUM(CASE WHEN ss.request IS NOT NULL OR ss.completed IS NOT NULL THEN 1 ELSE 0 END) as summary_session_count,
+         SUM(COALESCE(pc.prompt_count, 0)) as prompt_count,
+         SUM(COALESCE(tc.tool_event_count, 0)) as tool_event_count,
+         MAX(COALESCE(s.completed_at_epoch, s.started_at_epoch)) as last_seen_epoch
+       FROM sessions s
+       LEFT JOIN session_summaries ss ON ss.session_id = s.session_id
+       LEFT JOIN (
+         SELECT session_id, COUNT(*) as prompt_count
+         FROM user_prompts
+         GROUP BY session_id
+       ) pc ON pc.session_id = s.session_id
+       LEFT JOIN (
+         SELECT session_id, COUNT(*) as tool_event_count
+         FROM tool_events
+         GROUP BY session_id
+       ) tc ON tc.session_id = s.session_id
+       WHERE 1 = 1${projectFilter}${userFilter}
+       GROUP BY s.agent
+       ORDER BY last_seen_epoch DESC, s.agent ASC`).all(...projectArgs, ...userArgs).filter((row) => !isInternalAgent(row.agent));
+  const observationCounts = new Map;
+  const observationRows = db.db.query(`SELECT
+         COALESCE(s.agent, o.agent) as agent,
+         COUNT(*) as observation_count,
+         SUM(CASE WHEN o.type = 'message' AND o.concepts LIKE '%session-handoff%' THEN 1 ELSE 0 END) as handoff_count
+       FROM observations o
+       LEFT JOIN sessions s ON s.session_id = o.session_id
+       WHERE o.lifecycle IN ('active', 'aging', 'pinned')
+         AND o.superseded_by IS NULL
+         ${projectId !== null ? "AND o.project_id = ?" : ""}
+         ${input.user_id ? "AND (o.sensitivity != 'personal' OR o.user_id = ?)" : ""}
+       GROUP BY COALESCE(s.agent, o.agent)`).all(...projectId !== null ? [projectId] : [], ...input.user_id ? [input.user_id] : []).filter((row) => !isInternalAgent(row.agent));
+  for (const row of observationRows) {
+    observationCounts.set(row.agent, {
+      observation_count: row.observation_count,
+      handoff_count: row.handoff_count
+    });
+  }
+  const chatCoverage = new Map;
+  const chatRows = db.db.query(`SELECT
+         COALESCE(s.agent, cm.agent) as agent,
+         CASE
+           WHEN cm.source_kind = 'transcript' THEN 'transcript'
+           WHEN cm.remote_source_id LIKE 'history:%' THEN 'history'
+           ELSE 'hook'
+         END as origin_kind,
+         COUNT(*) as count
+       FROM chat_messages cm
+       LEFT JOIN sessions s ON s.session_id = cm.session_id
+       WHERE 1 = 1
+         ${projectId !== null ? "AND cm.project_id = ?" : ""}
+         ${input.user_id ? "AND cm.user_id = ?" : ""}
+       GROUP BY COALESCE(s.agent, cm.agent), origin_kind`).all(...projectId !== null ? [projectId] : [], ...input.user_id ? [input.user_id] : []).filter((row) => !isInternalAgent(row.agent));
+  for (const row of chatRows) {
+    const current = chatCoverage.get(row.agent) ?? {
+      chat_message_count: 0,
+      transcript_count: 0,
+      history_count: 0,
+      hook_count: 0
+    };
+    current.chat_message_count += row.count;
+    if (row.origin_kind === "transcript")
+      current.transcript_count += row.count;
+    else if (row.origin_kind === "history")
+      current.history_count += row.count;
+    else
+      current.hook_count += row.count;
+    chatCoverage.set(row.agent, current);
+  }
+  const recentSessions = db.getRecentSessions(projectId, 200, input.user_id).filter((session) => !isInternalAgent(session.agent));
+  const recallItems = listRecallItems(db, {
+    cwd,
+    project_scoped: projectScoped,
+    user_id: input.user_id,
+    limit: 30
+  }).items;
+  const latestByAgent = new Map;
+  const devicesByAgent = new Map;
+  for (const session of recentSessions) {
+    if (!latestByAgent.has(session.agent))
+      latestByAgent.set(session.agent, session);
+    const devices = devicesByAgent.get(session.agent) ?? new Set;
+    if (session.device_id)
+      devices.add(session.device_id);
+    devicesByAgent.set(session.agent, devices);
+  }
+  const knownAgents = new Set([
+    ...sessionRows.map((row) => row.agent),
+    ...Array.from(observationCounts.keys()),
+    ...Array.from(chatCoverage.keys())
+  ]);
+  const agents = Array.from(knownAgents).map((agent) => {
+    const session = sessionRows.find((row) => row.agent === agent) ?? {
+      agent,
+      session_count: 0,
+      summary_session_count: 0,
+      prompt_count: 0,
+      tool_event_count: 0,
+      last_seen_epoch: null
+    };
+    const obs = observationCounts.get(agent) ?? { observation_count: 0, handoff_count: 0 };
+    const chat = chatCoverage.get(agent) ?? {
+      chat_message_count: 0,
+      transcript_count: 0,
+      history_count: 0,
+      hook_count: 0
+    };
+    const latestSession = latestByAgent.get(agent) ?? null;
+    const bestRecall = pickBestRecallForAgent(recallItems, agent);
+    return {
+      agent,
+      session_count: session.session_count,
+      summary_session_count: session.summary_session_count,
+      prompt_count: session.prompt_count,
+      tool_event_count: session.tool_event_count,
+      observation_count: obs.observation_count,
+      handoff_count: obs.handoff_count,
+      chat_message_count: chat.chat_message_count,
+      chat_coverage_state: chat.transcript_count > 0 ? "transcript-backed" : chat.history_count > 0 ? "history-backed" : chat.hook_count > 0 ? "hook-only" : "none",
+      continuity_state: classifyAgentContinuity(session.last_seen_epoch, session.prompt_count, session.tool_event_count, chat.chat_message_count, obs.handoff_count, obs.observation_count),
+      capture_state: classifyAgentCaptureState(session.prompt_count, session.tool_event_count, session.summary_session_count, obs.observation_count, chat.chat_message_count),
+      last_seen_epoch: session.last_seen_epoch,
+      latest_session_id: latestSession?.session_id ?? null,
+      latest_summary: latestSession?.current_thread ?? latestSession?.request ?? latestSession?.completed ?? null,
+      devices: Array.from(devicesByAgent.get(agent) ?? []).sort(),
+      best_recall_key: bestRecall?.key ?? null,
+      best_recall_title: bestRecall?.title ?? null,
+      best_recall_kind: bestRecall?.kind ?? null,
+      resume_freshness: bestRecall?.freshness ?? "stale"
+    };
+  }).sort((a, b) => {
+    const epochA = a.last_seen_epoch ?? 0;
+    const epochB = b.last_seen_epoch ?? 0;
+    return epochB - epochA || a.agent.localeCompare(b.agent);
+  });
+  return {
+    project: projectName,
+    agents,
+    suggested_tools: buildSuggestedTools2(agents)
+  };
+}
+function isInternalAgent(agent) {
+  return !agent || agent.startsWith("engrm-");
+}
+function classifyAgentContinuity(lastSeenEpoch, promptCount, toolCount, chatCount, handoffCount, observationCount) {
+  if (!lastSeenEpoch)
+    return "cold";
+  const ageMs = Date.now() - lastSeenEpoch * 1000;
+  const hasStrongContinuity = promptCount > 0 || toolCount > 0 || chatCount > 0 || handoffCount > 0;
+  if (ageMs <= 3 * 24 * 60 * 60 * 1000 && hasStrongContinuity)
+    return "fresh";
+  if (observationCount > 0 || promptCount > 0 || toolCount > 0 || chatCount > 0)
+    return "thin";
+  return "cold";
+}
+function classifyAgentCaptureState(promptCount, toolCount, summarySessionCount, observationCount, chatCount) {
+  if (promptCount > 0 && toolCount > 0)
+    return "rich";
+  if (promptCount > 0 || toolCount > 0)
+    return "partial";
+  if (summarySessionCount > 0 || observationCount > 0 || chatCount > 0)
+    return "summary-only";
+  return "legacy";
+}
+function buildSuggestedTools2(agents) {
+  if (agents.length === 0)
+    return [];
+  const suggestions = ["recent_sessions", "capture_quality"];
+  if (agents.length > 1) {
+    suggestions.push("list_recall_items");
+  }
+  if (agents.some((agent) => agent.best_recall_key)) {
+    suggestions.push("load_recall_item");
+  }
+  if (agents.some((agent) => agent.continuity_state !== "fresh")) {
+    suggestions.push("resume_thread");
+  }
+  if (agents.some((agent) => agent.chat_coverage_state === "hook-only")) {
+    suggestions.push("repair_recall");
+  }
+  return suggestions;
+}
+function pickBestRecallForAgent(items, agent) {
+  return items.find((item) => item.source_agent === agent) ?? null;
+}
+
 // src/tools/tool-memory-index.ts
-function parseConcepts(value) {
+function parseConcepts2(value) {
   if (!value)
     return [];
   try {
@@ -19599,7 +19903,7 @@ function getToolMemoryIndex(db, input = {}) {
          ORDER BY o.created_at_epoch DESC, o.id DESC
          LIMIT 50`).all(...rowParams);
     const topPlugins = Array.from(observationRows.reduce((acc, obs) => {
-      for (const concept of parseConcepts(obs.concepts)) {
+      for (const concept of parseConcepts2(obs.concepts)) {
         if (!concept.startsWith("plugin:"))
           continue;
         const plugin = concept.slice("plugin:".length);
@@ -19628,7 +19932,7 @@ function getToolMemoryIndex(db, input = {}) {
 }
 
 // src/tools/session-tool-memory.ts
-function parseConcepts2(value) {
+function parseConcepts3(value) {
   if (!value)
     return [];
   try {
@@ -19660,7 +19964,7 @@ function getSessionToolMemory(db, input) {
     }, new Map).entries()).map(([type, count]) => ({ type, count })).sort((a, b) => b.count - a.count || a.type.localeCompare(b.type)).slice(0, 5);
     const sampleTitles = groupedObservations.map((obs) => obs.title).filter((title, index, all) => all.indexOf(title) === index).slice(0, 4);
     const topPlugins = Array.from(groupedObservations.reduce((acc, obs) => {
-      for (const concept of parseConcepts2(obs.concepts)) {
+      for (const concept of parseConcepts3(obs.concepts)) {
         if (!concept.startsWith("plugin:"))
           continue;
         const plugin = concept.slice("plugin:".length);
@@ -19716,6 +20020,13 @@ function getSessionContext(db, input) {
     user_id: input.user_id,
     limit: 8
   });
+  const recentActivity = getRecentActivity(db, {
+    cwd,
+    project_scoped: true,
+    user_id: input.user_id,
+    limit: 12
+  });
+  const recentInboxNotes = recentActivity.observations.filter((obs) => obs.message_kind === "inbox-note").slice(0, 5);
   const recentChatMessages = recentChat.messages.length;
   const recallIndex = listRecallItems(db, {
     cwd,
@@ -19732,9 +20043,12 @@ function getSessionContext(db, input) {
   const latestChatEpoch = recentChat.messages.length > 0 ? recentChat.messages[recentChat.messages.length - 1]?.created_at_epoch ?? null : null;
   const resumeTimestamp = latestChatEpoch ?? latestSession?.completed_at_epoch ?? latestSession?.started_at_epoch ?? null;
   const bestRecallItem = recallIndex.items.find((item) => item.kind !== "memory") ?? recallIndex.items[0] ?? null;
+  const activeAgents = collectActiveAgents(context.recentSessions ?? []);
   return {
     project_name: context.project_name,
     canonical_id: context.canonical_id,
+    active_agents: activeAgents,
+    cross_agent_active: activeAgents.length > 1,
     continuity_state: continuityState,
     continuity_summary: describeContinuityState(continuityState),
     recall_mode: recallIndex.continuity_mode,
@@ -19743,11 +20057,13 @@ function getSessionContext(db, input) {
       key: item.key,
       kind: item.kind,
       freshness: item.freshness,
-      title: item.title
+      title: item.title,
+      source_agent: item.source_agent
     })),
     best_recall_key: bestRecallItem?.key ?? null,
     best_recall_title: bestRecallItem?.title ?? null,
     best_recall_kind: bestRecallItem?.kind ?? null,
+    best_agent_resume_agent: activeAgents.length > 1 ? latestSession?.agent ?? null : null,
     resume_freshness: classifyResumeFreshness(resumeTimestamp),
     resume_source_session_id: latestSession?.session_id ?? null,
     resume_source_device_id: latestSession?.device_id ?? null,
@@ -19761,6 +20077,8 @@ function getSessionContext(db, input) {
     rolling_handoff_drafts: rollingHandoffDrafts,
     saved_handoffs: savedHandoffs,
     latest_handoff_title: latestHandoffTitle,
+    recent_inbox_notes: recentInboxNotes.length,
+    latest_inbox_note_title: recentInboxNotes[0]?.title ?? null,
     recent_chat_messages: recentChatMessages,
     recent_chat_sessions: recentChat.session_count,
     chat_source_summary: recentChat.source_summary,
@@ -19770,7 +20088,7 @@ function getSessionContext(db, input) {
     capture_state: captureState,
     raw_capture_active: recentRequests > 0 || recentTools > 0,
     estimated_read_tokens: estimateTokens(preview),
-    suggested_tools: buildSuggestedTools2(context, recentChat.coverage_state),
+    suggested_tools: buildSuggestedTools3(context, recentChat.coverage_state, activeAgents.length),
     preview
   };
 }
@@ -19801,11 +20119,14 @@ function parseJsonArray3(value) {
     return [];
   }
 }
-function buildSuggestedTools2(context, chatCoverageState) {
+function buildSuggestedTools3(context, chatCoverageState, activeAgentCount) {
   const tools = [];
   if ((context.recentSessions?.length ?? 0) > 0) {
     tools.push("recent_sessions");
   }
+  if (activeAgentCount > 1) {
+    tools.push("agent_memory_index");
+  }
   if ((context.recentPrompts?.length ?? 0) > 0 || (context.recentToolEvents?.length ?? 0) > 0) {
     tools.push("activity_feed");
   }
@@ -19833,7 +20154,7 @@ function buildSuggestedTools2(context, chatCoverageState) {
   if ((context.recentChatMessages?.length ?? 0) > 0) {
     tools.push("recent_chat", "search_chat");
   }
-  return Array.from(new Set(tools)).slice(0, 5);
+  return Array.from(new Set(tools)).slice(0, 6);
 }
 
 // src/tools/load-recall-item.ts
@@ -19847,6 +20168,7 @@ function loadRecallItem(db, input) {
       detail: "Malformed recall key",
       session_id: null,
       source_device_id: null,
+      source_agent: null,
       payload: null
     };
   }
@@ -19868,6 +20190,7 @@ function loadRecallItem(db, input) {
       detail: summarizeNarrative(result.handoff.narrative),
       session_id: result.handoff.session_id ?? null,
       source_device_id: result.handoff.device_id ?? null,
+      source_agent: result.handoff.session_id ? lookupSessionAgent(db, result.handoff.session_id) : null,
       payload: {
         type: "handoff",
         handoff_id: result.handoff.id,
@@ -19887,6 +20210,7 @@ function loadRecallItem(db, input) {
       detail: story.summary?.next_steps ?? story.summary?.completed ?? null,
       session_id: story.session.session_id,
       source_device_id: story.session.device_id ?? null,
+      source_agent: story.session.agent ?? null,
       payload: {
         type: "thread",
         latest_request: story.latest_request,
@@ -19916,6 +20240,7 @@ function loadRecallItem(db, input) {
       detail: message.content,
       session_id: message.session_id,
       source_device_id: message.device_id ?? null,
+      source_agent: message.agent ?? null,
       payload: {
         type: "chat",
         role: message.role,
@@ -19941,6 +20266,7 @@ function loadRecallItem(db, input) {
       detail: obs.narrative ?? obs.facts ?? null,
       session_id: obs.session_id ?? null,
       source_device_id: obs.device_id ?? null,
+      source_agent: obs.session_id ? lookupSessionAgent(db, obs.session_id) : obs.agent?.startsWith("engrm-") ? null : obs.agent ?? null,
       payload: {
         type: "memory",
         observation_id: obs.id,
@@ -19957,6 +20283,10 @@ function summarizeNarrative(value) {
     return null;
   return value.split(/\n+/).map((line) => line.trim()).find(Boolean) ?? null;
 }
+function lookupSessionAgent(db, sessionId) {
+  const row = db.db.query("SELECT agent FROM sessions WHERE session_id = ? LIMIT 1").get(sessionId);
+  return row?.agent ?? null;
+}
 function missing(key, kind) {
   return {
     kind,
@@ -19965,6 +20295,7 @@ function missing(key, kind) {
     detail: "Recall item not found",
     session_id: null,
     source_device_id: null,
+    source_agent: null,
     payload: null
   };
 }
@@ -20391,6 +20722,9 @@ async function resumeThread(db, config2, input = {}) {
   const detected = detectProject(cwd);
   const project = db.getProjectByCanonicalId(detected.canonical_id);
   let snapshot = await buildResumeSnapshot(db, cwd, input.user_id, input.current_device_id, limit);
+  if (input.agent) {
+    snapshot = filterResumeSnapshotByAgent(snapshot, input.agent, input.current_device_id);
+  }
   let repairResult = null;
   const shouldRepair = repairIfNeeded && snapshot.recentChat.coverage_state !== "transcript-backed" && (snapshot.recentChat.messages.length > 0 || snapshot.recentSessions.length > 0 || snapshot.context?.continuity_state !== "cold");
   if (shouldRepair) {
@@ -20401,6 +20735,9 @@ async function resumeThread(db, config2, input = {}) {
     });
     if (repairResult.imported_chat_messages > 0) {
       snapshot = await buildResumeSnapshot(db, cwd, input.user_id, input.current_device_id, limit);
+      if (input.agent) {
+        snapshot = filterResumeSnapshotByAgent(snapshot, input.agent, input.current_device_id);
+      }
     }
   }
   const { context, handoff, recentChat, recentSessions, recall } = snapshot;
@@ -20441,6 +20778,7 @@ async function resumeThread(db, config2, input = {}) {
   ])).slice(0, 4);
   return {
     project_name: project?.name ?? context?.project_name ?? null,
+    target_agent: input.agent ?? null,
     continuity_state: context?.continuity_state ?? "cold",
     continuity_summary: context?.continuity_summary ?? "No fresh repo-local continuity yet; older memory should be treated cautiously.",
     resume_freshness: classifyResumeFreshness2(sourceTimestamp),
@@ -20490,6 +20828,13 @@ async function buildResumeSnapshot(db, cwd, userId, currentDeviceId, limit) {
     user_id: userId,
     current_device_id: currentDeviceId
   });
+  const recentHandoffs = getRecentHandoffs(db, {
+    cwd,
+    project_scoped: true,
+    user_id: userId,
+    current_device_id: currentDeviceId,
+    limit: Math.max(limit, 4)
+  }).handoffs;
   const recentChat = getRecentChat(db, {
     cwd,
     project_scoped: true,
@@ -20519,15 +20864,50 @@ async function buildResumeSnapshot(db, cwd, userId, currentDeviceId, limit) {
   return {
     context,
     handoff: handoffResult.handoff,
+    recentHandoffs,
     recentChat,
     recentSessions,
     recall,
     recallIndex
   };
 }
+function filterResumeSnapshotByAgent(snapshot, agent, currentDeviceId) {
+  const recentSessions = snapshot.recentSessions.filter((session) => session.agent === agent);
+  const sessionIds = new Set(recentSessions.map((session) => session.session_id));
+  const recentChatMessages = snapshot.recentChat.messages.filter((message) => message.agent === agent);
+  const handoff = snapshot.recentHandoffs.filter((item) => item.session_id && sessionIds.has(item.session_id)).sort((a, b) => compareRecallCandidates(a.created_at_epoch, b.created_at_epoch, a.device_id ?? null, b.device_id ?? null, currentDeviceId))[0] ?? null;
+  const recallIndex = {
+    ...snapshot.recallIndex,
+    items: snapshot.recallIndex.items.filter((item) => item.source_agent === agent)
+  };
+  const recall = {
+    ...snapshot.recall,
+    results: snapshot.recall.results.filter((entry) => entry.session_id ? sessionIds.has(entry.session_id) : false)
+  };
+  return {
+    ...snapshot,
+    handoff,
+    recentHandoffs: snapshot.recentHandoffs.filter((item) => item.session_id && sessionIds.has(item.session_id)),
+    recentSessions,
+    recentChat: {
+      ...snapshot.recentChat,
+      messages: recentChatMessages,
+      session_count: new Set(recentChatMessages.map((message) => message.session_id)).size
+    },
+    recall,
+    recallIndex
+  };
+}
 function pickBestRecallItem2(items) {
   return items.find((item) => item.kind !== "memory") ?? items[0] ?? null;
 }
+function compareRecallCandidates(epochA, epochB, deviceA, deviceB, currentDeviceId) {
+  const remoteBoostA = currentDeviceId && deviceA && deviceA !== currentDeviceId ? 1 : 0;
+  const remoteBoostB = currentDeviceId && deviceB && deviceB !== currentDeviceId ? 1 : 0;
+  if (remoteBoostA !== remoteBoostB)
+    return remoteBoostB - remoteBoostA;
+  return epochB - epochA;
+}
 function extractCurrentThread(handoff) {
   const narrative = handoff?.narrative ?? "";
   const match = narrative.match(/Current thread:\s*(.+)/i);
@@ -20770,8 +21150,9 @@ function hasContent(value) {
 // src/tools/stats.ts
 function getMemoryStats(db) {
   const activeObservations = db.getActiveObservationCount();
-  const messages = db.db.query(`SELECT COUNT(*) as count FROM observations
-       WHERE type = 'message' AND lifecycle IN ('active', 'aging', 'pinned')`).get()?.count ?? 0;
+  const handoffs = db.db.query(`SELECT COUNT(*) as count FROM observations
+       WHERE ${getHandoffMessageFilterSql({ include_aging: true })}`).get()?.count ?? 0;
+  const inboxMessages = getInboxMessageCount(db);
   const userPrompts = db.db.query("SELECT COUNT(*) as count FROM user_prompts").get()?.count ?? 0;
   const toolEvents = db.db.query("SELECT COUNT(*) as count FROM tool_events").get()?.count ?? 0;
   const sessionSummaries = db.db.query("SELECT COUNT(*) as count FROM session_summaries").get()?.count ?? 0;
@@ -20785,7 +21166,9 @@ function getMemoryStats(db) {
     active_observations: activeObservations,
     user_prompts: userPrompts,
     tool_events: toolEvents,
-    messages,
+    messages: inboxMessages,
+    inbox_messages: inboxMessages,
+    handoffs,
     session_summaries: sessionSummaries,
     decisions: signals.decisions_count,
     lessons: signals.lessons_count,
@@ -22459,7 +22842,7 @@ process.on("SIGTERM", () => {
 });
 var server = new McpServer({
   name: "engrm",
-  version: "0.4.33"
+  version: "0.4.35"
 });
 server.tool("save_observation", "Save an observation to memory", {
   type: exports_external.enum([
@@ -22929,7 +23312,7 @@ server.tool("list_recall_items", "USE FIRST when continuity feels fuzzy. List th
   }
   const projectLine = result.project ? `Project: ${result.project}
 ` : "";
-  const rows = result.items.map((item) => `- ${item.key} [${item.kind} · ${item.freshness}] ${item.title}${item.source_device_id ? ` (${item.source_device_id})` : ""}
+  const rows = result.items.map((item) => `- ${item.key} [${item.kind} · ${item.freshness}${item.source_agent ? ` · ${item.source_agent}` : ""}] ${item.title}${item.source_device_id ? ` (${item.source_device_id})` : ""}
   ${item.detail}`).join(`
 `);
   return {
@@ -22974,6 +23357,7 @@ server.tool("load_recall_item", "USE AFTER list_recall_items. Load one exact rec
 ` + `Title: ${result.title}
 ` + `Session: ${result.session_id ?? "(unknown)"}
 ` + `Source: ${result.source_device_id ?? "(unknown)"}
+` + `Agent: ${result.source_agent ?? "(unknown)"}
 
 ` + `${result.payload.narrative ?? "(no narrative)"}`
         }
@@ -22993,6 +23377,7 @@ server.tool("load_recall_item", "USE AFTER list_recall_items. Load one exact rec
 ` + `Title: ${result.title}
 ` + `Session: ${result.session_id ?? "(unknown)"}
 ` + `Source: ${result.source_device_id ?? "(unknown)"}
+` + `Agent: ${result.source_agent ?? "(unknown)"}
 ` + `Latest request: ${result.payload.latest_request ?? "(none)"}
 ` + `Current thread: ${result.payload.current_thread ?? "(none)"}
 
@@ -23014,6 +23399,7 @@ ${hotFiles}`
 ` + `Title: ${result.title}
 ` + `Session: ${result.session_id ?? "(unknown)"}
 ` + `Source: ${result.source_device_id ?? "(unknown)"}
+` + `Agent: ${result.source_agent ?? "(unknown)"}
 
 ` + `${result.payload.content}`
         }
@@ -23028,6 +23414,7 @@ ${hotFiles}`
 ` + `Title: ${result.title}
 ` + `Session: ${result.session_id ?? "(unknown)"}
 ` + `Source: ${result.source_device_id ?? "(unknown)"}
+` + `Agent: ${result.source_agent ?? "(unknown)"}
 ` + `Type: ${result.payload.observation_type}
 
 ` + `${result.payload.narrative ?? result.payload.facts ?? "(no detail)"}`
@@ -23038,12 +23425,14 @@ ${hotFiles}`
 server.tool("resume_thread", "USE FIRST when you want one direct 'where were we?' answer. Build a clear resume point for the current project by combining handoff, live recall, current thread, and recent chat continuity.", {
   cwd: exports_external.string().optional().describe("Optional cwd override for the project to resume"),
   limit: exports_external.number().optional().describe("Max recall hits/chat snippets to include"),
+  agent: exports_external.string().optional().describe("Optional agent to resume specifically, such as claude-code or codex-cli"),
   user_id: exports_external.string().optional().describe("Optional user override"),
   repair_if_needed: exports_external.boolean().optional().describe("If true, attempt recall repair before resuming when continuity is still weak")
 }, async (params) => {
   const result = await resumeThread(db, config2, {
     cwd: params.cwd ?? process.cwd(),
     limit: params.limit,
+    agent: params.agent,
     user_id: params.user_id ?? config2.user_id,
     current_device_id: config2.device_id,
     repair_if_needed: params.repair_if_needed
@@ -23085,7 +23474,8 @@ server.tool("resume_thread", "USE FIRST when you want one direct 'where were we?
     content: [
       {
         type: "text",
-        text: `${projectLine}` + `Continuity: ${result.continuity_state} — ${result.continuity_summary}
+        text: `${projectLine}` + `${result.target_agent ? `Target agent: ${result.target_agent}
+` : ""}` + `Continuity: ${result.continuity_state} — ${result.continuity_summary}
 ` + `Freshness: ${result.resume_freshness}
 ` + `Source: ${result.resume_source_session_id ?? "(unknown session)"}${result.resume_source_device_id ? ` (${result.resume_source_device_id})` : ""}
 ` + `Resume confidence: ${result.resume_confidence}
@@ -23244,13 +23634,7 @@ server.tool("check_messages", "Check for messages sent from other devices or ses
   const markRead = params.mark_read !== false;
   const readKey = `messages_read_${config2.device_id}`;
   const lastReadId = parseInt(db.getSyncState(readKey) ?? "0", 10);
-  const messages = db.db.query(`SELECT id, title, narrative, user_id, device_id, created_at FROM observations
-         WHERE type = 'message'
-           AND id > ?
-           AND lifecycle IN ('active', 'pinned')
-           AND device_id != ?
-           AND (sensitivity != 'personal' OR user_id = ?)
-         ORDER BY created_at_epoch DESC LIMIT 20`).all(lastReadId, config2.device_id, config2.user_id);
+  const messages = getUnreadInboxMessages(db, config2.device_id, config2.user_id, lastReadId, 20);
   if (messages.length === 0) {
     return {
       content: [{ type: "text", text: "No new messages." }]
@@ -23297,7 +23681,7 @@ server.tool("send_message", "Leave a cross-device or team note in Engrm's shared
     ]
   };
 });
-server.tool("recent_activity", "Inspect the most recent observations captured by Engrm", {
+server.tool("recent_activity", "Inspect the most recent observations, notes, and handoffs captured by Engrm", {
   limit: exports_external.number().optional().describe("Max observations to return (default: 10)"),
   project_scoped: exports_external.boolean().optional().describe("Scope to current project (default: true)"),
   type: exports_external.string().optional().describe("Optional observation type filter")
@@ -23320,12 +23704,21 @@ server.tool("recent_activity", "Inspect the most recent observations captured by
   const showProject = !result.project;
   const header = showProject ? "| ID | Project | Type | Title | Created |" : "| ID | Type | Title | Created |";
   const separator = showProject ? "|---|---|---|---|---|" : "|---|---|---|---|";
+  const displayType = (obs) => {
+    if (obs.message_kind === "draft-handoff")
+      return "handoff:draft";
+    if (obs.message_kind === "handoff")
+      return "handoff";
+    if (obs.message_kind === "inbox-note")
+      return "note";
+    return obs.type;
+  };
   const rows = result.observations.map((obs) => {
     const date5 = obs.created_at.split("T")[0];
     if (showProject) {
-      return `| ${obs.id} | ${obs.project_name ?? "(unknown)"} | ${obs.type} | ${obs.title} | ${date5} |`;
+      return `| ${obs.id} | ${obs.project_name ?? "(unknown)"} | ${displayType(obs)} | ${obs.title} | ${date5} |`;
     }
-    return `| ${obs.id} | ${obs.type} | ${obs.title} | ${date5} |`;
+    return `| ${obs.id} | ${displayType(obs)} | ${obs.title} | ${date5} |`;
   });
   const projectLine = result.project ? `Project: ${result.project}
 ` : "";
@@ -23361,7 +23754,8 @@ server.tool("memory_stats", "Show high-level Engrm capture and sync statistics",
         text: `Active observations: ${stats.active_observations}
 ` + `User prompts: ${stats.user_prompts}
 ` + `Tool events: ${stats.tool_events}
-` + `Messages: ${stats.messages}
+` + `Inbox notes: ${stats.inbox_messages}
+` + `Handoffs: ${stats.handoffs}
 ` + `Session summaries: ${stats.session_summaries}
 ` + `Summary coverage: learned ${stats.summaries_with_learned}, completed ${stats.summaries_with_completed}, next steps ${stats.summaries_with_next_steps}
 ` + `Installed packs: ${packs}
@@ -23405,6 +23799,8 @@ server.tool("memory_console", "Show a high-signal local overview of what Engrm c
   }).join(`
 `) : "- (none)";
   const handoffLines = result.recent_handoffs.length > 0 ? result.recent_handoffs.map((obs) => `- #${obs.id} ${obs.title}`).join(`
+`) : "- (none)";
+  const inboxNoteLines = result.recent_inbox_notes.length > 0 ? result.recent_inbox_notes.map((obs) => `- #${obs.id} ${obs.title}`).join(`
 `) : "- (none)";
   const recentChatLines = result.recent_chat.length > 0 ? result.recent_chat.map((msg) => `- [${msg.role}] ${msg.content.replace(/\s+/g, " ").trim().slice(0, 180)}`).join(`
 `) : "- (none)";
@@ -23425,7 +23821,7 @@ server.tool("memory_console", "Show a high-signal local overview of what Engrm c
 `) : "- (none)";
   const topTypes = result.top_types.length > 0 ? result.top_types.map((item) => `- ${item.type}: ${item.count}`).join(`
 `) : "- (none)";
-  const recallPreviewLines = result.recall_index_preview.length > 0 ? result.recall_index_preview.map((item) => `- ${item.key} [${item.kind} · ${item.freshness}] ${item.title}`).join(`
+  const recallPreviewLines = result.recall_index_preview.length > 0 ? result.recall_index_preview.map((item) => `- ${item.key} [${item.kind} · ${item.freshness}${item.source_agent ? ` · ${item.source_agent}` : ""}] ${item.title}`).join(`
 `) : "- (none)";
   const openExactLine = result.best_recall_key ? `Open exact: load_recall_item("${result.best_recall_key}")${result.best_recall_title ? `  # ${result.best_recall_title}` : ""}
 ` : "";
@@ -23441,16 +23837,18 @@ server.tool("memory_console", "Show a high-signal local overview of what Engrm c
     content: [
       {
         type: "text",
-        text: `${projectLine}` + `${captureLine}` + `Continuity: ${result.continuity_state} — ${result.continuity_summary}
+        text: `${projectLine}` + `${captureLine}` + `${result.active_agents.length > 0 ? `Agents active: ${result.active_agents.join(", ")}
+` : ""}` + `Continuity: ${result.continuity_state} — ${result.continuity_summary}
 ` + `Recall index: ${result.recall_mode} · ${result.recall_items_ready} items ready
 ` + `Resume readiness: ${result.resume_freshness} · ${result.resume_source_session_id ?? "(unknown session)"}${result.resume_source_device_id ? ` (${result.resume_source_device_id})` : ""}
 ` + `Chat recall: ${result.chat_coverage_state} · ${result.recent_chat.length} messages across ${result.recent_chat_sessions} sessions (transcript ${result.chat_source_summary.transcript}, history ${result.chat_source_summary.history}, hook ${result.chat_source_summary.hook})
 ` + `${typeof result.assistant_checkpoint_count === "number" ? `Assistant checkpoints: ${result.assistant_checkpoint_count}
 ` : ""}` + `Handoffs: ${result.saved_handoffs} saved, ${result.rolling_handoff_drafts} rolling drafts
+` + `Inbox notes: ${result.recent_inbox_notes.length}${result.latest_inbox_note_title ? ` · latest "${result.latest_inbox_note_title}"` : ""}
 ` + `${typeof result.estimated_read_tokens === "number" ? `Estimated read cost: ~${result.estimated_read_tokens}t
 ` : ""}` + `Suggested tools: ${result.suggested_tools.join(", ") || "(none)"}
 
-` + openExactLine + `Recall preview:
+` + openExactLine + resumeAgentLine + `Recall preview:
 ${recallPreviewLines}
 
 ` + `Next actions:
@@ -23472,6 +23870,9 @@ ${sessionLines}
 ` + `Recent handoffs:
 ${handoffLines}
 
+` + `Recent inbox notes:
+${inboxNoteLines}
+
 ` + `Recent requests:
 ${requestLines}
 
@@ -23564,6 +23965,38 @@ ${projectLines}`
     ]
   };
 });
+server.tool("agent_memory_index", "Compare continuity and capture health across Claude Code, Codex, OpenClaw, and other agents for the current project or workspace.", {
+  cwd: exports_external.string().optional().describe("Project path to inspect. Defaults to the current working directory."),
+  project_scoped: exports_external.boolean().optional().describe("If true, limit results to the current project instead of the whole workspace."),
+  user_id: exports_external.string().optional().describe("Optional user override; defaults to the configured user.")
+}, async (params) => {
+  const result = getAgentMemoryIndex(db, {
+    cwd: params.cwd ?? process.cwd(),
+    project_scoped: params.project_scoped,
+    user_id: params.user_id ?? config2.user_id
+  });
+  const rows = result.agents.length > 0 ? result.agents.map((agent) => {
+    const lastSeen = agent.last_seen_epoch ? new Date(agent.last_seen_epoch * 1000).toISOString().replace("T", " ").slice(0, 16) : "unknown";
+    const latest = agent.latest_summary ? ` latest="${agent.latest_summary.replace(/\s+/g, " ").trim().slice(0, 120)}"` : "";
+    const devices = agent.devices.length > 0 ? ` devices=[${agent.devices.join(", ")}]` : "";
+    const exact = agent.best_recall_key ? ` open=load_recall_item("${agent.best_recall_key}")` : "";
+    return `- ${agent.agent}: continuity=${agent.continuity_state} capture=${agent.capture_state} resume=${agent.resume_freshness} chat=${agent.chat_coverage_state} sessions=${agent.session_count} prompts=${agent.prompt_count} tools=${agent.tool_event_count} obs=${agent.observation_count} handoffs=${agent.handoff_count} chat_msgs=${agent.chat_message_count} last_seen=${lastSeen}${devices}${latest}${exact} resume_call=resume_thread(agent="${agent.agent}")`;
+  }).join(`
+`) : "- (none)";
+  return {
+    content: [
+      {
+        type: "text",
+        text: `${result.project ? `Project: ${result.project}
+
+` : ""}` + `Agent memory index:
+${rows}
+
+` + `Suggested next step: ${result.suggested_tools.join(", ") || "(none)"}`
+      }
+    ]
+  };
+});
 server.tool("tool_memory_index", "Show which tools are actually producing durable memory, which plugins they exercise, and what memory types they create.", {
   cwd: exports_external.string().optional().describe("Project path to inspect. Defaults to the current working directory."),
   project_scoped: exports_external.boolean().optional().describe("If true, limit results to the current project instead of the whole workspace."),
@@ -23649,10 +24082,12 @@ server.tool("session_context", "Preview the exact project memory context Engrm w
         type: "text",
         text: `Project: ${result.project_name}
 ` + `Canonical ID: ${result.canonical_id}
+` + `Agents active: ${result.active_agents.join(", ") || "(none)"}
 ` + `Continuity: ${result.continuity_state} — ${result.continuity_summary}
 ` + `Recall index: ${result.recall_mode} · ${result.recall_items_ready} items ready
 ` + `Open exact: ${result.best_recall_key ? `load_recall_item("${result.best_recall_key}")` : "(none)"}
-` + `Resume readiness: ${result.resume_freshness} · ${result.resume_source_session_id ?? "(unknown session)"}${result.resume_source_device_id ? ` (${result.resume_source_device_id})` : ""}
+` + `${result.best_agent_resume_agent ? `Resume agent: resume_thread(agent="${result.best_agent_resume_agent}")
+` : ""}` + `Resume readiness: ${result.resume_freshness} · ${result.resume_source_session_id ?? "(unknown session)"}${result.resume_source_device_id ? ` (${result.resume_source_device_id})` : ""}
 ` + `Loaded observations: ${result.session_count}
 ` + `Searchable total: ${result.total_active}
 ` + `Recent requests: ${result.recent_requests}
@@ -23660,6 +24095,7 @@ server.tool("session_context", "Preview the exact project memory context Engrm w
 ` + `Recent sessions: ${result.recent_sessions}
 ` + `Recent handoffs: ${result.recent_handoffs}
 ` + `Handoff split: ${result.saved_handoffs} saved, ${result.rolling_handoff_drafts} rolling drafts
+` + `Recent inbox notes: ${result.recent_inbox_notes}${result.latest_inbox_note_title ? ` · latest "${result.latest_inbox_note_title}"` : ""}
 ` + `Recent chat messages: ${result.recent_chat_messages}
 ` + `Chat recall: ${result.chat_coverage_state} · ${result.recent_chat_sessions} sessions (transcript ${result.chat_source_summary.transcript}, history ${result.chat_source_summary.history}, hook ${result.chat_source_summary.hook})
 ` + `Latest handoff: ${result.latest_handoff_title ?? "(none)"}
@@ -23730,7 +24166,7 @@ server.tool("project_memory_index", "Show a typed local memory index for the cur
 `) : "- (none)";
   const topTitles = result.top_titles.length > 0 ? result.top_titles.map((item) => `- #${item.id} [${item.type}] ${item.title}`).join(`
 `) : "- (none)";
-  const recallPreviewLines = result.recall_index_preview.length > 0 ? result.recall_index_preview.map((item) => `- ${item.key} [${item.kind} · ${item.freshness}] ${item.title}`).join(`
+  const recallPreviewLines = result.recall_index_preview.length > 0 ? result.recall_index_preview.map((item) => `- ${item.key} [${item.kind} · ${item.freshness}${item.source_agent ? ` · ${item.source_agent}` : ""}] ${item.title}`).join(`
 `) : "- (none)";
   const openExactLine = result.best_recall_key ? `Open exact: load_recall_item("${result.best_recall_key}")${result.best_recall_title ? `  # ${result.best_recall_title}` : ""}
 ` : "";
@@ -23740,6 +24176,7 @@ server.tool("project_memory_index", "Show a typed local memory index for the cur
         type: "text",
         text: `Project: ${result.project}
 ` + `Canonical ID: ${result.canonical_id}
+` + `Agents active: ${result.active_agents.join(", ") || "(none)"}
 ` + `Continuity: ${result.continuity_state} — ${result.continuity_summary}
 ` + `Recall index: ${result.recall_mode} · ${result.recall_items_ready} items ready
 ` + `Resume readiness: ${result.resume_freshness} · ${result.resume_source_session_id ?? "(unknown session)"}${result.resume_source_device_id ? ` (${result.resume_source_device_id})` : ""}
@@ -23748,6 +24185,7 @@ server.tool("project_memory_index", "Show a typed local memory index for the cur
 
 ` + `Recent handoffs captured: ${result.recent_handoffs_count}
 ` + `Handoff split: ${result.saved_handoffs_count} saved, ${result.rolling_handoff_drafts_count} rolling drafts
+` + `Recent inbox notes: ${result.recent_inbox_notes_count}${result.latest_inbox_note_title ? ` · latest "${result.latest_inbox_note_title}"` : ""}
 ` + `Recent chat messages captured: ${result.recent_chat_count}
 ` + `Chat recall: ${result.chat_coverage_state} · ${result.recent_chat_sessions} sessions (transcript ${result.chat_source_summary.transcript}, history ${result.chat_source_summary.history}, hook ${result.chat_source_summary.hook})
 
@@ -23757,7 +24195,7 @@ server.tool("project_memory_index", "Show a typed local memory index for the cur
 ` + `Estimated read cost: ~${result.estimated_read_tokens}t
 ` + `Suggested tools: ${result.suggested_tools.join(", ") || "(none)"}
 
-` + openExactLine + `Recall preview:
+` + openExactLine + resumeAgentLine + `Recall preview:
 ${recallPreviewLines}
 
 ` + `Next actions:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "engrm",
-  "version": "0.4.33",
+  "version": "0.4.35",
   "description": "Shared memory across devices, sessions, and agents, with thin MCP tools for durable capture and live continuity",
   "mcpName": "io.github.dr12hes/engrm",
   "type": "module",