ei-tui 0.4.3 → 0.5.1

package/src/core/handlers/human-matching.ts

@@ -9,15 +9,10 @@ import type { StateManager } from "../state-manager.js";
 import type { ItemMatchResult, ExposureImpact, TopicUpdateResult, PersonUpdateResult } from "../../prompts/human/types.js";
 import { queueTopicUpdate, queuePersonUpdate, type ExtractionContext } from "../orchestrators/index.js";
 import { getEmbeddingService, getTopicEmbeddingText, getPersonEmbeddingText } from "../embedding-service.js";
+import { calculateExposureCurrent } from "../utils/exposure.js";
 
-function mergeGroups(personaGroup: string | null, isNewItem: boolean, existing: string[] | undefined): string[] | undefined {
-  if (!personaGroup) return existing;
-  if (isNewItem) return [personaGroup];
-  const groups = new Set(existing ?? []);
-  groups.add(personaGroup);
-  return Array.from(groups);
-}
-import { resolveMessageWindow, getMessageText } from "./utils.js";
+
+import { resolveMessageWindow, getMessageText, normalizeRoomMessages } from "./utils.js";
 
 export function handleTopicMatch(response: LLMResponse, state: StateManager): void {
   const result = response.parsed as ItemMatchResult | undefined;
@@ -28,6 +23,7 @@ export function handleTopicMatch(response: LLMResponse, state: StateManager): vo
 
   const personaId = response.request.data.personaId as string;
   const personaDisplayName = response.request.data.personaDisplayName as string;
+  const roomId = response.request.data.roomId as string | undefined;
   const { messages_context, messages_analyze } = resolveMessageWindow(response, state);
 
   let matched_guid = result.matched_guid;
@@ -51,6 +47,7 @@ export function handleTopicMatch(response: LLMResponse, state: StateManager): vo
   } = {
     personaId,
     personaDisplayName,
+    roomId,
     messages_context,
     messages_analyze,
     candidateName: response.request.data.candidateName as string,
@@ -73,6 +70,7 @@ export function handlePersonMatch(response: LLMResponse, state: StateManager): v
 
   const personaId = response.request.data.personaId as string;
   const personaDisplayName = response.request.data.personaDisplayName as string;
+  const roomId = response.request.data.roomId as string | undefined;
   const { messages_context, messages_analyze } = resolveMessageWindow(response, state);
 
   let matched_guid = result.matched_guid;
@@ -96,6 +94,7 @@ export function handlePersonMatch(response: LLMResponse, state: StateManager): v
   } = {
     personaId,
     personaDisplayName,
+    roomId,
     messages_context,
     messages_analyze,
     candidateName: response.request.data.candidateName as string,
@@ -121,6 +120,7 @@ export async function handleTopicUpdate(response: LLMResponse, state: StateManag
   const existingItemId = response.request.data.existingItemId as string | undefined;
   const personaId = response.request.data.personaId as string;
   const personaDisplayName = response.request.data.personaDisplayName as string;
+  const roomId = response.request.data.roomId as string | undefined;
   const candidateCategory = response.request.data.candidateCategory as string | undefined;
 
   if (!result.name || !result.description || result.sentiment === undefined) {
@@ -128,6 +128,9 @@ export async function handleTopicUpdate(response: LLMResponse, state: StateManag
     return;
   }
 
+  const personaIds = personaId.split("|").filter(Boolean);
+  const primaryId = personaIds[0] ?? personaId;
+
   const now = new Date().toISOString();
   const human = state.getHuman();
 
@@ -137,8 +140,11 @@ export async function handleTopicUpdate(response: LLMResponse, state: StateManag
   };
   const itemId = resolveItemId();
 
-  const persona = state.persona_getById(personaId);
+  const persona = state.persona_getById(primaryId);
   const personaGroup = persona?.group_primary ?? null;
+  const allPersonaGroups = personaIds
+    .map(id => state.persona_getById(id)?.group_primary)
+    .filter((g): g is string => g != null);
 
   const existingTopic = isNewItem ? undefined : human.topics.find(t => t.id === existingItemId);
 
@@ -153,27 +159,34 @@ export async function handleTopicUpdate(response: LLMResponse, state: StateManag
   }
 
   const exposureImpact = result.exposure_impact as ExposureImpact | undefined;
+  const interestedPersonas = isNewItem
+    ? personaIds
+    : [...new Set([...(existingTopic?.interested_personas ?? []), ...personaIds])];
+  const personaGroupsMerged = isNewItem
+    ? (allPersonaGroups.length > 0 ? allPersonaGroups : existingTopic?.persona_groups)
+    : [...new Set([...(existingTopic?.persona_groups ?? []), ...allPersonaGroups])];
+
   const topic: Topic = {
     id: itemId,
     name: result.name,
     description: result.description,
     sentiment: result.sentiment,
     category: result.category ?? candidateCategory ?? existingTopic?.category,
-    exposure_current: calculateExposureCurrent(exposureImpact),
+    exposure_current: calculateExposureCurrent(exposureImpact, existingTopic?.exposure_current ?? 0),
     exposure_desired: result.exposure_desired ?? 0.5,
     last_updated: now,
     last_mentioned: now,
-    learned_by: isNewItem ? personaId : existingTopic?.learned_by,
-    last_changed_by: personaId,
-    interested_personas: isNewItem
-      ? [personaId]
-      : [...new Set([...(existingTopic?.interested_personas ?? []), personaId])],
-    persona_groups: mergeGroups(personaGroup, isNewItem, existingTopic?.persona_groups),
+    learned_by: isNewItem ? primaryId : existingTopic?.learned_by,
+    last_changed_by: primaryId,
+    interested_personas: interestedPersonas,
+    persona_groups: personaGroupsMerged,
     embedding,
   };
   state.human_topic_upsert(topic);
 
-  const allMessages = state.messages_get(personaId);
+  const allMessages = roomId
+    ? normalizeRoomMessages(state.getRoomMessages(roomId), state)
+    : state.messages_get(personaId);
   await validateAndStoreQuotes(result.quotes, allMessages, itemId, personaDisplayName, personaGroup, state);
 
   console.log(`[handleTopicUpdate] ${isNewItem ? "Created" : "Updated"} topic "${result.name}"`);
@@ -191,6 +204,7 @@ export async function handlePersonUpdate(response: LLMResponse, state: StateMana
   const existingItemId = response.request.data.existingItemId as string | undefined;
   const personaId = response.request.data.personaId as string;
   const personaDisplayName = response.request.data.personaDisplayName as string;
+  const roomId = response.request.data.roomId as string | undefined;
   const candidateRelationship = response.request.data.candidateRelationship as string | undefined;
 
   if (!result.name || !result.description || result.sentiment === undefined) {
@@ -198,6 +212,9 @@ export async function handlePersonUpdate(response: LLMResponse, state: StateMana
     return;
   }
 
+  const personaIds = personaId.split("|").filter(Boolean);
+  const primaryId = personaIds[0] ?? personaId;
+
   const now = new Date().toISOString();
   const human = state.getHuman();
 
@@ -207,8 +224,11 @@ export async function handlePersonUpdate(response: LLMResponse, state: StateMana
   };
   const itemId = resolveItemId();
 
-  const persona = state.persona_getById(personaId);
+  const persona = state.persona_getById(primaryId);
   const personaGroup = persona?.group_primary ?? null;
+  const allPersonaGroups = personaIds
+    .map(id => state.persona_getById(id)?.group_primary)
+    .filter((g): g is string => g != null);
 
   const existingPerson = isNewItem ? undefined : human.people.find(p => p.id === existingItemId);
 
@@ -223,27 +243,34 @@ export async function handlePersonUpdate(response: LLMResponse, state: StateMana
   }
 
   const exposureImpact = result.exposure_impact as ExposureImpact | undefined;
+  const interestedPersonas = isNewItem
+    ? personaIds
+    : [...new Set([...(existingPerson?.interested_personas ?? []), ...personaIds])];
+  const personaGroupsMerged = isNewItem
+    ? (allPersonaGroups.length > 0 ? allPersonaGroups : existingPerson?.persona_groups)
+    : [...new Set([...(existingPerson?.persona_groups ?? []), ...allPersonaGroups])];
+
   const person: Person = {
     id: itemId,
     name: result.name,
     description: result.description,
     sentiment: result.sentiment,
     relationship: result.relationship ?? candidateRelationship ?? existingPerson?.relationship ?? "Unknown",
-    exposure_current: calculateExposureCurrent(exposureImpact),
+    exposure_current: calculateExposureCurrent(exposureImpact, existingPerson?.exposure_current ?? 0),
     exposure_desired: result.exposure_desired ?? 0.5,
     last_updated: now,
     last_mentioned: now,
-    learned_by: isNewItem ? personaId : existingPerson?.learned_by,
-    last_changed_by: personaId,
-    interested_personas: isNewItem
-      ? [personaId]
-      : [...new Set([...(existingPerson?.interested_personas ?? []), personaId])],
-    persona_groups: mergeGroups(personaGroup, isNewItem, existingPerson?.persona_groups),
+    learned_by: isNewItem ? primaryId : existingPerson?.learned_by,
+    last_changed_by: primaryId,
+    interested_personas: interestedPersonas,
+    persona_groups: personaGroupsMerged,
     embedding,
   };
   state.human_person_upsert(person);
 
-  const allMessages = state.messages_get(personaId);
+  const allMessages = roomId
+    ? normalizeRoomMessages(state.getRoomMessages(roomId), state)
+    : state.messages_get(personaId);
   await validateAndStoreQuotes(result.quotes, allMessages, itemId, personaDisplayName, personaGroup, state);
 
   console.log(`[handlePersonUpdate] ${isNewItem ? "Created" : "Updated"} person "${result.name}"`);
@@ -255,8 +282,7 @@ function normalizeText(text: string): string {
     .replace(/[\u2018\u2019\u0060\u00B4]/g, "'")  // curly single, backtick, acute accent
     .replace(/[\u2014\u2013\u2012]/g, '-')         // em-dash, en-dash, figure dash
     .replace(/\u00A0/g, ' ')                       // non-breaking space
-    .replace(/[\u2000-\u200F]/g, ' ')              // unicode space variants
-    .replace(/\u2026|\.\.\./g, '\u2026');           // normalize both ellipsis forms → unicode ellipsis (1:1)
+    .replace(/[\u2000-\u200F]/g, ' ');              // unicode space variants
 }
 
 function stripPunctuation(text: string): string {
@@ -270,31 +296,46 @@ function stripPunctuation(text: string): string {
     .toLowerCase();
 }
 
-interface WordBoundaryMatch {
+export interface WordBoundaryMatch {
   start: number;
   end: number;
   text: string;
 }
 
-function findQuoteByWords(quoteText: string, msgText: string): WordBoundaryMatch | null {
+export function expandToWordBoundaries(text: string, start: number, end: number): WordBoundaryMatch {
+  // Only walk backward if start is mid-word (not already at a word boundary)
+  if (start > 0 && !/\s/.test(text[start]))
+    while (start > 0 && !/\s/.test(text[start - 1])) start--;
+  // Only walk forward if end is mid-word
+  if (end > 0 && !/\s/.test(text[end - 1]))
+    while (end < text.length && !/\s/.test(text[end])) end++;
+  return { start, end, text: text.slice(start, end) };
+}
+
+export function findQuoteByWords(quoteText: string, msgText: string): WordBoundaryMatch | null {
   const strippedQuote = stripPunctuation(quoteText);
   const quoteWords = strippedQuote.split(' ').filter(w => w.length > 0);
 
-  if (quoteWords.length < 3) return null;  // Too short to trust — require at least 3 words
+  if (quoteWords.length < 2) return null;  // Too short to trust — require at least 2 words
 
-  // Build word token list from original message with original positions
+  // Build word token list from original message with original positions.
+  // Each \S+ token is re-split into sub-tokens (sharing the parent's start/end)
+  // so that contractions stripped by stripPunctuation (e.g. don't → "don t")
+  // align correctly with quoteWords which is also split on spaces.
   const wordTokens: Array<{ word: string; start: number; end: number }> = [];
   const wordRegex = /\S+/g;
   let match: RegExpExecArray | null;
   while ((match = wordRegex.exec(msgText)) !== null) {
-    wordTokens.push({
-      word: stripPunctuation(match[0]),
-      start: match.index,
-      end: match.index + match[0].length,
-    });
+    const tokenStart = match.index;
+    const tokenEnd = match.index + match[0].length;
+    const stripped = stripPunctuation(match[0]);
+    const subWords = stripped.split(' ').filter(w => w.length > 0);
+    for (const sub of subWords) {
+      wordTokens.push({ word: sub, start: tokenStart, end: tokenEnd });
+    }
   }
 
-  // Find contiguous sequence of words matching the quote words
+  // Find contiguous sequence of word tokens matching the quote words
   for (let i = 0; i <= wordTokens.length - quoteWords.length; i++) {
     let allMatch = true;
     for (let j = 0; j < quoteWords.length; j++) {
@@ -306,11 +347,7 @@ function findQuoteByWords(quoteText: string, msgText: string): WordBoundaryMatch
     if (allMatch) {
       const startToken = wordTokens[i];
       const endToken = wordTokens[i + quoteWords.length - 1];
-      return {
-        start: startToken.start,
-        end: endToken.end,
-        text: msgText.slice(startToken.start, endToken.end),
-      };
+      return expandToWordBoundaries(msgText, startToken.start, endToken.end);
     }
   }
 
@@ -343,9 +380,10 @@ async function validateAndStoreQuotes(
       let matchLevel: string;
 
       if (start !== -1) {
-        matchStart = start;
-        matchEnd = start + candidate.text.length;
-        matchText = candidate.text;
+        const expanded = expandToWordBoundaries(msgText, start, start + candidate.text.length);
+        matchStart = expanded.start;
+        matchEnd = expanded.end;
+        matchText = expanded.text;
         matchLevel = "exact";
       } else {
         // Level 2: word-boundary fallback
@@ -413,7 +451,8 @@ async function validateAndStoreQuotes(
         data_item_ids: [dataItemId],
         persona_groups: [personaGroup || "General"],
         text: matchText,
-        speaker: message.role === "human" ? "human" : personaName,
+        speaker: message.role === "human" ? "human" : (message.speaker_name ?? personaName),
+        channel: personaName,
         timestamp: message.timestamp,
         start: matchStart,
         end: matchEnd,
@@ -436,14 +475,5 @@ async function validateAndStoreQuotes(
   }
 }
 
-function calculateExposureCurrent(impact: ExposureImpact | undefined): number {
-  switch (impact) {
-    case "high": return 0.9;
-    case "medium": return 0.6;
-    case "low": return 0.3;
-    case "none": return 0.1;
-    default: return 0.5;
-  }
-}
 
 

package/src/core/handlers/index.ts

@@ -18,6 +18,8 @@ import { handleFactFind, handleHumanTopicScan, handleHumanPersonScan, handleEven
 import { handleTopicMatch, handleTopicUpdate, handlePersonMatch, handlePersonUpdate } from "./human-matching.js";
 import { handleRewriteScan, handleRewriteRewrite } from "./rewrite.js";
 import { handleDedupCurate } from "./dedup.js";
+import { handleRoomResponse, handleRoomJudge } from "./rooms.js";
+import { handlePersonaPreview } from "./persona-preview.js";
 
 export const handlers: Record<LLMNextStep, ResponseHandler> = {
   handlePersonaResponse,
@@ -45,4 +47,7 @@ export const handlers: Record<LLMNextStep, ResponseHandler> = {
   handleRewriteRewrite,
   handleDedupCurate,
   handleEventScan,
+  handleRoomResponse,
+  handleRoomJudge,
+  handlePersonaPreview,
 };

package/src/core/handlers/persona-preview.ts

@@ -0,0 +1,7 @@
+import type { LLMResponse } from "../types.js";
+import type { StateManager } from "../state-manager.js";
+
+export function handlePersonaPreview(_response: LLMResponse, _state: StateManager): void {
+  // Intentionally empty — state writes are not needed for preview generation.
+  // The Processor post-dispatch block handles: completeness validation, re-queue, and Promise resolution.
+}

package/src/core/handlers/persona-topics.ts

@@ -22,6 +22,7 @@ import {
 } from "../orchestrators/index.js";
 import { buildPersonaDescriptionsPrompt } from "../../prompts/generation/index.js";
 import { splitMessagesByTimestamp } from "./utils.js";
+import { calculateExposureCurrent } from "../utils/exposure.js";
 
 export const MIN_MESSAGE_COUNT_FOR_CREATE = 2;
 
@@ -272,7 +273,7 @@ export function handlePersonaTopicUpdate(response: LLMResponse, state: StateMana
       approach: result.approach || "",
       personal_stake: result.personal_stake || "",
       sentiment: result.sentiment,
-      exposure_current: result.exposure_current,
+      exposure_current: calculateExposureCurrent(result.exposure_impact, 0),
       exposure_desired: result.exposure_desired,
       last_updated: now,
     };
@@ -284,7 +285,7 @@ export function handlePersonaTopicUpdate(response: LLMResponse, state: StateMana
     const updatedTopics = persona.topics.map((t: PersonaTopic) => {
       if (t.id !== existingTopicId) return t;
 
-      const newExposure = Math.min(1.0, t.exposure_current + (result.exposure_current - t.exposure_current));
+      const newExposure = Math.max(calculateExposureCurrent(result.exposure_impact, t.exposure_current), t.exposure_current);
 
       return {
         ...t,

package/src/core/handlers/rooms.ts

@@ -0,0 +1,176 @@
+/**
+ * Room Response Handlers
+ */
+
+import { ContextStatus, LLMNextStep, LLMPriority, LLMRequestType } from "../types.js";
+import type { LLMResponse, RoomMessage } from "../types.js";
+import type { StateManager } from "../state-manager.js";
+import type { PersonaResponseResult } from "../../prompts/response/index.js";
+import type { RoomJudgeResult } from "../../prompts/room/index.js";
+import { buildRoomResponsePromptData } from "../prompt-context-builder.js";
+
+export function handleRoomResponse(response: LLMResponse, state: StateManager): void {
+  const roomId = response.request.data.roomId as string;
+  const personaId = response.request.data.personaId as string;
+  const personaDisplayName = response.request.data.personaDisplayName as string;
+  const parentMessageId = response.request.data.parentMessageId as string | null ?? null;
+
+  if (!roomId || !personaId) {
+    console.error("[handleRoomResponse] Missing roomId or personaId in request data");
+    return;
+  }
+
+  const now = new Date().toISOString();
+
+  if (response.parsed !== undefined) {
+    const result = response.parsed as PersonaResponseResult;
+
+    if (!result.should_respond) {
+      const reason = result.reason;
+      console.log(`[handleRoomResponse] ${personaDisplayName} chose silence in room ${roomId}: ${reason ?? "(no reason)"}`);
+      if (reason) {
+        const msg: RoomMessage = {
+          id: crypto.randomUUID(),
+          parent_id: parentMessageId,
+          role: "persona",
+          persona_id: personaId,
+          silence_reason: reason,
+          timestamp: now,
+          read: false,
+          context_status: ContextStatus.Default,
+        };
+        state.appendRoomMessage(roomId, msg);
+      }
+      return;
+    }
+
+    const verbal = result.verbal_response || undefined;
+    const action = result.action_response || undefined;
+
+    if (!verbal && !action) {
+      console.log(`[handleRoomResponse] ${personaDisplayName} returned should_respond=true but no content`);
+      return;
+    }
+
+    const msg: RoomMessage = {
+      id: crypto.randomUUID(),
+      parent_id: parentMessageId,
+      role: "persona",
+      persona_id: personaId,
+      verbal_response: verbal,
+      action_response: action,
+      timestamp: now,
+      read: false,
+      context_status: ContextStatus.Default,
+    };
+    state.appendRoomMessage(roomId, msg);
+    console.log(`[handleRoomResponse] Appended response from ${personaDisplayName} to room ${roomId}`);
+    return;
+  }
+
+  if (!response.content) {
+    console.log(`[handleRoomResponse] ${personaDisplayName} no response (empty content)`);
+    return;
+  }
+
+  const msg: RoomMessage = {
+    id: crypto.randomUUID(),
+    parent_id: parentMessageId,
+    role: "persona",
+    persona_id: personaId,
+    verbal_response: response.content,
+    timestamp: now,
+    read: false,
+    context_status: ContextStatus.Default,
+  };
+  state.appendRoomMessage(roomId, msg);
+  console.log(`[handleRoomResponse] Appended plain-text response from ${personaDisplayName} to room ${roomId}`);
+}
+
+export async function handleRoomJudge(response: LLMResponse, state: StateManager): Promise<void> {
+  const roomId = response.request.data.roomId as string;
+  const judgeDisplayName = response.request.data.judgePersonaDisplayName as string;
+
+  if (!roomId) {
+    console.error("[handleRoomJudge] Missing roomId in request data");
+    return;
+  }
+
+  if (!response.parsed) {
+    console.error(`[handleRoomJudge] No parsed result from judge ${judgeDisplayName}`);
+    return;
+  }
+
+  const result = response.parsed as RoomJudgeResult;
+  if (!result.winner_message_id) {
+    console.error(`[handleRoomJudge] Judge ${judgeDisplayName} returned no winner_message_id`);
+    return;
+  }
+
+  const judgePersonaId = response.request.data.judgePersonaId as string;
+
+  const allMessages = state.getRoomMessages(roomId);
+  const winner = allMessages.find(m => m.id === result.winner_message_id);
+  if (!winner) {
+    console.error(`[handleRoomJudge] Winner message ${result.winner_message_id} not found in room ${roomId}`);
+    return;
+  }
+
+  const verdictParentId = winner.parent_id;
+
+  const ok = state.setRoomActiveNode(roomId, result.winner_message_id);
+  if (!ok) {
+    console.error(`[handleRoomJudge] Could not set active node ${result.winner_message_id} in room ${roomId}`);
+    return;
+  }
+
+  const losers = allMessages
+    .filter(m => m.parent_id === verdictParentId && m.id !== winner.id)
+    .map(m => m.id);
+  if (losers.length > 0) {
+    state.removeRoomMessages(roomId, losers);
+  }
+
+  if (result.reason) {
+    console.log(`[handleRoomJudge] ${judgeDisplayName} verdict: ${result.reason}`);
+    const verdictMsg = {
+      id: crypto.randomUUID(),
+      parent_id: verdictParentId,
+      role: "persona" as const,
+      persona_id: judgePersonaId,
+      silence_reason: result.reason,
+      timestamp: new Date().toISOString(),
+      read: false,
+      context_status: "default" as import("../types.js").ContextStatus,
+    };
+    state.appendRoomMessage(roomId, verdictMsg);
+  }
+
+  const room = state.getRoom(roomId);
+  if (!room) return;
+
+  for (const personaId of room.persona_ids) {
+    if (room.judge_persona_id === personaId) continue;
+    const persona = state.persona_getById(personaId);
+    if (!persona || persona.is_archived || persona.is_paused) continue;
+
+    const isTUI = false;
+    const promptData = await buildRoomResponsePromptData(state, room, persona, isTUI);
+    const model = persona.model ?? state.getHuman().settings?.default_model ?? "";
+
+    state.queue_enqueue({
+      type: LLMRequestType.JSON,
+      priority: LLMPriority.Room,
+      system: promptData.system,
+      user: promptData.user,
+      next_step: LLMNextStep.HandleRoomResponse,
+      model,
+      data: {
+        roomId,
+        personaId,
+        personaDisplayName: persona.display_name,
+        parentMessageId: result.winner_message_id,
+      },
+    });
+  }
+}

package/src/core/handlers/utils.ts

@@ -1,12 +1,53 @@
-import type { Message, LLMResponse } from "../types.js";
+import type { Message, RoomMessage, LLMResponse } from "../types.js";
 import type { StateManager } from "../state-manager.js";
 
+export function normalizeRoomMessages(messages: RoomMessage[], state: StateManager): Message[] {
+  const human = state.getHuman();
+  const humanName = human.settings?.name_display ?? "Human";
+  return messages.map(m => {
+    const speakerName = m.role === "human"
+      ? humanName
+      : (state.persona_getById(m.persona_id ?? "")?.display_name ?? "Participant");
+    return {
+      id: m.id,
+      role: m.role === "human" ? "human" as const : "system" as const,
+      speaker_name: speakerName,
+      verbal_response: m.verbal_response,
+      action_response: m.action_response,
+      silence_reason: m.silence_reason,
+      timestamp: m.timestamp,
+      read: m.read,
+      context_status: m.context_status,
+      f: m.f,
+      t: m.t,
+      p: m.p,
+      e: m.e,
+    };
+  });
+}
+
 export function resolveMessageWindow(
   response: LLMResponse,
   state: StateManager
 ): { messages_context: Message[]; messages_analyze: Message[] } {
-  const personaId = response.request.data.personaId as string;
+  const roomId = response.request.data.roomId as string | undefined;
   const messageIdsToMark = response.request.data.message_ids_to_mark as string[] | undefined;
+
+  if (roomId) {
+    const allRoomMessages = normalizeRoomMessages(state.getRoomMessages(roomId), state);
+    if (messageIdsToMark && messageIdsToMark.length > 0) {
+      const idSet = new Set(messageIdsToMark);
+      const messages_analyze = allRoomMessages.filter(m => idSet.has(m.id));
+      const analyzeStartTime = messages_analyze[0]?.timestamp ?? '9999';
+      const messages_context = allRoomMessages.filter(m =>
+        !idSet.has(m.id) && new Date(m.timestamp).getTime() < new Date(analyzeStartTime).getTime()
+      );
+      return { messages_context, messages_analyze };
+    }
+    return { messages_context: [], messages_analyze: allRoomMessages };
+  }
+
+  const personaId = response.request.data.personaId as string;
   const allMessages = state.messages_get(personaId);
 
   if (messageIdsToMark && messageIdsToMark.length > 0) {
@@ -48,10 +89,21 @@ export function markMessagesExtracted(
   state: StateManager, 
   flag: ExtractionFlag
 ): void {
+  const roomId = response.request.data.roomId as string | undefined;
   const personaId = response.request.data.personaId as string | undefined;
   const messageIds = response.request.data.message_ids_to_mark as string[] | undefined;
   
-  if (!personaId || !messageIds?.length) return;
+  if (!messageIds?.length) return;
+
+  if (roomId) {
+    const count = state.markRoomMessagesExtracted(roomId, messageIds, flag);
+    if (count > 0) {
+      console.log(`[markMessagesExtracted] Marked ${count} room messages with flag '${flag}' for room ${roomId}`);
+    }
+    return;
+  }
+
+  if (!personaId) return;
   
   const count = state.messages_markExtracted(personaId, messageIds, flag);
   if (count > 0) {

package/src/core/heartbeat-manager.ts

@@ -158,9 +158,11 @@ export async function queueEiHeartbeat(
     return;
   }
 
+  const recentHistory = history.slice(-10);
   const promptData: EiHeartbeatPromptData = {
     items,
-    recent_history: history.slice(-10),
+    recent_history: recentHistory,
+    system_messages: recentHistory.filter(m => m.role === "system"),
   };
 
   const prompt = buildEiHeartbeatPrompt(promptData);

package/src/core/llm-client.ts

@@ -159,7 +159,7 @@ export async function callLLMRaw(
   const chatMessages: ChatMessage[] = [
     { role: "system", content: systemPrompt },
     ...messages,
-    { role: "user", content: userPrompt },
+    ...(userPrompt ? [{ role: "user" as const, content: userPrompt }] : []),
   ];
   
   const finalMessages = ensureUserFirst(chatMessages);