ei-tui 0.6.6 → 0.7.0

package/package.json

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

package/src/cli/README.md

@@ -72,9 +72,11 @@ ei "What are the user's current preferences, active projects, and workflow?"
 
 Ei is a persistent knowledge base built from the user's conversations — facts, preferences,
 people, topics, personas. Use it when the user references past work, mentions how they like things done,
-or asks "how did we do X." Use `ei --persona "Beta" "walruses"` to scope results to what a specific
-persona has learned. Use `ei personas "name"` to find personas by name. Query again mid-session when
-they correct you or reference something from a previous session.
+asks "how did we do X," or needs to look up a person by any name, handle, or account (GitHub username,
+Discord handle, email, nickname, etc.) — people results include an `identifiers` array covering all
+known accounts and aliases for that person. Use `ei --persona "Beta" "walruses"` to scope results to
+what a specific persona has learned. Use `ei personas "name"` to find personas by name. Query again
+mid-session when they correct you or reference something from a previous session.
 ```
 
 ### Claude Code
@@ -87,9 +89,11 @@ natural-language query about the user's preferences, active projects, and workfl
 A `persona` filter is available to scope results to what a specific persona has learned.
 Use `type: "personas"` to search for personas by name.
 
-Use Ei when the user references past decisions, mentions people or preferences, or asks
-"how did we do X." Query again when they correct you or reference something from a previous
-session.
+Use Ei when the user references past decisions, mentions people or preferences, asks
+"how did we do X," or needs to look up a person by any name, handle, or account — people
+results include an `identifiers` array (GitHub username, Discord handle, email, nickname, etc.)
+covering all known accounts and aliases. Query again when they correct you or reference
+something from a previous session.
 ```
 
 ### Cursor
@@ -111,6 +115,9 @@ conversations (facts, people, topics, quotes, personas).
   doesn't have that context.
 - You need the user's preferences, contacts, or project conventions (e.g. who to ask for
   access, how something was fixed).
+- You need to look up a person by any name, handle, or account — people results include an
+  `identifiers` array (GitHub username, Discord handle, email, nickname, etc.) covering all
+  known accounts and aliases for that person.
 - The question is about the user personally (people, workflow, prior discussions) rather
   than only code.
 
@@ -138,7 +145,9 @@ The installed tool gives OpenCode agents access to all five data types with prop
 
 All search commands return arrays. Each result includes a `type` field.
 
-**Fact / Person / Topic**: `{ type, id, name, description, sentiment, ...type-specific fields }`
+**Fact / Topic**: `{ type, id, name, description, sentiment, ...type-specific fields }`
+
+**Person**: `{ type, id, name, description, relationship, sentiment, identifiers[] }` — `identifiers` contains all known accounts and aliases (e.g. `{ type: "GitHub", value: "flare576" }`)
 
 **Quote**: `{ type, id, text, speaker, timestamp, linked_items[] }`
 

package/src/cli/commands/people.ts

@@ -21,5 +21,6 @@ export async function execute(query: string, limit: number, options: { recent?:
     description: person.description,
     relationship: person.relationship,
     sentiment: person.sentiment,
+    identifiers: person.identifiers ?? [],
   }));
 }

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 {
@@ -16,7 +16,7 @@ export function createMcpServer(): McpServer {
     "ei_search",
     {
       description:
-        "Search the user's Ei knowledge base — a persistent memory store built from conversations. Returns facts, people, topics of interest, and quotes. Results include entity IDs that can be passed back to ei_lookup for full detail. Omit query to browse by recency (use with recent=true or persona filter).",
+        "Search the user's Ei knowledge base — a persistent memory store built from conversations. Returns facts, people, topics of interest, and quotes. People results include an identifiers array (e.g. GitHub username, Discord handle, email, nickname) — query by any name or handle to find what Ei knows about that person. Results include entity IDs that can be passed back to ei_lookup for full detail. Omit query to browse by recency (use with recent=true or persona filter).",
       inputSchema: {
         query: z.string().optional().describe("Search text. Supports natural language. Omit to browse without semantic filtering — useful with recent=true or persona filter."),
         type: z
@@ -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/retrieval.ts

@@ -1,6 +1,6 @@
 import type { StorageState, Quote, Fact, Person, Topic } from "../core/types";
 import type { PersonaEntity } from "../core/types/entities.js";
-import type { PersonaTrait, PersonaTopic } from "../core/types/data-items.js";
+import type { PersonaTrait, PersonaTopic, PersonIdentifier } from "../core/types/data-items.js";
 import { decodeAllEmbeddings } from "../storage/embeddings";
 import { crossFind } from "../core/utils/index.ts";
 import { join } from "path";
@@ -102,6 +102,7 @@ export interface PersonResult {
   description: string;
   relationship: string;
   sentiment: number;
+  identifiers: PersonIdentifier[];
 }
 
 export interface TopicResult {
@@ -182,6 +183,7 @@ function mapPerson(person: Person): PersonResult {
     description: person.description,
     relationship: person.relationship,
     sentiment: person.sentiment,
+    identifiers: person.identifiers ?? [],
   };
 }
 

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

@@ -14,7 +14,7 @@ import { calculateExposureCurrent } from "../utils/exposure.js";
 
 
 import { resolveMessageWindow, getMessageText, normalizeRoomMessages } from "./utils.js";
-import { sanitizeEiPersonaIdentifiers } from "../utils/identifier-utils.js";
+import { sanitizeEiPersonaIdentifiers, normalizeIdentifierType } from "../utils/identifier-utils.js";
 
 export function handleTopicMatch(response: LLMResponse, state: StateManager): void {
   const result = response.parsed as ItemMatchResult | undefined;
@@ -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,12 +284,16 @@ 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) {
     const llmIdentifiers: PersonIdentifier[] = sanitizeEiPersonaIdentifiers(
       (result.identifiers ?? []).map(i => ({
-        type: i.type,
+        type: normalizeIdentifierType(i.type, state),
         value: i.value,
         ...(i.is_primary ? { is_primary: i.is_primary } : {}),
       })),
@@ -293,7 +302,7 @@ export async function handlePersonUpdate(response: LLMResponse, state: StateMana
     const allCandidateIds = [...llmIdentifiers, ...candidateIdentifiers];
     if (allCandidateIds.length === 0) {
       const hasSpace = candidateName.includes(' ');
-      allCandidateIds.push({ type: hasSpace ? "full_name" : "nickname", value: candidateName, is_primary: true });
+      allCandidateIds.push({ type: hasSpace ? "Full Name" : "Nickname", value: candidateName, is_primary: true });
     }
     const deduped: PersonIdentifier[] = [];
     for (const id of allCandidateIds) {
@@ -304,7 +313,13 @@ export async function handlePersonUpdate(response: LLMResponse, state: StateMana
     resolvedIdentifiers = deduped;
   } else {
     const base = [...(existingPerson?.identifiers ?? [])];
-    const sanitizedToAdd = sanitizeEiPersonaIdentifiers(result.identifiers_to_add ?? [], state);
+    const sanitizedToAdd = sanitizeEiPersonaIdentifiers(
+      (result.identifiers_to_add ?? []).map(i => ({
+        ...i,
+        type: normalizeIdentifierType(i.type, state),
+      })),
+      state
+    );
     for (const id of sanitizedToAdd) {
       if (!base.some(e => e.value === id.value)) {
         base.push({ type: id.type, value: id.value, ...(id.is_primary ? { is_primary: id.is_primary } : {}) });
@@ -329,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,
       },
     });
   }
@@ -281,6 +285,7 @@ export function queueDirectTopicUpdate(
         isNewItem: false,
         existingItemId: topic.id,
         analyze_from_timestamp: getAnalyzeFromTimestamp(chunk),
+        extraction_model: extractionModel,
       },
     });
   }
@@ -425,14 +430,11 @@ export function queueTopicUpdate(
       user: prompt.user,
       next_step: LLMNextStep.HandleTopicUpdate,
       data: {
-        personaId: context.personaId,
-        personaDisplayName: context.personaDisplayName,
-        roomId: context.roomId,
+        ...context,
         isNewItem,
         existingItemId: existingItem?.id,
         candidateName: isNewItem ? context.candidateName : undefined,
         candidateDescription: isNewItem ? context.candidateDescription : undefined,
-        candidateCategory: context.candidateCategory,
         analyze_from_timestamp: getAnalyzeFromTimestamp(chunk),
       },
     });
@@ -469,13 +471,25 @@ export function queueEventSummary(
 
   const allMessages = state.messages_get(personaId);
   const extractionModel = options?.extraction_model;
+  const gapMs = gapHours * 60 * 60 * 1000;
+  const now = Date.now();
   let totalChunks = 0;
 
-  state.messages_markExtracted(personaId, sorted.map(m => m.id), "e");
-
-  for (const windowMessages of windows) {
+  for (let i = 0; i < windows.length; i++) {
+    const windowMessages = windows[i];
     if (windowMessages.length === 0) continue;
 
+    const isLastWindow = i === windows.length - 1;
+    if (isLastWindow) {
+      const lastMsgTime = new Date(windowMessages[windowMessages.length - 1].timestamp).getTime();
+      if (now - lastMsgTime < gapMs) {
+        console.log(`[queueEventSummary] Skipping open window for ${persona.display_name} — last message < ${gapHours}h ago`);
+        continue;
+      }
+    }
+
+    state.messages_markExtracted(personaId, windowMessages.map(m => m.id), "e");
+
     const windowStartTime = new Date(windowMessages[0].timestamp).getTime();
     const messages_context = allMessages.filter(
       m => m.e === true && new Date(m.timestamp).getTime() < windowStartTime
@@ -599,6 +613,8 @@ export function queuePersonUpdate(
         candidateRelationship: context.candidateRelationship,
         candidateIdentifiers: isNewItem ? candidateIdentifiers : undefined,
         analyze_from_timestamp: getAnalyzeFromTimestamp(chunk),
+        extraction_model: context.extraction_model,
+        sources: context.sources,
       },
     });
   }
@@ -653,6 +669,7 @@ export async function queueTopicValidate(
     data: {
       entity_type: "topic",
       entity_ids: [existingTopic.id, newTopic.id],
+      extraction_model: extractionModel,
     },
   });
 }

package/src/core/persona-manager.ts

@@ -20,6 +20,9 @@ export async function getPersonaList(sm: StateManager): Promise<PersonaSummary[]
     unread_count: sm.messages_countUnread(entity.id),
     last_activity: entity.last_activity,
     context_boundary: entity.context_boundary,
+    avatar_emoji: entity.avatar_emoji,
+    avatar_image: entity.avatar_image,
+    preferred_theme: entity.preferred_theme,
   }));
 }
 

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,