ei-tui 0.6.5 → 0.6.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ei-tui",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "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

@@ -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

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/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;
@@ -284,7 +284,7 @@ export async function handlePersonUpdate(response: LLMResponse, state: StateMana
   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 +293,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 +304,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 } : {}) });

package/src/core/llm-client.ts

@@ -51,9 +51,10 @@ function isGuid(str: string): boolean {
 }
 
 function buildResolvedModel(account: ProviderAccount, model: ModelConfig): ResolvedModel {
+  const apiModelId = model.model_id ?? model.name;
   return {
     provider: account.name,
-    model: model.name === "(default)" ? undefined : model.name,
+    model: apiModelId === "(default)" ? undefined : apiModelId,
     config: {
       name: account.name,
       baseURL: account.url,
@@ -164,10 +165,16 @@ function findModelAndAccount(
     const model = account?.models?.find((m) => m.name === modelName);
     return { model, account };
   }
+  // Try matching by model UUID first
   for (const account of accounts) {
     const model = account.models?.find((m) => m.id === spec);
     if (model) return { model, account };
   }
+  // Fall back to matching by account name (bare spec like "EG" or "RnP")
+  const accountByName = accounts.find(
+    (a) => a.name.toLowerCase() === spec.toLowerCase() && a.enabled
+  );
+  if (accountByName) return { model: undefined, account: accountByName };
   return { model: undefined, account: undefined };
 }
 
@@ -265,6 +272,10 @@ export async function callLLMRaw(
     max_tokens: modelConfig?.max_output_tokens ?? DEFAULT_MAX_OUTPUT_TOKENS,
   };
 
+  if (modelConfig?.thinking_budget !== undefined) {
+    requestBody.think = { budget_tokens: modelConfig.thinking_budget };
+  }
+
   if (options.tools && options.tools.length > 0) {
     requestBody.tools = options.tools;
     requestBody.tool_choice = "auto";

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

@@ -281,6 +281,7 @@ export function queueDirectTopicUpdate(
         isNewItem: false,
         existingItemId: topic.id,
         analyze_from_timestamp: getAnalyzeFromTimestamp(chunk),
+        extraction_model: extractionModel,
       },
     });
   }
@@ -425,14 +426,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 +467,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 +609,7 @@ export function queuePersonUpdate(
         candidateRelationship: context.candidateRelationship,
         candidateIdentifiers: isNewItem ? candidateIdentifiers : undefined,
         analyze_from_timestamp: getAnalyzeFromTimestamp(chunk),
+        extraction_model: context.extraction_model,
       },
     });
   }
@@ -653,6 +664,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

@@ -1130,6 +1130,9 @@ const toolNextSteps = new Set([
                     });
                   }
                 },
+                onUsageUpdate: (modelId, usage) => {
+                  this.stateManager.model_update_usage(modelId, usage);
+                },
               }
             );
 

package/src/core/queue-processor.ts

@@ -37,9 +37,10 @@ export interface QueueProcessorStartOptions {
   onEnqueue?: EnqueueCallback;
   /**
    * Called when a tool executor updates its provider config (e.g. Spotify refresh token rotation).
-   * Injected by Processor to persist the updated config back to storage.
+   * Injected by Processor pointing to stateManager.queue_enqueue.
    */
   onProviderConfigUpdate?: (providerId: string, updates: Record<string, string>) => void;
+  onUsageUpdate?: (modelId: string, usage: { calls: number; tokens_in: number; tokens_out: number }) => void;
 }
 
 export class QueueProcessor {
@@ -52,6 +53,7 @@ export class QueueProcessor {
   private currentTools: ToolDefinition[] | undefined;
   private currentOnEnqueue: EnqueueCallback | undefined;
   private currentOnProviderConfigUpdate: ((providerId: string, updates: Record<string, string>) => void) | undefined;
+  private currentOnUsageUpdate: ((modelId: string, usage: { calls: number; tokens_in: number; tokens_out: number }) => void) | undefined;
 
   getState(): QueueProcessorState {
     return this.state;
@@ -70,6 +72,7 @@ export class QueueProcessor {
     this.currentTools = options?.tools;
     this.currentOnEnqueue = options?.onEnqueue;
     this.currentOnProviderConfigUpdate = options?.onProviderConfigUpdate;
+    this.currentOnUsageUpdate = options?.onUsageUpdate;
     this.abortController = new AbortController();
 
     this.processRequest(request)
@@ -197,7 +200,7 @@ export class QueueProcessor {
         hydratedUser,
         messages,
         request.model,
-        { signal: this.abortController?.signal, tools: openAITools },
+        { signal: this.abortController?.signal, tools: openAITools, onUsageUpdate: this.currentOnUsageUpdate },
         this.currentAccounts
       );
 
@@ -304,7 +307,7 @@ export class QueueProcessor {
       hydratedUser,
       messages,
       request.model,
-      { signal: this.abortController?.signal, tools: openAITools },
+      { signal: this.abortController?.signal, tools: openAITools, onUsageUpdate: this.currentOnUsageUpdate },
       this.currentAccounts
     );
     if (thinking) {
@@ -496,7 +499,7 @@ export class QueueProcessor {
         reformatUserPrompt,
         messages, // existing tool history — gives full context without duplicating the ask
         request.model,
-        { signal: this.abortController?.signal },
+        { signal: this.abortController?.signal, onUsageUpdate: this.currentOnUsageUpdate },
         this.currentAccounts
       );
 
@@ -553,7 +556,7 @@ export class QueueProcessor {
         reformatUserPrompt,
         [], // no message history needed — schema is already in the system prompt
         request.model,
-        { signal: this.abortController?.signal },
+        { signal: this.abortController?.signal, onUsageUpdate: this.currentOnUsageUpdate },
         this.currentAccounts
       );
 

package/src/core/state-manager.ts

@@ -18,6 +18,7 @@ import type {
   RoomCreationInput,
 } 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";
 import {
   HumanState,
@@ -68,6 +69,7 @@ export class StateManager {
     this.migrateInterestedPersonas();
     this.migrateProviderModel();
     this.migrateRoomMessageContent();
+    this.migrateThemes();
   }
 
   private migrateRoomMessageContent(): void {
@@ -566,6 +568,14 @@ export class StateManager {
     this.persistenceState.scheduleSave(this.buildStorageState());
   }
 
+  private migrateThemes(): void {
+    const human = this.humanState.get();
+    if (!human.settings) return;
+    if (human.settings.custom_themes !== undefined) return;
+    human.settings.custom_themes = [];
+    this.humanState.set(human);
+  }
+
   getHuman(): HumanEntity {
     return this.humanState.get();
   }
@@ -575,6 +585,44 @@ export class StateManager {
     this.scheduleSave();
   }
 
+  human_theme_getActive(): string | undefined {
+    return this.getHuman().settings?.active_theme;
+  }
+
+  human_theme_setActive(id: string | undefined): void {
+    const human = this.getHuman();
+    human.settings ??= {};
+    human.settings.active_theme = id;
+    this.setHuman(human);
+  }
+
+  human_theme_getAll(): ThemeDefinition[] {
+    return this.getHuman().settings?.custom_themes ?? [];
+  }
+
+  human_theme_upsert(theme: ThemeDefinition): void {
+    const human = this.getHuman();
+    human.settings ??= {};
+    human.settings.custom_themes ??= [];
+    const idx = human.settings.custom_themes.findIndex(t => t.id === theme.id);
+    if (idx >= 0) {
+      human.settings.custom_themes[idx] = theme;
+    } else {
+      human.settings.custom_themes.push(theme);
+    }
+    this.setHuman(human);
+  }
+
+  human_theme_remove(id: string): boolean {
+    const human = this.getHuman();
+    const themes = human.settings?.custom_themes ?? [];
+    const idx = themes.findIndex(t => t.id === id);
+    if (idx < 0) return false;
+    themes.splice(idx, 1);
+    this.setHuman(human);
+    return true;
+  }
+
   human_fact_upsert(fact: Fact): void {
     this.humanState.fact_upsert(fact);
     this.scheduleSave();
@@ -1064,6 +1112,24 @@ export class StateManager {
     return { success: true, cleared };
   }
 
+  model_update_usage(modelId: string, delta: { calls: number; tokens_in: number; tokens_out: number }): void {
+    const human = this.humanState.get();
+    const accounts = human.settings?.accounts;
+    if (!accounts) return;
+
+    for (const account of accounts) {
+      const model = account.models?.find(m => m.id === modelId);
+      if (model) {
+        model.total_calls = (model.total_calls ?? 0) + delta.calls;
+        model.total_tokens_in = (model.total_tokens_in ?? 0) + delta.tokens_in;
+        model.total_tokens_out = (model.total_tokens_out ?? 0) + delta.tokens_out;
+        model.last_used = new Date().toISOString();
+        this.scheduleSave();
+        return;
+      }
+    }
+  }
+
   async flush(): Promise<void> {
     await this.persistenceState.flush();
   }

package/src/core/tools/builtin/read-memory.ts

@@ -57,7 +57,7 @@ export function createReadMemoryExecutor(searchHumanData: SearchHumanData, getPe
       const output: Record<string, unknown[]> = {};
       if (results.facts.length > 0) output.facts = results.facts.map(f => ({ name: f.name, description: f.description }));
       if (results.topics.length > 0) output.topics = results.topics.map(t => ({ name: t.name, description: t.description }));
-      if (results.people.length > 0) output.people = results.people.map(p => ({ name: p.name, relationship: p.relationship, description: p.description }));
+      if (results.people.length > 0) output.people = results.people.map(p => ({ name: p.name, relationship: p.relationship, description: p.description, identifiers: p.identifiers ?? [] }));
       if (results.quotes.length > 0) output.quotes = results.quotes.map(q => ({ text: q.text, speaker: q.speaker }));
 
       if (Object.keys(output).length === 0) {

package/src/core/types/entities.ts

@@ -44,9 +44,11 @@ export interface BackupConfig {
  */
 export interface ModelConfig {
   id: string;                       // GUID (crypto.randomUUID())
-  name: string;                     // Model identifier, e.g. "claude-haiku-4-5", "(default)"
+  name: string;                     // Display name shown in UI, e.g. "Gemma4 (thinking)", "(default)"
+  model_id?: string;                // Actual model identifier sent to API — falls back to name if absent
   token_limit?: number;             // Input token limit (user sets effective limit)
   max_output_tokens?: number;       // Output token limit (API-enforced)
+  thinking_budget?: number;         // Thinking token budget: 0 = disabled, N = enable with N tokens, undefined = don't send
   total_calls?: number;             // Usage counter
   total_tokens_in?: number;         // Usage counter
   total_tokens_out?: number;        // Usage counter
@@ -89,6 +91,14 @@ export interface ProviderAccount {
   created_at: string;              // ISO timestamp
 }
 
+export interface ThemeDefinition {
+  id: string;
+  name: string;
+  base?: string;
+  encoded: string;
+  created_at: string;
+}
+
 export interface HumanSettings {
   default_model?: string;           // Will store ModelConfig.id GUID post-migration
   oneshot_model?: string;           // Model for AI-assist (wand) requests; falls back to default_model. Will store ModelConfig.id GUID post-migration.
@@ -109,6 +119,8 @@ export interface HumanSettings {
   backup?: BackupConfig;
   claudeCode?: import("../../integrations/claude-code/types.js").ClaudeCodeSettings;
   cursor?: import("../../integrations/cursor/types.js").CursorSettings;
+  active_theme?: string;
+  custom_themes?: ThemeDefinition[];
 }
 
 export interface HumanEntity {
@@ -150,6 +162,9 @@ export interface PersonaEntity {
   tools?: string[];              // IDs of ToolDefinitions this persona can use. Empty/absent = no tool access.
   reflection_last_asked?: string;   // ISO timestamp. Set ONLY when Persona explicitly surfaces identity drift (mentioned_reflection: true).
   description_embedding?: number[]; // Embedding of long_description (short_description fallback). Excludes traits. See embedding-service.ts:getPersonaDescriptionText.
+  avatar_emoji?: string;            // Single emoji character used as avatar in place of initials.
+  avatar_image?: string;            // Base64-encoded 64×64 image used as avatar (takes priority over avatar_emoji).
+  preferred_theme?: string;         // Theme ID (built-in name or ThemeDefinition.id). Applied to chat panel when this persona is active.
 }
 
 export interface PersonaCreationInput {

package/src/core/types/integrations.ts

@@ -56,6 +56,9 @@ export interface PersonaSummary {
   unread_count: number;
   last_activity?: string;
   context_boundary?: string;
+  avatar_emoji?: string;
+  avatar_image?: string;
+  preferred_theme?: string;
 }
 
 export interface MessageQueryOptions {

package/src/core/utils/identifier-utils.ts

@@ -1,8 +1,32 @@
 import type { PersonIdentifier } from "../types/data-items.js";
 import type { StateManager } from "../state-manager.js";
+import { BUILT_IN_IDENTIFIER_TYPES } from "../constants/built-in-identifier-types.js";
 
 export const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 
+function toNormalizedKey(s: string): string {
+  return s.replace(/[^a-z0-9]/gi, '').toLowerCase();
+}
+
+// Fuzzy-matches LLM-provided type against built-in + in-use types (strip non-alphanumeric, lowercase).
+// "nickname" -> "Nickname", "full_name" -> "Full Name", "EMAIL" -> "Email", "Slack RNP" -> "Slack RNP" (custom, no match)
+export function normalizeIdentifierType(llmType: string, state: StateManager): string {
+  const inUseTypes = state.getHuman().people.flatMap(p =>
+    (p.identifiers ?? []).map(i => i.type)
+  );
+
+  const canonicalMap = new Map<string, string>();
+  for (const t of [...BUILT_IN_IDENTIFIER_TYPES, ...inUseTypes]) {
+    const key = toNormalizedKey(t);
+    if (!canonicalMap.has(key)) {
+      canonicalMap.set(key, t);
+    }
+  }
+
+  const normalized = toNormalizedKey(llmType);
+  return canonicalMap.get(normalized) ?? llmType;
+}
+
 export function sanitizeEiPersonaIdentifiers(
   identifiers: PersonIdentifier[],
   state: StateManager

package/src/core/utils/theme-codec.ts

@@ -0,0 +1,78 @@
+import type { ThemeDefinition } from "../types/entities.js";
+
+const VERSION = "v1";
+const PREFIX = `ei-theme:${VERSION}:`;
+const TOKEN_COUNT = 37;
+const HEX_LENGTH = 6;
+
+export const THEME_TOKEN_ORDER: readonly string[] = [
+  "bg-primary", "bg-secondary", "bg-tertiary",
+  "border", "border-light",
+  "text-primary", "text-secondary", "text-muted",
+  "accent", "accent-hover",
+  "success", "success-hover",
+  "warning", "warning-text",
+  "danger",
+  "status-thinking", "status-ready", "status-unread", "status-paused",
+  "room-cyp", "room-ffa", "room-map",
+  "archive-bg-start", "archive-bg-end", "archive-border",
+  "ai-assist-start", "ai-assist-end",
+  "code-bg", "code-bg-controls", "code-border",
+  "code-text", "code-text-muted",
+  "code-accent", "code-string", "code-error", "code-success", "code-special",
+] as const;
+
+export const BUILT_IN_THEME_NAMES: readonly string[] = [
+  "default", "dark", "coder", "depressing", "cotton-candy",
+  "crimuh", "spoopy", "lovey-dovey", "lucky",
+] as const;
+
+export type ThemeTokenMap = Record<string, string>;
+
+export function encodeTheme(tokens: ThemeTokenMap): string {
+  const hex = THEME_TOKEN_ORDER.map((key) => {
+    const value = tokens[`--ei-${key}`] ?? tokens[key] ?? "000000";
+    return value.replace(/^#/, "").toLowerCase().padEnd(HEX_LENGTH, "0").slice(0, HEX_LENGTH);
+  }).join("");
+  return PREFIX + btoa(hex);
+}
+
+export function decodeTheme(encoded: string): ThemeTokenMap | null {
+  if (!encoded.startsWith(PREFIX)) return null;
+  try {
+    const hex = atob(encoded.slice(PREFIX.length));
+    if (hex.length !== TOKEN_COUNT * HEX_LENGTH) return null;
+    const tokens: ThemeTokenMap = {};
+    for (let i = 0; i < TOKEN_COUNT; i++) {
+      const key = THEME_TOKEN_ORDER[i];
+      tokens[`--ei-${key}`] = `#${hex.slice(i * HEX_LENGTH, (i + 1) * HEX_LENGTH)}`;
+    }
+    return tokens;
+  } catch {
+    return null;
+  }
+}
+
+export function themeToStyleString(tokens: ThemeTokenMap): string {
+  return Object.entries(tokens)
+    .map(([k, v]) => `  ${k}: ${v};`)
+    .join("\n");
+}
+
+export function isBuiltInTheme(id: string): boolean {
+  return (BUILT_IN_THEME_NAMES as readonly string[]).includes(id);
+}
+
+export function makeThemeDefinition(
+  name: string,
+  tokens: ThemeTokenMap,
+  base?: string,
+): ThemeDefinition {
+  return {
+    id: crypto.randomUUID(),
+    name,
+    base,
+    encoded: encodeTheme(tokens),
+    created_at: new Date().toISOString(),
+  };
+}

package/tui/src/commands/me.tsx

@@ -103,7 +103,8 @@ export const meCommand: Command = {
       }
       
       try {
-        const parsed = humanFromYAML(result.content, filteredHuman);
+        const currentHuman = await ctx.ei.getHuman();
+        const parsed = humanFromYAML(result.content, filteredHuman, currentHuman);
         
         for (const id of parsed.deletedFactIds) {
           await ctx.ei.removeDataItem("fact", id);
@@ -131,14 +132,20 @@ export const meCommand: Command = {
           }
         }
         
-        const deleteCount = parsed.deletedFactIds.length + 
-                           parsed.deletedTopicIds.length + 
+        const deleteCount = parsed.deletedFactIds.length +
+                           parsed.deletedTopicIds.length +
                            parsed.deletedPersonIds.length;
-        const updateCount = parsed.changedFactIds.size + 
-                           parsed.changedTopicIds.size + 
+        const updateCount = parsed.changedFactIds.size +
+                           parsed.changedTopicIds.size +
                            parsed.changedPersonIds.size;
-        
-        ctx.showNotification(`Updated ${updateCount} items, deleted ${deleteCount}`, "info");
+        const skippedCount = parsed.skippedFactCount +
+                            parsed.skippedTopicCount +
+                            parsed.skippedPersonCount;
+
+        const msg = skippedCount > 0
+          ? `Updated ${updateCount}, deleted ${deleteCount}, skipped ${skippedCount} (changed by another process)`
+          : `Updated ${updateCount} items, deleted ${deleteCount}`;
+        ctx.showNotification(msg, "info");
         return;
         
       } catch (parseError) {

package/tui/src/context/ei.tsx

@@ -14,6 +14,7 @@ import { Processor } from "../../../src/core/processor.js";
 import { FileStorage } from "../storage/file.js";
 import { remoteSync } from "../../../src/storage/remote.js";
 import { logger, clearLog, interceptConsole } from "../util/logger.js";
+import { E2E_SKIP_LOCAL_DETECT } from "../util/e2e-flags.js";
 import { ConflictOverlay } from "../components/ConflictOverlay.js";
 import type {
   Ei_Interface,
@@ -698,7 +699,10 @@ export const EiProvider: ParentComponent = (props) => {
       try {
         const human = await processor!.getHuman();
         const hasAccounts = human.settings?.accounts && human.settings.accounts.length > 0;
-        if (!hasAccounts) {
+        if (!hasAccounts && E2E_SKIP_LOCAL_DETECT) {
+          logger.info("E2E_SKIP_LOCAL_DETECT active, skipping local LLM check");
+          setShowWelcomeOverlay(true);
+        } else if (!hasAccounts) {
           logger.info("No LLM accounts configured, checking for local LLM...");
           try {
             const response = await fetch("http://127.0.0.1:1234/v1/models", {
@@ -707,6 +711,7 @@ export const EiProvider: ParentComponent = (props) => {
             });
             if (response.ok) {
               logger.info("Local LLM detected, auto-configuring...");
+              const defaultModelId = crypto.randomUUID();
               const localAccount: ProviderAccount = {
                 id: crypto.randomUUID(),
                 name: "Local LLM",
@@ -714,13 +719,15 @@ export const EiProvider: ParentComponent = (props) => {
                 url: "http://127.0.0.1:1234/v1",
                 enabled: true,
                 created_at: new Date().toISOString(),
+                default_model: defaultModelId,
+                models: [{ id: defaultModelId, name: "(default)" }],
               };
               const currentHuman = await processor!.getHuman();
               await processor!.updateHuman({
                 settings: {
                   ...currentHuman.settings,
                   accounts: [localAccount],
-                  default_model: "Local LLM",
+                  default_model: defaultModelId,
                 },
               });
               showNotification("Local LLM detected and configured!", "info");

package/tui/src/util/e2e-flags.ts

@@ -0,0 +1,13 @@
+/**
+ * EI_E2E_MODE — bitfield for test seams that can't be solved via data seeding.
+ *
+ * Use prime-power bits so combinations are unambiguous:
+ *   1  — skip local LLM auto-detect (fetch to :1234/:11434)
+ *   2  — (reserved for next scenario)
+ *   3  — flags 1 + 2 combined
+ *
+ * Production code should never set this. Tests pass it via env in test.use({ env: { EI_E2E_MODE: "1" } }).
+ */
+const E2E_MODE = parseInt(process.env.EI_E2E_MODE ?? "0", 10);
+
+export const E2E_SKIP_LOCAL_DETECT = (E2E_MODE & 1) !== 0;

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

@@ -225,6 +225,9 @@ export interface HumanYAMLResult {
   changedFactIds: Set<string>;
   changedTopicIds: Set<string>;
   changedPersonIds: Set<string>;
+  skippedFactCount: number;
+  skippedTopicCount: number;
+  skippedPersonCount: number;
 }
 
 function identifiersEqual(a: PersonIdentifier[] | undefined, b: PersonIdentifier[] | undefined): boolean {
@@ -279,7 +282,7 @@ function personChanged(parsed: Person, original: Person): boolean {
   return !identifiersEqual(parsed.identifiers, original.identifiers);
 }
 
-export function humanFromYAML(yamlContent: string, original?: HumanEntity): HumanYAMLResult {
+export function humanFromYAML(yamlContent: string, original?: HumanEntity, current?: HumanEntity): HumanYAMLResult {
   const stripped = yamlContent
     .split('\n')
     .filter(line => !/^\s*#\s*\[read-only\]/.test(line))
@@ -292,6 +295,15 @@ export function humanFromYAML(yamlContent: string, original?: HumanEntity): Huma
   const changedFactIds = new Set<string>();
   const changedTopicIds = new Set<string>();
   const changedPersonIds = new Set<string>();
+  let skippedFactCount = 0;
+  let skippedTopicCount = 0;
+  let skippedPersonCount = 0;
+
+  const staleInState = (id: string | undefined, originalItem: { last_updated: string } | undefined, currentItems: { id: string; last_updated: string }[] | undefined): boolean => {
+    if (!id || !originalItem || !current || !currentItems) return false;
+    const currentItem = currentItems.find(i => i.id === id);
+    return !!currentItem && currentItem.last_updated !== originalItem.last_updated;
+  };
 
   const facts: Fact[] = [];
   for (const f of data.facts ?? []) {
@@ -306,10 +318,14 @@ export function humanFromYAML(yamlContent: string, original?: HumanEntity): Huma
         : { ...parsed, last_updated: new Date().toISOString(), persona_groups: parseGroupCheckboxMap(groupMap) };
       facts.push(fact);
       if (!originalFact || factChanged(fact, originalFact)) {
-        if (fact.description && !originalFact?.validated_date) {
-          fact.validated_date = new Date().toISOString();
+        if (staleInState(parsed.id, originalFact, current?.facts)) {
+          skippedFactCount++;
+        } else {
+          if (fact.description && !originalFact?.validated_date) {
+            fact.validated_date = new Date().toISOString();
+          }
+          changedFactIds.add(fact.id);
         }
-        changedFactIds.add(fact.id);
       }
     }
   }
@@ -327,7 +343,11 @@ export function humanFromYAML(yamlContent: string, original?: HumanEntity): Huma
         : { ...parsed, last_updated: new Date().toISOString(), persona_groups: parseGroupCheckboxMap(groupMap) };
       topics.push(topic);
       if (!originalTopic || topicChanged(topic, originalTopic)) {
-        changedTopicIds.add(topic.id);
+        if (staleInState(parsed.id, originalTopic, current?.topics)) {
+          skippedTopicCount++;
+        } else {
+          changedTopicIds.add(topic.id);
+        }
       }
     }
   }
@@ -350,7 +370,11 @@ export function humanFromYAML(yamlContent: string, original?: HumanEntity): Huma
         : { ...parsed, last_updated: new Date().toISOString(), identifiers, persona_groups: parseGroupCheckboxMap(groupMap) };
       people.push(person);
       if (!originalPerson || personChanged(person, originalPerson)) {
-        changedPersonIds.add(person.id);
+        if (staleInState(parsed.id, originalPerson, current?.people)) {
+          skippedPersonCount++;
+        } else {
+          changedPersonIds.add(person.id);
+        }
       }
     }
   }
@@ -365,5 +389,8 @@ export function humanFromYAML(yamlContent: string, original?: HumanEntity): Huma
     changedFactIds,
     changedTopicIds,
     changedPersonIds,
+    skippedFactCount,
+    skippedTopicCount,
+    skippedPersonCount,
   };
 }

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

@@ -5,10 +5,15 @@ import type {
 } from "../../../src/core/types.js";
 import { modelGuidToDisplay } from "./yaml-shared.js";
 
+const tokenFormatter = new Intl.NumberFormat("en-US", { notation: "compact", maximumFractionDigits: 1 });
+const formatTokens = (n: number) => tokenFormatter.format(n);
+
 interface EditableModelData {
   name: string;
+  model_id?: string;
   token_limit?: number;
   max_output_tokens?: number;
+  thinking_budget?: number;
   _delete?: boolean;
 }
 
@@ -45,11 +50,14 @@ function parseModels(editableModels: EditableModelData[]): import('../../../src/
   const result: import('../../../src/core/types.js').ModelConfig[] = [];
   for (const m of editableModels) {
     if (m._delete) continue;
+    const modelId = m.model_id ?? undefined;
     result.push({
       id: crypto.randomUUID(),
       name: m.name,
-      token_limit: m.token_limit,
-      max_output_tokens: m.max_output_tokens,
+      model_id: (modelId === null || modelId === m.name) ? undefined : modelId,
+      token_limit: m.token_limit ?? undefined,
+      max_output_tokens: m.max_output_tokens ?? undefined,
+      thinking_budget: m.thinking_budget ?? undefined,
     });
   }
   return result;
@@ -70,6 +78,10 @@ export function newProviderToYAML(name?: string): string {
   const modelsYAML = [
     "models:",
     "  - name: (default)",
+    "    model_id: (default)",
+    "    token_limit: null",
+    "    max_output_tokens: null",
+    "    thinking_budget: null",
     "    # _delete: true",
     "# _delete: true   # Delete this entire provider",
   ].join("\n");
@@ -141,16 +153,26 @@ export function providerToYAML(account: ProviderAccount): string {
   if (modelList.length > 0) {
     for (const m of modelList) {
       modelLines.push(`  - name: ${m.name}`);
-      if (m.token_limit !== undefined) {
-        modelLines.push(`    token_limit: ${m.token_limit}`);
-      }
-      if (m.max_output_tokens !== undefined) {
-        modelLines.push(`    max_output_tokens: ${m.max_output_tokens}`);
+      modelLines.push(`    model_id: ${m.model_id ?? m.name}`);
+      modelLines.push(`    token_limit: ${m.token_limit ?? null}`);
+      modelLines.push(`    max_output_tokens: ${m.max_output_tokens ?? null}`);
+      modelLines.push(`    thinking_budget: ${m.thinking_budget ?? null}`);
+      if (m.total_calls !== undefined || m.total_tokens_in !== undefined) {
+        const tokensIn = m.total_tokens_in ?? 0;
+        const tokensOut = m.total_tokens_out ?? 0;
+        modelLines.push(`    # stats: ${formatTokens(m.total_calls ?? 0)} calls · ${formatTokens(tokensIn)} in / ${formatTokens(tokensOut)} out`);
+        if (m.last_used) {
+          modelLines.push(`    # used: ${m.last_used}`);
+        }
       }
       modelLines.push(`    _delete: false`);
     }
   } else {
     modelLines.push("  - name: (default)");
+    modelLines.push(`    model_id: (default)`);
+    modelLines.push(`    token_limit: null`);
+    modelLines.push(`    max_output_tokens: null`);
+    modelLines.push(`    thinking_budget: null`);
     modelLines.push("    _delete: false");
   }
   modelLines.push("_delete: false   # Set to true to delete this entire provider");
@@ -185,11 +207,14 @@ export function providerFromYAML(yamlContent: string, original: ProviderAccount)
   for (const m of data.models ?? []) {
     if (m._delete) continue;
     const existing = existingModels.find(em => em.name === m.name);
+    const modelId = m.model_id ?? undefined;
     parsedModels.push({
       id: existing?.id ?? crypto.randomUUID(),
       name: m.name,
-      token_limit: m.token_limit,
-      max_output_tokens: m.max_output_tokens,
+      model_id: (modelId === null || modelId === m.name) ? undefined : modelId,
+      token_limit: m.token_limit ?? undefined,
+      max_output_tokens: m.max_output_tokens ?? undefined,
+      thinking_budget: m.thinking_budget ?? undefined,
       total_calls: existing?.total_calls,
       total_tokens_in: existing?.total_tokens_in,
       total_tokens_out: existing?.total_tokens_out,