ei-tui 1.6.9 → 1.7.1

package/tui/src/storage/file.ts

@@ -1,6 +1,7 @@
 import type { StorageState } from "../../../src/core/types";
 import type { Storage } from "../../../src/storage/interface";
 import { encodeAllEmbeddings, decodeAllEmbeddings } from "../../../src/storage/embeddings";
+import { withLock, atomicWrite } from "../../../src/storage/file-lock";
 import { join } from "path";
 import { mkdir, rename, unlink, readdir } from "fs/promises";
 import { resolveDataPath } from "../util/resolve-data-path.js";
@@ -8,8 +9,6 @@ import { resolveDataPath } from "../util/resolve-data-path.js";
 const STATE_FILE = "state.json";
 const BACKUP_FILE = "state.backup.json";
 const BACKUPS_DIR = "backups";
-const LOCK_TIMEOUT_MS = 5000;
-const LOCK_RETRY_DELAY_MS = 50;
 
 export class FileStorage implements Storage {
   private readonly dataPath: string;
@@ -39,9 +38,9 @@ export class FileStorage implements Storage {
     const filePath = join(this.dataPath, STATE_FILE);
     state.timestamp = new Date().toISOString();
 
-    await this.withLock(filePath, async () => {
+    await withLock(filePath, async () => {
       try {
-        await this.atomicWrite(filePath, JSON.stringify(encodeAllEmbeddings(state), null, 2));
+        await atomicWrite(filePath, JSON.stringify(encodeAllEmbeddings(state), null, 2));
       } catch (e) {
         if (this.isQuotaError(e)) {
           throw new Error("STORAGE_SAVE_FAILED: Disk quota exceeded");
@@ -89,7 +88,7 @@ export class FileStorage implements Storage {
   async saveBackup(state: StorageState): Promise<void> {
     await this.ensureDataDir();
     const backupPath = join(this.dataPath, BACKUP_FILE);
-    await this.atomicWrite(backupPath, JSON.stringify(encodeAllEmbeddings(state), null, 2));
+    await atomicWrite(backupPath, JSON.stringify(encodeAllEmbeddings(state), null, 2));
   }
 
   /**
@@ -130,7 +129,7 @@ export class FileStorage implements Storage {
     ].join("") + ".json";
 
     const destPath = join(backupsPath, name);
-    await this.atomicWrite(destPath, JSON.stringify(encodeAllEmbeddings(state), null, 2));
+    await atomicWrite(destPath, JSON.stringify(encodeAllEmbeddings(state), null, 2));
 
     // Prune: keep only the newest maxBackups files
     const entries = await readdir(backupsPath);
@@ -149,8 +148,16 @@ export class FileStorage implements Storage {
   private async ensureDataDir(): Promise<void> {
     try {
       await mkdir(this.dataPath, { recursive: true });
-    } catch {
-      return;
+    } catch (e: any) {
+      if (e?.code === 'EACCES' || e?.code === 'EPERM') {
+        throw new Error(
+          `Cannot create data directory: ${this.dataPath}\n` +
+          `Fix options:\n` +
+          `  - Fix Permissions  (sudo chown $USER $EI_DATA_PATH)\n` +
+          `  - Change Data Path (EI_DATA_PATH=~/ei-data ei-tui)`
+        );
+      }
+      // Other errors (e.g., race conditions) are safe to ignore
     }
   }
 
@@ -160,79 +167,4 @@ export class FileStorage implements Storage {
       (e.message.includes("ENOSPC") || e.message.includes("quota"))
     );
   }
-
-  private async atomicWrite(filePath: string, content: string): Promise<void> {
-    const tempPath = `${filePath}.tmp.${Date.now()}.${Math.random().toString(36).slice(2)}`;
-    try {
-      await Bun.write(tempPath, content);
-      await rename(tempPath, filePath);
-    } catch (e) {
-      try {
-        await unlink(tempPath);
-      } catch {}
-      throw e;
-    }
-  }
-
-  private getLockPath(filePath: string): string {
-    return `${filePath}.lock`;
-  }
-
-  private async acquireLock(filePath: string): Promise<boolean> {
-    const lockPath = this.getLockPath(filePath);
-    const startTime = Date.now();
-
-    while (Date.now() - startTime < LOCK_TIMEOUT_MS) {
-      const lockFile = Bun.file(lockPath);
-      if (await lockFile.exists()) {
-        // Read may throw if another writer deleted the lock between exists() and text() —
-        // treat that as "lock is gone, proceed to acquire" by falling through.
-        let lockContent: string;
-        try {
-          lockContent = await lockFile.text();
-        } catch {
-          // Lock vanished in the race window — retry from top to re-check state cleanly.
-          await new Promise((r) => setTimeout(r, LOCK_RETRY_DELAY_MS));
-          continue;
-        }
-        const lockTime = parseInt(lockContent, 10);
-        if (!isNaN(lockTime) && Date.now() - lockTime > LOCK_TIMEOUT_MS) {
-          try {
-            await unlink(lockPath);
-          } catch {}
-        } else {
-          await new Promise((r) => setTimeout(r, LOCK_RETRY_DELAY_MS));
-          continue;
-        }
-      }
-
-      try {
-        await Bun.write(lockPath, Date.now().toString());
-        return true;
-      } catch {
-        await new Promise((r) => setTimeout(r, LOCK_RETRY_DELAY_MS));
-      }
-    }
-
-    return false;
-  }
-
-  private async releaseLock(filePath: string): Promise<void> {
-    const lockPath = this.getLockPath(filePath);
-    try {
-      await unlink(lockPath);
-    } catch {}
-  }
-
-  private async withLock<T>(filePath: string, fn: () => Promise<T>): Promise<T> {
-    const acquired = await this.acquireLock(filePath);
-    if (!acquired) {
-      throw new Error("STORAGE_LOCK_TIMEOUT: Could not acquire file lock");
-    }
-    try {
-      return await fn();
-    } finally {
-      await this.releaseLock(filePath);
-    }
-  }
 }

package/tui/src/util/instance-lock.ts

@@ -1,5 +1,5 @@
-import { join } from "path";
-import { unlink } from "fs/promises";
+import { join, dirname } from "path";
+import { unlink, mkdir } from "fs/promises";
 
 const LOCK_FILE = "ei.lock";
 
@@ -69,6 +69,7 @@ export class InstanceLock {
   }
 
   private async writeLock(): Promise<void> {
+    await mkdir(dirname(this.lockPath), { recursive: true });
     const data: LockData = {
       pid: process.pid,
       started: new Date().toISOString(),

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

@@ -7,6 +7,7 @@ import type {
   ProviderAccount,
 } from "../../../src/core/types.js";
 import { modelGuidToDisplay, displayToModelGuid } from "./yaml-shared.js";
+import { buildPersonaToolsMap, resolvePersonaToolsFromMap, preserveHiddenToolGrants } from "../../../src/core/persona-tools.js";
 import { parseDuration, formatDuration } from "./duration.js";
 
 const PLACEHOLDER_LONG_DESC = "Detailed description of this persona's personality, background, and role";
@@ -62,43 +63,6 @@ const PLACEHOLDER_TOPIC: YAMLPersonaTopic = {
   exposure_desired: 0.5,
 };
 
-function buildPersonaToolsMap(
-  enabledToolIds: string[],
-  allTools: ToolDefinition[],
-  allProviders: import('../../../src/core/types.js').ToolProvider[]
-): Record<string, Record<string, boolean>> | undefined {
-  if (allTools.length === 0) return undefined;
-  const enabledSet = new Set(enabledToolIds);
-  const result: Record<string, Record<string, boolean>> = {};
-  for (const provider of allProviders.filter(p => p.enabled)) {
-    const providerTools = allTools.filter(t => t.provider_id === provider.id);
-    if (providerTools.length === 0) continue;
-    result[provider.display_name] = Object.fromEntries(
-      providerTools.map(t => [t.display_name, enabledSet.has(t.id)])
-    );
-  }
-  return Object.keys(result).length > 0 ? result : undefined;
-}
-
-function resolvePersonaToolsFromMap(
-  toolsMap: Record<string, Record<string, boolean>> | undefined,
-  allTools: ToolDefinition[],
-  allProviders: import('../../../src/core/types.js').ToolProvider[]
-): string[] | undefined {
-  if (!toolsMap) return undefined;
-  const enabledIds: string[] = [];
-  for (const [providerDisplayName, toolToggles] of Object.entries(toolsMap)) {
-    const provider = allProviders.find(p => p.display_name === providerDisplayName);
-    if (!provider) continue;
-    for (const [toolDisplayName, enabled] of Object.entries(toolToggles)) {
-      if (!enabled) continue;
-      const tool = allTools.find(t => t.provider_id === provider.id && t.display_name === toolDisplayName);
-      if (tool) enabledIds.push(tool.id);
-    }
-  }
-  return enabledIds.length > 0 ? enabledIds : [];
-}
-
 export function newPersonaToYAML(name: string, allTools?: ToolDefinition[], allProviders?: import('../../../src/core/types.js').ToolProvider[]): string {
   const toolsMap = buildPersonaToolsMap([], allTools ?? [], allProviders ?? []);
 
@@ -337,7 +301,12 @@ export function personaFromYAML(yamlContent: string, original: PersonaEntity, al
     pause_until: data.pause_until,
     is_static: data.is_static ?? false,
     include_message_timestamps: data.include_message_timestamps ?? false,
-    tools: resolvePersonaToolsFromMap(data.tools, allTools ?? [], allProviders ?? []),
+    tools: preserveHiddenToolGrants(
+      resolvePersonaToolsFromMap(data.tools, allTools ?? [], allProviders ?? []),
+      original.tools,
+      allTools ?? [],
+      allProviders ?? []
+    ),
     last_updated: new Date().toISOString(),
   };