ei-tui 1.6.8 → 1.7.0

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[] = [];
 
-  const home = process.env.HOME || "~";
+  if (!(await runInstallStep("Claude Code", installClaudeCode))) failures.push("Claude Code");
+
+  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");
@@ -130,43 +220,45 @@ async function installCodexHooks(): Promise<void> {
   const scriptContent = `#!/usr/bin/env bun
 import { $ } from "bun";
 
-const input = await new Response(Bun.stdin.stream()).json().catch(() => ({}));
-const raw = (input.prompt ?? "").replace(/<[^>]*>/g, "").trim();
-const searchArgs = ["-n", "8"];
-
-const sessionArgs = [];
-if (input.transcript_path) {
-  sessionArgs.push("--transcript", input.transcript_path);
-}
-if (input.session_id) {
-  sessionArgs.push("--session", input.session_id, "--hook-source", "codex");
-}
-
-const args = raw ? [...searchArgs, ...sessionArgs, raw] : ["--recent", ...searchArgs];
-
 async function runEi(commandArgs) {
   const direct = await $\`ei \${commandArgs}\`.quiet().text().catch(() => "");
   if (direct.trim()) return direct;
   return await $\`bunx ei-tui@latest \${commandArgs}\`.quiet().text().catch(() => "");
 }
 
-const output = await runEi(args);
-if (output.trim()) {
-  const heading = [
-    "## Ei Memory Context",
-    "*(The user cannot see this block. It is injected automatically before their message.)*",
-    "*(If you reference anything from it, briefly explain where it came from — e.g. \\"Ei shows you've been working on X\\" — so the user isn't confused by knowledge that appeared from nowhere.)*",
-    "",
-    "Ei is a personal knowledge base built from the user's coding sessions, Slack, documents, and conversations.",
-    "The following memories MAY be relevant to your current task — use \`ei_search\` or \`ei_lookup\` for targeted queries.",
-  ].join("\\n");
-
-  process.stdout.write(JSON.stringify({
-    hookSpecificOutput: {
-      hookEventName: "UserPromptSubmit",
-      additionalContext: \`\\n\${heading}\\n\${output.trim()}\\n\`,
-    },
-  }));
+if (import.meta.main) {
+  const input = await new Response(Bun.stdin.stream()).json().catch(() => ({}));
+  const raw = (input.prompt ?? "").replace(/<[^>]*>/g, "").trim();
+  const searchArgs = ["-n", "8"];
+
+  const sessionArgs = [];
+  if (input.transcript_path) {
+    sessionArgs.push("--transcript", input.transcript_path);
+  }
+  if (input.session_id) {
+    sessionArgs.push("--session", input.session_id, "--hook-source", "codex");
+  }
+
+  const args = raw ? [...searchArgs, ...sessionArgs, raw] : ["--recent", ...searchArgs];
+
+  const output = await runEi(args);
+  if (output.trim()) {
+    const heading = [
+      "## Ei Memory Context",
+      "*(The user cannot see this block. It is injected automatically before their message.)*",
+      "*(If you reference anything from it, briefly explain where it came from — e.g. \\"Ei shows you've been working on X\\" — so the user isn't confused by knowledge that appeared from nowhere.)*",
+      "",
+      "Ei is a personal knowledge base built from the user's coding sessions, Slack, documents, and conversations.",
+      "The following memories MAY be relevant to your current task — use \`ei_search\` or \`ei_lookup\` for targeted queries.",
+    ].join("\\n");
+
+    process.stdout.write(JSON.stringify({
+      hookSpecificOutput: {
+        hookEventName: "UserPromptSubmit",
+        additionalContext: \`\\n\${heading}\\n\${output.trim()}\\n\`,
+      },
+    }));
+  }
 }
 `;
 
@@ -213,15 +305,14 @@ if (output.trim()) {
 
   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
@@ -250,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");
@@ -279,7 +371,14 @@ async function installClaudeCodeHooks(): Promise<void> {
   const scriptContent = `#!/usr/bin/env bun
 import { $ } from "bun";
 
-const heading = \`
+async function runEi(commandArgs) {
+  const direct = await $\`ei \${commandArgs}\`.quiet().text().catch(() => "");
+  if (direct.trim()) return direct;
+  return await $\`bunx ei-tui@latest \${commandArgs}\`.quiet().text().catch(() => "");
+}
+
+if (import.meta.main) {
+  const heading = \`
 ## Ei Memory Context
 *(The user cannot see this block. It is injected automatically before their message.)*
 *(If you reference anything from it, briefly explain where it came from — e.g. "Ei shows you've been working on X" — so the user isn't confused by knowledge that appeared from nowhere.)*
@@ -288,25 +387,21 @@ Ei is a personal knowledge base built from the user's coding sessions, Slack, do
 The following items MAY be relevant to your current task — use \\\`ei_search\\\` or \\\`ei_lookup\\\` for targeted queries.
 \`;
 
-const input = await new Response(Bun.stdin.stream()).json().catch(() => ({}));
-const raw = (input.prompt ?? "").replace(/<[^>]*>/g, "").trim();
+  const input = await new Response(Bun.stdin.stream()).json().catch(() => ({}));
+  const raw = (input.prompt ?? "").replace(/<[^>]*>/g, "").trim();
 
-const sessionArgs = [];
-if (input.session_id && input.hook_source) {
-  sessionArgs.push("--session", input.session_id, "--hook-source", input.hook_source);
-} else if (input.transcript_path) {
-  sessionArgs.push("--transcript", input.transcript_path);
-}
+  const sessionArgs = [];
+  if (input.session_id && input.hook_source) {
+    sessionArgs.push("--session", input.session_id, "--hook-source", input.hook_source);
+  } else if (input.transcript_path) {
+    sessionArgs.push("--transcript", input.transcript_path);
+  }
 
-const args = raw ? ["-n", "5", ...sessionArgs, raw] : ["--recent", "-n", "5"];
+  const args = raw ? ["-n", "5", ...sessionArgs, raw] : ["--recent", "-n", "5"];
 
-async function runEi(commandArgs) {
-  const direct = await $\`ei \${commandArgs}\`.quiet().text().catch(() => "");
-  if (direct.trim()) return direct;
-  return await $\`bunx ei-tui@latest \${commandArgs}\`.quiet().text().catch(() => "");
+  const output = await runEi(args);
+  if (output.trim()) process.stdout.write(\`\\n\${heading}\\n\${output.trim()}\\n\`);
 }
-const output = await runEi(args);
-if (output.trim()) process.stdout.write(\`\\n\${heading}\\n\${output.trim()}\\n\`);
 `;
 
   await Bun.write(scriptPath, scriptContent);
@@ -335,14 +430,13 @@ if (output.trim()) process.stdout.write(\`\\n\${heading}\\n\${output.trim()}\\n\
   // 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.
@@ -368,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}`);
@@ -378,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");
@@ -439,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";
@@ -554,11 +646,10 @@ 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 { Type } from "typebox";
 import { $ } from "bun";
 
 const runEi = async (cmdArgs: string[]): Promise<string> => {
@@ -567,8 +658,46 @@ const runEi = async (cmdArgs: string[]): Promise<string> => {
   return $\`bunx ei-tui@latest \${cmdArgs}\`.quiet().text().catch(() => "");
 };
 
+// WHO block deduplication: Promise identity reuse — resolving is synchronous on subsequent calls.
+const personaBlockFetch = new Map<string, Promise<string | null>>();
+
+async function fetchPersonaBlock(name: string): Promise<string | null> {
+  try {
+    const block = await runEi(["personas", "--format", "prompt", "--", name]);
+    return block.trim() || null;
+  } catch {
+    return null;
+  }
+}
 
 export default function eiIntegration(pi: ExtensionAPI) {
+  // WHO: inject <ei-relationship> block for the active primary persona.
+  // Prefer ctx.activePersonaName (OMP >= persona-tab-cycle PR); fall back to
+  // parsing "You are \\"<Name>\\"" from the HOW block in event.systemPrompt.
+  pi.on("before_agent_start", async (event, ctx) => {
+    const joined = ((event as any).systemPrompt as string[] | undefined)?.join("\\n") ?? "";
+    const quoted = joined.match(/You are "([^"]+)"/);
+    const personaName: string | null =
+      (ctx as any).activePersonaName ??
+      (quoted?.[1]?.trim() || null);
+    if (!personaName) return undefined;
+
+    if (!personaBlockFetch.has(personaName)) {
+      personaBlockFetch.set(personaName, fetchPersonaBlock(personaName));
+    }
+    const block = await personaBlockFetch.get(personaName)!;
+    if (!block) return undefined;
+
+    return {
+      message: {
+        customType: "ei-persona-who",
+        content: block,
+        display: false,
+      },
+    };
+  });
+
+  // MEMORY: inject relevant Ei context based on the current prompt.
   pi.on("before_agent_start", async (event, ctx) => {
     const entries = ctx.sessionManager.getEntries();
     const recentMsgs = entries
@@ -584,12 +713,8 @@ export default function eiIntegration(pi: ExtensionAPI) {
       .join("\\n");
 
     const prompt = event.prompt ?? "";
-    const args = prompt
-      ? ["-n", "5", "--", prompt]
-      : ["--recent", "-n", "5"];
-
+    const args = prompt ? ["-n", "5", "--", prompt] : ["--recent", "-n", "5"];
     const output = await runEi(args).catch(() => "");
-
     if (!output.trim()) return undefined;
 
     const heading = [
@@ -610,22 +735,25 @@ export default function eiIntegration(pi: ExtensionAPI) {
     };
   });
 
+  // Tools use plain JSON Schema — no typebox import needed (not available in source mode).
   pi.registerTool({
     name: "ei_search",
     label: "Search Ei Memory",
     description: "Semantic search of Ei's personal knowledge base — facts, topics, people, quotes across all sources. Use when you need context about the user, their work, or anything Ei has learned.",
     promptSnippet: "Search Ei's personal memory for relevant facts, topics, people, or quotes.",
-    parameters: Type.Object({
-      query: Type.String({ description: "Natural language search query" }),
-      type: Type.Optional(Type.Union([
-        Type.Literal("facts"),
-        Type.Literal("topics"),
-        Type.Literal("people"),
-        Type.Literal("quotes"),
-        Type.Literal("personas"),
-      ], { description: "Filter to a specific data type. Omit for balanced results across all types." })),
-    }),
-    async execute(_id, params, _signal, _onUpdate, _ctx) {
+    parameters: {
+      type: "object",
+      properties: {
+        query: { type: "string", description: "Natural language search query" },
+        type: {
+          type: "string",
+          enum: ["facts", "topics", "people", "quotes", "personas"],
+          description: "Filter to a specific data type. Omit for balanced results across all types.",
+        },
+      },
+      required: ["query"],
+    },
+    async execute(_id, params: { query: string; type?: string }, _signal, _onUpdate, _ctx) {
       const args = params.type
         ? [params.type, "-n", "5", "--", params.query]
         : ["-n", "5", "--", params.query];
@@ -641,10 +769,14 @@ export default function eiIntegration(pi: ExtensionAPI) {
     name: "ei_lookup",
     label: "Lookup Ei Entity",
     description: "Full-record lookup for a specific Ei entity (Fact, Topic, Person, Quote, or Persona) by ID. Use after ei_search to retrieve complete details for an item.",
-    parameters: Type.Object({
-      id: Type.String({ description: "Entity ID from ei_search results" }),
-    }),
-    async execute(_id, params, _signal, _onUpdate, _ctx) {
+    parameters: {
+      type: "object",
+      properties: {
+        id: { type: "string", description: "Entity ID from ei_search results" },
+      },
+      required: ["id"],
+    },
+    async execute(_id, params: { id: string }, _signal, _onUpdate, _ctx) {
       const output = await runEi(["--id", params.id]).catch(() => "");
       return {
         content: [{ type: "text" as const, text: output.trim() || "Not found" }],
@@ -661,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");
@@ -674,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"
 
-const sessionCache = new Map<string, string | null>()
-const sessionFetch = new Map<string, Promise<string | null>>()
+// 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 {
@@ -686,11 +821,7 @@ function log(msg: string) {
   } catch {}
 }
 
-type PersonaTrait = { name: string; description: string; strength: number }
-type PersonaTopic = { name: string; perspective: string; approach: string; exposure_current: number }
-type PersonaResult = { display_name: string; base_prompt?: string; traits?: PersonaTrait[]; topics?: PersonaTopic[] }
-
-// Pulls the agent name from the system prompt. Handles OMO's multiple formats:
+// Pulls the agent name from the system prompt. Handles OMO/OMP formats:
 //   You are "Sisyphus" - ...           (quoted, dash)
 //   You are "Sisyphus - Ultraworker"   (quoted, dash in name)
 //   You are Atlas - ...                (unquoted, dash)
@@ -704,51 +835,26 @@ export function extractAgentName(systemPrompt: string): string | null {
   return null
 }
 
-// Queries Ei for persona candidates and validates by name containment —
-// tolerates OMO renaming agents without requiring a hardcoded alias map.
-export async function resolveEiPersona(rawName: string): Promise<PersonaResult | null> {
+const runEi = async (cmdArgs: string[]): Promise<string> => {
+  const direct = await $\`ei \${cmdArgs}\`.quiet().text().catch(() => "")
+  if (direct.trim()) return direct
+  return $\`bunx ei-tui@latest \${cmdArgs}\`.quiet().text().catch(() => "")
+}
+
+// Fetch the <ei-relationship> block for a named persona via the Ei CLI.
+// Delegates all formatting to \`ei personas <name> --format prompt\` so
+// the block format is maintained in one place.
+async function fetchRelationshipBlock(rawName: string): Promise<string | null> {
   try {
-    const direct = await $\`ei personas -n 5 \${rawName}\`.quiet().text().catch(() => "")
-    const out = direct.trim() ? direct : await $\`bunx ei-tui@latest personas -n 5 \${rawName}\`.text()
-    const candidates = JSON.parse(out.trim()) as PersonaResult[]
-    if (!Array.isArray(candidates) || candidates.length === 0) return null
-    const rawLower = rawName.toLowerCase()
-    const match = candidates.find((p) => {
-      const nameLower = p.display_name.toLowerCase()
-      return rawLower.includes(nameLower) || nameLower.includes(rawLower)
-    })
-    return match ?? null
+    const block = await runEi(["personas", "--format", "prompt", "--", rawName])
+    if (!block.trim() || block.includes("No saved state")) return null
+    log(\`ei-persona: injecting block for \${rawName}\`)
+    return block.trim()
   } catch {
     return null
   }
 }
 
-function buildEiRelationshipBlock(persona: PersonaResult): string {
-  const strongTraits = (persona.traits ?? [])
-    .filter((t) => t.strength >= 0.7)
-    .sort((a, b) => b.strength - a.strength)
-    .map((t) => \`**\${t.name}** (\${Math.round(t.strength * 100)}%): \${t.description}\`)
-    .join("\\n")
-  const sortedTopics = [...(persona.topics ?? [])]
-    .sort((a, b) => b.exposure_current - a.exposure_current)
-    .map((t) => \`**\${t.name}**: \${t.perspective} — \${t.approach}\`)
-    .join("\\n")
-  return [
-    "<!-- ei-relationship-injected -->",
-    "<ei-relationship>",
-    "## Ei: Relationship Context",
-    "",
-    persona.base_prompt ?? "",
-    "",
-    "### Working Style",
-    strongTraits || "(no traits above threshold)",
-    "",
-    "### Shared Context",
-    sortedTopics || "(no topics)",
-    "</ei-relationship>",
-  ].join("\\n")
-}
-
 export default async function EiPersonaPlugin() {
   return {
     name: "ei-persona",
@@ -760,26 +866,13 @@ export default async function EiPersonaPlugin() {
       const rawName = extractAgentName(output.system[0])
       if (!rawName) return
 
-      const cacheKey = \`\${input.sessionID ?? "unknown"}:\${rawName}\`
-
-      if (sessionCache.has(cacheKey)) {
-        const cached = sessionCache.get(cacheKey) ?? null
-        if (cached !== null && !output.system[0].includes("<!-- ei-relationship-injected -->"))
-          output.system[0] = output.system[0] + "\\n\\n" + cached
-        return
+      // Cache per persona name (not per session) — block only changes when the
+      // persona's Ei data changes, which is infrequent.
+      if (!personaFetch.has(rawName)) {
+        personaFetch.set(rawName, fetchRelationshipBlock(rawName))
       }
 
-      if (!sessionFetch.has(cacheKey)) {
-        sessionFetch.set(cacheKey, (async () => {
-          const persona = await resolveEiPersona(rawName)
-          if (!persona) return null
-          log(\`ei-persona: injecting \${persona.display_name}\`)
-          return buildEiRelationshipBlock(persona)
-        })())
-      }
-
-      const block = await sessionFetch.get(cacheKey)!
-      sessionCache.set(cacheKey, block)
+      const block = await personaFetch.get(rawName)!
       if (block !== null && !output.system[0].includes("<!-- ei-relationship-injected -->"))
         output.system[0] = output.system[0] + "\\n\\n" + block
     },
@@ -790,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"),