ei-tui 0.6.7 → 0.7.1

package/src/core/state-manager.ts

@@ -17,6 +17,7 @@ import type {
   RoomSummary,
   RoomCreationInput,
 } from "./types.js";
+import { RoomMode } from "./types.js";
 import { BUILT_IN_FACT_NAMES } from './constants/built-in-facts.js';
 import type { ThemeDefinition } from './types/entities.js';
 import type { Storage } from "../storage/interface.js";
@@ -70,6 +71,7 @@ export class StateManager {
     this.migrateProviderModel();
     this.migrateRoomMessageContent();
     this.migrateThemes();
+    this.migrateFfaParentIds();
   }
 
   private migrateRoomMessageContent(): void {
@@ -576,6 +578,30 @@ export class StateManager {
     this.humanState.set(human);
   }
 
+  private migrateFfaParentIds(): void {
+    const rooms = this.roomState.getAll(true);
+    let migratedCount = 0;
+
+    for (const room of rooms) {
+      if (room.mode !== RoomMode.FreeForAll) continue;
+      const rootMsg = room.messages.find(m => m.parent_id === null);
+      if (!rootMsg) continue;
+
+      for (const msg of room.messages) {
+        if (msg.role !== "human") continue;
+        if (msg.id === rootMsg.id) continue;
+        if (msg.parent_id === rootMsg.id) continue;
+        msg.parent_id = rootMsg.id;
+        migratedCount++;
+      }
+    }
+
+    if (migratedCount > 0) {
+      this.scheduleSave();
+      console.log(`[StateManager] Migrated ${migratedCount} FFA human messages to root parent_id`);
+    }
+  }
+
   getHuman(): HumanEntity {
     return this.humanState.get();
   }

package/src/core/types/data-items.ts

@@ -15,6 +15,7 @@ export interface DataItemBase {
   learned_by?: string;           // Persona ID that originally learned this item (stable UUID)
   last_changed_by?: string;      // Persona ID that most recently updated this item (stable UUID)
   interested_personas?: string[]; // Persona IDs that have extracted/touched this item (accumulated)
+  sources?: string[];            // Namespaced source identifiers — where items were learned from. Format: "provider:id" (e.g., "opencode:ses_abc123", "cursor:composerId"). Grow-only union.
   persona_groups?: string[];
   embedding?: number[];
   rewrite_checked?: boolean;     // True after rewrite scan finds no changes. Cleared automatically when extraction upserts a fresh item.

package/src/core/types/enums.ts

@@ -38,6 +38,7 @@ export enum LLMNextStep {
   HandleHeartbeatCheck = "handleHeartbeatCheck",
   HandleEiHeartbeat = "handleEiHeartbeat",
   HandleOneShot = "handleOneShot",
+  HandleOneShotJSON = "handleOneShotJSON",
   // Tool calling continuation (second LLM call after tool execution, may loop for more tool calls).
   // data.toolHistory: serialized LLMHistoryMessage[] (assistant + tool result messages)
   // data.toolCallCounts: serialized Map entries [[name, count], ...] carrying per-tool call counts

package/src/core/types/integrations.ts

@@ -102,6 +102,7 @@ export interface Ei_Interface {
   onError?: (error: EiError) => void;
   onStateImported?: () => void;
   onOneShotReturned?: (guid: string, content: string) => void;
+  onOneShotJSONReturned?: (guid: string, parsed: unknown) => void;
   onContextBoundaryChanged?: (personaId: string) => void;
   onSaveAndExitStart?: () => void;
   onSaveAndExitFinish?: () => void;

package/src/core/types/rooms.ts

@@ -38,6 +38,8 @@ export interface RoomEntity {
   last_updated: string;
   last_activity: string;
   capture_used?: boolean;
+  context_window_hours?: number;  // FFA only; falls back to human.settings.default_context_window_hours
+  context_boundary?: string;      // FFA only; ISO timestamp; same semantics as persona context_boundary
   messages: RoomMessage[];
 }
 

package/src/integrations/claude-code/importer.ts

@@ -1,10 +1,9 @@
 import type { StateManager } from "../../core/state-manager.js";
-import type { Ei_Interface, Topic, Message, ContextStatus, PersonaEntity, PersonaTrait } from "../../core/types.js";
+import type { Ei_Interface, Message, ContextStatus, PersonaEntity, PersonaTrait } from "../../core/types.js";
 import { DEFAULT_SEED_TRAITS } from "../../core/constants/seed-traits.js";
 import type { IClaudeCodeReader, ClaudeCodeSession, ClaudeCodeMessage } from "./types.js";
 import {
   CLAUDE_CODE_PERSONA_NAME,
-  CLAUDE_CODE_TOPIC_GROUPS,
   MIN_SESSION_AGE_MS,
 } from "./types.js";
 import { ClaudeCodeReader } from "./reader.js";
@@ -20,8 +19,6 @@ import { isProcessRunning } from "../process-check.js";
 
 export interface ClaudeCodeImportResult {
   sessionsProcessed: number;
-  topicsCreated: number;
-  topicsUpdated: number;
   messagesImported: number;
   personaCreated: boolean;
   extractionScansQueued: number;
@@ -109,47 +106,6 @@ function ensureClaudeCodePersona(
   return persona;
 }
 
-// =============================================================================
-// Topic Management
-// =============================================================================
-
-function ensureSessionTopic(
-  session: ClaudeCodeSession,
-  stateManager: StateManager
-): "created" | "updated" | "unchanged" {
-  const human = stateManager.getHuman();
-  const existingTopic = human.topics.find((t) => t.id === session.id);
-
-  if (existingTopic) {
-    if (existingTopic.name !== session.title) {
-      const updatedTopic: Topic = {
-        ...existingTopic,
-        name: session.title,
-        last_updated: new Date().toISOString(),
-      };
-      stateManager.human_topic_upsert(updatedTopic);
-      return "updated";
-    }
-    return "unchanged";
-  }
-
-  const newTopic: Topic = {
-    id: session.id,
-    name: session.title,
-    description: `Claude Code session in ${session.cwd}`,
-    sentiment: 0,
-    exposure_current: 0.5,
-    exposure_desired: 0.3,
-    persona_groups: CLAUDE_CODE_TOPIC_GROUPS,
-    learned_by: stateManager.persona_getByName(CLAUDE_CODE_PERSONA_NAME)?.id ?? undefined,
-    last_updated: new Date().toISOString(),
-    learned_on: new Date().toISOString(),
-  };
-
-  stateManager.human_topic_upsert(newTopic);
-  return "created";
-}
-
 // =============================================================================
 // State Helpers
 // =============================================================================
@@ -205,26 +161,15 @@ export async function importClaudeCodeSessions(
 
   const result: ClaudeCodeImportResult = {
     sessionsProcessed: 0,
-    topicsCreated: 0,
-    topicsUpdated: 0,
     messagesImported: 0,
     personaCreated: false,
     extractionScansQueued: 0,
   };
 
-  // ─── Step 1: Ensure topics exist for ALL sessions ─────────────────────
+  // ─── Step 1: Get all sessions ─────────────────────────────────────────
   const allSessions = await reader.getSessions();
 
-  for (const session of allSessions) {
-    const topicResult = ensureSessionTopic(session, stateManager);
-    if (topicResult === "created") result.topicsCreated++;
-    else if (topicResult === "updated") result.topicsUpdated++;
-  }
-
   if (signal?.aborted) return result;
-  if (result.topicsCreated > 0 || result.topicsUpdated > 0) {
-    eiInterface?.onHumanUpdated?.();
-  }
 
   // ─── Step 2: Find next unprocessed session ────────────────────────────
   const human = stateManager.getHuman();
@@ -323,6 +268,7 @@ export async function importClaudeCodeSessions(
       personaDisplayName: persona.display_name,
       messages_context: contextMsgs,
       messages_analyze: toAnalyze,
+      sources: [`claudecode:${targetSession.id}`],
     };
 
     const ccSettings = stateManager.getHuman().settings?.claudeCode;

package/src/integrations/cursor/importer.ts

@@ -1,10 +1,9 @@
 import type { StateManager } from "../../core/state-manager.js";
-import type { Ei_Interface, Topic, Message, ContextStatus, PersonaEntity, PersonaTrait } from "../../core/types.js";
+import type { Ei_Interface, Message, ContextStatus, PersonaEntity, PersonaTrait } from "../../core/types.js";
 import { DEFAULT_SEED_TRAITS } from "../../core/constants/seed-traits.js";
 import type { ICursorReader, CursorSession, CursorMessage } from "./types.js";
 import {
   CURSOR_PERSONA_NAME,
-  CURSOR_TOPIC_GROUPS,
   MIN_SESSION_AGE_MS,
 } from "./types.js";
 import { CursorReader } from "./reader.js";
@@ -16,8 +15,6 @@ import {
 
 export interface CursorImportResult {
   sessionsProcessed: number;
-  topicsCreated: number;
-  topicsUpdated: number;
   messagesImported: number;
   personaCreated: boolean;
   extractionScansQueued: number;
@@ -97,43 +94,6 @@ function ensureCursorPersona(
   return persona;
 }
 
-function ensureSessionTopic(
-  session: CursorSession,
-  stateManager: StateManager
-): "created" | "updated" | "unchanged" {
-  const human = stateManager.getHuman();
-  const existingTopic = human.topics.find((t) => t.id === session.id);
-
-  if (existingTopic) {
-    if (existingTopic.name !== session.name) {
-      const updatedTopic: Topic = {
-        ...existingTopic,
-        name: session.name,
-        last_updated: new Date().toISOString(),
-      };
-      stateManager.human_topic_upsert(updatedTopic);
-      return "updated";
-    }
-    return "unchanged";
-  }
-
-  const newTopic: Topic = {
-    id: session.id,
-    name: session.name,
-    description: `Cursor session in ${session.workspacePath}`,
-    sentiment: 0,
-    exposure_current: 0.5,
-    exposure_desired: 0.3,
-    persona_groups: CURSOR_TOPIC_GROUPS,
-    learned_by: stateManager.persona_getByName(CURSOR_PERSONA_NAME)?.id ?? undefined,
-    last_updated: new Date().toISOString(),
-    learned_on: new Date().toISOString(),
-  };
-
-  stateManager.human_topic_upsert(newTopic);
-  return "created";
-}
-
 function updateProcessedState(
   stateManager: StateManager,
   session: CursorSession
@@ -173,8 +133,6 @@ export async function importCursorSessions(
 
   const result: CursorImportResult = {
     sessionsProcessed: 0,
-    topicsCreated: 0,
-    topicsUpdated: 0,
     messagesImported: 0,
     personaCreated: false,
     extractionScansQueued: 0,
@@ -182,16 +140,7 @@ export async function importCursorSessions(
 
   const allSessions = await reader.getSessions();
 
-  for (const session of allSessions) {
-    const topicResult = ensureSessionTopic(session, stateManager);
-    if (topicResult === "created") result.topicsCreated++;
-    else if (topicResult === "updated") result.topicsUpdated++;
-  }
-
   if (signal?.aborted) return result;
-  if (result.topicsCreated > 0 || result.topicsUpdated > 0) {
-    eiInterface?.onHumanUpdated?.();
-  }
 
   const human = stateManager.getHuman();
   const processedSessions = human.settings?.cursor?.processed_sessions ?? {};
@@ -278,6 +227,7 @@ export async function importCursorSessions(
       personaDisplayName: persona.display_name,
       messages_context: contextMsgs,
       messages_analyze: toAnalyze,
+      sources: [`cursor:${targetSession.id}`],
     };
 
     queueAllScans(context, stateManager, { external_filter: "only" });

package/src/integrations/opencode/importer.ts

@@ -250,6 +250,7 @@ export async function importOpenCodeSessions(
         personaDisplayName: persona.display_name,
         messages_context: contextMsgs,
         messages_analyze: toAnalyze,
+        sources: [`opencode:${targetSession.id}`],
       };
 
       if (!signal?.aborted) {

package/src/prompts/response/sections.ts

@@ -277,7 +277,7 @@ export function buildQuotesSection(quotes: Quote[], human: ResponsePromptData["h
   const idToName = new Map(allDataItems.map(item => [item.id, item.name]));
   
   const formatted = quotes.map(q => {
-    const speaker = q.speaker === "human" ? "Human" : q.speaker;
+    const speaker = q.speaker === "human" ? human.name : q.speaker;
     const date = formatDate(q.timestamp);
     const linkedNames = q.data_item_ids
       .map(id => idToName.get(id))

package/src/prompts/response/types.ts

@@ -23,6 +23,7 @@ export interface ResponsePromptData {
     include_message_timestamps?: boolean;
   };
   human: {
+    name: string;
     facts: Fact[];
     topics: Topic[];
     people: Person[];

package/src/prompts/room/index.ts

@@ -97,10 +97,10 @@ There is no objectively correct answer. Pick the response you find most interest
 **The MAP dynamic**: Every participant — personas and the Human alike — can see your description and traits. They have been crafting their responses specifically to appeal to your tastes. Personas are also constrained to stay true to their own identities; the Human is not. Factor that in if you choose to.`;
 
   const contextSection = context.length > 0
-    ? buildRoomHistorySection(context)
+    ? buildRoomHistorySection(context, data.human.name)
     : "";
 
-  const candidatesSection = buildJudgeCandidatesSection(candidates);
+  const candidatesSection = buildJudgeCandidatesSection(candidates, data.human.name);
   const decisionSection = buildJudgeDecisionFormatSection();
   const currentTime = formatCurrentTime();
 

package/src/prompts/room/sections.ts

@@ -32,11 +32,11 @@ export function buildRoomParticipantsSection(participants: RoomParticipantIdenti
   return `## Others in the Room\n\n${lines.join("\n\n")}`;
 }
 
-export function buildRoomHistorySection(history: RoomHistoryMessage[]): string {
+export function buildRoomHistorySection(history: RoomHistoryMessage[], humanName: string): string {
   if (history.length === 0) return "";
 
   const lines = history.map(msg => {
-    const speaker = msg.speaker_id === "human" ? "Human" : msg.speaker_name;
+    const speaker = msg.speaker_id === "human" ? humanName : msg.speaker_name;
     if (msg.silence_reason) {
       return `**${speaker}**: *[chose not to respond: ${msg.silence_reason}]*`;
     }
@@ -116,9 +116,9 @@ ${lines.join("\n\n")}
 Respond as yourself — your read on this moment, your relationship with the human, the reaction that comes naturally to who you are. A room with distinct voices is more alive than one with echoes.`;
 }
 
-export function buildJudgeCandidatesSection(candidates: RoomJudgeCandidate[]): string {
+export function buildJudgeCandidatesSection(candidates: RoomJudgeCandidate[], humanName: string): string {
   const lines = candidates.map((c, i) => {
-    const speaker = c.speaker_id === "human" ? "Human" : c.speaker_name;
+    const speaker = c.speaker_id === "human" ? humanName : c.speaker_name;
     const content = c.silence_reason
       ? `*[chose not to respond: ${c.silence_reason}]*`
       : [c.verbal_response, c.action_response ? `*${c.action_response}*` : ""].filter(Boolean).join(" ");

package/src/prompts/room/types.ts

@@ -39,6 +39,7 @@ export interface RoomResponsePromptData {
   };
   other_participants: RoomParticipantIdentity[];
   human: {
+    name: string;
     facts: Fact[];
     topics: Topic[];
     people: Person[];
@@ -72,6 +73,9 @@ export interface RoomJudgePromptData {
     long_description?: string;
     traits: PersonaTrait[];
   };
+  human: {
+    name: string;
+  };
   context: RoomHistoryMessage[];
   candidates: RoomJudgeCandidate[];
 }

package/tui/src/commands/activate.tsx

@@ -1,6 +1,7 @@
 import type { Command } from "./registry";
 import { RoomMode } from "../../../src/core/types/enums.js";
 import { openCYPEditor } from "../util/cyp-editor.js";
+import { buildCYPTree } from "../util/cyp-tree.js";
 
 export const activateCommand: Command = {
   name: "activate",
@@ -55,18 +56,18 @@ export const activateCommand: Command = {
 
     const num = parseInt(args[0], 10);
     if (isNaN(num) || num < 1) {
-      ctx.showNotification("Usage: /activate <num> (1-based message index)", "error");
+      ctx.showNotification("Usage: /activate <num> (1-based BFS tree number)", "error");
       return;
     }
 
     const messages = ctx.ei.roomMessages();
-    const target = messages[num - 1];
-    if (!target) {
-      ctx.showNotification(`No message at index ${num} (room has ${messages.length} messages)`, "error");
+    const { numToId } = buildCYPTree(messages);
+    const targetId = numToId.get(num);
+    if (!targetId) {
+      ctx.showNotification(`No message at tree position ${num} (tree has ${numToId.size} nodes)`, "error");
       return;
     }
-
-    await ctx.ei.selectCYPBranch(target.id);
+    await ctx.ei.selectCYPBranch(targetId);
 
     const freshRoom = ctx.ei.getRoom(roomId);
     const newActiveNodeId = freshRoom?.active_node_id;

package/tui/src/commands/context.tsx

@@ -1,8 +1,11 @@
 import type { Command } from "./registry.js";
 import { spawnEditor } from "../util/editor.js";
-import { contextToYAML, contextFromYAML } from "../util/yaml-serializers.js";
+import { contextToYAML, contextFromYAML, ffaContextToYAML, ffaContextFromYAML } from "../util/yaml-serializers.js";
 import { logger } from "../util/logger.js";
 import { ConfirmOverlay } from "../components/ConfirmOverlay.js";
+import { CYPTreeOverlay } from "../components/CYPTreeOverlay.js";
+import { MAPScoreOverlay } from "../components/MAPScoreOverlay.js";
+import { RoomMode } from "../../../src/core/types/enums.js";
 
 export const contextCommand: Command = {
   name: "context",
@@ -12,8 +15,191 @@ export const contextCommand: Command = {
 
   async execute(_args, ctx) {
     const personaId = ctx.ei.activePersonaId();
+    const roomId = ctx.ei.activeRoomId();
+
+    if (roomId) {
+      const room = ctx.ei.getRoom(roomId);
+      if (!room) {
+        ctx.showNotification("Room not found", "warn");
+        return;
+      }
+
+      if (room.mode === RoomMode.ChooseYourPath) {
+        const activeNodeId = room.active_node_id;
+        if (!activeNodeId) {
+          ctx.showNotification("No active node in room", "warn");
+          return;
+        }
+        ctx.showOverlay((hideOverlay) => (
+          <CYPTreeOverlay
+            roomId={roomId}
+            roomName={room.display_name}
+            messages={ctx.ei.roomMessages()}
+            activeNodeId={activeNodeId}
+            activeRoomPath={ctx.ei.roomActivePath()}
+            personas={ctx.ei.personas()}
+            onSelectBranch={(msgId) => ctx.ei.selectCYPBranch(msgId)}
+            onDismiss={hideOverlay}
+          />
+        ), ctx.renderer);
+        return;
+      }
+
+      if (room.mode === RoomMode.FreeForAll) {
+        const allMessages = ctx.ei.roomMessages();
+        if (allMessages.length === 0) {
+          ctx.showNotification("No messages to edit", "info");
+          return;
+        }
+
+        const personas = ctx.ei.personas();
+        const speakerMap = new Map(personas.map((p) => [p.id, p.display_name]));
+
+        const originalStatus = new Map(allMessages.map((m) => [m.id, m.context_status]));
+
+        let yamlContent = ffaContextToYAML(allMessages, speakerMap);
+        let editorIteration = 0;
+
+        while (true) {
+          editorIteration++;
+          logger.debug("[context] ffa starting editor iteration", { iteration: editorIteration });
+
+          const result = await spawnEditor({
+            initialContent: yamlContent,
+            filename: "ffa-context.yaml",
+            renderer: ctx.renderer,
+          });
+
+          logger.debug("[context] ffa editor returned", {
+            iteration: editorIteration,
+            aborted: result.aborted,
+            success: result.success,
+            hasContent: result.content !== null,
+          });
+
+          if (result.aborted) {
+            ctx.showNotification("Editor cancelled", "info");
+            return;
+          }
+
+          if (!result.success) {
+            ctx.showNotification("Editor failed to open", "error");
+            return;
+          }
+
+          if (result.content === null) {
+            ctx.showNotification("No changes made", "info");
+            return;
+          }
+
+          try {
+            const parsed = ffaContextFromYAML(result.content);
+
+            if (parsed.deletedMessageIds.length > 0) {
+              const count = parsed.deletedMessageIds.length;
+              const hasImplicit = parsed.implicitDeleteCount > 0;
+              const confirmed = await new Promise<boolean>((resolve) => {
+                ctx.showOverlay((hideOverlay) => (
+                  <ConfirmOverlay
+                    message={`Delete ${count} message${count === 1 ? "" : "s"}?${hasImplicit ? `\n(includes ${parsed.implicitDeleteCount} persona response${parsed.implicitDeleteCount === 1 ? "" : "s"})` : ""}`}
+                    onConfirm={() => { hideOverlay(); resolve(true); }}
+                    onCancel={() => { hideOverlay(); resolve(false); }}
+                  />
+                ), ctx.renderer);
+              });
+              if (!confirmed) {
+                ctx.showNotification("Delete cancelled", "info");
+                return;
+              }
+              await ctx.ei.deleteRoomMessages(roomId, parsed.deletedMessageIds);
+            }
+
+            for (const msg of parsed.messages) {
+              const orig = originalStatus.get(msg.id);
+              if (orig !== undefined && orig !== msg.context_status) {
+                await ctx.ei.setRoomMessageContextStatus(roomId, msg.id, msg.context_status);
+              }
+            }
+
+            const deleteCount = parsed.deletedMessageIds.length;
+            const notification =
+              deleteCount > 0
+                ? `Context updated (${deleteCount} message${deleteCount === 1 ? "" : "s"} deleted)`
+                : "Context updated";
+
+            ctx.showNotification(notification, "info");
+            return;
+          } catch (parseError) {
+            const errorMsg = parseError instanceof Error ? parseError.message : String(parseError);
+            logger.debug("[context] ffa YAML parse error, prompting for re-edit", {
+              iteration: editorIteration,
+              error: errorMsg,
+            });
+
+            const shouldReEdit = await new Promise<boolean>((resolve) => {
+              ctx.showOverlay((hideOverlay, hideForEditor) => (
+                <ConfirmOverlay
+                  message={`YAML parse error:\n${errorMsg}\n\nRe-edit?`}
+                  onConfirm={() => {
+                    logger.debug("[context] ffa user confirmed re-edit");
+                    hideForEditor();
+                    resolve(true);
+                  }}
+                  onCancel={() => {
+                    logger.debug("[context] ffa user cancelled re-edit");
+                    hideOverlay();
+                    resolve(false);
+                  }}
+                />
+              ), ctx.renderer);
+            });
+
+            logger.debug("[context] ffa shouldReEdit", { shouldReEdit, iteration: editorIteration });
+
+            if (shouldReEdit) {
+              yamlContent = result.content;
+              logger.debug("[context] ffa continuing to next iteration");
+              continue;
+            } else {
+              ctx.showNotification("Changes discarded", "info");
+              return;
+            }
+          }
+        }
+      }
+
+      if (room.mode === RoomMode.MessagesAgainstPersona) {
+        if (!room.judge_persona_id) {
+          ctx.showNotification("No judge configured for this room", "warn");
+          return;
+        }
+        const human = await ctx.ei.getHuman();
+        const humanName =
+          human.settings?.name_display ||
+          human.facts?.find((f) => f.name === "Nickname/Preferred Name")?.description ||
+          "You";
+        ctx.showOverlay((hideOverlay) => (
+          <MAPScoreOverlay
+            roomId={roomId}
+            roomName={room.display_name}
+            messages={ctx.ei.roomMessages()}
+            activeNodeId={room.active_node_id ?? ""}
+            activeRoomPath={ctx.ei.roomActivePath()}
+            personas={ctx.ei.personas()}
+            judgePersonaId={room.judge_persona_id!}
+            humanName={humanName}
+            onDismiss={hideOverlay}
+          />
+        ), ctx.renderer);
+        return;
+      }
+
+      ctx.showNotification("Unknown room mode", "warn");
+      return;
+    }
+
     if (!personaId) {
-      ctx.showNotification("No active persona", "error");
+      ctx.showNotification("No active chat", "warn");
       return;
     }