ei-tui 0.1.25 → 0.2.0

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

@@ -7,7 +7,7 @@ import type {
   OpenCodeSettings,
   BackupConfig,
   Fact,
-  Trait,
+  PersonaTrait,
   Topic,
   Person,
   PersonaTopic,
@@ -23,15 +23,12 @@ import type {
   } from "../../../src/core/types.js";
 import { ContextStatus } from "../../../src/core/types.js";
 import type { ClaudeCodeSettings } from "../../../src/integrations/claude-code/types.js";
+import { BUILT_IN_FACT_NAMES } from "../../../src/core/constants/built-in-facts.js";
 
 // =============================================================================
 // TYPES FOR YAML EDITING
 // =============================================================================
 
-interface EditableTrait extends Trait {
-  _delete?: boolean;
-}
-
 interface EditableTopic extends Topic {
   _delete?: boolean;
 }
@@ -64,7 +61,6 @@ interface EditablePersonaData {
 
 interface EditableHumanData {
   facts: EditableFact[];
-  traits: EditableTrait[];
   topics: EditableTopic[];
   people: EditablePerson[];
 }
@@ -190,7 +186,7 @@ export function newPersonaFromYAML(yamlContent: string, allTools?: ToolDefinitio
     t.name === PLACEHOLDER_TRAIT.name && 
     t.description === PLACEHOLDER_TRAIT.description;
 
-  const traits: Trait[] = [];
+  const traits: PersonaTrait[] = [];
   for (const t of data.traits ?? []) {
     if (isTraitPlaceholder(t)) {
       continue;
@@ -313,7 +309,7 @@ export function personaFromYAML(yamlContent: string, original: PersonaEntity, al
     t.name === PLACEHOLDER_TRAIT.name && 
     t.description === PLACEHOLDER_TRAIT.description;
 
-  const traits: Trait[] = [];
+  const traits: PersonaTrait[] = [];
   for (const t of data.traits ?? []) {
     if (isTraitPlaceholder(t)) {
       continue;
@@ -406,7 +402,6 @@ export function personaFromYAML(yamlContent: string, original: PersonaEntity, al
 export function humanToYAML(human: HumanEntity, personaLookup?: Map<string, string>): string {
   const data: EditableHumanData = {
     facts: human.facts.map(f => ({ ...f, _delete: false })),
-    traits: human.traits.map(t => ({ ...t, _delete: false })),
     topics: human.topics.map(t => ({ ...t, _delete: false })),
     people: human.people.map(p => ({ ...p, _delete: false })),
   };
@@ -414,27 +409,28 @@ export function humanToYAML(human: HumanEntity, personaLookup?: Map<string, stri
   return YAML.stringify(data, {
     lineWidth: 0,
   })
-  .replace(/^(\s+validated:\s+\S+)$/mg, '$1 # none | ei | human')
   .replace(/^(\s+)(learned_by: )(.+)$/mg, (_, indent, key, val) => {
     const trimmed = val.trim();
     const displayName = personaLookup?.get(trimmed) ?? trimmed;
     return `${indent}# [read-only] ${key}${displayName}`;
   })
-  .replace(/^(\s+)(last_changed_by: .+)$/mg, '$1# [read-only] $2');
+  .replace(/^(\s+)(last_changed_by: )(.+)$/mg, (_, indent, key, val) => {
+    const trimmed = val.trim();
+    const displayName = personaLookup?.get(trimmed) ?? trimmed;
+    return `${indent}# [read-only] ${key}${displayName}`;
+  });
 }
 
 export interface HumanYAMLResult {
   facts: Fact[];
-  traits: Trait[];
   topics: Topic[];
   people: Person[];
   deletedFactIds: string[];
-  deletedTraitIds: string[];
   deletedTopicIds: string[];
   deletedPersonIds: string[];
 }
 
-export function humanFromYAML(yamlContent: string): HumanYAMLResult {
+export function humanFromYAML(yamlContent: string, original?: HumanEntity): HumanYAMLResult {
   // Strip read-only comment lines before parsing so users can't accidentally corrupt them
   const stripped = yamlContent
     .split('\n')
@@ -443,36 +439,32 @@ export function humanFromYAML(yamlContent: string): HumanYAMLResult {
   const data = YAML.parse(stripped) as EditableHumanData;
   
   const deletedFactIds: string[] = [];
-  const deletedTraitIds: string[] = [];
   const deletedTopicIds: string[] = [];
   const deletedPersonIds: string[] = [];
   
   const facts: Fact[] = [];
   for (const f of data.facts ?? []) {
-    if (f._delete) {
+    if (f._delete && !BUILT_IN_FACT_NAMES.has(f.name)) {
       deletedFactIds.push(f.id);
     } else {
-      const { _delete, ...fact } = f;
+      const { _delete, ...parsed } = f;
+      const originalFact = original?.facts.find(of => of.id === parsed.id);
+      const fact = originalFact ? { ...originalFact, ...parsed } : parsed;
+      if (fact.description && !fact.validated_date) {
+        fact.validated_date = new Date().toISOString();
+      }
       facts.push(fact);
     }
   }
   
-  const traits: Trait[] = [];
-  for (const t of data.traits ?? []) {
-    if (t._delete) {
-      deletedTraitIds.push(t.id);
-    } else {
-      const { _delete, ...trait } = t;
-      traits.push(trait);
-    }
-  }
-  
   const topics: Topic[] = [];
   for (const t of data.topics ?? []) {
     if (t._delete) {
       deletedTopicIds.push(t.id);
     } else {
-      const { _delete, ...topic } = t;
+      const { _delete, ...parsed } = t;
+      const originalTopic = original?.topics.find(ot => ot.id === parsed.id);
+      const topic = originalTopic ? { ...originalTopic, ...parsed } : parsed;
       topics.push(topic);
     }
   }
@@ -482,18 +474,18 @@ export function humanFromYAML(yamlContent: string): HumanYAMLResult {
     if (p._delete) {
       deletedPersonIds.push(p.id);
     } else {
-      const { _delete, ...person } = p;
+      const { _delete, ...parsed } = p;
+      const originalPerson = original?.people.find(op => op.id === parsed.id);
+      const person = originalPerson ? { ...originalPerson, ...parsed } : parsed;
       people.push(person);
     }
   }
   
   return {
     facts,
-    traits,
     topics,
     people,
     deletedFactIds,
-    deletedTraitIds,
     deletedTopicIds,
     deletedPersonIds,
   };
@@ -520,11 +512,15 @@ interface EditableSettingsData {
     polling_interval_ms?: number | null;
     last_sync?: string | null;
     extraction_point?: string | null;
+    extraction_model?: string | null;
+    extraction_token_limit?: string | number | null;
   };
   claudeCode?: {
     integration?: boolean | null;
     polling_interval_ms?: number | null;
     last_sync?: string | null;
+    extraction_model?: string | null;
+    extraction_token_limit?: string | number | null;
   };
   backup?: {
     enabled?: boolean | null;
@@ -550,12 +546,16 @@ export function settingsToYAML(settings: HumanSettings | undefined): string {
     opencode: {
       integration: settings?.opencode?.integration ?? false,
       polling_interval_ms: settings?.opencode?.polling_interval_ms ?? 1800000,
+      extraction_model: settings?.opencode?.extraction_model ?? 'default',
+      extraction_token_limit: settings?.opencode?.extraction_token_limit ?? 'default',
       last_sync: settings?.opencode?.last_sync ?? null,
       extraction_point: settings?.opencode?.extraction_point ?? null,
     },
     claudeCode: {
       integration: settings?.claudeCode?.integration ?? false,
       polling_interval_ms: settings?.claudeCode?.polling_interval_ms ?? 1800000,
+      extraction_model: settings?.claudeCode?.extraction_model ?? 'default',
+      extraction_token_limit: settings?.claudeCode?.extraction_token_limit ?? 'default',
       last_sync: settings?.claudeCode?.last_sync ?? null,
     },
     backup: {
@@ -569,7 +569,9 @@ export function settingsToYAML(settings: HumanSettings | undefined): string {
     lineWidth: 0,
   })
   .replace(/^(\s+)(last_sync: .+)$/mg, '$1# [read-only] $2')
-  .replace(/^(\s+)(extraction_point: .+)$/mg, '$1# [read-only] $2');
+  .replace(/^(\s+)(extraction_point: .+)$/mg, '$1# [read-only] $2')
+  .replace(/^(\s+)(extraction_model: .+)$/mg, '$1$2 # e.g. Anthropic:claude-haiku-4-5')
+  .replace(/^(\s+)(extraction_token_limit: .+)$/mg, '$1$2 # e.g. 100000 for Haiku');
 }
 export function settingsFromYAML(yamlContent: string, original: HumanSettings | undefined): HumanSettings {
   const data = YAML.parse(yamlContent) as EditableSettingsData;
@@ -596,6 +598,12 @@ export function settingsFromYAML(yamlContent: string, original: HumanSettings |
       last_sync: original?.opencode?.last_sync,
       extraction_point: original?.opencode?.extraction_point,
       processed_sessions: original?.opencode?.processed_sessions,
+      extraction_model: (data.opencode.extraction_model != null && data.opencode.extraction_model !== 'default')
+        ? data.opencode.extraction_model
+        : undefined,
+      extraction_token_limit: (data.opencode.extraction_token_limit != null && data.opencode.extraction_token_limit !== 'default')
+        ? Number(data.opencode.extraction_token_limit)
+        : undefined,
     };
   }
 
@@ -606,6 +614,12 @@ export function settingsFromYAML(yamlContent: string, original: HumanSettings |
       polling_interval_ms: nullToUndefined(data.claudeCode.polling_interval_ms),
       last_sync: original?.claudeCode?.last_sync,
       processed_sessions: original?.claudeCode?.processed_sessions,
+      extraction_model: (data.claudeCode.extraction_model != null && data.claudeCode.extraction_model !== 'default')
+        ? data.claudeCode.extraction_model
+        : undefined,
+      extraction_token_limit: (data.claudeCode.extraction_token_limit != null && data.claudeCode.extraction_token_limit !== 'default')
+        ? Number(data.claudeCode.extraction_token_limit)
+        : undefined,
     };
   }
 
@@ -896,7 +910,8 @@ export function contextFromYAML(yamlContent: string): ContextYAMLResult {
     if (m._delete) {
       deletedMessageIds.push(m.id);
     } else {
-      messages.push({ id: m.id, context_status: m.context_status });
+      const normalized = (m.context_status ?? 'default').toString().toLowerCase() as ContextStatus;
+      messages.push({ id: m.id, context_status: normalized });
     }
   }
 

package/src/cli/commands/traits.ts

@@ -1,25 +0,0 @@
-import { loadLatestState, retrieve } from "../retrieval";
-import type { TraitResult } from "../retrieval";
-
-export async function execute(query: string, limit: number): Promise<TraitResult[]> {
-  const state = await loadLatestState();
-  if (!state) {
-    console.error("No saved state found. Is EI_DATA_PATH set correctly?");
-    return [];
-  }
-
-  const traits = state.human.traits;
-  if (traits.length === 0) {
-    return [];
-  }
-
-  const results = await retrieve(traits, query, limit);
-  
-  return results.map(trait => ({
-    id: trait.id,
-    name: trait.name,
-    description: trait.description,
-    strength: trait.strength ?? 0.5,
-    sentiment: trait.sentiment,
-  }));
-}

package/src/prompts/human/item-match.ts

@@ -1,74 +0,0 @@
-import type { ItemMatchPromptData, PromptOutput } from "./types.js";
-
-export function buildHumanItemMatchPrompt(data: ItemMatchPromptData): PromptOutput {
-  if (!data.candidate_type || !data.candidate_name) {
-    throw new Error("buildHumanItemMatchPrompt: candidate_type and candidate_name are required");
-  }
-
-  const typeLabel = data.candidate_type.toUpperCase();
-
-  const system = `# Task
-
-You are checking if a new ${typeLabel} already exists in our database.
-
-We track four types of data about the human user:
-- **FACT**: Biographical data (name, birthday, job, etc.)
-- **TRAIT**: Personality patterns (introverted, analytical, etc.)
-- **TOPIC**: Interests, goals, concerns, stories
-- **PERSON**: People in their life (family, friends, coworkers)
-
-Your job is to find if this candidate matches ANY existing entry — even if it's stored as a different type.
-
-## Why Cross-Type Matching?
-
-Sometimes the same concept gets detected as different types:
-- "Juliet" might be detected as a TOPIC but should be a PERSON
-- "Birthday" might be detected as a TOPIC but is actually a FACT
-- "Always planning ahead" might be a TOPIC but is really a TRAIT
-
-If you find a match in a DIFFERENT type, still return it! The system will handle the type mismatch.
-
-## Matching Rules
-
-1. **Exact match**: Same name/concept → return its ID
-2. **Similar match**: Clearly the same thing with different wording → return its ID
-3. **Cross-type match**: Same concept stored as different type → return its ID
-4. **No match**: Genuinely new information → return "new"
-
-# Existing Data
-
-The following entries are already in our database. Same-type entries have full descriptions; cross-type entries are truncated for brevity.
-
-\`\`\`json
-${JSON.stringify(data.all_items, null, 2)}
-\`\`\`
-
-# Response Format
-
-Return ONLY the ID of the matching entry, or "new" if no match exists.
-
-\`\`\`json
-{
-    "matched_guid": "uuid-of-matching-entry" | "new"
-}
-\`\`\`
-
-**Return JSON only.**`;
-
-  const user = `# Candidate to Match
-
-Type: ${typeLabel}
-Name: ${data.candidate_name}
-Value: ${data.candidate_value}
-
-Find the best match in existing data, or return "new" if this is genuinely new.
-
-**Return JSON:**
-\`\`\`json
-{
-    "matched_guid": "..." | "new"
-}
-\`\`\``;
-
-  return { system, user };
-}