ei-tui 1.6.9 → 1.7.1

package/src/cli/install.ts

@@ -1,12 +1,96 @@
 import { join } from "path";
+import { fileURLToPath } from "url";
+import { homedir } from "os";
+import { cp, mkdir, readdir, rename, rm, stat } from "fs/promises";
+
+/**
+ * Copy every skills/<name>/ directory from Ei's own package into a
+ * harness's native skill-discovery directory (targetDir). Copy, not
+ * symlink — a symlink into an npm/bunx-installed package's cache breaks
+ * silently on upgrade/uninstall, and Windows symlinks need elevated
+ * permissions; every other install* function in this file already
+ * materializes content onto disk rather than referencing back to source.
+ * Generic over whatever exists under skills/ — adding a new Ei-shipped
+ * skill later requires zero changes here. Overwrites unconditionally on
+ * every run, same as the extension files below.
+ *
+ * `sourceDir` defaults to Ei's own packaged skills/ (resolved relative to
+ * this file's own location, so it works regardless of install method —
+ * global npm, bunx, or a from-source checkout) and exists as a parameter
+ * purely so tests can redirect it at a fixture directory instead.
+ */
+export async function installSkillsTo(targetDir: string, sourceDir?: string): Promise<void> {
+  // `.pathname` on a file:// URL keeps a leading slash before a Windows
+  // drive letter (`/C:/Users/...`), which fs APIs on Windows do not accept
+  // as an absolute path — fileURLToPath() normalizes it correctly on every OS.
+  const skillsSourceDir = sourceDir ?? fileURLToPath(new URL("../../skills", import.meta.url));
+
+  // Plain fs.stat instead of shelling out to `test -d` — `test` is not a
+  // Bun Shell builtin (it falls back to a PATH lookup), and stock Windows
+  // ships no `test` binary, so the old shell-based check silently treated
+  // every Windows install as "source doesn't exist" and skipped skill
+  // installation with no warning at all.
+  try {
+    const sourceStat = await stat(skillsSourceDir);
+    if (!sourceStat.isDirectory()) return;
+  } catch {
+    // From-source checkout or a package build that predates this feature —
+    // nothing to do yet, and that's not an error.
+    return;
+  }
+
+  // fs.readdir + isDirectory() instead of `ls -d dir/*/` — skips stray files
+  // directly under skills/ (e.g. a top-level README.md) without depending on
+  // Bun Shell's undocumented `-d` flag support or POSIX glob semantics.
+  const entries = await readdir(skillsSourceDir, { withFileTypes: true });
+  const skillNames = entries.filter((entry) => entry.isDirectory()).map((entry) => entry.name);
+  if (skillNames.length === 0) return;
+
+  await mkdir(targetDir, { recursive: true });
+
+  for (const skillName of skillNames) {
+    const dest = join(targetDir, skillName);
+    // fs.cp merges into an existing dest rather than nesting like a naive
+    // `cp -r` would, but it won't remove files that only exist in a stale
+    // prior copy — clear first so every run leaves an exact mirror of the
+    // current source, matching the unconditional full-overwrite behavior
+    // every other install* function in this file gets via Bun.write.
+    await rm(dest, { recursive: true, force: true });
+    await cp(join(skillsSourceDir, skillName), dest, { recursive: true });
+  }
+
+  console.log(`✓ Installed ${skillNames.length} skill(s) to ${targetDir}`);
+}
+
+function resolveHome(): string {
+  // Plain Windows shells (cmd.exe, PowerShell without Git Bash/WSL) don't set
+  // $HOME — os.homedir() reads USERPROFILE there instead. Without this
+  // fallback, `home` silently became the literal string "~", and every
+  // downstream join("~", ...) resolved relative to CWD instead of the user's
+  // actual profile directory.
+  return process.env.HOME || homedir();
+}
+
+export async function runInstallStep(label: string, step: () => Promise<void>): Promise<boolean> {
+  try {
+    await step();
+    return true;
+  } catch (e) {
+    console.warn(`⚠️  ${label} install step failed: ${e instanceof Error ? e.message : String(e)}`);
+    console.warn(`   Skipping — other integrations will still be attempted.`);
+    return false;
+  }
+}
 
 export async function installMcpClients(): Promise<void> {
-  await installClaudeCode();
+  const failures: string[] = [];
+
+  if (!(await runInstallStep("Claude Code", installClaudeCode))) failures.push("Claude Code");
 
-  const home = process.env.HOME || "~";
+  const home = resolveHome();
 
   if (await commandExists("codex")) {
-    await installCodex();
+    if (!(await runInstallStep("Codex", installCodex))) failures.push("Codex");
   } else {
     console.log(`ℹ️  Codex CLI not detected — skipping Codex MCP install.`);
   }
@@ -18,7 +102,7 @@ export async function installMcpClients(): Promise<void> {
   ];
   const hasCursor = (await Promise.all(cursorDataDirs.map((p) => Bun.file(join(p, "User")).exists()))).some(Boolean);
   if (hasCursor) {
-    await installCursor();
+    if (!(await runInstallStep("Cursor", installCursor))) failures.push("Cursor");
   } else {
     console.log(`ℹ️  Cursor not detected — skipping Cursor install.`);
   }
@@ -29,7 +113,7 @@ export async function installMcpClients(): Promise<void> {
     await Bun.file(join(opencodeDir, "opencode.db")).exists();
 
   if (hasOpenCode) {
-    await installOpenCodePlugin();
+    if (!(await runInstallStep("OpenCode plugin", installOpenCodePlugin))) failures.push("OpenCode plugin");
   } else {
     console.log(`ℹ️  OpenCode not detected — skipping OpenCode plugin install.`);
   }
@@ -39,7 +123,7 @@ export async function installMcpClients(): Promise<void> {
     await Bun.file(join(home, ".pi", "agent", "auth.json")).exists();
 
   if (hasPi) {
-    await installPi();
+    if (!(await runInstallStep("Pi extension", installPi))) failures.push("Pi extension");
   } else {
     console.log(`ℹ️  Pi not detected — skipping Pi extension install.`);
   }
@@ -51,10 +135,16 @@ export async function installMcpClients(): Promise<void> {
     await Bun.file(join(home, ".omp", "agent", "agent.db")).exists();
 
   if (hasOmp) {
-    await installOmp();
+    if (!(await runInstallStep("OMP extension", installOmp))) failures.push("OMP extension");
   } else {
     console.log(`ℹ️  OMP not detected — skipping OMP extension install.`);
   }
+
+  if (failures.length > 0) {
+    throw new Error(
+      `${failures.length} integration(s) failed to install: ${failures.join(", ")}. See warnings above for details.`,
+    );
+  }
 }
 
 async function commandExists(command: string): Promise<boolean> {
@@ -83,7 +173,7 @@ function hookEntryHasCommand(entry: unknown, command: string): boolean {
 }
 
 async function installCodex(): Promise<void> {
-  const dataPath = process.env.EI_DATA_PATH ?? join(process.env.HOME || "~", ".local", "share", "ei");
+  const dataPath = process.env.EI_DATA_PATH ?? join(resolveHome(), ".local", "share", "ei");
   const proc = Bun.spawn(
     ["codex", "mcp", "add", "ei", "--env", `EI_DATA_PATH=${dataPath}`, "--", "bunx", "ei-tui", "mcp"],
     {
@@ -111,7 +201,7 @@ async function installCodex(): Promise<void> {
 }
 
 async function installCodexHooks(): Promise<void> {
-  const home = process.env.HOME || "~";
+  const home = resolveHome();
   const hooksDir = join(home, ".codex", "hooks");
   const scriptPath = join(hooksDir, "ei-inject.ts");
   const hooksJsonPath = join(home, ".codex", "hooks.json");
@@ -215,15 +305,14 @@ if (import.meta.main) {
 
   const tmpPath = `${hooksJsonPath}.ei-install.tmp`;
   await Bun.write(tmpPath, JSON.stringify(hooksConfig, null, 2) + "\n");
-  const { rename } = await import(/* @vite-ignore */ "fs/promises");
   await rename(tmpPath, hooksJsonPath);
 
   console.log(`✓ Installed Ei Codex context hook to ~/.codex/hooks/ei-inject.ts`);
   console.log(`  Use /hooks in Codex to review/trust the hook if prompted.`);
 }
 
-async function installClaudeCode(): Promise<void> {
-  const home = process.env.HOME || "~";
+export async function installClaudeCode(): Promise<void> {
+  const home = resolveHome();
   const claudeJsonPath = join(home, ".claude.json");
 
   // Claude Code supports ${VAR} substitution in env values, resolved from its
@@ -252,17 +341,18 @@ async function installClaudeCode(): Promise<void> {
   // Atomic write: write to temp file then rename to avoid partial writes
   const tmpPath = `${claudeJsonPath}.ei-install.tmp`;
   await Bun.write(tmpPath, JSON.stringify(config, null, 2) + "\n");
-  const { rename } = await import(/* @vite-ignore */ "fs/promises");
   await rename(tmpPath, claudeJsonPath);
 
   console.log(`✓ Installed Ei MCP server to ${claudeJsonPath}`);
   console.log(`  Restart Claude Code to activate.`);
 
   await installClaudeCodeHooks();
+
+  await installSkillsTo(join(home, ".claude", "skills"));
 }
 
 async function installClaudeCodeHooks(): Promise<void> {
-  const home = process.env.HOME || "~";
+  const home = resolveHome();
   const hooksDir = join(home, ".claude", "hooks");
   const scriptPath = join(hooksDir, "ei-inject.ts");
   const settingsPath = join(home, ".claude", "settings.json");
@@ -340,14 +430,13 @@ The following items MAY be relevant to your current task — use \\\`ei_search\\
   // Atomic write: write to temp file then rename to avoid partial writes
   const tmpPath = `${settingsPath}.ei-install.tmp`;
   await Bun.write(tmpPath, JSON.stringify(settings, null, 2) + "\n");
-  const { rename } = await import(/* @vite-ignore */ "fs/promises");
   await rename(tmpPath, settingsPath);
 
   console.log(`✓ Installed Ei context hook to ~/.claude/hooks/ei-inject.ts`);
 }
 
 async function installCursor(): Promise<void> {
-  const home = process.env.HOME || "~";
+  const home = resolveHome();
   const cursorJsonPath = join(home, ".cursor", "mcp.json");
 
   // Cursor does not support ${VAR} substitution in mcp.json — literal values only.
@@ -373,7 +462,6 @@ async function installCursor(): Promise<void> {
   await Bun.$`mkdir -p ${join(home, ".cursor")}`;
   const tmpPath = `${cursorJsonPath}.ei-install.tmp`;
   await Bun.write(tmpPath, JSON.stringify(config, null, 2) + "\n");
-  const { rename } = await import(/* @vite-ignore */ "fs/promises");
   await rename(tmpPath, cursorJsonPath);
 
   console.log(`✓ Installed Ei MCP server to ${cursorJsonPath}`);
@@ -383,7 +471,7 @@ async function installCursor(): Promise<void> {
 }
 
 async function installCursorHooks(): Promise<void> {
-  const home = process.env.HOME || "~";
+  const home = resolveHome();
   const hooksDir = join(home, ".cursor", "hooks");
   const rulesDir = join(home, ".cursor", "rules");
   const hookScriptPath = join(hooksDir, "ei-inject.sh");
@@ -444,14 +532,13 @@ exit 0
 
   const tmpPath = `${hooksJsonPath}.ei-install.tmp`;
   await Bun.write(tmpPath, JSON.stringify(hooksConfig, null, 2) + "\n");
-  const { rename } = await import(/* @vite-ignore */ "fs/promises");
   await rename(tmpPath, hooksJsonPath);
 
   console.log(`✓ Installed Ei context hook to ~/.cursor/hooks/ei-inject.sh`);
 }
 
 async function installPi(): Promise<void> {
-  const home = process.env.HOME || "~";
+  const home = resolveHome();
 
   const extensionContent = `import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
@@ -559,8 +646,8 @@ export default function eiIntegration(pi: ExtensionAPI) {
   console.log(`✓ Installed Ei extension to ~/.pi/agent/extensions/${extFilename}`);
 }
 
-async function installOmp(): Promise<void> {
-  const home = process.env.HOME || "~";
+export async function installOmp(): Promise<void> {
+  const home = resolveHome();
 
   const extensionContent = `import type { ExtensionAPI } from "@oh-my-pi/pi-coding-agent";
 import { $ } from "bun";
@@ -706,10 +793,12 @@ export default function eiIntegration(pi: ExtensionAPI) {
   await Bun.$`mkdir -p ${extDir}`;
   await Bun.write(join(extDir, extFilename), extensionContent);
   console.log(`✓ Installed Ei extension to ~/.omp/agent/extensions/${extFilename}`);
+
+  await installSkillsTo(join(home, ".omp", "agent", "skills"));
 }
 
-async function installOpenCodePlugin(): Promise<void> {
-  const home = process.env.HOME || "~";
+export async function installOpenCodePlugin(): Promise<void> {
+  const home = resolveHome();
   const opencodeDir = join(home, ".config", "opencode");
   const pluginsDir = join(opencodeDir, "plugins");
   const pluginPath = join(pluginsDir, "ei-persona.ts");
@@ -719,11 +808,12 @@ async function installOpenCodePlugin(): Promise<void> {
   const pluginContent = `import { $ } from "bun"
 import { join } from "path"
 import { appendFileSync } from "fs"
+import { homedir } from "os"
 
 // Deduplication: the Promise itself is re-awaited on subsequent calls (synchronous once resolved).
 const personaFetch = new Map<string, Promise<string | null>>()
 
-const logPath = join(process.env.EI_DATA_PATH ?? join(process.env.HOME ?? "~", ".local", "share", "ei"), "ei-persona-plugin.log")
+const logPath = join(process.env.EI_DATA_PATH ?? join(process.env.HOME ?? homedir(), ".local", "share", "ei"), "ei-persona-plugin.log")
 
 function log(msg: string) {
   try {
@@ -793,6 +883,8 @@ export default async function EiPersonaPlugin() {
   await Bun.write(pluginPath, pluginContent);
   console.log(`✓ Installed Ei persona plugin to ${pluginPath}`);
 
+  await installSkillsTo(join(opencodeDir, "skills"));
+
   const omoCandidates = [
     join(opencodeDir, "oh-my-opencode.json"),
     join(opencodeDir, "oh-my-opencode.jsonc"),

package/src/cli/mcp.ts

@@ -6,6 +6,8 @@ import type { StorageState } from "../core/types.js";
 import type { Message } from "../core/types.js";
 import type { RoomMessage } from "../core/types/rooms.js";
 import { resolvePersonaId, filterByPersona, filterTypeSpecificByPersona, filterBySource, filterTypeSpecificBySource } from "./persona-filter.js";
+import { createEntity, updateEntity, removeEntity, CorrectionValidationError } from "./corrections-endpoints.js";
+import { createPersonaEntity, updatePersonaEntity, removePersonaEntity } from "./persona-corrections.js";
 
 // Exported so tests can inject their own transport
 export function createMcpServer(): McpServer {
@@ -99,7 +101,7 @@ export function createMcpServer(): McpServer {
     "ei_lookup",
     {
       description:
-        "Retrieve the full record for any Ei entity by ID — facts, topics, people, quotes, or personas. Use when ei_search returns an item and you need its complete details (all fields, traits, topics, identifiers, etc.). Pass the entity id from ei_search results.",
+        "Retrieve the full record for any Ei entity by ID — facts, topics, people, quotes, or personas. Use when ei_search returns an item and you need its complete details (all fields, traits, topics, identifiers, etc.). Pass the entity id from ei_search results. For facts, topics, and people, the result also includes a `linked_quotes` array listing every quote whose data_item_ids references this entity — check this before correcting a bad merge/split (e.g. un-merging an over-merged Person) to see the full blast radius.",
       inputSchema: {
         id: z.string().describe("The entity ID to look up."),
         source: z
@@ -253,6 +255,83 @@ export function createMcpServer(): McpServer {
     }
   );
 
+  server.registerTool(
+    "ei_create",
+    {
+      description:
+        "Create a new entity in the user's Ei knowledge base — a fact, topic, person, or persona. Use to add data the extraction pipeline missed, split/correct bad merges, or author a new AI persona's identity (display name, description, traits, topics). The record is validated against the entity type's schema server-side; unknown fields are rejected. Returns the assigned id and the full stored record. Not available for quotes — verifiable-origin data can only be corrected via ei_update, never created.",
+      inputSchema: {
+        entity_type: z.enum(["fact", "topic", "person", "persona"]).describe("The type of entity to create."),
+        data: z
+          .record(z.unknown())
+          .describe(
+            "The entity fields. Fact requires name/description/sentiment/validated_date. Topic requires name/description/sentiment. Person requires a name and/or at least one identifier. Persona requires display_name (traits/topics default to empty arrays, is_paused/is_archived default to false, group_primary/groups_visible default to \"General\" if omitted). Structural validation happens server-side against the entity type's schema."
+          ),
+      },
+    },
+    async ({ entity_type, data }) => {
+      try {
+        if (entity_type === "persona") {
+          const { id, record } = await createPersonaEntity(data);
+          return { content: [{ type: "text" as const, text: JSON.stringify({ id, record }, null, 2) }] };
+        }
+        const { id, record } = await createEntity(entity_type, data);
+        return { content: [{ type: "text" as const, text: JSON.stringify({ id, record }, null, 2) }] };
+      } catch (e) {
+        const message = e instanceof CorrectionValidationError ? e.message : (e as Error).message;
+        return { content: [{ type: "text" as const, text: `Error: ${message}` }], isError: true };
+      }
+    }
+  );
+
+  server.registerTool(
+    "ei_update",
+    {
+      description:
+        "Replace an existing fact, topic, person, quote, or persona by ID with a COMPLETE record — this is full replacement, not a partial patch. Any field omitted from `data` is treated as absent, not 'leave the existing value alone'. Always fetch the current record with ei_lookup first, edit the fields you need to change, and pass the WHOLE thing back — passing a partial object will silently drop the fields you didn't include. Use to fix bad extracted data (e.g. correcting a person record where two people were wrongly merged into one). Quote records can also be corrected this way — specifically to repoint `data_item_ids` after splitting or merging a person/topic/fact, or to fix mistranscribed `text`. Persona records support full CRUD this way too — rewriting display_name/traits[]/topics[] to author a persona's character (e.g. \"make this persona talk like Yoda\"), or toggling `is_archived` (archive/unarchive is just a normal update). Renaming a persona to a reserved name (\"new\", \"clone\") is rejected.",
+      inputSchema: {
+        entity_type: z.enum(["fact", "topic", "person", "quote", "persona"]).describe("The type of entity to update."),
+        id: z.string().describe("The ID of the entity to replace, from ei_lookup or ei_search."),
+        data: z
+          .record(z.unknown())
+          .describe("The COMPLETE replacement record — round-tripped from ei_lookup output, not a partial patch."),
+      },
+    },
+    async ({ entity_type, id, data }) => {
+      try {
+        const record = entity_type === "persona" ? await updatePersonaEntity(id, data) : await updateEntity(entity_type, id, data);
+        return { content: [{ type: "text" as const, text: JSON.stringify(record, null, 2) }] };
+      } catch (e) {
+        const message = e instanceof CorrectionValidationError ? e.message : (e as Error).message;
+        return { content: [{ type: "text" as const, text: `Error: ${message}` }], isError: true };
+      }
+    }
+  );
+
+  server.registerTool(
+    "ei_remove",
+    {
+      description:
+        "Permanently remove a fact, topic, person, or persona from the user's Ei knowledge base by ID. Use to delete bad extracted data that shouldn't be split or corrected, just dropped entirely, or to delete an AI persona that's no longer needed. Not available for quotes — verifiable-origin data can only be corrected, never deleted. Reserved built-in personas (\"ei\", \"emmet\") cannot be deleted this way — use ei_update to set `is_archived: true` instead.",
+      inputSchema: {
+        entity_type: z.enum(["fact", "topic", "person", "persona"]).describe("The type of entity to remove."),
+        id: z.string().describe("The ID of the entity to remove, from ei_lookup or ei_search."),
+      },
+    },
+    async ({ entity_type, id }) => {
+      try {
+        if (entity_type === "persona") {
+          await removePersonaEntity(id);
+        } else {
+          await removeEntity(entity_type, id);
+        }
+        return { content: [{ type: "text" as const, text: JSON.stringify({ removed: true, id }, null, 2) }] };
+      } catch (e) {
+        return { content: [{ type: "text" as const, text: `Error: ${(e as Error).message}` }], isError: true };
+      }
+    }
+  );
+
   return server;
 }