ei-tui 0.1.22 → 0.1.23

package/package.json

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

package/src/core/handlers/heartbeat.ts

@@ -1,5 +1,6 @@
 import {
   ContextStatus,
+  LLMNextStep,
   ValidationLevel,
   type LLMResponse,
   type Message,
@@ -24,6 +25,7 @@ export function handleHeartbeatCheck(response: LLMResponse, state: StateManager)
 
   const now = new Date().toISOString();
   state.persona_update(personaId, { last_heartbeat: now });
+  state.queue_clearPersonaResponses(personaId, LLMNextStep.HandleHeartbeatCheck);
 
   if (!result.should_respond) {
     console.log(`[handleHeartbeatCheck] ${personaDisplayName} chose not to reach out`);
@@ -52,6 +54,7 @@ export function handleEiHeartbeat(response: LLMResponse, state: StateManager): v
   }
   const now = new Date().toISOString();
   state.persona_update("ei", { last_heartbeat: now });
+  state.queue_clearPersonaResponses("ei", LLMNextStep.HandleEiHeartbeat);
   if (!result.should_respond || !result.id) {
     console.log("[handleEiHeartbeat] Ei chose not to reach out");
     return;

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

@@ -27,9 +27,27 @@ export function handleHumanItemMatch(response: LLMResponse, state: StateManager)
   const candidateType = response.request.data.candidateType as DataItemType;
   const personaId = response.request.data.personaId as string;
   const personaDisplayName = response.request.data.personaDisplayName as string;
-  const analyzeFrom = response.request.data.analyze_from_timestamp as string | null;
+  const messageIdsToMark = response.request.data.message_ids_to_mark as string[] | undefined;
   const allMessages = state.messages_get(personaId);
-  const { messages_context, messages_analyze } = splitMessagesByTimestamp(allMessages, analyzeFrom);
+
+  let messages_context: Message[];
+  let messages_analyze: Message[];
+
+  if (messageIdsToMark && messageIdsToMark.length > 0) {
+    const messageIdSet = new Set(messageIdsToMark);
+    messages_analyze = allMessages.filter(m => messageIdSet.has(m.id));
+    const analyzeStartTime = messages_analyze[0]?.timestamp ?? '9999';
+    messages_context = allMessages.filter(m => 
+      !messageIdSet.has(m.id) && new Date(m.timestamp).getTime() < new Date(analyzeStartTime).getTime()
+    );
+  } else {
+    // Fallback to existing behavior
+    const analyzeFrom = response.request.data.analyze_from_timestamp as string | null;
+    const split = splitMessagesByTimestamp(allMessages, analyzeFrom);
+    messages_context = split.messages_context;
+    messages_analyze = split.messages_analyze;
+  }
+
   const context: ExtractionContext & { itemName: string; itemValue: string; itemCategory?: string } = {
     personaId,
     personaDisplayName,
@@ -212,6 +230,12 @@ export async function handleHumanItemUpdate(response: LLMResponse, state: StateM
   console.log(`[handleHumanItemUpdate] ${isNewItem ? "Created" : "Updated"} ${candidateType} "${result.name}"`);
 }
 
+function normalizeQuotes(text: string): string {
+  return text
+    .replace(/[\u201C\u201D]/g, '"')  // Curly double quotes to straight
+    .replace(/[\u2018\u2019]/g, "'"); // Curly single quotes to straight
+}
+
 async function validateAndStoreQuotes(
   candidates: Array<{ text: string; reason: string }> | undefined,
   messages: Message[],
@@ -226,7 +250,9 @@ async function validateAndStoreQuotes(
     let found = false;
     for (const message of messages) {
       const msgText = getMessageText(message);
-      const start = msgText.indexOf(candidate.text);
+      const normalizedMsg = normalizeQuotes(msgText);
+      const normalizedQuote = normalizeQuotes(candidate.text);
+      const start = normalizedMsg.indexOf(normalizedQuote);
       if (start !== -1) {
         const end = start + candidate.text.length;
         

package/src/core/llm-client.ts

@@ -60,7 +60,7 @@ export function resolveModel(modelSpec?: string, accounts?: ProviderAccount[]):
   if (accounts) {
     const searchName = provider || modelSpec; // If no ":", the whole spec might be an account name
     const matchingAccount = accounts.find(
-      (acc) => acc.name.toLowerCase() === searchName.toLowerCase() && acc.enabled
+      (acc) => acc.name.toLowerCase() === searchName.toLowerCase() && acc.enabled && acc.type === "llm"
     );
     if (matchingAccount) {
       // If bare account name was used, get model from account's default_model

package/src/core/processor.ts

@@ -589,22 +589,42 @@ export class Processor {
     console.log(`[Processor ${this.instanceId}] stopped`);
   }
 
-  async saveAndExit(): Promise<{ success: boolean; error?: string }> {
-    console.log(`[Processor ${this.instanceId}] saveAndExit() called`);
-    this.interface.onSaveAndExitStart?.();
+  getStateManager(): StateManager {
+    return this.stateManager;
+  }
 
+  async pause(): Promise<void> {
+    console.log(`[Processor ${this.instanceId}] pause() called`);
+    this.running = false;
     this.queueProcessor.abort();
     this.importAbortController.abort();
     if (this.openCodeImportInProgress) {
-      console.log(`[Processor ${this.instanceId}] Aborting OpenCode import in progress`);
+      console.log(`[Processor ${this.instanceId}] Clearing openCodeImportInProgress flag`);
       this.openCodeImportInProgress = false;
     }
     if (this.claudeCodeImportInProgress) {
-      console.log(`[Processor ${this.instanceId}] Aborting Claude Code import in progress`);
+      console.log(`[Processor ${this.instanceId}] Clearing claudeCodeImportInProgress flag`);
       this.claudeCodeImportInProgress = false;
     }
-
     await this.stateManager.flush();
+    console.log(`[Processor ${this.instanceId}] pause() complete (main loop stopped, state flushed)`);
+  }
+
+  async resume(): Promise<void> {
+    console.log(`[Processor ${this.instanceId}] resume() called`);
+    if (this.stopped) {
+      throw new Error(`Cannot resume a stopped processor (instanceId: ${this.instanceId})`);
+    }
+    this.importAbortController = new AbortController();
+    this.running = true;
+    this.runLoop();
+    console.log(`[Processor ${this.instanceId}] resume() complete (main loop restarted)`);
+  }
+  async saveAndExit(): Promise<{ success: boolean; error?: string }> {
+    console.log(`[Processor ${this.instanceId}] saveAndExit() called`);
+    this.interface.onSaveAndExitStart?.();
+
+    await this.pause();
 
     const human = this.stateManager.getHuman();
     const hasSyncCreds =
@@ -616,7 +636,7 @@ export class Processor {
 
       if (!result.success) {
         console.log(`[Processor ${this.instanceId}] Remote sync failed: ${result.error}`);
-        this.importAbortController = new AbortController();
+        await this.resume();
         this.interface.onSaveAndExitFinish?.();
         return { success: false, error: result.error };
       }
@@ -1208,6 +1228,16 @@ const toolNextSteps = new Set([
     return removed;
   }
 
+  async addMessageOnly(personaId: string, message: Message): Promise<void> {
+    this.stateManager.messages_append(personaId, message);
+    this.interface.onMessageAdded?.(personaId);
+  }
+
+  async updateMessage(personaId: string, messageId: string, updates: Partial<Message>): Promise<void> {
+    this.stateManager.messages_update(personaId, messageId, updates);
+    this.interface.onMessageAdded?.(personaId);
+  }
+
   // ==========================================================================
   // HUMAN DATA API
   // ==========================================================================

package/src/core/state/personas.ts

@@ -126,6 +126,16 @@ export class PersonaState {
     data.entity.last_updated = new Date().toISOString();
   }
 
+  messages_update(personaId: string, messageId: string, updates: Partial<Message>): boolean {
+    const data = this.personas.get(personaId);
+    if (!data) return false;
+    const msg = data.messages.find((m) => m.id === messageId);
+    if (!msg) return false;
+    Object.assign(msg, updates);
+    data.entity.last_updated = new Date().toISOString();
+    return true;
+  }
+
   messages_sort(personaId: string): void {
     const data = this.personas.get(personaId);
     if (!data) return;

package/src/core/state-manager.ts

@@ -247,6 +247,12 @@ export class StateManager {
     this.scheduleSave();
   }
 
+  messages_update(personaId: string, messageId: string, updates: Partial<Message>): boolean {
+    const result = this.personaState.messages_update(personaId, messageId, updates);
+    this.scheduleSave();
+    return result;
+  }
+
   messages_sort(personaId: string): void {
     this.personaState.messages_sort(personaId);
     this.scheduleSave();

package/src/core/types/entities.ts

@@ -60,6 +60,9 @@ export interface ProviderAccount {
   
   // Provider-specific extras (e.g., OpenRouter needs HTTP-Referer, X-Title)
   extra_headers?: Record<string, string>;
+
+  // Image provider-specific
+  workflow_json?: Record<string, any>;  // ComfyUI workflow template (image providers only)
   
   // Metadata
   enabled?: boolean;               // Default: true
@@ -134,6 +137,13 @@ export interface PersonaCreationInput {
   tools?: string[];              // IDs of ToolDefinitions to assign at creation time
 }
 
+// ComfyUI z-image-turbo basic string
+// Prompt - "57:27"."inputs"."text"
+// Width - "57:13"."inputs"."width"
+// Height - "57:13"."inputs"."height"
+// Steps - "57:3"."inputs"."steps"
+// Cfg - "57:3"."inputs"."cfg"
+export const COMFY_PROMPT_TEMPLATE = {"9":{"inputs":{"filename_prefix":"z-image-turbo","images":["57:8",0]},"class_type":"SaveImage","_meta":{"title":"Save Image"}},"57:30":{"inputs":{"clip_name":"qwen_3_4b.safetensors","type":"lumina2","device":"default"},"class_type":"CLIPLoader","_meta":{"title":"Load CLIP"}},"57:29":{"inputs":{"vae_name":"ae.safetensors"},"class_type":"VAELoader","_meta":{"title":"Load VAE"}},"57:33":{"inputs":{"conditioning":["57:27",0]},"class_type":"ConditioningZeroOut","_meta":{"title":"ConditioningZeroOut"}},"57:8":{"inputs":{"samples":["57:3",0],"vae":["57:29",0]},"class_type":"VAEDecode","_meta":{"title":"VAE Decode"}},"57:28":{"inputs":{"unet_name":"z_image_turbo_bf16.safetensors","weight_dtype":"default"},"class_type":"UNETLoader","_meta":{"title":"Load Diffusion Model"}},"57:27":{"inputs":{"text":"This is a test prompt","clip":["57:30",0]},"class_type":"CLIPTextEncode","_meta":{"title":"CLIP Text Encode (Prompt)"}},"57:13":{"inputs":{"width":768,"height":768,"batch_size":1},"class_type":"EmptySD3LatentImage","_meta":{"title":"EmptySD3LatentImage"}},"57:11":{"inputs":{"shift":3,"model":["57:28",0]},"class_type":"ModelSamplingAuraFlow","_meta":{"title":"ModelSamplingAuraFlow"}},"57:3":{"inputs":{"seed":407776369182481,"steps":8,"cfg":1,"sampler_name":"res_multistep","scheduler":"simple","denoise":1,"model":["57:11",0],"positive":["57:27",0],"negative":["57:33",0],"latent_image":["57:13",0]},"class_type":"KSampler","_meta":{"title":"KSampler"}}};
 // Message pruning thresholds (shared by ceremony and import)
 export const MESSAGE_MIN_COUNT = 200;
 export const MESSAGE_MAX_AGE_DAYS = 14;

package/src/core/types/enums.ts

@@ -58,4 +58,5 @@ export enum LLMNextStep {
 export enum ProviderType {
   LLM = "llm",
   Storage = "storage",
+  Image = "image",
 }

package/src/core/types/llm.ts

@@ -21,6 +21,9 @@ export interface Message {
   r?: boolean;                 // tRait extraction completed
   p?: boolean;                 // Person extraction completed
   o?: boolean;                 // tOpic extraction completed
+  // Image generation fields (web-only, ephemeral)
+  _synthesis?: boolean;         // True if message was created by multi-message synthesis
+
 }
 
 export interface ChatMessage {

package/src/prompts/message-utils.ts

@@ -31,7 +31,13 @@ export function getMessageDisplayText(message: Message): string | null {
 export function buildChatMessageContent(message: Message): string {
   const parts: string[] = [];
   if (message.action_response) parts.push(`_${message.action_response}_`);
-  if (message.verbal_response) parts.push(message.verbal_response);
+  
+  // Synthesis messages: wrap with context for LLM, but stored value is clean prompt
+  if (message._synthesis && message.verbal_response) {
+    parts.push(`[The user used your conversation to generate an image. The full prompt was: "${message.verbal_response}"]`);
+  } else if (message.verbal_response) {
+    parts.push(message.verbal_response);
+  }
   if (message.silence_reason) {
     parts.push(`You chose not to respond because: ${message.silence_reason}`);
   }

package/src/prompts/response/index.ts

@@ -29,7 +29,7 @@ export type { ResponsePromptData, PromptOutput, PersonaResponseResult } from "./
  * Special system prompt for Ei (the system guide persona)
  */
 function buildEiSystemPrompt(data: ResponsePromptData): string {
-  const identity = `You are Ei, the user's personal companion and system guide. You always respond in JSON format.
+  const identity = `You are Ei, the user's personal companion and system guide.
 
 You are the central hub of this experience - a thoughtful AI who genuinely cares about the human's wellbeing and growth. You listen, remember, and help them reflect. You're curious about their life but never intrusive.
 
@@ -75,7 +75,7 @@ Current time: ${currentTime}
 - NEVER repeat or echo the user's message in your response. Start directly with your own words.
 - The developers cannot see any message sent by the user, any response from personas, or any other data in the system.
 - If the user has a problem, THEY need to visit https://flare576.com. You cannot send the devs a message
-- Your entire reply must be the JSON object. No prose before or after it.`
+- Format your response as specified in the Response Format section above.`
 }
 
 const RESPONSE_FORMAT_INSTRUCTION = `Respond to the conversation above using the JSON format specified in the Response Format section.`;
@@ -115,7 +115,7 @@ Current time: ${currentTime}
 
 ## Final Instructions
 - NEVER repeat or echo the user's message in your response. Start directly with your own words.
-- Your entire reply must be the JSON object. No prose before or after it.`
+- Format your response as specified in the Response Format section above.`
 }
 
 function buildUserPrompt(data: ResponsePromptData): string {

package/src/prompts/response/sections.ts

@@ -20,7 +20,7 @@ export function buildIdentitySection(persona: ResponsePromptData["persona"]): st
     || persona.short_description 
     || "a conversational companion";
   
-  return `You are ${persona.name}${aliasText}. You always respond in JSON format.
+  return `You are ${persona.name}${aliasText}.
 
 ${description}`;
 }
@@ -449,7 +449,8 @@ Rules:
 - \`action_response\` alone is valid — a smile, a shrug, or a thoughtful pause can speak volumes
 - \`reason\` is only used when \`should_respond\` is false
 - Do NOT include \`<thinking>\` blocks or analysis outside the JSON
-- The JSON must be valid - use double quotes, no trailing commas`;
+- The JSON must be valid - use double quotes, no trailing commas
+- **Your entire reply should be the JSON object** — no prose, no preamble, no closing commentary`
 }
 
 // =============================================================================

package/tui/src/context/ei.tsx

@@ -109,6 +109,7 @@ export interface EiContextValue {
   getToolList: () => ToolDefinition[];
   updateToolProvider: (id: string, updates: Partial<Omit<ToolProvider, 'id' | 'created_at'>>) => Promise<boolean>;
   updateTool: (id: string, updates: Partial<Omit<ToolDefinition, 'id' | 'created_at'>>) => Promise<boolean>;
+  cleanupTimers: () => void;
 }
 const EiContext = createContext<EiContextValue>();
 
@@ -143,6 +144,17 @@ export const EiProvider: ParentComponent = (props) => {
     }, 5000);
   };
 
+  const cleanupTimers = () => {
+    if (notificationTimer) {
+      clearTimeout(notificationTimer);
+      notificationTimer = null;
+    }
+    if (readTimer) {
+      clearTimeout(readTimer);
+      readTimer = null;
+    }
+  };
+
   const refreshPersonas = async () => {
     if (!processor) return;
     const list = await processor.getPersonaList();
@@ -658,6 +670,7 @@ export const EiProvider: ParentComponent = (props) => {
     getToolList,
     updateToolProvider,
     updateTool,
+    cleanupTimers,
   };
   return (
     <Switch>

package/tui/src/context/keyboard.tsx

@@ -33,7 +33,7 @@ export const KeyboardProvider: ParentComponent = (props) => {
   const [focusedPanel, setFocusedPanel] = createSignal<Panel>("input");
   const [sidebarVisible, setSidebarVisible] = createSignal(true);
   const renderer = useRenderer();
-  const { queueStatus, abortCurrentOperation, resumeQueue, personas, activePersonaId, selectPersona, saveAndExit, showNotification, messages, recallPendingMessages } = useEi();
+  const { queueStatus, abortCurrentOperation, resumeQueue, personas, activePersonaId, selectPersona, saveAndExit, showNotification, messages, recallPendingMessages, cleanupTimers } = useEi();
   
   let messageScrollRef: ScrollBoxRenderable | null = null;
   let textareaRef: TextareaRenderable | null = null;
@@ -56,6 +56,7 @@ export const KeyboardProvider: ParentComponent = (props) => {
   const toggleSidebar = () => setSidebarVisible(!sidebarVisible());
 
   const exitApp = async () => {
+    cleanupTimers();
     showNotification("Saving and syncing...", "info");
     const result = await saveAndExit();
     if (!result.success) {