ei-tui 1.3.2 → 1.3.3

package/package.json

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

package/src/core/llm-client.ts

@@ -1,4 +1,5 @@
 import type { ChatMessage, ProviderAccount, ModelConfig } from "./types.js";
+import { resolveDataPath } from "./utils/resolve-data-path.js";
 const DEFAULT_TOKEN_LIMIT = 8192;
 const DEFAULT_MAX_OUTPUT_TOKENS = 8000;
 
@@ -11,8 +12,7 @@ async function writeNetworkDump(
   request: unknown,
   response: unknown
 ): Promise<void> {
-  const dataPath = (typeof process !== "undefined" && process.env?.EI_DATA_PATH) ||
-    (typeof Bun !== "undefined" && (Bun as Record<string, unknown>).env && ((Bun as { env: Record<string, string> }).env.EI_DATA_PATH));
+  const dataPath = resolveDataPath();
   if (!dataPath) return;
 
   try {

package/src/core/utils/index.ts

@@ -1,5 +1,6 @@
 import { crossFind } from "./crossFind.js";
 import { applyDecayToValue } from "./decay.js";
 import { UUID_REGEX, sanitizeEiPersonaIdentifiers } from "./identifier-utils.js";
+import { resolveDataPath } from "./resolve-data-path.js";
 
-export { crossFind, applyDecayToValue, UUID_REGEX, sanitizeEiPersonaIdentifiers };
+export { crossFind, applyDecayToValue, UUID_REGEX, sanitizeEiPersonaIdentifiers, resolveDataPath };

package/src/core/utils/resolve-data-path.ts

@@ -0,0 +1,27 @@
+/**
+ * Resolves the Ei data directory path using the same precedence everywhere:
+ *   1. EI_DATA_PATH env var (explicit override)
+ *   2. $XDG_DATA_HOME/ei
+ *   3. ~/.local/share/ei
+ *
+ * Cross-env: works in Bun, Node, and browser (browser will always return null
+ * since no filesystem env is available, which is the correct behaviour there).
+ *
+ * Trailing slashes are stripped so callers can safely do `path.join(dataPath, "logs")`.
+ */
+export function resolveDataPath(): string | null {
+  const env: Record<string, string | undefined> =
+    (typeof Bun !== "undefined" && (Bun as { env?: Record<string, string> }).env) ||
+    (typeof process !== "undefined" && process.env) ||
+    {};
+
+  const raw = env.EI_DATA_PATH ||
+    (() => {
+      const xdg = env.XDG_DATA_HOME ||
+        (env.HOME ? `${env.HOME}/.local/share` : null);
+      return xdg ? `${xdg}/ei` : null;
+    })();
+
+  if (!raw) return null;
+  return raw.replace(/\/+$/, "");
+}

package/tui/src/commands/reflect.tsx

@@ -11,6 +11,7 @@ import {
   personaPreviewFromYAML,
 } from "../util/yaml-serializers.js";
 import { useKeyboardNav } from "../context/keyboard.js";
+import { resolveDataPath } from "../util/resolve-data-path.js";
 
 function wrapComment(text: string, width = 78): string {
   const words = text.split(/\s+/);
@@ -28,16 +29,10 @@ function wrapComment(text: string, width = 78): string {
   return lines.join("\n");
 }
 
-function getDataPath(): string {
-  const raw = process.env.EI_DATA_PATH ??
-    join(process.env.XDG_DATA_HOME ?? join(homedir(), ".local", "share"), "ei");
-  return raw.replace(/\/+$/, "");
-}
-
 function getReflectFolder(persona: PersonaEntity): string {
   const datePrefix = persona.pending_update!.created_at.slice(0, 10);
   const safeName = persona.display_name.replace(/\s+/g, "_");
-  return join(getDataPath(), "reflect", `${datePrefix}_${safeName}`);
+  return join(resolveDataPath(), "reflect", `${datePrefix}_${safeName}`);
 }
 
 async function resolveReflectionPersona(
@@ -102,7 +97,7 @@ export const reflectCommand: Command = {
 
       const headerName = hasPending ? activePersona!.display_name : undefined;
       const pendingNames = pendingPersonas.map(p => p.display_name);
-      const dataPath = getDataPath();
+      const dataPath = resolveDataPath();
 
       ctx.showOverlay((hideOverlay, _hideForEditor) => {
         const { setOverlayActive } = useKeyboardNav();

package/tui/src/storage/file.ts

@@ -3,6 +3,7 @@ import type { Storage } from "../../../src/storage/interface";
 import { encodeAllEmbeddings, decodeAllEmbeddings } from "../../../src/storage/embeddings";
 import { join } from "path";
 import { mkdir, rename, unlink, readdir } from "fs/promises";
+import { resolveDataPath } from "../util/resolve-data-path.js";
 
 const STATE_FILE = "state.json";
 const BACKUP_FILE = "state.backup.json";
@@ -14,13 +15,7 @@ export class FileStorage implements Storage {
   private readonly dataPath: string;
 
   constructor(dataPath?: string) {
-    const raw = dataPath ?? process.env.EI_DATA_PATH;
-    if (raw) {
-      this.dataPath = raw.replace(/\/+$/, "");
-    } else {
-      const xdgData = process.env.XDG_DATA_HOME || join(process.env.HOME || "~", ".local", "share");
-      this.dataPath = join(xdgData, "ei");
-    }
+    this.dataPath = resolveDataPath(dataPath);
   }
 
   getDataPath(): string {

package/tui/src/util/logger.ts

@@ -2,17 +2,12 @@
 
 import { appendFileSync, mkdirSync, existsSync, readdirSync, unlinkSync, renameSync } from "node:fs";
 import { join } from "node:path";
+import { resolveDataPath } from "./resolve-data-path.js";
 
 const MAX_ROLLED_LOGS = 10;
 
-function getDataPath(): string {
-  if (Bun.env.EI_DATA_PATH) return Bun.env.EI_DATA_PATH;
-  const xdgData = Bun.env.XDG_DATA_HOME || join(Bun.env.HOME || "~", ".local", "share");
-  return join(xdgData, "ei");
-}
-
 function getLogPath(): string {
-  return join(getDataPath(), "tui.log");
+  return join(resolveDataPath(), "tui.log");
 }
 
 type LogLevel = "debug" | "info" | "warn" | "error";

package/tui/src/util/resolve-data-path.ts

@@ -0,0 +1,7 @@
+import { join } from "node:path";
+
+export function resolveDataPath(override?: string): string {
+  const raw = override ?? Bun.env.EI_DATA_PATH ??
+    join(Bun.env.XDG_DATA_HOME ?? join(Bun.env.HOME ?? "~", ".local", "share"), "ei");
+  return raw.replace(/\/+$/, "");
+}