ei-tui 0.6.4 → 0.6.6

package/tui/src/commands/me.tsx

@@ -6,37 +6,73 @@ import { ConfirmOverlay } from "../components/ConfirmOverlay.js";
 
 type DataType = "facts" | "topics" | "people";
 
-const VALID_TYPES: DataType[] = ["facts", "topics", "people"];
+const TYPE_ALIASES: Record<string, DataType> = {
+  facts: "facts", fact: "facts",
+  topics: "topics", topic: "topics",
+  people: "people", person: "people", persons: "people",
+};
 
 export const meCommand: Command = {
   name: "me",
   aliases: [],
   description: "Edit your data in $EDITOR",
-  usage: "/me [facts|topics|people]",
-  
+  usage: "/me [fact|topic|person] [new | <search>]",
+
   async execute(args, ctx) {
     const human = await ctx.ei.getHuman();
-    
-    const filterArg = args[0]?.toLowerCase();
-    const filterType: DataType | null = filterArg && VALID_TYPES.includes(filterArg as DataType) 
-      ? filterArg as DataType 
-      : null;
-    
-    if (filterArg && !filterType) {
-      ctx.showNotification(`Invalid type: ${filterArg}. Use: facts, topics, people`, "error");
+
+    const typeArg = args[0]?.toLowerCase();
+    const filterType: DataType | null = typeArg ? (TYPE_ALIASES[typeArg] ?? null) : null;
+
+    if (typeArg && !filterType) {
+      ctx.showNotification(`Unknown type: ${typeArg}. Use: fact, topic, person`, "error");
       return;
     }
-    
+
+    const secondArg = args[1]?.toLowerCase();
+    const isNew = secondArg === "new";
+    const searchTerm = !isNew && secondArg ? args.slice(1).join(" ") : null;
+
+    if (isNew && args.length > 2) {
+      ctx.showNotification(
+        `Use /me ${typeArg} new to create, or /me ${typeArg} ${args.slice(2).join(" ")} to search`,
+        "error"
+      );
+      return;
+    }
+
+    if ((isNew || searchTerm) && !filterType) {
+      ctx.showNotification(`Specify a type first: /me fact|topic|person [new | <search>]`, "error");
+      return;
+    }
+
+    const filterItems = <T extends { name: string }>(items: T[]): T[] => {
+      if (isNew) return [];
+      if (searchTerm) return items.filter(i => i.name.toLowerCase().includes(searchTerm.toLowerCase()));
+      return items;
+    };
+
     const filteredHuman = filterType ? {
       ...human,
-      facts: filterType === "facts" ? human.facts : [],
-      topics: filterType === "topics" ? human.topics : [],
-      people: filterType === "people" ? human.people : [],
+      facts:  filterType === "facts"  ? filterItems(human.facts)  : [],
+      topics: filterType === "topics" ? filterItems(human.topics) : [],
+      people: filterType === "people" ? filterItems(human.people) : [],
     } : human;
+
+    const isEmpty = filteredHuman.facts.length === 0
+      && filteredHuman.topics.length === 0
+      && filteredHuman.people.length === 0;
+
+    if (searchTerm && isEmpty) {
+      ctx.showNotification(`No ${filterType} matching "${searchTerm}" — open editor to create one`, "info");
+    }
     
     const personaLookup = new Map(ctx.ei.personas().map(p => [p.id, p.display_name]));
     const allGroups = await ctx.ei.getGroupList();
-    let yamlContent = humanToYAML(filteredHuman, personaLookup, allGroups);
+    const sections = filterType
+      ? new Set<"facts" | "topics" | "people">([filterType])
+      : new Set<"facts" | "topics" | "people">(["facts", "topics", "people"]);
+    let yamlContent = humanToYAML(filteredHuman, personaLookup, allGroups, sections);
     let editorIteration = 0;
     
     while (true) {
@@ -67,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);
@@ -95,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/components/HelpOverlay.tsx

@@ -1,10 +1,13 @@
 import { useKeyboard } from "@opentui/solid";
-import { For, onMount, onCleanup } from "solid-js";
-import { getAllCommands } from "../commands/registry";
+import { onMount, onCleanup } from "solid-js";
+import type { CliRenderer } from "@opentui/core";
 import { useKeyboardNav } from "../context/keyboard.js";
+import { spawnPager } from "../util/editor.js";
+import { buildManPage } from "../util/help-content.js";
 
 interface HelpOverlayProps {
   onDismiss: () => void;
+  renderer: CliRenderer;
 }
 
 export function HelpOverlay(props: HelpOverlayProps) {
@@ -14,11 +17,14 @@ export function HelpOverlay(props: HelpOverlayProps) {
 
   useKeyboard((event) => {
     event.preventDefault();
-    props.onDismiss();
+    if (event.name === "m") {
+      props.onDismiss();
+      void spawnPager(buildManPage(), props.renderer);
+    } else {
+      props.onDismiss();
+    }
   });
 
-  const commands = getAllCommands();
-
   return (
     <box
       position="absolute"
@@ -31,43 +37,67 @@ export function HelpOverlay(props: HelpOverlayProps) {
       justifyContent="center"
     >
       <box
-        width={60}
+        width={82}
         backgroundColor="#1a1a2e"
         borderStyle="single"
         borderColor="#586e75"
         padding={2}
         flexDirection="column"
+        gap={1}
       >
 
-        <text fg="#eee8d5">
-          Commands:
-        </text>
-        <For each={commands.sort()}>
-          {(cmd) => (
-            <text fg="#93a1a1">
-              /{cmd.name} - {cmd.description}
-            </text>
-          )}
-        </For>
-        <text> </text>
+        <box flexDirection="row" gap={2}>
+
+          <box flexDirection="column" gap={1} width={38}>
+            <box flexDirection="column">
+              <text fg="#eee8d5">Keybindings</text>
+              <text fg="#93a1a1">  Ctrl+E    Open $EDITOR (preserves input)</text>
+              <text fg="#93a1a1">  Ctrl+C    Clear input / exit</text>
+              <text fg="#93a1a1">  Ctrl+B    Toggle sidebar</text>
+              <text fg="#93a1a1">  Escape    Abort / resume queue</text>
+              <text fg="#93a1a1">  PgUp/Dn  Scroll messages</text>
+            </box>
+
+            <box flexDirection="column">
+              <text fg="#eee8d5">Core</text>
+              <text fg="#93a1a1">  /set          Edit global settings</text>
+              <text fg="#93a1a1">  /q  /q!       Quit  (! = skip sync)</text>
+              <text fg="#93a1a1">  /provider     Manage LLM providers</text>
+              <text fg="#93a1a1">  /me           Edit your data</text>
+              <text fg="#93a1a1">  /d  /d &lt;name&gt; Edit persona details</text>
+            </box>
+          </box>
+
+          <box flexDirection="column" gap={1} width={38}>
+            <box flexDirection="column">
+              <text fg="#eee8d5">Persona</text>
+              <text fg="#93a1a1">  /p  /p new  /p update</text>
+              <text fg="#93a1a1">  /context   Message context</text>
+              <text fg="#93a1a1">  /pause  /resume</text>
+            </box>
+
+            <box flexDirection="column">
+              <text fg="#eee8d5">Rooms</text>
+              <text fg="#93a1a1">  /r  /r new    Room picker / create</text>
+              <text fg="#93a1a1">  /activate     Advance active node</text>
+              <text fg="#93a1a1">  /silence      Pass your turn</text>
+            </box>
+
+            <box flexDirection="column">
+              <text fg="#eee8d5">Extended</text>
+              <text fg="#93a1a1">  /tools        Tool providers</text>
+              <text fg="#93a1a1">  /auth spotify Spotify OAuth</text>
+              <text fg="#93a1a1">  /queue  /dlq  Inspect queues</text>
+            </box>
+          </box>
+
+        </box>
 
-        <text fg="#eee8d5">
-          Keybindings:
-        </text>
-        <text fg="#93a1a1">Escape - Abort operation / Resume queue</text>
-        <text fg="#93a1a1">Ctrl+C - Clear input / Exit</text>
-        <text fg="#93a1a1">Ctrl+B - Toggle sidebar</text>
-        <text fg="#93a1a1">Ctrl+E - Edit in $EDITOR</text>
-        <text fg="#93a1a1">PageUp/Down - Scroll messages</text>
-        <text> </text>
+        <box flexDirection="column">
+          <text fg="#586e75">  m - full manual  |  any key - dismiss</text>
+          <text fg="#2a2a3e">  Ei - 永 (ei) - eternal</text>
+        </box>
 
-        <text fg="#586e75">
-          Press any key to dismiss
-        </text>
-        <text> </text>
-        <text fg="#2a2a3e">
-          Ei - 永 (ei) - eternal
-        </text>
       </box>
     </box>
   );

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/context/overlay.tsx

@@ -33,8 +33,10 @@ export const OverlayProvider: ParentComponent = (props) => {
     const hideOverlay = () => {
       logger.debug("[overlay] hideOverlay called");
       setOverlayRenderer(null);
+      cliRenderer?.requestRender();
     };
     setOverlayRenderer(() => () => renderer(hideOverlay, hideForEditor));
+    queueMicrotask(() => cliRenderer?.requestRender());
   };
 
   const hideOverlay = () => {

package/tui/src/index.tsx

@@ -4,6 +4,13 @@ import { App } from "./app";
 
 import { InstanceLock } from "./util/instance-lock";
 import { FileStorage } from "./storage/file";
+import pkg from "../../package.json";
+
+const args = process.argv.slice(2);
+if (args.includes("--version") || args.includes("version") || args.includes("-v")) {
+  process.stdout.write(`${pkg.version}\n`);
+  process.exit(0);
+}
 
 const storage = new FileStorage(Bun.env.EI_DATA_PATH);
 const lock = new InstanceLock(storage.getDataPath());

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/editor.ts

@@ -23,6 +23,41 @@ export interface EditorResult {
   aborted: boolean;
 }
 
+export async function spawnPager(content: string, renderer: CliRenderer): Promise<void> {
+  const pager = process.env.PAGER || "less";
+  const tmpDir = os.tmpdir();
+  const tmpFile = path.join(tmpDir, `ei-help-${Date.now()}.txt`);
+
+  fs.writeFileSync(tmpFile, content, "utf-8");
+
+  await new Promise(resolve => setTimeout(resolve, 50));
+
+  return new Promise((resolve) => {
+    renderer.suspend();
+    renderer.currentRenderBuffer.clear();
+
+    const child = spawn(pager, [tmpFile], {
+      stdio: "inherit",
+      shell: true,
+    });
+
+    child.on("error", () => {
+      try { fs.unlinkSync(tmpFile); } catch {}
+      renderer.resume();
+      renderer.requestRender();
+      resolve();
+    });
+
+    child.on("exit", () => {
+      try { fs.unlinkSync(tmpFile); } catch {}
+      renderer.currentRenderBuffer.clear();
+      renderer.resume();
+      renderer.requestRender();
+      resolve();
+    });
+  });
+}
+
 export async function spawnEditorRaw(options: EditorRawOptions): Promise<EditorResult> {
   const { initialContent, filename } = options;
   const editor = process.env.EDITOR || process.env.VISUAL || "vi";
@@ -152,9 +187,7 @@ export async function spawnEditor(options: EditorOptions): Promise<EditorResult>
         logger.debug("[editor] already suspended before spawn, skipping resume");
       }
       
-      queueMicrotask(() => {
-        renderer.requestRender();
-      });
+      renderer.requestRender();
       
       if (code !== 0) {
         try { fs.unlinkSync(tmpFile); } catch {}

package/tui/src/util/help-content.ts

@@ -0,0 +1,136 @@
+export function buildManPage(): string {
+  return `EI(1)                           Ei Terminal UI                          EI(1)
+
+NAME
+    ei - local-first AI companion with persistent personas
+
+KEYBINDINGS
+    Ctrl+E        Open current input in $EDITOR (preserves text)
+    Ctrl+C        Clear input field (second press exits)
+    Ctrl+B        Toggle sidebar
+    Escape        Abort operation / resume queue
+    PageUp/Down   Scroll message history
+
+CORE COMMANDS
+    /settings, /set
+        Edit global settings in $EDITOR. Configure default model,
+        heartbeat interval, context window, integrations, and more.
+
+    /quit, /q
+        Save, sync, and exit. Add ! to force quit without syncing: /q!
+
+    /provider
+        Open provider picker to select, edit, or create LLM providers.
+        /provider <Name>           Set provider on active persona
+        /provider <Name>:<Model>   Set provider and model explicitly
+        /provider new              Create a new provider
+
+    /me
+        Edit your personal data (facts, topics, people) in $EDITOR.
+        Each section includes a commented stub — uncomment and fill it in
+        to create a new entry. No UUID required; one is generated for you.
+
+        /me fact               Edit only facts (stub included)
+        /me topic              Edit only topics (stub included)
+        /me person             Edit only people (stub included)
+        /me fact new           Open with just the new-fact stub
+        /me fact coffee        Filter facts whose name contains "coffee"
+        /me person "New York"  Quoted search for multi-word names
+
+    /details, /d
+        Edit the current persona's details in $EDITOR.
+        /d <name>     Edit a specific persona by name
+
+PERSONA COMMANDS
+    /persona, /p
+        Open persona picker. Switch, list, or create personas.
+        /p new <name>              Create a new persona
+        /p update <name> [person]  Regenerate persona from a person record
+
+    /context, /messages
+        Edit which messages are included in LLM context.
+
+    /pause
+        Pause the current persona indefinitely.
+        /pause <duration>   Pause for a duration: 2h, 1d, 1w
+
+    /resume, /unpause
+        Resume the current paused persona.
+        /resume <name>   Resume a specific persona
+
+    /new
+        Toggle a context boundary — starts a fresh conversation thread
+        without deleting history.
+
+    /quotes, /quote
+        Manage quotes attached to messages.
+        /quotes <N>            View quotes from message N
+        /quotes me             View your own quotes
+        /quotes search "term"  Search quotes by keyword
+        /quotes <persona>      View a persona's quotes
+
+ROOM COMMANDS
+    /room, /r
+        Open room picker. Switch or create rooms.
+        /room new         Create a new room (FFA, CYP, or MAP mode)
+        /room new <name>  Create with a pre-filled name
+
+    /activate, /a
+        Advance the active node in a CYP or MAP room.
+        /activate <num>   Activate a specific response by number
+
+    /silence
+        Pass your turn in a room with an optional reason.
+        /silence [reason]
+
+    /capture
+        Force-extract quotes, topics, and people from the current chat now.
+
+EXTENDED COMMANDS
+    /tools
+        Manage tool providers — enable or disable tools per persona.
+
+    /auth
+        Authenticate with an external service.
+        /auth spotify   Connect your Spotify account
+
+    /queue
+        Pause the queue and inspect or edit active items in $EDITOR.
+
+    /dlq
+        Inspect and recover failed (dead-letter) queue items in $EDITOR.
+
+    /dedupe
+        Find and merge duplicate people or topics.
+        /dedupe person Flare "Jeremy Scherer"
+        /dedupe topic AI "artificial intelligence"
+
+    /archive
+        Archive a persona or room. Lists archived items if no name given.
+        /archive <name>   Archive by name
+
+    /unarchive
+        Restore an archived persona or room and switch to it.
+        /unarchive <name>
+
+    /delete, /del
+        Permanently delete a persona. Cannot be undone.
+        /delete <name>
+
+    /setsync, /ss
+        Set sync credentials (triggers restart).
+        /setsync <username> <passphrase>
+
+    /editor, /e, /edit
+        Open $EDITOR with the current input field contents.
+        Note: Ctrl+E does the same thing without clearing the input first.
+
+TIPS
+    - Append ! to any command as shorthand for --force: /quit!
+    - Duration strings: 30m, 2h, 1d, 1w (used by /pause, /settings)
+    - All editor fields that say "null" inherit from your global settings
+    - $EDITOR and $PAGER are respected throughout
+
+Ei - 永 (ei) - eternal
+`;
+}