ei-tui 0.6.7 → 0.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ei-tui",
-  "version": "0.6.7",
+  "version": "0.7.1",
   "author": "Flare576",
   "repository": {
     "type": "git",

package/src/cli/mcp.ts

@@ -3,7 +3,7 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 import { z } from "zod";
 import { retrieveBalanced, lookupById, loadLatestState, type BalancedResult } from "./retrieval.js";
 import type { StorageState } from "../core/types/index.js";
-import { resolvePersonaId, filterByPersona, filterTypeSpecificByPersona } from "./persona-filter.js";
+import { resolvePersonaId, filterByPersona, filterTypeSpecificByPersona, filterBySource, filterTypeSpecificBySource } from "./persona-filter.js";
 
 // Exported so tests can inject their own transport
 export function createMcpServer(): McpServer {
@@ -31,6 +31,12 @@ export function createMcpServer(): McpServer {
           .describe(
             "Filter to entities a specific persona has learned about. Use the persona display name."
           ),
+        source: z
+          .string()
+          .optional()
+          .describe(
+            "Filter to entities from a specific source. Prefix match against namespaced source identifiers (e.g. 'cursor', 'opencode', 'opencode:ses_abc123')."
+          ),
         limit: z
           .number()
           .optional()
@@ -42,16 +48,16 @@ export function createMcpServer(): McpServer {
           .describe("If true, sort by most recently mentioned."),
       },
     },
-    async ({ query: rawQuery, type, persona, limit, recent }) => {
+    async ({ query: rawQuery, type, persona, source, limit, recent }) => {
       const query = rawQuery ?? "";
       const options = { recent: recent ?? false };
       const effectiveLimit = limit ?? 10;
 
       let state: StorageState | null = null;
       let personaId: string | undefined;
-      if (persona) {
+      if (persona || source) {
         state = await loadLatestState();
-        if (state) {
+        if (state && persona) {
           personaId = resolvePersonaId(state, persona) ?? undefined;
           if (!personaId) {
             return {
@@ -68,11 +74,17 @@ export function createMcpServer(): McpServer {
         if (personaId && state) {
           result = filterTypeSpecificByPersona(result as { id: string }[], state, personaId, type);
         }
+        if (source && state) {
+          result = filterTypeSpecificBySource(result as { id: string }[], state, source, type);
+        }
       } else {
         result = await retrieveBalanced(query, effectiveLimit, options);
         if (personaId && state) {
           result = filterByPersona(result as BalancedResult[], state, personaId);
         }
+        if (source && state) {
+          result = filterBySource(result as BalancedResult[], state, source);
+        }
       }
 
       return {
@@ -88,17 +100,30 @@ export function createMcpServer(): McpServer {
         "Look up a specific entity in the Ei knowledge base by ID. Returns the full entity record. Use IDs from ei_search results.",
       inputSchema: {
         id: z.string().describe("The entity ID to look up."),
+        source: z
+          .string()
+          .optional()
+          .describe(
+            "Filter to entities from a specific source. Prefix match against namespaced source identifiers (e.g. 'cursor', 'opencode', 'opencode:ses_abc123'). If the entity does not match, returns not found."
+          ),
       },
     },
-    async ({ id }) => {
+    async ({ id, source }) => {
       const result = await lookupById(id);
-      const text =
-        result === null
-          ? `No entity found with ID: ${id}`
-          : JSON.stringify(result, null, 2);
+
+      if (result === null) {
+        return { content: [{ type: "text" as const, text: `No entity found with ID: ${id}` }] };
+      }
+
+      if (source) {
+        const sources = (result as { sources?: string[] }).sources;
+        if (!sources?.some((s) => s.startsWith(source))) {
+          return { content: [{ type: "text" as const, text: `No entity found with ID: ${id}` }] };
+        }
+      }
 
       return {
-        content: [{ type: "text" as const, text }],
+        content: [{ type: "text" as const, text: JSON.stringify(result, null, 2) }],
       };
     }
   );

package/src/cli/persona-filter.ts

@@ -52,3 +52,45 @@ export function filterTypeSpecificByPersona<T extends { id: string }>(
     return original?.interested_personas?.includes(personaId) ?? false;
   });
 }
+
+export function filterBySource(results: BalancedResult[], state: StorageState, sourcePrefix: string): BalancedResult[] {
+  return results.filter((result) => {
+    if (result.type === "quote") {
+      return false;
+    }
+    const { id } = result;
+    let original: { sources?: string[] } | undefined;
+    if (result.type === "fact") {
+      original = state.human.facts.find((f) => f.id === id);
+    } else if (result.type === "topic") {
+      original = state.human.topics.find((t) => t.id === id);
+    } else if (result.type === "person") {
+      original = state.human.people.find((p) => p.id === id);
+    }
+    return original?.sources?.some((s) => s.startsWith(sourcePrefix)) ?? false;
+  });
+}
+
+export function filterTypeSpecificBySource<T extends { id: string }>(
+  results: T[],
+  state: StorageState,
+  sourcePrefix: string,
+  targetType: string
+): T[] {
+  if (targetType === "quotes") {
+    return [];
+  }
+  const collection =
+    targetType === "facts"
+      ? state.human.facts
+      : targetType === "topics"
+        ? state.human.topics
+        : targetType === "people"
+          ? state.human.people
+          : null;
+  if (!collection) return results;
+  return results.filter((r) => {
+    const original = collection.find((item) => item.id === r.id) as { sources?: string[] } | undefined;
+    return original?.sources?.some((s) => s.startsWith(sourcePrefix)) ?? false;
+  });
+}

package/src/cli.ts

@@ -15,7 +15,7 @@ import { parseArgs } from "util";
 import { join } from "path";
 import { retrieveBalanced, lookupById, loadLatestState } from "./cli/retrieval";
 import type { StorageState } from "./core/types";
-import { resolvePersonaId, filterByPersona, filterTypeSpecificByPersona } from "./cli/persona-filter.js";
+import { resolvePersonaId, filterByPersona, filterTypeSpecificByPersona, filterBySource, filterTypeSpecificBySource } from "./cli/persona-filter.js";
 
 const TYPE_ALIASES: Record<string, string> = {
   quote: "quotes",
@@ -59,6 +59,7 @@ Options:
   --number, -n     Maximum number of results (default: 10)
   --recent, -r     Sort by last_mentioned date (most recent first)
   --persona, -p    Filter to entities a specific persona has learned about
+  --source, -s     Filter to entities from a specific source (prefix match, e.g. "cursor", "opencode:ses_abc123")
   --id             Look up entity by ID (accepts value or stdin)
   --install        Register Ei with OpenCode, Claude Code, and Cursor
   --help, -h       Show this help message
@@ -70,6 +71,7 @@ Examples:
   ei --recent                            # Most recently mentioned items
   ei topics --recent "work"              # Recent work-related topics
   ei --persona "Architect" "work stuff"  # What Architect knows about work
+  ei topics --source cursor "X"          # Topics learned from Cursor sessions
   ei --id abc-123                        # Look up entity by ID
   ei "memory leak" | jq .[0].id | ei --id  # Pipe ID from search
 `);
@@ -305,6 +307,7 @@ async function main(): Promise<void> {
         number: { type: "string", short: "n" },
         recent: { type: "boolean", short: "r" },
         persona: { type: "string", short: "p" },
+        source: { type: "string", short: "s" },
         help: { type: "boolean", short: "h" },
       },
       allowPositionals: true,
@@ -325,6 +328,7 @@ async function main(): Promise<void> {
   // Default to recent mode when no query — allows `ei --persona Foo` and `ei` with no args
   const recent = parsed.values.recent === true || !query;
   const personaName = parsed.values.persona?.trim();
+  const sourcePrefix = parsed.values.source?.trim();
 
   if (isNaN(limit) || limit < 1) {
     console.error("--number must be a positive integer");
@@ -333,16 +337,18 @@ async function main(): Promise<void> {
 
   let state: StorageState | null = null;
   let personaId: string | undefined;
-  if (personaName) {
+  if (personaName || sourcePrefix) {
     state = await loadLatestState();
     if (!state) {
       console.error("No saved state found. Is EI_DATA_PATH set correctly?");
       process.exit(1);
     }
-    personaId = resolvePersonaId(state, personaName) ?? undefined;
-    if (!personaId) {
-      console.error(`Persona "${personaName}" not found.`);
-      process.exit(1);
+    if (personaName) {
+      personaId = resolvePersonaId(state, personaName) ?? undefined;
+      if (!personaId) {
+        console.error(`Persona "${personaName}" not found.`);
+        process.exit(1);
+      }
     }
   }
 
@@ -355,11 +361,17 @@ async function main(): Promise<void> {
     if (personaId && state) {
       result = filterTypeSpecificByPersona(result, state, personaId, targetType);
     }
+    if (sourcePrefix && state) {
+      result = filterTypeSpecificBySource(result, state, sourcePrefix, targetType);
+    }
   } else {
     result = await retrieveBalanced(query, limit, options);
     if (personaId && state) {
       result = filterByPersona(result, state, personaId);
     }
+    if (sourcePrefix && state) {
+      result = filterBySource(result, state, sourcePrefix);
+    }
   }
 
   console.log(JSON.stringify(result, null, 2));

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

@@ -147,6 +147,7 @@ export async function handleFactFind(response: LLMResponse, state: StateManager)
       learned_by: existingFact.learned_by ?? context.personaId,
       last_changed_by: context.personaId,
       interested_personas: [...new Set([...(existingFact.interested_personas ?? []), context.personaId])],
+      sources: [...new Set([...(existingFact.sources ?? []), ...(context.sources ?? [])])],
       embedding,
     };
 

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

@@ -176,6 +176,10 @@ export async function handleTopicUpdate(response: LLMResponse, state: StateManag
   const personaGroupsMerged = isNewItem
     ? (allPersonaGroups.length > 0 ? allPersonaGroups : existingTopic?.persona_groups)
     : [...new Set([...(existingTopic?.persona_groups ?? []), ...allPersonaGroups])];
+  const incomingSources = (response.request.data.sources ?? []) as string[];
+  const sources = isNewItem
+    ? incomingSources
+    : [...new Set([...(existingTopic?.sources ?? []), ...incomingSources])];
 
   const topic: Topic = {
     id: itemId,
@@ -191,6 +195,7 @@ export async function handleTopicUpdate(response: LLMResponse, state: StateManag
     learned_by: isNewItem ? primaryId : existingTopic?.learned_by,
     last_changed_by: primaryId,
     interested_personas: interestedPersonas,
+    sources: sources.length > 0 ? sources : undefined,
     persona_groups: personaGroupsMerged,
     embedding,
   };
@@ -279,6 +284,10 @@ export async function handlePersonUpdate(response: LLMResponse, state: StateMana
   const personaGroupsMerged = isNewItem
     ? (allPersonaGroups.length > 0 ? allPersonaGroups : existingPerson?.persona_groups)
     : [...new Set([...(existingPerson?.persona_groups ?? []), ...allPersonaGroups])];
+  const incomingPersonSources = (response.request.data.sources ?? []) as string[];
+  const personSources = isNewItem
+    ? incomingPersonSources
+    : [...new Set([...(existingPerson?.sources ?? []), ...incomingPersonSources])];
 
   let resolvedIdentifiers: PersonIdentifier[];
   if (isNewItem) {
@@ -335,6 +344,7 @@ export async function handlePersonUpdate(response: LLMResponse, state: StateMana
     learned_by: isNewItem ? primaryId : existingPerson?.learned_by,
     last_changed_by: primaryId,
     interested_personas: interestedPersonas,
+    sources: personSources.length > 0 ? personSources : undefined,
     persona_groups: personaGroupsMerged,
     embedding,
   };

package/src/core/handlers/index.ts

@@ -6,7 +6,7 @@ import type { PersonIdentifier } from "../types/data-items.js";
 
 export type { ResponseHandler } from "./persona-response.js";
 
-import { handlePersonaResponse, handleToolContinuation, handleOneShot } from "./persona-response.js";
+import { handlePersonaResponse, handleToolContinuation, handleOneShot, handleOneShotJSON } from "./persona-response.js";
 import { handleHeartbeatCheck, handleEiHeartbeat } from "./heartbeat.js";
 import { handlePersonaGeneration, handlePersonaDescriptions, handlePersonaTraitExtraction } from "./persona-generation.js";
 import {
@@ -79,6 +79,7 @@ export const handlers: Record<LLMNextStep, ResponseHandler> = {
   handleHeartbeatCheck,
   handleEiHeartbeat,
   handleOneShot,
+  handleOneShotJSON,
   handleToolContinuation,
   handleRewriteScan,
   handleRewriteRewrite,

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

@@ -139,3 +139,8 @@ export function handleOneShot(_response: LLMResponse, _state: StateManager): voi
   // One-shot is handled specially in Processor to fire onOneShotReturned
   // This handler is a no-op placeholder
 }
+
+export function handleOneShotJSON(_response: LLMResponse, _state: StateManager): void {
+  // One-shot JSON is handled specially in Processor to fire onOneShotJSONReturned
+  // This handler is a no-op placeholder
+}

package/src/core/handlers/utils.ts

@@ -11,7 +11,10 @@ export function getMessageContent(msg: { content?: string; verbal_response?: str
 
 export function normalizeRoomMessages(messages: RoomMessage[], state: StateManager): Message[] {
   const human = state.getHuman();
-  const humanName = human.settings?.name_display ?? "Human";
+  const humanName =
+    human.settings?.name_display ||
+    human.facts?.find(f => f.name === "Nickname/Preferred Name")?.description ||
+    "Human";
   return messages.map(m => {
     const speakerName = m.role === "human"
       ? humanName

package/src/core/orchestrators/ceremony.ts

@@ -1,4 +1,4 @@
-import { LLMRequestType, LLMPriority, LLMNextStep, RoomMode, type CeremonyConfig, type PersonaTopic, type Topic, type DataItemBase } from "../types.js";
+import { LLMRequestType, LLMPriority, LLMNextStep, RoomMode, ContextStatus, type CeremonyConfig, type PersonaTopic, type Topic, type DataItemBase } from "../types.js";
 import type { StateManager } from "../state-manager.js";
 import { normalizeRoomMessages } from "../handlers/utils.js";
 import { applyDecayToValue } from "../utils/index.js";
@@ -347,7 +347,7 @@ export function prunePersonaMessages(personaId: string, state: StateManager): vo
     if (msgMs >= cutoffMs) break; // Sorted by time, no more old ones
     
     const fullyExtracted = m.t && m.p && m.f; // r intentionally excluded — trait extraction deprecated
-    if (fullyExtracted) {
+    if (fullyExtracted && m.context_status !== ContextStatus.Always) {
       toRemove.push(m.id);
     }
   }

package/src/core/orchestrators/human-extraction.ts

@@ -59,6 +59,7 @@ export interface ExtractionContext {
   messages_analyze: Message[];
   extraction_flag?: "f" | "t" | "p" | "e";
   roomId?: string;
+  sources?: string[];
 }
 
 export interface ExtractionOptions {
@@ -132,6 +133,7 @@ export function queueFactFind(context: ExtractionContext, state: StateManager, o
         analyze_from_timestamp: getAnalyzeFromTimestamp(chunk),
         extraction_flag: context.extraction_flag,
         message_ids_to_mark: chunk.messages_analyze.map(m => m.id),
+        sources: context.sources,
       },
     });
   }
@@ -173,6 +175,7 @@ export function queueTopicScan(context: ExtractionContext, state: StateManager,
         analyze_from_timestamp: getAnalyzeFromTimestamp(chunk),
         extraction_flag: context.extraction_flag,
         message_ids_to_mark: chunk.messages_analyze.map(m => m.id),
+        sources: context.sources,
       },
     });
   }
@@ -222,6 +225,7 @@ export function queuePersonScan(context: ExtractionContext, state: StateManager,
         analyze_from_timestamp: getAnalyzeFromTimestamp(chunk),
         extraction_flag: context.extraction_flag,
         message_ids_to_mark: chunk.messages_analyze.map(m => m.id),
+        sources: context.sources,
       },
     });
   }
@@ -610,6 +614,7 @@ export function queuePersonUpdate(
         candidateIdentifiers: isNewItem ? candidateIdentifiers : undefined,
         analyze_from_timestamp: getAnalyzeFromTimestamp(chunk),
         extraction_model: context.extraction_model,
+        sources: context.sources,
       },
     });
   }

package/src/core/personas/opencode-agent.ts

@@ -16,6 +16,7 @@ export interface EnsureAgentPersonaOptions {
 }
 
 export function resolveCanonicalAgent(agentName: string): { canonical: string; aliases: string[] } {
+  agentName = agentName.replace(/^\p{Z}+|\p{Z}+$/gu, "");
   for (const [canonical, variants] of Object.entries(AGENT_ALIASES)) {
     if (variants.includes(agentName)) {
       return { canonical, aliases: variants };

package/src/core/processor.ts

@@ -112,6 +112,7 @@ import {
   deleteQueueItems,
   clearQueue,
   submitOneShot,
+  submitOneShotJSON,
 } from "./queue-manager.js";
 import {
   getRoomList,
@@ -1354,7 +1355,7 @@ const toolNextSteps = new Set([
         if (result.sessionsProcessed > 0) {
           console.log(
             `[Processor] Claude Code sync complete: ${result.sessionsProcessed} sessions, ` +
-              `${result.topicsCreated} topics created, ${result.messagesImported} messages imported, ` +
+              `${result.messagesImported} messages imported, ` +
               `${result.extractionScansQueued} extraction scans queued`
           );
         }
@@ -1407,7 +1408,7 @@ const toolNextSteps = new Set([
         if (result.sessionsProcessed > 0) {
           console.log(
             `[Processor] Cursor sync complete: ${result.sessionsProcessed} sessions, ` +
-              `${result.topicsCreated} topics created, ${result.messagesImported} messages imported, ` +
+              `${result.messagesImported} messages imported, ` +
               `${result.extractionScansQueued} extraction scans queued`
           );
         }
@@ -1484,6 +1485,10 @@ const toolNextSteps = new Set([
           const guid = response.request.data.guid as string;
           this.interface.onOneShotReturned?.(guid, "");
         }
+        if (response.request.next_step === LLMNextStep.HandleOneShotJSON) {
+          const guid = response.request.data.guid as string;
+          this.interface.onOneShotJSONReturned?.(guid, null);
+        }
       }
 
       this.interface.onError?.({ code, message });
@@ -1529,6 +1534,11 @@ const toolNextSteps = new Set([
         this.interface.onOneShotReturned?.(guid, content);
       }
 
+      if (response.request.next_step === LLMNextStep.HandleOneShotJSON) {
+        const guid = response.request.data.guid as string;
+        this.interface.onOneShotJSONReturned?.(guid, response.parsed ?? null);
+      }
+
       if (response.request.next_step === LLMNextStep.HandlePersonaPreview) {
         const guid = response.request.data.guid as string;
         const loopCounter = (response.request.data.loop_counter as number) ?? 0;
@@ -1994,6 +2004,16 @@ const toolNextSteps = new Set([
     );
   }
 
+  async submitOneShotJSON(guid: string, systemPrompt: string, userPrompt: string): Promise<void> {
+    return submitOneShotJSON(
+      this.stateManager,
+      () => getOneshotModel(this.stateManager),
+      guid,
+      systemPrompt,
+      userPrompt
+    );
+  }
+
   async generatePersonaPreview(
     name: string,
     description: string,

package/src/core/prompt-context-builder.ts

@@ -1,4 +1,5 @@
-import type { PersonaEntity, HumanEntity, DataItemBase, Quote, RoomEntity } from "./types.js";
+import type { PersonaEntity, HumanEntity, DataItemBase, Quote, RoomEntity, RoomMessage } from "./types.js";
+import { RoomMode, ContextStatus } from "./types.js";
 import { StateManager } from "./state-manager.js";
 import { getEmbeddingService, findTopK } from "./embedding-service.js";
 import type { ResponsePromptData, PromptOutput } from "../prompts/index.js";
@@ -121,7 +122,12 @@ export async function filterHumanDataByVisibility(
       selectRelevantQuotes(human.quotes ?? [], currentMessage),
     ]);
     const { topics, people } = capTopicsAndPeople(rawTopics, rawPeople);
+    const humanName =
+      human.settings?.name_display ||
+      human.facts?.find(f => f.name === "Nickname/Preferred Name")?.description ||
+      "Human";
     return {
+      name: humanName,
       facts,
       topics,
       people,
@@ -158,7 +164,12 @@ export async function filterHumanDataByVisibility(
   ]);
   const { topics, people } = capTopicsAndPeople(rawTopics, rawPeople);
 
+  const humanName =
+    human.settings?.name_display ||
+    human.facts?.find(f => f.name === "Nickname/Preferred Name")?.description ||
+    "Human";
   return {
+    name: humanName,
     facts,
     topics,
     people,
@@ -264,14 +275,30 @@ export async function buildRoomResponsePromptData(
     ? [...sm.getRoomMessages(room.id)].sort((a, b) => a.timestamp.localeCompare(b.timestamp))
     : activePath;
 
-  // Apply time window (same hours setting as 1:1 personas), but guarantee
-  // at least MIN_ROOM_MESSAGES so rooms never feel like they're starting over.
-  // Whichever anchor reaches further back wins.
-  const contextWindowHours = human.settings?.default_context_window_hours ?? 8;
-  const windowCutoff = new Date(Date.now() - contextWindowHours * 60 * 60 * 1000).toISOString();
-  const byTime = allSourceMessages.filter(m => m.timestamp >= windowCutoff);
-  const byCount = allSourceMessages.slice(-MIN_ROOM_MESSAGES);
-  const sourceMessages = byTime.length >= byCount.length ? byTime : byCount;
+  let sourceMessages: RoomMessage[];
+  if (room.mode === RoomMode.FreeForAll) {
+    const contextWindowHours = room.context_window_hours
+      ?? human.settings?.default_context_window_hours
+      ?? 8;
+    const windowCutoff = new Date(Date.now() - contextWindowHours * 60 * 60 * 1000).toISOString();
+    const boundaryMs = room.context_boundary ? new Date(room.context_boundary).getTime() : 0;
+    sourceMessages = allSourceMessages.filter(m => {
+      const msgMs = new Date(m.timestamp).getTime();
+      if (m.context_status === ContextStatus.Always) return true;
+      if (m.context_status === ContextStatus.Never) return false;
+      if (msgMs < new Date(windowCutoff).getTime()) return false;
+      if (boundaryMs && msgMs < boundaryMs) return false;
+      return true;
+    });
+    const byCount = allSourceMessages.slice(-MIN_ROOM_MESSAGES);
+    if (byCount.length > sourceMessages.length) sourceMessages = byCount;
+  } else {
+    const contextWindowHours = human.settings?.default_context_window_hours ?? 8;
+    const windowCutoff = new Date(Date.now() - contextWindowHours * 60 * 60 * 1000).toISOString();
+    const byTime = allSourceMessages.filter(m => m.timestamp >= windowCutoff);
+    const byCount = allSourceMessages.slice(-MIN_ROOM_MESSAGES);
+    sourceMessages = byTime.length >= byCount.length ? byTime : byCount;
+  }
 
   const lastMessage = sourceMessages[sourceMessages.length - 1];
   const currentMessage = lastMessage ? getMessageContent(lastMessage) : undefined;
@@ -297,7 +324,10 @@ export async function buildRoomResponsePromptData(
   }
   otherParticipants.push({
     id: "human",
-    name: human.settings?.name_display ?? "Human",
+    name:
+      human.settings?.name_display ||
+      human.facts?.find(f => f.name === "Nickname/Preferred Name")?.description ||
+      "Human",
     traits: [],
     is_human: true,
   });

package/src/core/queue-manager.ts

@@ -77,3 +77,21 @@ export async function submitOneShot(
     data: { guid },
   });
 }
+
+export async function submitOneShotJSON(
+  sm: StateManager,
+  getOneshotModel: () => string | undefined,
+  guid: string,
+  systemPrompt: string,
+  userPrompt: string
+): Promise<void> {
+  sm.queue_enqueue({
+    type: LLMRequestType.JSON,
+    priority: LLMPriority.High,
+    system: systemPrompt,
+    user: userPrompt,
+    next_step: LLMNextStep.HandleOneShotJSON,
+    model: getOneshotModel(),
+    data: { guid },
+  });
+}

package/src/core/room-manager.ts

@@ -149,8 +149,19 @@ export async function sendFfaMessage(
   }
 
   const now = new Date().toISOString();
+
+  // FFA human messages always hang off the room root (the initial message with parent_id === null)
+  // so the tree is a flat star: root → every human turn, each human turn → persona responses.
+  // This gives the context window a bounded, predictable shape instead of a chain.
+  const ffaRootMsg = sm.getRoomMessages(roomId).find(m => m.parent_id === null);
+  if (!ffaRootMsg) {
+    onError({ code: "ROOM_NO_ROOT", message: "FFA room has no root message. Try archiving and recreating the room." });
+    return;
+  }
+  const ffaParentId = ffaRootMsg.id;
+
   const existing = sm.getRoomMessages(roomId).find(
-    m => m.role === "human" && m.parent_id === room.active_node_id
+    m => m.role === "human" && m.id === room.active_node_id && m.parent_id === ffaParentId
   );
 
   let humanMsgId: string;
@@ -164,7 +175,7 @@ export async function sendFfaMessage(
   } else {
     const msg: RoomMessage = {
       id: crypto.randomUUID(),
-      parent_id: room.active_node_id,
+      parent_id: ffaParentId,
       role: "human",
       verbal_response: content ?? undefined,
       silence_reason: content ? undefined : (silenceReason ?? "passed"),
@@ -278,9 +289,14 @@ export async function activateRoom(
 
     const currentRound = allMessages.filter(m => m.parent_id === room.active_node_id);
 
+    const humanDisplayName =
+      human.settings?.name_display ||
+      human.facts?.find(f => f.name === "Nickname/Preferred Name")?.description ||
+      "Human";
+
     const context: RoomHistoryMessage[] = sm.getRoomActivePath(roomId).map(m => ({
       speaker_name: m.role === "human"
-        ? (human.settings?.name_display ?? "Human")
+        ? humanDisplayName
         : (sm.persona_getById(m.persona_id ?? "")?.display_name ?? "Unknown"),
       speaker_id: m.role === "human" ? "human" : (m.persona_id ?? ""),
       verbal_response: getMessageContent(m) || undefined,
@@ -290,7 +306,7 @@ export async function activateRoom(
     const candidates: RoomJudgeCandidate[] = currentRound.map(m => ({
       message_id: m.id,
       speaker_name: m.role === "human"
-        ? (human.settings?.name_display ?? "Human")
+        ? humanDisplayName
         : (sm.persona_getById(m.persona_id ?? "")?.display_name ?? "Unknown"),
       speaker_id: m.role === "human" ? "human" : (m.persona_id ?? ""),
       verbal_response: getMessageContent(m) || undefined,
@@ -305,6 +321,7 @@ export async function activateRoom(
         long_description: judgePersona.long_description,
         traits: judgePersona.traits,
       },
+      human: { name: humanDisplayName },
       context,
       candidates,
     });

package/src/core/state/personas.ts

@@ -46,8 +46,8 @@ export class PersonaState {
     return this.personas.get(id)?.entity ?? null;
   }
 
-  getByName(nameOrAlias: string): PersonaEntity | null {
-    const searchTerm = nameOrAlias.toLowerCase();
+   getByName(nameOrAlias: string): PersonaEntity | null {
+    const searchTerm = nameOrAlias.replace(/^\p{Z}+|\p{Z}+$/gu, "").toLowerCase();
     
     // Priority 1: Exact display_name match
     for (const data of this.personas.values()) {