ei-tui 0.1.3 → 0.1.4

package/tui/src/components/PromptInput.tsx

@@ -1,3 +1,5 @@
+import { createEffect, createSignal } from "solid-js";
+import { getAllCommands } from "../commands/registry";
 import type { TextareaRenderable, KeyBinding } from "@opentui/core";
 import { useEi } from "../context/ei";
 import { useKeyboardNav } from "../context/keyboard";
@@ -20,6 +22,9 @@ import { quotesCommand } from "../commands/quotes";
 import { providerCommand } from "../commands/provider";
 import { setSyncCommand } from "../commands/setsync";
 import { useOverlay } from "../context/overlay";
+import { CommandSuggest } from "./CommandSuggest";
+import { useKeyboard } from "@opentui/solid";
+import type { KeyEvent } from "@opentui/core";
 
 const TEXTAREA_KEYBINDINGS: KeyBinding[] = [
   { name: "return", action: "submit" },
@@ -30,7 +35,7 @@ const TEXTAREA_KEYBINDINGS: KeyBinding[] = [
 export function PromptInput() {
   const ei = useEi();
   const { sendMessage, activePersonaId, stopProcessor, showNotification } = ei;
-  const { registerTextarea, registerEditorHandler, exitApp, renderer } = useKeyboardNav();
+  const { registerTextarea, registerEditorHandler, exitApp, renderer, resetHistoryIndex } = useKeyboardNav();
   const { showOverlay, hideOverlay, overlayRenderer } = useOverlay();
 
   registerCommand(helpCommand);
@@ -54,6 +59,65 @@ export function PromptInput() {
 
   let textareaRef: TextareaRenderable | undefined;
 
+  const [inputText, setInputText] = createSignal("");
+  const [suggestIndex, setSuggestIndex] = createSignal(0);
+
+  const suggestMatches = () => {
+    const raw = inputText().trim();
+    if (!raw.startsWith("/")) return [];
+    const query = raw.slice(1).split(/\s/)[0].replace(/!$/, "").toLowerCase();
+    return getAllCommands().filter(
+      (cmd) =>
+        cmd.name.startsWith(query) ||
+        cmd.aliases.some((a) => a.startsWith(query))
+    );
+  };
+
+  const suggestVisible = () => suggestMatches().length > 0 && !overlayRenderer();
+
+  createEffect(() => {
+    inputText();
+    setSuggestIndex(0);
+  });
+
+  createEffect(() => {
+    activePersonaId();
+    resetHistoryIndex();
+  });
+
+  useKeyboard((event: KeyEvent) => {
+    if (!suggestVisible()) return;
+
+    if (event.name === "up") {
+      event.preventDefault();
+      setSuggestIndex(i => Math.max(0, i - 1));
+      return;
+    }
+    if (event.name === "down") {
+      event.preventDefault();
+      setSuggestIndex(i => Math.min(suggestMatches().length - 1, i + 1));
+      return;
+    }
+    if (event.name === "tab" || event.name === "right") {
+      event.preventDefault();
+      const match = suggestMatches()[suggestIndex()];
+      if (match) {
+        textareaRef?.setText(`/${match.name} `);
+        setInputText(`/${match.name} `);
+        textareaRef?.gotoBufferEnd();
+        setSuggestIndex(0);
+      }
+      return;
+    }
+    if (event.name === "escape") {
+      event.preventDefault();
+      textareaRef?.clear();
+      setInputText("");
+      setSuggestIndex(0);
+      return;
+    }
+  });
+
   const getCommandContext = (): CommandContext => ({
     showOverlay,
     hideOverlay,
@@ -62,21 +126,24 @@ export function PromptInput() {
     stopProcessor,
     ei,
     renderer,
-    setInputText: (text: string) => textareaRef?.setText(text),
+    setInputText: (text: string) => {
+      textareaRef?.setText(text);
+      setInputText(text);
+    },
     getInputText: () => textareaRef?.plainText || "",
   });
 
   const handleSubmit = async () => {
     const text = textareaRef?.plainText?.trim();
     if (!text) return;
-    
+
     if (text.startsWith("/")) {
       const isEditorCmd = text.startsWith("/editor") ||
                           text.startsWith("/edit") ||
                           text.startsWith("/e ") ||
                           text === "/e";
-      const opensEditorForData = text.startsWith("/me") || 
-                                 text.startsWith("/details") || 
+      const opensEditorForData = text.startsWith("/me") ||
+                                 text.startsWith("/details") ||
                                  text.startsWith("/d ") ||
                                  text === "/d" ||
                                  text.startsWith("/settings") ||
@@ -87,18 +154,24 @@ export function PromptInput() {
                                  text.startsWith("/q ") ||
                                  text.startsWith("/context") ||
                                  text.startsWith("/messages");
-      
+
       if (!isEditorCmd && !opensEditorForData) {
         textareaRef?.clear();
+        setInputText("");
       }
       await parseAndExecute(text, getCommandContext());
       if (opensEditorForData) {
         textareaRef?.clear();
+        setInputText("");
       }
+      setSuggestIndex(0);
       return;
     }
-    
+
     textareaRef?.clear();
+    setInputText("");
+    resetHistoryIndex();
+    setSuggestIndex(0);
     if (!activePersonaId()) return;
     await sendMessage(text);
   };
@@ -115,31 +188,40 @@ export function PromptInput() {
   };
 
   return (
-    <box 
+    <box
+      flexDirection="column"
       flexShrink={0}
-      border={["top"]}
-      borderStyle="single" 
-      backgroundColor="#0f3460"
-      paddingLeft={1}
-      paddingRight={1}
-      paddingTop={0.5}
-      paddingBottom={0.5}
     >
-      <textarea
-        ref={(r: TextareaRenderable) => {
-          textareaRef = r;
-          registerTextarea(r);
-        }}
-        focused={!overlayRenderer()}
-        onSubmit={() => void handleSubmit()}
-        placeholder={getPlaceholder()}
-        textColor="#eee8d5"
-        backgroundColor="#0f3460"
-        cursorColor="#eee8d5"
-        minHeight={1}
-        maxHeight={6}
-        keyBindings={overlayRenderer() ? [] : TEXTAREA_KEYBINDINGS}
+      <CommandSuggest
+        input={inputText}
+        highlightIndex={suggestIndex}
       />
+      <box
+        border={["top"]}
+        borderStyle="single"
+        backgroundColor="#0f3460"
+        paddingLeft={1}
+        paddingRight={1}
+        paddingTop={0.5}
+        paddingBottom={0.5}
+      >
+        <textarea
+          ref={(r: TextareaRenderable) => {
+            textareaRef = r;
+            registerTextarea(r);
+          }}
+          focused={!overlayRenderer()}
+          onSubmit={() => void handleSubmit()}
+          onContentChange={() => setInputText(textareaRef?.plainText ?? "")}
+          placeholder={getPlaceholder()}
+          textColor="#eee8d5"
+          backgroundColor="#0f3460"
+          cursorColor="#eee8d5"
+          minHeight={1}
+          maxHeight={6}
+          keyBindings={overlayRenderer() ? [] : TEXTAREA_KEYBINDINGS}
+        />
+      </box>
     </box>
   );
 }

package/tui/src/components/Sidebar.tsx

@@ -71,6 +71,7 @@ export function Sidebar() {
 
               return (
                 <box
+                  flexDirection="column"
                   backgroundColor={
                     isActive() && highlightedPersona() === persona.id 
                       ? "#3d5a80"
@@ -78,12 +79,15 @@ export function Sidebar() {
                       ? "#2d3748"
                       : "transparent"
                   }
-                  padding={1}
-                  marginBottom={0.5}
+                  paddingX={1}
+                  marginBottom={1}
                 >
                   <text fg={textColor()}>
                     {getLabel()}
                   </text>
+                  <text fg="#586e75" wrapMode="word" height={2} visible={!!persona.short_description}>
+                    {persona.short_description ?? ""}
+                  </text>
                 </box>
               );
             }}

package/tui/src/context/ei.tsx

@@ -98,6 +98,7 @@ export interface EiContextValue {
   dismissWelcomeOverlay: () => void;
   deleteMessages: (personaId: string, messageIds: string[]) => Promise<void>;
   setMessageContextStatus: (personaId: string, messageId: string, status: ContextStatus) => Promise<void>;
+  recallPendingMessages: () => Promise<string>;
 }
 
 const EiContext = createContext<EiContextValue>();
@@ -378,6 +379,14 @@ export const EiProvider: ParentComponent = (props) => {
     await processor.setMessageContextStatus(personaId, messageId, status);
   };
 
+  const recallPendingMessages = async (): Promise<string> => {
+    if (!processor) return "";
+    const personaId = store.activePersonaId;
+    if (!personaId) return "";
+    return processor.recallPendingMessages(personaId);
+  };
+
+
   const searchHumanData = async (
     query: string,
     options?: { types?: Array<"fact" | "trait" | "topic" | "person" | "quote">; limit?: number }
@@ -591,6 +600,7 @@ export const EiProvider: ParentComponent = (props) => {
     dismissWelcomeOverlay: () => setShowWelcomeOverlay(false),
     deleteMessages,
     setMessageContextStatus,
+    recallPendingMessages,
   };
 
   return (

package/tui/src/context/keyboard.tsx

@@ -5,11 +5,12 @@ import {
   type ParentComponent,
   type Accessor,
 } from "solid-js";
-import { useKeyboard, useRenderer } from "@opentui/solid";
+import { useKeyboard, useRenderer, useSelectionHandler } from "@opentui/solid";
 import type { ScrollBoxRenderable, KeyEvent, TextareaRenderable, CliRenderer } from "@opentui/core";
 import type { PersonaSummary } from "../../../src/core/types.js";
 import { useEi } from "./ei";
 import { logger } from "../util/logger";
+import { copyToClipboard } from "../util/clipboard";
 
 export type Panel = "sidebar" | "messages" | "input";
 
@@ -23,6 +24,7 @@ interface KeyboardContextValue {
   toggleSidebar: () => void;
   exitApp: () => Promise<void>;
   renderer: CliRenderer;
+  resetHistoryIndex: () => void;
 }
 
 const KeyboardContext = createContext<KeyboardContextValue>();
@@ -31,11 +33,13 @@ 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 } = useEi();
+  const { queueStatus, abortCurrentOperation, resumeQueue, personas, activePersonaId, selectPersona, saveAndExit, showNotification, messages, recallPendingMessages } = useEi();
   
   let messageScrollRef: ScrollBoxRenderable | null = null;
   let textareaRef: TextareaRenderable | null = null;
   let editorHandler: (() => Promise<void>) | null = null;
+  let historyIndex = -1;  // -1 = not browsing history
+  let savedDraft = "";   // input text saved when history browsing starts
 
   const registerMessageScroll = (scrollbox: ScrollBoxRenderable) => {
     messageScrollRef = scrollbox;
@@ -123,6 +127,67 @@ export const KeyboardProvider: ParentComponent = (props) => {
       return;
     }
 
+
+    if (event.name === "up" && !event.ctrl && !event.shift && !event.meta) {
+      if (!textareaRef) return;
+      const cursor = textareaRef.logicalCursor;
+      // Only intercept when cursor is at the very beginning (row 0, col 0)
+      if (cursor.row !== 0 || cursor.col !== 0) return;
+      // Don't intercept when slash-command suggest panel is visible
+      if (textareaRef.plainText.startsWith("/")) return;
+
+      event.preventDefault();
+      // First Up from fresh state: check for pending (unread) messages to recall
+      if (historyIndex === -1) {
+        const hasPending = messages().some(m => m.role === "human" && !m.read);
+        if (hasPending) {
+          savedDraft = textareaRef.plainText;
+          void recallPendingMessages().then(recalled => {
+            if (recalled) {
+              textareaRef!.setText(recalled);
+              textareaRef!.gotoBufferHome();
+            }
+          });
+          return;
+        }
+      }
+      // Navigate backward through sent-message history
+      const history = messages().filter(m => m.role === "human").map(m => m.content);
+      if (history.length === 0) return;
+      if (historyIndex === -1) {
+        savedDraft = textareaRef.plainText;
+      }
+      historyIndex = Math.min(historyIndex + 1, history.length - 1);
+      // history is newest-last; index 0 = most recent
+      const entry = history[history.length - 1 - historyIndex];
+      textareaRef.setText(entry);
+      textareaRef.gotoBufferHome();  // cursor at start so next Up continues backward
+      return;
+    }
+
+    if (event.name === "down" && !event.ctrl && !event.shift && !event.meta) {
+      if (!textareaRef || historyIndex === -1) return;
+      // Only intercept when cursor is at the very end
+      if (textareaRef.cursorOffset !== textareaRef.plainText.length) return;
+      // Don't intercept when slash-command suggest panel is visible
+      if (textareaRef.plainText.startsWith("/")) return;
+
+      event.preventDefault();
+      if (historyIndex === 0) {
+        // Back to the draft
+        historyIndex = -1;
+        textareaRef.setText(savedDraft);
+        textareaRef.gotoBufferEnd();
+      } else {
+        historyIndex -= 1;
+        const history = messages().filter(m => m.role === "human").map(m => m.content);
+        const entry = history[history.length - 1 - historyIndex];
+        textareaRef.setText(entry);
+        textareaRef.gotoBufferEnd();  // cursor at end so next Down continues forward
+      }
+      return;
+    }
+
     if (!messageScrollRef) return;
 
     const scrollAmount = messageScrollRef.height;
@@ -136,6 +201,28 @@ export const KeyboardProvider: ParentComponent = (props) => {
     }
   });
 
+
+  useSelectionHandler((selection) => {
+    const text = selection.getSelectedText();
+    if (!text || text.length === 0) return;
+    logger.info(`Selection detected: ${text.length} chars, copying...`);
+    void copyToClipboard(text)
+      .then(() => {
+        showNotification(`Copied ${text.length} chars`, "info");
+        renderer.clearSelection();
+        logger.info(`Clipboard copy succeeded`);
+      })
+      .catch((err: unknown) => {
+        logger.error(`Clipboard copy failed: ${String(err)}`);
+      });
+  });
+
+  const resetHistoryIndex = () => {
+    historyIndex = -1;
+    savedDraft = "";
+  };
+
+
   const value: KeyboardContextValue = {
     focusedPanel,
     setFocusedPanel,
@@ -146,6 +233,7 @@ export const KeyboardProvider: ParentComponent = (props) => {
     toggleSidebar,
     exitApp,
     renderer,
+    resetHistoryIndex,
   };
 
   return (

package/tui/src/util/clipboard.ts

@@ -0,0 +1,73 @@
+import { platform } from "os";
+
+/**
+ * Write OSC 52 escape sequence to stdout.
+ * Works in terminals that support it (Kitty, Alacritty, etc.).
+ * Apple Terminal.app does NOT support OSC 52 — use copyNative() for macOS.
+ */
+function writeOsc52(text: string): void {
+  if (!process.stdout.isTTY) return;
+  const base64 = Buffer.from(text).toString("base64");
+  const osc52 = `\x1b]52;c;${base64}\x07`;
+  const inTmux = process.env["TMUX"] || process.env["STY"];
+  const sequence = inTmux ? `\x1bPtmux;\x1b${osc52}\x1b\\` : osc52;
+  process.stdout.write(sequence);
+}
+
+/**
+ * Copy text to clipboard using the best available native method.
+ * Mirrors OpenCode's clipboard.ts approach.
+ */
+export async function copyToClipboard(text: string): Promise<void> {
+  // Always attempt OSC 52 (works over SSH, in supported terminals)
+  writeOsc52(text);
+
+  const os = platform();
+
+  if (os === "darwin") {
+    // osascript is the reliable path on macOS (works in Apple Terminal + tmux)
+    const escaped = text.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+    const proc = Bun.spawn(
+      ["osascript", "-e", `set the clipboard to "${escaped}"`],
+      { stdout: "ignore", stderr: "ignore" },
+    );
+    await proc.exited.catch(() => {});
+    return;
+  }
+
+  if (os === "linux") {
+    if (process.env["WAYLAND_DISPLAY"] && Bun.which("wl-copy")) {
+      const proc = Bun.spawn(["wl-copy"], {
+        stdin: "pipe",
+        stdout: "ignore",
+        stderr: "ignore",
+      });
+      proc.stdin.write(text);
+      proc.stdin.end();
+      await proc.exited.catch(() => {});
+      return;
+    }
+    if (Bun.which("xclip")) {
+      const proc = Bun.spawn(["xclip", "-selection", "clipboard"], {
+        stdin: "pipe",
+        stdout: "ignore",
+        stderr: "ignore",
+      });
+      proc.stdin.write(text);
+      proc.stdin.end();
+      await proc.exited.catch(() => {});
+      return;
+    }
+    if (Bun.which("xsel")) {
+      const proc = Bun.spawn(["xsel", "--clipboard", "--input"], {
+        stdin: "pipe",
+        stdout: "ignore",
+        stderr: "ignore",
+      });
+      proc.stdin.write(text);
+      proc.stdin.end();
+      await proc.exited.catch(() => {});
+      return;
+    }
+  }
+}

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

@@ -220,7 +220,7 @@ export function personaToYAML(persona: PersonaEntity, allGroups?: string[]): str
       : persona.topics.map(({ name, perspective, approach, personal_stake, exposure_current, exposure_desired }) => ({ 
           name, perspective, approach, personal_stake, exposure_current, exposure_desired 
         })),
-    heartbeat_delay_ms: persona.heartbeat_delay_ms,
+    heartbeat_delay_ms: persona.heartbeat_delay_ms || 'default',
     context_window_hours: persona.context_window_hours,
     is_paused: persona.is_paused || undefined,
     pause_until: persona.pause_until,
@@ -322,7 +322,7 @@ export function personaFromYAML(yamlContent: string, original: PersonaEntity): P
     groups_visible: groupsVisible,
     traits,
     topics,
-    heartbeat_delay_ms: data.heartbeat_delay_ms,
+    heartbeat_delay_ms: stripPlaceholder(data.heartbeat_delay_ms, 'default'),
     context_window_hours: data.context_window_hours,
     is_paused: data.is_paused ?? false,
     pause_until: data.pause_until,
@@ -347,7 +347,7 @@ export function humanToYAML(human: HumanEntity): string {
   
   return YAML.stringify(data, {
     lineWidth: 0,
-  });
+  }).replace(/^(\s+validated:\s+\S+)$/mg, '$1 # none | ei | human');
 }
 
 export interface HumanYAMLResult {
@@ -640,6 +640,10 @@ export function newProviderFromYAML(yamlContent: string): ProviderAccount {
     data.default_model = undefined;
   }
   
+  if (data.token_limit !== undefined && data.token_limit !== null && (typeof data.token_limit !== "number" || isNaN(data.token_limit))) {
+    throw new Error(`token_limit must be a number (got: ${JSON.stringify(data.token_limit)}). Note: underscore separators (100_000) are not valid in YAML.`);
+  }
+
   return {
     id: crypto.randomUUID(),
     name: data.name,
@@ -687,6 +691,10 @@ export function providerFromYAML(yamlContent: string, original: ProviderAccount)
     throw new Error("Provider URL is required");
   }
   
+  if (data.token_limit !== undefined && data.token_limit !== null && (typeof data.token_limit !== "number" || isNaN(data.token_limit))) {
+    throw new Error(`token_limit must be a number (got: ${JSON.stringify(data.token_limit)}). Note: underscore separators (100_000) are not valid in YAML.`);
+  }
+
   return {
     id: original.id,
     name: data.name,
@@ -752,4 +760,4 @@ export function contextFromYAML(yamlContent: string): ContextYAMLResult {
   }
 
   return { messages, deletedMessageIds };
-}
+}

package/src/prompts/validation/ei.ts

@@ -1,93 +0,0 @@
-import type { EiValidationPromptData, PromptOutput } from "./types.js";
-import type { DataItemBase } from "../../core/types.js";
-
-function formatDataItem(item: DataItemBase, label: string): string {
-  return `### ${label}
-- **Name**: ${item.name}
-- **Description**: ${item.description}
-- **Sentiment**: ${item.sentiment}
-- **Last Updated**: ${item.last_updated}
-${item.learned_by ? `- **Learned By**: ${item.learned_by}` : ""}`;
-}
-
-export function buildEiValidationPrompt(data: EiValidationPromptData): PromptOutput {
-  if (!data.item_name || !data.data_type) {
-    throw new Error("buildEiValidationPrompt: item_name and data_type are required");
-  }
-
-  const roleFragment = `You are Ei, the system guide and arbiter of truth for the human's data.
-
-When other personas learn things about the human, those changes come to you for validation. Your job is to ensure data quality and consistency.`;
-
-  const contextFragment = `# Validation Request
-
-**Type**: ${data.data_type.toUpperCase()}
-**Item**: "${data.item_name}"
-**Source**: ${data.source_persona}
-**Context**: ${data.context}`;
-
-  const dataFragment = data.current_item
-    ? `# Data Comparison
-
-${formatDataItem(data.current_item, "Current (existing data)")}
-
-${formatDataItem(data.proposed_item, "Proposed (from " + data.source_persona + ")")}`
-    : `# New Data
-
-${formatDataItem(data.proposed_item, "Proposed (from " + data.source_persona + ")")}
-
-*(This is a NEW ${data.data_type} - no existing data to compare)*`;
-
-  const guidelinesFragment = `# Validation Guidelines
-
-## ACCEPT if:
-- Change is factual and well-evidenced
-- New information is consistent with what you know about the human
-- Source persona's interpretation seems reasonable
-- Data improves understanding of the human
-
-## MODIFY if:
-- Partially correct but needs refinement
-- Description could be clearer or more accurate
-- Sentiment or other fields seem off
-- Good information but poorly expressed
-
-## REJECT if:
-- Contradicts known facts
-- Seems like a hallucination or misunderstanding
-- Would misrepresent the human
-- Source persona lacks context to make this claim
-
-## Considerations
-- ${data.source_persona} may have context you don't
-- The human's data should be accurate, not just convenient
-- When in doubt, lean toward accepting with modifications`;
-
-  const outputFragment = `# Response Format
-
-\`\`\`json
-{
-  "decision": "accept" | "modify" | "reject",
-  "reason": "Brief explanation of your decision",
-  "modified_item": { ... }  // Only if decision is "modify"
-}
-\`\`\`
-
-If modifying, include the corrected item with all fields.`;
-
-  const system = `${roleFragment}
-
-${contextFragment}
-
-${dataFragment}
-
-${guidelinesFragment}
-
-${outputFragment}`;
-
-  const user = `Review the ${data.data_type} "${data.item_name}" proposed by ${data.source_persona}.
-
-Should this change be accepted, modified, or rejected?`;
-
-  return { system, user };
-}

package/src/prompts/validation/index.ts

@@ -1,6 +0,0 @@
-export { buildEiValidationPrompt } from "./ei.js";
-export type {
-  EiValidationPromptData,
-  EiValidationResult,
-  PromptOutput,
-} from "./types.js";

package/src/prompts/validation/types.ts

@@ -1,22 +0,0 @@
-import type { DataItemBase } from "../../core/types.js";
-
-export interface PromptOutput {
-  system: string;
-  user: string;
-}
-
-export interface EiValidationPromptData {
-  validation_type: "cross_persona";
-  item_name: string;
-  data_type: "fact" | "trait" | "topic" | "person";
-  context: string;
-  source_persona: string;
-  current_item?: DataItemBase;
-  proposed_item: DataItemBase;
-}
-
-export interface EiValidationResult {
-  decision: "accept" | "modify" | "reject";
-  reason: string;
-  modified_item?: DataItemBase;
-}