ei-tui 0.5.2 → 0.5.4

package/package.json

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

package/src/core/llm-client.ts

@@ -336,10 +336,21 @@ export async function callLLMRaw(
     console.log(`[LLM] Extended thinking detected (${thinking.length} chars)`);
   }
 
+  let finalToolCalls = rawToolCalls;
+  if ((!rawToolCalls || rawToolCalls.length === 0) && choice?.finish_reason === "stop" && typeof textContent === "string") {
+    const rescued = rescueGemmaToolCalls(textContent);
+    if (rescued.length > 0) {
+      console.log(`[LLM] Rescued ${rescued.length} tool call(s) from content (Gemma native format)`);
+      finalToolCalls = rescued;
+      textContent = null;
+      if (choice) (choice as Record<string, unknown>).finish_reason = "tool_calls";
+    }
+  }
+
   return {
     content: textContent,
     finishReason: choice?.finish_reason ?? null,
-    rawToolCalls,
+    rawToolCalls: finalToolCalls,
     assistantMessage,
     ...(thinking ? { thinking } : {}),
   };
@@ -395,6 +406,57 @@ export function repairJSON(jsonStr: string): string {
   return repaired;
 }
 
+// =============================================================================
+// Gemma native tool call rescue
+// =============================================================================
+
+/**
+ * Gemma (via LM Studio) occasionally emits tool calls in `content` instead of
+ * `tool_calls`, using its native token format:
+ *
+ *   <|tool_call>call:FUNCTION{param:<|"|>string value<|"|>,bool:true}<tool_call|>
+ *
+ * This parser extracts those calls and converts them to OpenAI-compatible shape
+ * so the rest of the pipeline (parseToolCalls → executeToolCalls) sees a clean
+ * contract. Call it when finish_reason is "stop" and tool_calls is empty.
+ */
+export function rescueGemmaToolCalls(content: string): unknown[] {
+  const CALL_RE = /<\|tool_call>call:(\w+)\{([\s\S]*?)\}<tool_call\|>/g;
+  const STRING_PARAM_RE = /(\w+):<\|"?\|>([\s\S]*?)<\|"?\|>/g;
+  const SCALAR_PARAM_RE = /(\w+):(true|false|-?\d+\.?\d*)/g;
+
+  const rescued: unknown[] = [];
+  let callMatch: RegExpExecArray | null;
+
+  while ((callMatch = CALL_RE.exec(content)) !== null) {
+    const fnName = callMatch[1];
+    const argsStr = callMatch[2];
+    const args: Record<string, unknown> = {};
+
+    let m: RegExpExecArray | null;
+    STRING_PARAM_RE.lastIndex = 0;
+    while ((m = STRING_PARAM_RE.exec(argsStr)) !== null) {
+      args[m[1]] = m[2];
+    }
+
+    SCALAR_PARAM_RE.lastIndex = 0;
+    while ((m = SCALAR_PARAM_RE.exec(argsStr)) !== null) {
+      if (!(m[1] in args)) {
+        const v = m[2];
+        args[m[1]] = v === "true" ? true : v === "false" ? false : Number(v);
+      }
+    }
+
+    rescued.push({
+      id: crypto.randomUUID(),
+      type: "function",
+      function: { name: fnName, arguments: JSON.stringify(args) },
+    });
+  }
+
+  return rescued;
+}
+
 export function parseJSONResponse(content: string): unknown {
   const jsonMatch = content.match(/```(?:json)?\s*([\s\S]*?)```/);
   const jsonStr = jsonMatch ? jsonMatch[1].trim() : content.trim();

package/src/core/processor.ts

@@ -24,6 +24,7 @@ import {
   type ToolProvider,
 } from "./types.js";
 import { buildPersonaFromPersonPrompt } from "../prompts/index.js";
+import { buildSiblingAwarenessSection } from "../prompts/room/index.js";
 import type { PersonaGenerationResult } from "../prompts/generation/types.js";
 
 import type { Storage } from "../storage/interface.js";
@@ -300,18 +301,17 @@ export class Processor {
     }
 
     // read_memory tool
-    if (!this.stateManager.tools_getByName("read_memory")) {
-      this.stateManager.tools_add({
+    this.stateManager.tools_upsertBuiltin({
         id: crypto.randomUUID(),
         provider_id: "ei",
         name: "read_memory",
         display_name: "Read Memory",
         description:
-          "Search your personal memory for relevant facts, topics, people, or quotes. Use this when you need information about the user that may not be in the current conversation. Use `recent: true` to retrieve what's been discussed recently.",
+          "Search Ei's persistent knowledge base — facts, topics, people, and quotes learned across ALL conversations over time, not just this one. Use this when you need context about the user, their life, relationships, or interests that may not be visible in the current exchange. Use `recent: true` to retrieve what's been discussed recently.",
         input_schema: {
           type: "object",
           properties: {
-            query: { type: "string", description: "What to search for in memory" },
+            query: { type: "string", description: "What to search for — a person, topic, fact, or anything Ei has learned about the user" },
             types: {
               type: "array",
               items: { type: "string", enum: ["fact", "topic", "person", "quote"] },
@@ -327,12 +327,10 @@ export class Processor {
         enabled: true,
         created_at: now,
         max_calls_per_interaction: 6,  // Dedup needs to verify relationships before irreversible merges. Typical cluster (3-8 items) requires: parent concept lookup + 2 relationship verifications + context validation. Still under HARD_TOOL_CALL_LIMIT (10).
-      });
-    }
+    });
 
     // file_read tool (TUI only)
-    if (!this.stateManager.tools_getByName("file_read")) {
-      this.stateManager.tools_add({
+    this.stateManager.tools_upsertBuiltin({
         id: crypto.randomUUID(),
         provider_id: "ei",
         name: "file_read",
@@ -351,12 +349,10 @@ export class Processor {
         enabled: true,
         created_at: now,
         max_calls_per_interaction: 5,
-      });
-    }
+    });
 
     // list_directory tool (TUI only)
-    if (!this.stateManager.tools_getByName("list_directory")) {
-      this.stateManager.tools_add({
+    this.stateManager.tools_upsertBuiltin({
         id: crypto.randomUUID(),
         provider_id: "ei",
         name: "list_directory",
@@ -375,12 +371,10 @@ export class Processor {
         enabled: true,
         created_at: now,
         max_calls_per_interaction: 5,
-      });
-    }
+    });
 
     // directory_tree tool (TUI only)
-    if (!this.stateManager.tools_getByName("directory_tree")) {
-      this.stateManager.tools_add({
+    this.stateManager.tools_upsertBuiltin({
         id: crypto.randomUUID(),
         provider_id: "ei",
         name: "directory_tree",
@@ -400,12 +394,10 @@ export class Processor {
         enabled: true,
         created_at: now,
         max_calls_per_interaction: 3,
-      });
-    }
+    });
 
     // search_files tool (TUI only)
-    if (!this.stateManager.tools_getByName("search_files")) {
-      this.stateManager.tools_add({
+    this.stateManager.tools_upsertBuiltin({
         id: crypto.randomUUID(),
         provider_id: "ei",
         name: "search_files",
@@ -425,12 +417,10 @@ export class Processor {
         enabled: true,
         created_at: now,
         max_calls_per_interaction: 3,
-      });
-    }
+    });
 
     // grep tool (TUI only)
-    if (!this.stateManager.tools_getByName("grep")) {
-      this.stateManager.tools_add({
+    this.stateManager.tools_upsertBuiltin({
         id: crypto.randomUUID(),
         provider_id: "ei",
         name: "grep",
@@ -452,12 +442,10 @@ export class Processor {
         enabled: true,
         created_at: now,
         max_calls_per_interaction: 5,
-      });
-    }
+    });
 
     // get_file_info tool (TUI only)
-    if (!this.stateManager.tools_getByName("get_file_info")) {
-      this.stateManager.tools_add({
+    this.stateManager.tools_upsertBuiltin({
         id: crypto.randomUUID(),
         provider_id: "ei",
         name: "get_file_info",
@@ -476,12 +464,10 @@ export class Processor {
         enabled: true,
         created_at: now,
         max_calls_per_interaction: 5,
-      });
-    }
+    });
 
     // web_fetch tool
-    if (!this.stateManager.tools_getByName("web_fetch")) {
-      this.stateManager.tools_add({
+    this.stateManager.tools_upsertBuiltin({
         id: crypto.randomUUID(),
         provider_id: "ei",
         name: "web_fetch",
@@ -500,8 +486,7 @@ export class Processor {
         enabled: true,
         created_at: now,
         max_calls_per_interaction: 3,
-      });
-    }
+    });
 
     // --- Tavily Search provider ---
     if (!this.stateManager.tools_getProviderById("tavily")) {
@@ -520,8 +505,7 @@ export class Processor {
     }
 
     // tavily_web_search
-    if (!this.stateManager.tools_getByName("tavily_web_search")) {
-      this.stateManager.tools_add({
+    this.stateManager.tools_upsertBuiltin({
         id: crypto.randomUUID(),
         provider_id: "tavily",
         name: "tavily_web_search",
@@ -541,12 +525,10 @@ export class Processor {
         enabled: true,
         created_at: now,
         max_calls_per_interaction: 3,
-      });
-    }
+    });
 
     // tavily_news_search
-    if (!this.stateManager.tools_getByName("tavily_news_search")) {
-      this.stateManager.tools_add({
+    this.stateManager.tools_upsertBuiltin({
         id: crypto.randomUUID(),
         provider_id: "tavily",
         name: "tavily_news_search",
@@ -566,8 +548,7 @@ export class Processor {
         enabled: true,
         created_at: now,
         max_calls_per_interaction: 3,
-      });
-    }
+    });
 
     // --- Spotify provider ---
     if (!this.stateManager.tools_getProviderById("spotify")) {
@@ -586,8 +567,7 @@ export class Processor {
     }
 
     // get_currently_playing
-    if (!this.stateManager.tools_getByName("get_currently_playing")) {
-      this.stateManager.tools_add({
+    this.stateManager.tools_upsertBuiltin({
         id: crypto.randomUUID(),
         provider_id: "spotify",
         name: "get_currently_playing",
@@ -604,12 +584,10 @@ export class Processor {
         enabled: true,
         created_at: now,
         max_calls_per_interaction: 3,
-      });
-    }
+    });
 
     // get_liked_songs
-    if (!this.stateManager.tools_getByName("get_liked_songs")) {
-      this.stateManager.tools_add({
+    this.stateManager.tools_upsertBuiltin({
         id: crypto.randomUUID(),
         provider_id: "spotify",
         name: "get_liked_songs",
@@ -626,14 +604,12 @@ export class Processor {
         enabled: true,
         created_at: now,
         max_calls_per_interaction: 1,
-      });
-    }
+    });
 
     // submit_response tool — auto-injected for HandlePersonaResponse and HandleRoomResponse.
     // Not user-configurable; invisible in the tools UI. Terminates the tool loop immediately
     // when called; its arguments become response.parsed.
-    if (!this.stateManager.tools_getByName("submit_response")) {
-      this.stateManager.tools_add({
+    this.stateManager.tools_upsertBuiltin({
         id: crypto.randomUUID(),
         provider_id: "ei",
         name: "submit_response",
@@ -652,7 +628,7 @@ export class Processor {
             },
             action_response: {
               type: "string",
-              description: "What you do — rendered as italics stage directions. Optional alongside verbal_response.",
+              description: "Italicized stage directions only — physical actions, expressions, or internal states. Keep this distinct from verbal_response: do not repeat or paraphrase what you are saying. If you have nothing to physically do, omit this field.",
             },
             reason: {
               type: "string",
@@ -668,11 +644,9 @@ export class Processor {
         is_submit: true,
         max_calls_per_interaction: 1,
         created_at: now,
-      });
-    }
+    });
 
-    if (!this.stateManager.tools_getByName("submit_heartbeat_check")) {
-      this.stateManager.tools_add({
+    this.stateManager.tools_upsertBuiltin({
         id: crypto.randomUUID(),
         provider_id: "ei",
         name: "submit_heartbeat_check",
@@ -694,11 +668,9 @@ export class Processor {
         is_submit: true,
         max_calls_per_interaction: 1,
         created_at: now,
-      });
-    }
+    });
 
-    if (!this.stateManager.tools_getByName("submit_ei_heartbeat")) {
-      this.stateManager.tools_add({
+    this.stateManager.tools_upsertBuiltin({
         id: crypto.randomUUID(),
         provider_id: "ei",
         name: "submit_ei_heartbeat",
@@ -720,11 +692,9 @@ export class Processor {
         is_submit: true,
         max_calls_per_interaction: 1,
         created_at: now,
-      });
-    }
+    });
 
-    if (!this.stateManager.tools_getByName("submit_dedup_decisions")) {
-      this.stateManager.tools_add({
+    this.stateManager.tools_upsertBuiltin({
         id: crypto.randomUUID(),
         provider_id: "ei",
         name: "submit_dedup_decisions",
@@ -800,8 +770,7 @@ export class Processor {
         is_submit: true,
         max_calls_per_interaction: 1,
         created_at: now,
-      });
-    }
+    });
   }
 
   /**
@@ -1024,8 +993,9 @@ export class Processor {
         const isBackingOff = retryAfter !== null && retryAfter > new Date().toISOString();
 
         if (!isBackingOff) {
-          const request = this.stateManager.queue_claimHighest();
+          let request = this.stateManager.queue_claimHighest();
           if (request) {
+            request = this.augmentRoomRequest(request);
             const personaId = request.data.personaId as string | undefined;
             const personaDisplayName = request.data.personaDisplayName as string | undefined;
             const personaSuffix = personaDisplayName ? ` [${personaDisplayName}]` : "";
@@ -1412,6 +1382,28 @@ const toolNextSteps = new Set([
       });
   }
 
+  private augmentRoomRequest(request: LLMRequest): LLMRequest {
+    if (request.next_step !== LLMNextStep.HandleRoomResponse) return request;
+
+    const roomId = request.data.roomId as string | undefined;
+    const parentMessageId = request.data.parentMessageId as string | undefined;
+    const personaDisplayName = request.data.personaDisplayName as string | undefined;
+
+    if (!roomId || !parentMessageId || !personaDisplayName) return request;
+
+    const siblings = this.stateManager.getRoomChildren(roomId, parentMessageId)
+      .filter((m: RoomMessage) => m.role === "persona" && m.verbal_response)
+      .map((m: RoomMessage) => ({
+        name: this.stateManager.persona_getById(m.persona_id ?? "")?.display_name ?? "Participant",
+        verbal_response: m.verbal_response!,
+      }));
+
+    if (siblings.length === 0) return request;
+
+    const siblingSection = buildSiblingAwarenessSection(siblings, personaDisplayName);
+    return { ...request, system: request.system + "\n\n" + siblingSection };
+  }
+
   private classifyLLMError(error: string): string {
     const match = error.match(/\((\d{3})\)/);
     if (match) {

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

@@ -3,7 +3,8 @@ import { StateManager } from "./state-manager.js";
 import { getEmbeddingService, findTopK } from "./embedding-service.js";
 import type { ResponsePromptData, PromptOutput } from "../prompts/index.js";
 import { buildRoomResponsePrompt } from "../prompts/room/index.js";
-import type { RoomParticipantIdentity, RoomHistoryMessage } from "../prompts/room/types.js";
+import type { RoomParticipantIdentity } from "../prompts/room/types.js";
+import { normalizeRoomMessages } from "./handlers/utils.js";
 
 const QUOTE_LIMIT = 10;
 const DATA_ITEM_LIMIT = 15;
@@ -205,6 +206,7 @@ export async function buildResponsePromptData(
       traits: persona.traits,
       topics: persona.topics,
       interested_topics: persona.topics.filter(t => t.exposure_desired - t.exposure_current > 0.2),
+      include_message_timestamps: persona.include_message_timestamps,
     },
     human: filteredHuman,
     visible_personas: visiblePersonas,
@@ -221,25 +223,29 @@ export async function buildRoomResponsePromptData(
   isTUI: boolean,
   useAllMessages = false
 ): Promise<PromptOutput> {
+  const MIN_ROOM_MESSAGES = 20;
+
   const human = sm.getHuman();
   const activePath = sm.getRoomActivePath(room.id);
-  const sourceMessages = useAllMessages
+  const allSourceMessages = useAllMessages
     ? [...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;
+
   const lastMessage = sourceMessages[sourceMessages.length - 1];
   const currentMessage = lastMessage?.verbal_response;
 
   const filteredHuman = await filterHumanDataByVisibility(human, respondingPersona, currentMessage);
 
-  const history: RoomHistoryMessage[] = sourceMessages.map(m => ({
-    speaker_name: m.role === "human"
-      ? (human.settings?.name_display ?? "Human")
-      : (sm.persona_getById(m.persona_id ?? "")?.display_name ?? m.persona_id ?? "Unknown"),
-    speaker_id: m.role === "human" ? "human" : (m.persona_id ?? ""),
-    verbal_response: m.verbal_response,
-    action_response: m.action_response,
-    silence_reason: m.silence_reason,
-  }));
+  const history = normalizeRoomMessages(sourceMessages, sm);
 
   const otherParticipants: RoomParticipantIdentity[] = [];
   for (const pid of room.persona_ids) {
@@ -273,6 +279,7 @@ export async function buildRoomResponsePromptData(
       long_description: respondingPersona.long_description,
       traits: respondingPersona.traits,
       topics: respondingPersona.topics,
+      include_message_timestamps: respondingPersona.include_message_timestamps,
     },
     other_participants: otherParticipants,
     human: filteredHuman,

package/src/core/room-manager.ts

@@ -32,7 +32,11 @@ async function queueRoomPersonaResponses(
   isTUI: boolean,
   onRoomMessageQueued: (roomId: string) => void
 ): Promise<void> {
-  for (const personaId of room.persona_ids) {
+  const personaIds = room.mode === RoomMode.FreeForAll
+    ? [...room.persona_ids].sort(() => Math.random() - 0.5)
+    : room.persona_ids;
+
+  for (const personaId of personaIds) {
     const persona = sm.persona_getById(personaId);
     if (!persona || persona.is_archived || persona.is_paused) continue;
     if (room.mode === RoomMode.MessagesAgainstPersona && room.judge_persona_id === personaId) continue;
@@ -186,7 +190,9 @@ export async function sendFfaMessage(
       .map(q => q.data.personaId as string)
   );
 
-  for (const personaId of updatedRoom.persona_ids) {
+  const shuffledIds = [...updatedRoom.persona_ids].sort(() => Math.random() - 0.5);
+
+  for (const personaId of shuffledIds) {
     if (alreadyQueued.has(personaId)) continue;
     const persona = sm.persona_getById(personaId);
     if (!persona || persona.is_archived || persona.is_paused) continue;

package/src/core/state-manager.ts

@@ -873,6 +873,17 @@ export class StateManager {
     this.scheduleSave();
   }
 
+  tools_upsertBuiltin(tool: ToolDefinition): void {
+    const existing = this.tools.find(t => t.name === tool.name);
+    if (!existing) {
+      this.tools.push(tool);
+    } else if (existing.builtin) {
+      const idx = this.tools.indexOf(existing);
+      this.tools[idx] = { ...tool, id: existing.id, enabled: existing.enabled, created_at: existing.created_at };
+    }
+    this.scheduleSave();
+  }
+
   tools_update(id: string, updates: Partial<ToolDefinition>): boolean {
     const idx = this.tools.findIndex(t => t.id === id);
     if (idx === -1) return false;

package/src/prompts/response/index.ts

@@ -54,6 +54,9 @@ Your role is unique among personas:
   const toolsSection = (data.tools && data.tools.length > 0) ? buildToolsSection() : "";
   const currentTime = formatCurrentTime();
   const conversationState = getConversationStateText(data.delay_ms);
+  const timestampNote = data.persona.include_message_timestamps
+    ? `\nNote: Timestamps are shown to help you understand time context — the user sees them too, no need to echo or reference them.`
+    : "";
 
   return `${identity}
 
@@ -71,7 +74,7 @@ ${priorities}
 
 ${responseFormat}${toolsSection ? `\n\n${toolsSection}` : ""}
 
-Current time: ${currentTime}
+Current time: ${currentTime}${timestampNote}
 ${conversationState}
 
 ## Final Instructions
@@ -99,6 +102,9 @@ function buildStandardSystemPrompt(data: ResponsePromptData): string {
   const toolsSection = (data.tools && data.tools.length > 0) ? buildToolsSection() : "";
   const currentTime = formatCurrentTime();
   const conversationState = getConversationStateText(data.delay_ms);
+  const timestampNote = data.persona.include_message_timestamps
+    ? `\nNote: Timestamps are shown to help you understand time context — the user sees them too, no need to echo or reference them.`
+    : "";
 
   return `${identity}
 
@@ -115,7 +121,7 @@ ${priorities}
 
 ${responseFormat}${toolsSection ? `\n\n${toolsSection}` : ""}
 
-Current time: ${currentTime}
+Current time: ${currentTime}${timestampNote}
 ${conversationState}
 
 ## Final Instructions

package/src/prompts/response/types.ts

@@ -19,6 +19,8 @@ export interface ResponsePromptData {
     topics: PersonaTopic[];
     /** Pre-filtered: topics where exposure_desired - exposure_current > 0.2 */
     interested_topics: PersonaTopic[];
+    /** When true, each message has a timestamp prepended; include a note so the persona doesn't echo them */
+    include_message_timestamps?: boolean;
   };
   human: {
     facts: Fact[];

package/src/prompts/room/index.ts

@@ -4,6 +4,7 @@
 
 import type { RoomResponsePromptData, RoomJudgePromptData, PromptOutput } from "./types.js";
 import { formatCurrentTime } from "../../core/format-utils.js";
+import { formatMessagesAsPlaceholders } from "../message-utils.js";
 import {
   buildRoomParticipantsSection,
   buildRoomHistorySection,
@@ -14,6 +15,8 @@ import {
   buildJudgeCandidatesSection,
   buildJudgeDecisionFormatSection,
 } from "./sections.js";
+
+export { buildSiblingAwarenessSection } from "./sections.js";
 import {
   buildHumanSection,
   buildQuotesSection,
@@ -48,6 +51,9 @@ export function buildRoomResponsePrompt(data: RoomResponsePromptData): PromptOut
   const responseFormat = buildRoomResponseFormatSection();
   const toolsSection = tools && tools.length > 0 ? buildToolsSection() : "";
   const currentTime = formatCurrentTime();
+  const timestampNote = persona.include_message_timestamps
+    ? `Note: Timestamps are shown to help you understand time context — the user sees them too, no need to echo or reference them.`
+    : "";
 
   const system = [
     identity,
@@ -61,10 +67,10 @@ export function buildRoomResponsePrompt(data: RoomResponsePromptData): PromptOut
     guidelines,
     responseFormat,
     toolsSection,
-    `Current time: ${currentTime}`,
+    `Current time: ${currentTime}${timestampNote ? `\n${timestampNote}` : ""}`,
   ].filter(Boolean).join("\n\n");
 
-  const user = buildRoomHistorySection(history) +
+  const user = formatMessagesAsPlaceholders(history, name) +
     `\n\nRespond to the conversation above as ${name}. Call the \`submit_response\` tool with your response. If the tool is unavailable, use the JSON format in the Response Format section.`;
 
   return { system, user };

package/src/prompts/room/sections.ts

@@ -123,6 +123,22 @@ Rules:
 - If the \`submit_response\` tool is unavailable, return the JSON object directly as your entire reply — no prose, no preamble`;
 }
 
+export function buildSiblingAwarenessSection(
+  siblings: Array<{ name: string; verbal_response: string }>,
+  personaName: string
+): string {
+  if (siblings.length === 0) return "";
+  const lines = siblings.map(s => `**${s.name}**: "${s.verbal_response}"`);
+  const header = siblings.length === 1
+    ? "## Another voice has already responded this round"
+    : "## Others have already responded this round";
+  return `${header}
+
+${lines.join("\n\n")}
+
+Find the angle that's distinctly yours on this same moment — don't try to cover more ground, just be the version of this reaction that only *${personaName}* could give.`;
+}
+
 export function buildJudgeCandidatesSection(candidates: RoomJudgeCandidate[]): string {
   const lines = candidates.map((c, i) => {
     const speaker = c.speaker_id === "human" ? "Human" : c.speaker_name;

package/src/prompts/room/types.ts

@@ -2,7 +2,7 @@
  * Room Prompt Types
  */
 
-import type { Fact, PersonaTrait, Topic, Person, Quote, PersonaTopic, ToolDefinition } from "../../core/types.js";
+import type { Fact, Message, PersonaTrait, Topic, Person, Quote, PersonaTopic, ToolDefinition } from "../../core/types.js";
 import type { RoomMode } from "../../core/types.js";
 
 export interface RoomParticipantIdentity {
@@ -35,6 +35,7 @@ export interface RoomResponsePromptData {
     long_description?: string;
     traits: PersonaTrait[];
     topics: PersonaTopic[];
+    include_message_timestamps?: boolean;
   };
   other_participants: RoomParticipantIdentity[];
   human: {
@@ -47,7 +48,7 @@ export interface RoomResponsePromptData {
     /** Pre-filtered: topics where exposure_desired - exposure_current > 0.2 */
     interested_topics: Topic[];
   };
-  history: RoomHistoryMessage[];
+  history: Message[];
   isTUI: boolean;
   tools?: ToolDefinition[];
 }

package/tui/src/components/MessageList.tsx

@@ -99,6 +99,7 @@ export function MessageList() {
           backgroundColor="#0f1419"
           stickyScroll={true}
           stickyStart="bottom"
+          viewportCulling={true}
         >
           <For each={messagesWithQuotes()}>
             {(message, index) => {

package/tui/src/components/RoomMessageList.tsx

@@ -126,6 +126,7 @@ export function RoomMessageList() {
           backgroundColor="#0f1419"
           stickyScroll={true}
           stickyStart="bottom"
+          viewportCulling={true}
         >
           <For each={displayMessagesWithQuotes()}>
             {(msg) => {

package/tui/src/util/yaml-serializers.ts

@@ -47,7 +47,7 @@ interface EditablePersonaData {
   aliases?: string[];
   short_description?: string;
   long_description?: string;
-  model?: string;
+  model?: string | null;
   group_primary?: string | null;
   groups_visible?: Record<string, boolean>[];
   traits: YAMLTrait[];
@@ -243,7 +243,7 @@ export function newPersonaFromYAML(yamlContent: string, allTools?: ToolDefinitio
   
   return {
     long_description: stripPlaceholder(data.long_description, PLACEHOLDER_LONG_DESC),
-    model: data.model,
+    model: data.model ?? undefined,
     group_primary: data.group_primary ?? "General",
     groups_visible: groupsVisible.length > 0 ? groupsVisible : ["General"],
     traits,
@@ -276,7 +276,7 @@ export function personaToYAML(persona: PersonaEntity, allGroups?: string[], allT
     aliases: persona.aliases,
     short_description: persona.short_description,
     long_description: persona.long_description || PLACEHOLDER_LONG_DESC,
-    model: modelDisplay,
+    model: modelDisplay ?? null,
     group_primary: persona.group_primary,
     groups_visible: groupsForYAML,
     traits: useTraitPlaceholder 
@@ -381,7 +381,7 @@ export function personaFromYAML(yamlContent: string, original: PersonaEntity, al
     }
   }
 
-  let resolvedModel: string | undefined = data.model;
+  let resolvedModel: string | undefined = data.model ?? undefined;
   if (data.model && accounts && accounts.length > 0) {
     const guid = displayToModelGuid(data.model, accounts);
     if (guid !== undefined) {
@@ -1220,6 +1220,9 @@ export function toolkitToYAML(provider: ToolProvider, tools: ToolDefinition[]):
   const toolsMap = tools.length > 0
     ? Object.fromEntries(tools.map(t => [t.display_name, t.enabled]))
     : undefined;
+  if (provider.builtin) {
+    return YAML.stringify({ enabled: provider.enabled, tools: toolsMap }, { lineWidth: 0 });
+  }
   const data: EditableToolkitData = {
     display_name: provider.display_name,
     enabled: provider.enabled,
@@ -1241,7 +1244,8 @@ export function toolkitFromYAML(yamlContent: string, original: ToolProvider, too
   const data = YAML.parse(yamlContent) as EditableToolkitData;
 
   if (!data.display_name) {
-    throw new Error("display_name is required");
+    if (!original.display_name) throw new Error("display_name is required");
+    data.display_name = original.display_name;
   }
 
   const updates: Partial<Omit<ToolProvider, 'id' | 'created_at'>> = {