ei-tui 1.1.0 → 1.3.0

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

@@ -12,8 +12,7 @@ export function handlePersonaTopicRating(response: LLMResponse, state: StateMana
   const personaId = response.request.data.personaId as string;
   const personaDisplayName = response.request.data.personaDisplayName as string;
   if (!personaId || !personaDisplayName) {
-    console.error("[handlePersonaTopicRating] Missing personaId or personaDisplayName in request data");
-    return;
+    throw new Error("[handlePersonaTopicRating] Missing personaId or personaDisplayName in request data");
   }
 
   const result = response.parsed as PersonaTopicRatingResult | undefined;
@@ -35,8 +34,7 @@ export function handlePersonaTopicRating(response: LLMResponse, state: StateMana
 
   const persona = state.persona_getById(personaId);
   if (!persona) {
-    console.error(`[handlePersonaTopicRating] Persona not found: ${personaDisplayName}`);
-    return;
+    throw new Error(`[handlePersonaTopicRating] Persona not found: ${personaDisplayName}`);
   }
 
   const now = new Date().toISOString();

package/src/core/handlers/rewrite.ts

@@ -20,6 +20,8 @@ import { getEmbeddingService, getItemEmbeddingText } from "../embedding-service.
 
 import { searchHumanData } from "../human-data-manager.js";
 
+const MIN_REWRITE_FLOOR = 750;
+
 /**
  * handleRewriteScan — Phase 1 of Rewrite.
  * LLM returns an array of subject strings found in the bloated item.
@@ -31,20 +33,25 @@ export async function handleRewriteScan(response: LLMResponse, state: StateManag
   const rewriteModel = response.request.data.rewriteModel as string;
 
   if (!itemId || !itemType) {
-    console.error("[handleRewriteScan] Missing itemId or itemType in request data");
-    return;
+    throw new Error("[handleRewriteScan] Missing itemId or itemType in request data");
   }
 
   const subjects = response.parsed as RewriteScanResult | undefined;
   if (!subjects || !Array.isArray(subjects) || subjects.length === 0) {
-    console.log(`[handleRewriteScan] No extra subjects found for ${itemType} "${itemId}" — marking rewrite_checked`);
+    console.log(`[handleRewriteScan] No extra subjects found for ${itemType} "${itemId}" — setting rewrite_length_floor`);
     const human = state.getHuman();
     if (itemType === "topic") {
       const topic = human.topics.find(t => t.id === itemId);
-      if (topic) state.human_topic_upsert({ ...topic, rewrite_checked: true });
+      if (topic) state.human_topic_upsert({
+        ...topic,
+        rewrite_length_floor: Math.max(MIN_REWRITE_FLOOR, Math.ceil((topic.description?.length ?? 0) * 1.1)),
+      });
     } else if (itemType === "person") {
       const person = human.people.find(p => p.id === itemId);
-      if (person) state.human_person_upsert({ ...person, rewrite_checked: true });
+      if (person) state.human_person_upsert({
+        ...person,
+        rewrite_length_floor: Math.max(MIN_REWRITE_FLOOR, Math.ceil((person.description?.length ?? 0) * 1.1)),
+      });
     }
     return;
   }
@@ -111,8 +118,7 @@ export async function handleRewriteRewrite(response: LLMResponse, state: StateMa
   const itemType = response.request.data.itemType as RewriteItemType;
 
   if (!itemId || !itemType) {
-    console.error("[handleRewriteRewrite] Missing itemId or itemType in request data");
-    return;
+    throw new Error("[handleRewriteRewrite] Missing itemId or itemType in request data");
   }
 
   const result = response.parsed as RewriteResult | undefined;
@@ -171,6 +177,7 @@ export async function handleRewriteRewrite(response: LLMResponse, state: StateMa
       console.warn(`[handleRewriteRewrite] Failed to compute embedding for existing ${resolvedType} "${item.name}":`, err);
     }
 
+    const existingFloor = Math.max(MIN_REWRITE_FLOOR, Math.ceil(item.description.length * 1.1));
     switch (resolvedType) {
       case "topic": {
         const existing = human.topics.find(t => t.id === item.id)!;
@@ -181,6 +188,7 @@ export async function handleRewriteRewrite(response: LLMResponse, state: StateMa
           sentiment: item.sentiment ?? existing.sentiment,
           last_updated: now,
           embedding,
+          rewrite_length_floor: existingFloor,
         });
         break;
       }
@@ -193,6 +201,7 @@ export async function handleRewriteRewrite(response: LLMResponse, state: StateMa
           sentiment: item.sentiment ?? existing.sentiment,
           last_updated: now,
           embedding,
+          rewrite_length_floor: existingFloor,
         });
         break;
       }
@@ -216,6 +225,7 @@ export async function handleRewriteRewrite(response: LLMResponse, state: StateMa
       console.warn(`[handleRewriteRewrite] Failed to compute embedding for new ${item.type} "${item.name}":`, err);
     }
 
+    const newFloor = Math.max(MIN_REWRITE_FLOOR, Math.ceil(item.description.length * 1.1));
     const baseFields = {
       id: crypto.randomUUID(),
       name: item.name,
@@ -227,6 +237,7 @@ export async function handleRewriteRewrite(response: LLMResponse, state: StateMa
       persona_groups: unionGroups,
       interested_personas: unionPersonas,
       embedding,
+      rewrite_length_floor: newFloor,
     };
 
     switch (item.type) {
@@ -267,10 +278,16 @@ export async function handleRewriteRewrite(response: LLMResponse, state: StateMa
   const updatedHuman = state.getHuman();
   if (itemType === "topic") {
     const original = updatedHuman.topics.find(t => t.id === itemId);
-    if (original) state.human_topic_upsert({ ...original, rewrite_checked: true });
+    if (original) state.human_topic_upsert({
+      ...original,
+      rewrite_length_floor: Math.max(MIN_REWRITE_FLOOR, Math.ceil((original.description?.length ?? 0) * 1.1)),
+    });
   } else if (itemType === "person") {
     const original = updatedHuman.people.find(p => p.id === itemId);
-    if (original) state.human_person_upsert({ ...original, rewrite_checked: true });
+    if (original) state.human_person_upsert({
+      ...original,
+      rewrite_length_floor: Math.max(MIN_REWRITE_FLOOR, Math.ceil((original.description?.length ?? 0) * 1.1)),
+    });
   }
 
   console.log(`[handleRewriteRewrite] Complete for ${itemType} "${itemId}": ${existingCount} existing updated, ${newCount} new created`);

package/src/core/handlers/rooms.ts

@@ -17,8 +17,7 @@ export function handleRoomResponse(response: LLMResponse, state: StateManager):
   const parentMessageId = response.request.data.parentMessageId as string | null ?? null;
 
   if (!roomId || !personaId) {
-    console.error("[handleRoomResponse] Missing roomId or personaId in request data");
-    return;
+    throw new Error("[handleRoomResponse] Missing roomId or personaId in request data");
   }
 
   const now = new Date().toISOString();
@@ -111,19 +110,16 @@ export async function handleRoomJudge(response: LLMResponse, state: StateManager
   const judgeDisplayName = response.request.data.judgePersonaDisplayName as string;
 
   if (!roomId) {
-    console.error("[handleRoomJudge] Missing roomId in request data");
-    return;
+    throw new Error("[handleRoomJudge] Missing roomId in request data");
   }
 
   if (!response.parsed) {
-    console.error(`[handleRoomJudge] No parsed result from judge ${judgeDisplayName}`);
-    return;
+    throw new Error(`[handleRoomJudge] No parsed result from judge ${judgeDisplayName}`);
   }
 
   const result = response.parsed as RoomJudgeResult;
   if (!result.winner_message_id) {
-    console.error(`[handleRoomJudge] Judge ${judgeDisplayName} returned no winner_message_id`);
-    return;
+    throw new Error(`[handleRoomJudge] Judge ${judgeDisplayName} returned no winner_message_id`);
   }
 
   const judgePersonaId = response.request.data.judgePersonaId as string;
@@ -131,16 +127,14 @@ export async function handleRoomJudge(response: LLMResponse, state: StateManager
   const allMessages = state.getRoomMessages(roomId);
   const winner = allMessages.find(m => m.id === result.winner_message_id);
   if (!winner) {
-    console.error(`[handleRoomJudge] Winner message ${result.winner_message_id} not found in room ${roomId}`);
-    return;
+    throw new Error(`[handleRoomJudge] Winner message ${result.winner_message_id} not found in room ${roomId}`);
   }
 
   const verdictParentId = winner.parent_id;
 
   const ok = state.setRoomActiveNode(roomId, result.winner_message_id);
   if (!ok) {
-    console.error(`[handleRoomJudge] Could not set active node ${result.winner_message_id} in room ${roomId}`);
-    return;
+    throw new Error(`[handleRoomJudge] Could not set active node ${result.winner_message_id} in room ${roomId}`);
   }
 
   const losers = allMessages

package/src/core/heartbeat-manager.ts

@@ -168,6 +168,16 @@ export async function queueEiHeartbeat(
     });
   }
 
+  // Ei's own pending reflection — separate item type so she can introspect on herself
+  const eiPersona = personas.find((p) => p.id === "ei");
+  if (eiPersona?.pending_update?.critique) {
+    items.push({
+      id: eiPersona.id,
+      type: "Self Reflection Alert",
+      critique: eiPersona.pending_update.critique,
+    });
+  }
+
   const personasWithPendingUpdate = personas.filter(
     (p) => !p.is_archived && !p.is_paused && !p.is_static && p.id !== "ei" && p.pending_update?.critique
   );

package/src/core/llm-client.ts

@@ -76,7 +76,17 @@ export interface LLMRawResponse {
 
 let llmCallCount = 0;
 
-
+function resolveApiKey(raw: string | undefined): string {
+  if (!raw || !raw.startsWith("$")) return raw ?? "";
+  const varName = raw.slice(1);
+  const resolved =
+    (typeof Bun !== "undefined" && (Bun as { env: Record<string, string> }).env?.[varName]) ||
+    (typeof process !== "undefined" && process.env?.[varName]);
+  if (!resolved) {
+    throw new Error(`Provider API key references env var $${varName}, but it is not set.`);
+  }
+  return resolved;
+}
 
 function isGuid(str: string): boolean {
   return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(str);
@@ -90,7 +100,7 @@ function buildResolvedModel(account: ProviderAccount, model: ModelConfig): Resol
     config: {
       name: account.name,
       baseURL: account.url,
-      apiKey: account.api_key || "",
+      apiKey: resolveApiKey(account.api_key),
     },
     extraHeaders: account.extra_headers,
   };
@@ -171,7 +181,7 @@ export function resolveModel(modelSpec?: string, accounts?: ProviderAccount[]):
         config: {
           name: matchingAccount.name,
           baseURL: matchingAccount.url,
-          apiKey: matchingAccount.api_key || "",
+          apiKey: resolveApiKey(matchingAccount.api_key),
         },
         extraHeaders: matchingAccount.extra_headers,
       };

package/src/core/message-manager.ts

@@ -255,8 +255,6 @@ export function checkAndQueueHumanExtraction(
   const unextractedPeople = sm.messages_getUnextracted(personaId, "p", undefined, "exclude");
   const peopleThreshold = Math.min(EXTRACTION_TAPER_CAP, human.people.length);
   if (unextractedPeople.length > 0 && unextractedPeople.length >= peopleThreshold) {
-    const personaForScan = sm.persona_getById(personaId);
-    const personScanOptions = personaForScan?.pending_update ? { reflection_progress: 1 } : undefined;
     const context: ExtractionContext = {
       personaId,
       channelDisplayName: personaDisplayName,
@@ -264,9 +262,9 @@ export function checkAndQueueHumanExtraction(
       messages_analyze: unextractedPeople,
       extraction_flag: "p",
     };
-    queuePersonScan(context, sm, personScanOptions);
+    queuePersonScan(context, sm);
     console.log(
-      `[Processor] Human Seed extraction: people (threshold: ${peopleThreshold}, unextracted: ${unextractedPeople.length}${personScanOptions ? ", reflection_progress=1" : ""})`
+      `[Processor] Human Seed extraction: people (threshold: ${peopleThreshold}, unextracted: ${unextractedPeople.length})`
     );
   }
 }

package/src/core/orchestrators/ceremony.ts

@@ -137,10 +137,7 @@ function queueExposurePhase(personaId: string, state: StateManager, options?: Ex
       messages_analyze: unextractedPeople,
       extraction_flag: "p",
     };
-    const personScanOptions = persona.pending_update
-      ? { ...options, reflection_progress: 1 }
-      : options;
-    queuePersonScan(context, state, personScanOptions);
+    queuePersonScan(context, state, options);
   }
   
   const totalUnextracted = unextractedFacts.length + unextractedTopics.length + unextractedPeople.length;
@@ -267,14 +264,6 @@ export function handleCeremonyProgress(state: StateManager, lastPhase: number):
     !p.is_static
   );
   
-  const eiIndex = activePersonas.findIndex(p => 
-    (p.aliases?.[0] ?? "").toLowerCase() === "ei"
-  );
-  
-  // Ei's topics don't change
-  if (eiIndex > -1) {
-    activePersonas.splice(eiIndex, 1);
-  }
   // Decay phase: apply decay + prune for ALL active personas
   for (const persona of activePersonas) {
     applyDecayPhase(persona.id, state);
@@ -287,7 +276,7 @@ export function handleCeremonyProgress(state: StateManager, lastPhase: number):
   // Person Rewrite phase (phase 4): scan bloated Person records, extract Topics from them.
   // Gated via ceremony_progress so Topic Rewrite can run after — Topics created here
   // need to be visible before Topic Rewrite snapshots the threshold.
-  queuePersonRewritePhase(state);
+  queuePersonRewritePhase(state, { ceremonyProgress: 4 });
 
   // Zero-work guard: if no person rewrites queued, advance to topic rewrite immediately
   if (!state.queue_hasPendingCeremonies()) {
@@ -482,7 +471,7 @@ export function queueReflectionDrain(personaId: string, state: StateManager): vo
     messages_analyze: unextractedPeople,
     extraction_flag: "p",
   };
-  queuePersonScan(context, state, { reflection_progress: 1 });
+  queuePersonScan(context, state);
   console.log(`[reflection:drain] Queued Person scan for ${persona.display_name} (${unextractedPeople.length} messages) — clears on completion`);
 }
 
@@ -490,7 +479,7 @@ function getRewriteModel(state: StateManager): string | undefined {
   return state.getHuman().settings?.rewrite_model;
 }
 
-export function queuePersonRewritePhase(state: StateManager): void {
+export function queuePersonRewritePhase(state: StateManager, options?: { ceremonyProgress?: number }): void {
   const rewriteModel = getRewriteModel(state);
   if (!rewriteModel) {
     console.log("[ceremony:rewrite] rewrite_model not set — skipping person rewrite phase");
@@ -498,13 +487,30 @@ export function queuePersonRewritePhase(state: StateManager): void {
   }
 
   const human = state.getHuman();
-  const personsToScan = human.people.filter(person => {
+  const allCandidates = human.people.filter(person => {
     const isPersonaLinked = (person.identifiers ?? []).some(
       i => i.type.toLowerCase() === 'ei persona'
     );
     return !isPersonaLinked
-      && (person.description?.length ?? 0) > REWRITE_DESCRIPTION_THRESHOLD
-      && !person.rewrite_checked;
+      && (person.description?.length ?? 0) > REWRITE_DESCRIPTION_THRESHOLD;
+  });
+
+  const alreadyChecked = allCandidates.filter(p => {
+    const descLen = p.description?.length ?? 0;
+    return p.rewrite_length_floor !== undefined && descLen < p.rewrite_length_floor;
+  });
+  if (alreadyChecked.length > 0) {
+    for (const person of alreadyChecked) {
+      console.log(
+        `[ceremony:rewrite] Person "${person.name}" is ${person.description?.length ?? 0} chars ` +
+        `(floor: ${person.rewrite_length_floor}) — already reviewed, skipping`
+      );
+    }
+  }
+
+  const personsToScan = allCandidates.filter(p => {
+    if (p.rewrite_length_floor === undefined) return true;
+    return (p.description?.length ?? 0) >= p.rewrite_length_floor;
   });
 
   if (personsToScan.length === 0) {
@@ -527,7 +533,7 @@ export function queuePersonRewritePhase(state: StateManager): void {
         itemId: person.id,
         itemType: "person" as RewriteItemType,
         rewriteModel,
-        ceremony_progress: 4,
+        ...(options?.ceremonyProgress !== undefined && { ceremony_progress: options.ceremonyProgress }),
       },
     });
   }
@@ -543,11 +549,28 @@ export function queueTopicRewritePhase(state: StateManager): void {
   }
 
   const human = state.getHuman();
-  const topicsToScan = human.topics.filter(topic =>
+  const allCandidateTopics = human.topics.filter(topic =>
     (topic.description?.length ?? 0) > REWRITE_DESCRIPTION_THRESHOLD
-    && !topic.rewrite_checked
   );
 
+  const alreadyCheckedTopics = allCandidateTopics.filter(t => {
+    const descLen = t.description?.length ?? 0;
+    return t.rewrite_length_floor !== undefined && descLen < t.rewrite_length_floor;
+  });
+  if (alreadyCheckedTopics.length > 0) {
+    for (const topic of alreadyCheckedTopics) {
+      console.log(
+        `[ceremony:rewrite] Topic "${topic.name}" is ${topic.description?.length ?? 0} chars ` +
+        `(floor: ${topic.rewrite_length_floor}) — already reviewed, skipping`
+      );
+    }
+  }
+
+  const topicsToScan = allCandidateTopics.filter(t => {
+    if (t.rewrite_length_floor === undefined) return true;
+    return (t.description?.length ?? 0) >= t.rewrite_length_floor;
+  });
+
   if (topicsToScan.length === 0) {
     console.log("[ceremony:rewrite] No topics above threshold — skipping topic rewrite phase");
     return;
@@ -592,7 +615,7 @@ function queueEventSummaryForAll(state: StateManager, options?: ExtractionOption
 
 function queueReflectionPhase(state: StateManager): void {
   const personas = state.persona_getAll().filter(p =>
-    !p.is_paused && !p.is_archived && !p.is_static && p.id !== "ei"
+    !p.is_paused && !p.is_archived && !p.is_static
   );
 
   let queued = 0;

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

@@ -195,6 +195,15 @@ export function queuePersonScan(context: ExtractionContext, state: StateManager,
   
   if (chunks.length === 0) return 0;
 
+  // If the persona has a pending_update (reflection in progress), gate person
+  // scans so handleHumanPersonScan won't queue updates for persona-linked people.
+  // This prevents importers and other callers from bypassing the reflection lock
+  // — they don't know about pending_update, so we enforce it here centrally.
+  const persona = state.persona_getById(context.personaId);
+  const effectiveOptions: ExtractionOptions | undefined = persona?.pending_update
+    ? { ...options, reflection_progress: 1 }
+    : options;
+
   // Pre-mark messages before enqueuing — prevents duplicate scans if the
   // queue check fires again during LLM latency (100ms loop × 5s call = 50 dupes)
   for (const chunk of chunks) {
@@ -225,7 +234,7 @@ export function queuePersonScan(context: ExtractionContext, state: StateManager,
       user: prompt.user,
       next_step: LLMNextStep.HandleHumanPersonScan,
       data: {
-        ...options,
+        ...effectiveOptions,
         personaId: chunk.personaId,
         personaDisplayName: chunk.channelDisplayName,
         analyze_from_timestamp: getAnalyzeFromTimestamp(chunk),