ei-tui 0.6.5 → 0.6.6

package/package.json

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

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

@@ -1064,6 +1064,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/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

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,