ei-tui 1.6.2 → 1.6.3

package/package.json

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

package/src/cli/README.md

@@ -36,6 +36,7 @@ ei --id "opencode:jeremys-macbook-pro:ses_38a7...:msg_c75b..."
 ei --id "claudecode:my-machine:session-uuid:message-uuid"
 ei --id "cursor:my-machine:composer-uuid:bubble-uuid"
 ei --id "codex:my-machine:thread-uuid:evt_42"
+ei --id "pi:my-machine:session-uuid:session-uuid/entry-id"
 ```
 
 Quotes surfaced by `ei_search` include a `message_id` field in this format — pipe it to `ei --id` to read the original conversation.
@@ -56,6 +57,7 @@ This registers Ei with Claude Code, Cursor, Codex, and OpenCode — MCP server c
 | **Cursor** | `~/.cursor/mcp.json` | `~/.cursor/hooks.json` (`beforeSubmitPrompt`) + `~/.cursor/hooks/ei-inject.sh` | — |
 | **Codex** | `~/.codex/config.toml` via `codex mcp add ei` | `~/.codex/hooks.json` (`UserPromptSubmit`) + `~/.codex/hooks/ei-inject.ts` | Local Codex agent plugin if installed separately |
 | **OpenCode** | manual (see below) | Via Oh My OpenCode compatibility layer (reads `~/.claude/settings.json`) | `~/.config/opencode/plugins/ei-persona.ts` |
+| **Pi / OMP** | — (tools registered as native Pi extension) | `~/.pi/agent/extensions/ei-integration.ts` (Pi) or `~/.omp/agent/extensions/ei-integration.ts` (OMP) | — |
 
 **Context hook**: fires before every message, searches Ei for relevant memory, and injects it silently. No tool call required.
 

package/src/cli/retrieval.ts

@@ -521,6 +521,28 @@ export async function resolveExternalMessage(
       }
     }
 
+    case "pi": {
+      if (parsed.machine !== getMachineId()) {
+        return { error: `Message is from machine '${parsed.machine}', not available on this machine (${getMachineId()})` };
+      }
+      try {
+        const { PiReader } = await import("../integrations/pi/reader.js");
+        const reader = new PiReader();
+        const win = await reader.getMessageById(parsed.session!, parsed.nativeId, before, after);
+        if (!win) return null;
+        return {
+          type: "opencode_message",
+          message: { id: win.message.id, role: win.message.role, content: win.message.content, timestamp: win.message.timestamp },
+          before: win.before.map(m => ({ id: m.id, role: m.role, content: m.content, timestamp: m.timestamp })),
+          after: win.after.map(m => ({ id: m.id, role: m.role, content: m.content, timestamp: m.timestamp })),
+          session: { id: win.session.id, title: win.session.title, directory: win.session.cwd },
+          source: "pi",
+        };
+      } catch {
+        return null;
+      }
+    }
+
     case "unknown":
     default: {
       // Backward compat: bare msg_xxx → treat as opencode (no machine qualifier)

package/src/cli.ts

@@ -121,6 +121,17 @@ async function installMcpClients(): Promise<void> {
   } else {
     console.log(`ℹ️  OpenCode not detected — skipping OpenCode plugin install.`);
   }
+
+  const hasPi = await Bun.file(join(home, ".pi", "agent", "settings.json")).exists() ||
+    await Bun.file(join(home, ".pi", "agent", "auth.json")).exists();
+  const hasOmp = await Bun.file(join(home, ".omp", "agent", "settings.json")).exists() ||
+    await Bun.file(join(home, ".omp", "agent", "auth.json")).exists();
+
+  if (hasPi || hasOmp) {
+    await installPi();
+  } else {
+    console.log(`ℹ️  Pi/OMP not detected — skipping Pi extension install.`);
+  }
 }
 
 async function commandExists(command: string): Promise<boolean> {
@@ -351,12 +362,11 @@ const heading = \`
 *(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 topics MAY be relevant to your current task — use \\\`ei_search\\\` or \\\`ei_lookup\\\` for targeted queries.
+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 typeArgs = ["topics", "-n", "5"];
 
 const sessionArgs = [];
 if (input.session_id && input.hook_source) {
@@ -365,7 +375,7 @@ if (input.session_id && input.hook_source) {
   sessionArgs.push("--transcript", input.transcript_path);
 }
 
-const args = raw ? [...typeArgs, ...sessionArgs, raw] : ["--recent", ...typeArgs];
+const args = raw ? ["-n", "5", ...sessionArgs, raw] : ["--recent", "-n", "5"];
 
 const output = await $\`bunx ei-tui@latest \${args}\`.quiet().text().catch(() => "");
 if (output.trim()) process.stdout.write(\`\\n\${heading}\\n\${output.trim()}\\n\`);
@@ -507,6 +517,135 @@ exit 0
   console.log(`✓ Installed Ei context hook to ~/.cursor/hooks/ei-inject.sh`);
 }
 
+async function installPi(): Promise<void> {
+  const home = process.env.HOME || "~";
+  const dataPath = process.env.EI_DATA_PATH ?? join(home, ".local", "share", "ei");
+
+  const extensionContent = `import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
+import { $ } from "bun";
+
+export default function eiIntegration(pi: ExtensionAPI) {
+  pi.on("before_agent_start", async (event, ctx) => {
+    const entries = ctx.sessionManager.getEntries();
+    const recentMsgs = entries
+      .filter((e: any) => e.type === "message" && (e.message?.role === "user" || e.message?.role === "assistant"))
+      .slice(-5)
+      .map((e: any) => {
+        const role = e.message?.role ?? "unknown";
+        const text = Array.isArray(e.message?.content)
+          ? e.message.content.filter((b: any) => b.type === "text").map((b: any) => b.text).join(" ")
+          : (e.message?.content ?? "");
+        return \`\${role}: \${text.slice(0, 200)}\`;
+      })
+      .join("\\n");
+
+    const prompt = event.prompt ?? "";
+    const args = prompt
+      ? ["-n", "5", "--", prompt]
+      : ["--recent", "-n", "5"];
+
+    const output = await $\`bunx ei-tui@latest \${args}\`
+      .env({ ...process.env, EI_DATA_PATH: "${dataPath}" })
+      .quiet()
+      .text()
+      .catch(() => "");
+
+    if (!output.trim()) return undefined;
+
+    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.)*",
+      "",
+      "Ei is a personal knowledge base built from your coding sessions, Slack, documents, and conversations.",
+      "The following items MAY be relevant to your current task — use ei_search or ei_lookup for targeted queries.",
+    ].join("\\n");
+
+    return {
+      message: {
+        customType: "ei-context",
+        content: \`\${heading}\\n\\n\${output.trim()}\`,
+        display: false,
+      },
+    };
+  });
+
+  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) {
+      const args = params.type
+        ? [params.type, "-n", "5", "--", params.query]
+        : ["-n", "5", "--", params.query];
+      const output = await $\`bunx ei-tui@latest \${args}\`
+        .env({ ...process.env, EI_DATA_PATH: "${dataPath}" })
+        .quiet()
+        .text()
+        .catch(() => "No results found");
+      return {
+        content: [{ type: "text" as const, text: output.trim() || "No results found" }],
+        details: {},
+      };
+    },
+  });
+
+  pi.registerTool({
+    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) {
+      const output = await $\`bunx ei-tui@latest --id \${params.id}\`
+        .env({ ...process.env, EI_DATA_PATH: "${dataPath}" })
+        .quiet()
+        .text()
+        .catch(() => "Not found");
+      return {
+        content: [{ type: "text" as const, text: output.trim() || "Not found" }],
+        details: {},
+      };
+    },
+  });
+}
+`;
+
+  const piExtDir = join(home, ".pi", "agent", "extensions");
+  const ompExtDir = join(home, ".omp", "agent", "extensions");
+  const extFilename = "ei-integration.ts";
+
+  const hasPiAgent = await Bun.file(join(home, ".pi", "agent", "auth.json")).exists() ||
+    await Bun.file(join(home, ".pi", "agent", "settings.json")).exists();
+  const hasOmpAgent = await Bun.file(join(home, ".omp", "agent", "auth.json")).exists() ||
+    await Bun.file(join(home, ".omp", "agent", "settings.json")).exists();
+
+  if (hasPiAgent) {
+    await Bun.$`mkdir -p ${piExtDir}`;
+    await Bun.write(join(piExtDir, extFilename), extensionContent);
+    console.log(`✓ Installed Ei extension to ~/.pi/agent/extensions/${extFilename}`);
+  }
+
+  if (hasOmpAgent) {
+    await Bun.$`mkdir -p ${ompExtDir}`;
+    await Bun.write(join(ompExtDir, extFilename), extensionContent);
+    console.log(`✓ Installed Ei extension to ~/.omp/agent/extensions/${extFilename}`);
+  }
+}
+
 async function installOpenCodePlugin(): Promise<void> {
   const home = process.env.HOME || "~";
   const opencodeDir = join(home, ".config", "opencode");

package/src/core/processor.ts

@@ -149,6 +149,7 @@ const DEFAULT_OPENCODE_POLLING_MS = 60000;
 const DEFAULT_CLAUDE_CODE_POLLING_MS = 60000;
 const DEFAULT_CURSOR_POLLING_MS = 60000;
 const DEFAULT_CODEX_POLLING_MS = 60000;
+const DEFAULT_PI_POLLING_MS = 60000;
 
 let processorInstanceCount = 0;
 
@@ -173,6 +174,8 @@ export class Processor {
   private cursorImportInProgress = false;
   private lastCodexSync = 0;
   private codexImportInProgress = false;
+  private lastPiSync = 0;
+  private piImportInProgress = false;
   private lastSlackSync = 0;
   private slackImportInProgress = false;
   private pendingConflict: StateConflictData | null = null;
@@ -1296,6 +1299,10 @@ export class Processor {
       console.log(`[Processor ${this.instanceId}] Clearing codexImportInProgress flag`);
       this.codexImportInProgress = false;
     }
+    if (this.piImportInProgress) {
+      console.log(`[Processor ${this.instanceId}] Clearing piImportInProgress flag`);
+      this.piImportInProgress = false;
+    }
     if (this.slackImportInProgress) {
       console.log(`[Processor ${this.instanceId}] Clearing slackImportInProgress flag`);
       this.slackImportInProgress = false;
@@ -1549,6 +1556,14 @@ const toolNextSteps = new Set([
       await this.checkAndSyncCodex(human, now);
     }
 
+    if (
+      this.isTUI &&
+      human.settings?.pi?.integration &&
+      this.stateManager.queue_length() === 0
+    ) {
+      await this.checkAndSyncPi(human, now);
+    }
+
     if (
       this.isTUI &&
       human.settings?.personaHistory?.integration &&
@@ -1860,6 +1875,60 @@ const toolNextSteps = new Set([
       });
   }
 
+  private async checkAndSyncPi(human: HumanEntity, now: number): Promise<void> {
+    if (this.piImportInProgress) {
+      return;
+    }
+
+    const pi = human.settings?.pi;
+    const pollingInterval = pi?.polling_interval_ms ?? DEFAULT_PI_POLLING_MS;
+    const lastSync = pi?.last_sync ? new Date(pi.last_sync).getTime() : 0;
+    const timeSinceSync = now - lastSync;
+
+    if (timeSinceSync < pollingInterval && this.lastPiSync > 0) {
+      return;
+    }
+
+    this.lastPiSync = now;
+    const syncTimestamp = new Date().toISOString();
+    const currentHuman = this.stateManager.getHuman();
+    this.stateManager.setHuman({
+      ...currentHuman,
+      settings: {
+        ...currentHuman.settings,
+        pi: {
+          ...pi,
+          last_sync: syncTimestamp,
+        },
+      },
+    });
+
+    this.piImportInProgress = true;
+    import("../integrations/pi/importer.js")
+      .then(({ importPiSessions }) =>
+        importPiSessions({
+          stateManager: this.stateManager,
+          interface: this.interface,
+          signal: this.importAbortController.signal,
+        })
+      )
+      .then((result) => {
+        if (result.sessionsProcessed > 0) {
+          console.log(
+            `[Processor] Pi sync complete: ${result.sessionsProcessed} sessions, ` +
+              `${result.messagesImported} messages imported, ` +
+              `${result.extractionScansQueued} extraction scans queued`
+          );
+        }
+      })
+      .catch((err) => {
+        console.warn(`[Processor] Pi sync failed:`, err);
+      })
+      .finally(() => {
+        this.piImportInProgress = false;
+      });
+  }
+
   private async checkAndSyncSlack(human: HumanEntity, now: number): Promise<void> {
     if (this.slackImportInProgress) return;
 

package/src/core/types/entities.ts

@@ -131,6 +131,7 @@ export interface HumanSettings {
   claudeCode?: import("../../integrations/claude-code/types.js").ClaudeCodeSettings;
   cursor?: import("../../integrations/cursor/types.js").CursorSettings;
   codex?: import("../../integrations/codex/types.js").CodexSettings;
+  pi?: import("../../integrations/pi/types.js").PiSettings;
   document?: DocumentSettings;
   active_theme?: string;
   custom_themes?: ThemeDefinition[];

package/src/core/utils/message-id.ts

@@ -15,6 +15,7 @@ export type MessageIdIntegration =
   | "claudecode"
   | "cursor"
   | "codex"
+  | "pi"
   | "import"
   | "slack"
   | "unknown"
@@ -79,6 +80,16 @@ export function parseMessageId(id: string): ParsedMessageId {
     }
   }
 
+  if (parts[0] === "pi" && parts.length >= 4) {
+    return {
+      integration: "pi",
+      machine: parts[1],
+      session: parts[2],
+      nativeId: parts.slice(3).join(":"),
+      raw: id,
+    }
+  }
+
   if (parts[0] === "import" && parts[1] === "document" && parts.length >= 4) {
     return {
       integration: "import",
@@ -125,6 +136,10 @@ export function qualifyCodexMessage(machine: string, sessionId: string, nativeId
   return `codex:${machine}:${sessionId}:${nativeId}`
 }
 
+export function qualifyPiMessage(machine: string, sessionId: string, nativeId: string): string {
+  return `pi:${machine}:${sessionId}:${nativeId}`
+}
+
 export function qualifyDocumentMessage(slug: string, uuid: string): string {
   return `import:document:${slug}:${uuid}`
 }

package/src/integrations/claude-code/importer.ts

@@ -1,11 +1,9 @@
 import type { StateManager } from "../../core/state-manager.js";
-import type { Ei_Interface, Message, ContextStatus, PersonaEntity, PersonaTrait } from "../../core/types.js";
+import type { Ei_Interface, Message, PersonaEntity, PersonaTrait } from "../../core/types.js";
 import { DEFAULT_SEED_TRAITS } from "../../core/constants/seed-traits.js";
-import type { IClaudeCodeReader, ClaudeCodeSession, ClaudeCodeMessage } from "./types.js";
-import {
-  CLAUDE_CODE_PERSONA_NAME,
-  MIN_SESSION_AGE_MS,
-} from "./types.js";
+import type { IClaudeCodeReader, ClaudeCodeSession } from "./types.js";
+import { CLAUDE_CODE_PERSONA_NAME } from "./types.js";
+import { MIN_SESSION_AGE_MS } from "../constants.js";
 import { ClaudeCodeReader } from "./reader.js";
 import {
   queueAllScans,
@@ -16,8 +14,10 @@ import {
   queueTopicRewritePhase,
 } from "../../core/orchestrators/ceremony.js";
 import { isProcessRunning } from "../process-check.js";
-import { getMachineId } from "../machine-id.js";
 import { qualifyClaudeCodeMessage } from "../../core/utils/message-id.js";
+import { getMachineId } from "../machine-id.js";
+import { convertToEiMessage, convertToPreMarkedEiMessage } from "../shared/message-converter.js";
+import { TWELVE_HOURS_MS } from "../constants.js";
 
 // =============================================================================
 // Export Types
@@ -41,30 +41,9 @@ export interface ClaudeCodeImporterOptions {
 // Utility Functions
 // =============================================================================
 
-const TWELVE_HOURS_MS = 43_200_000;
 const CLAUDE_CODE_GROUP = "Claude Code";
 
-function convertToEiMessage(msg: ClaudeCodeMessage, sessionId: string): Message {
-  return {
-    id: qualifyClaudeCodeMessage(getMachineId(), sessionId, msg.id),
-    role: msg.role === "user" ? "human" : "system",
-    content: msg.content,
-    timestamp: msg.timestamp,
-    read: true,
-    context_status: "default" as ContextStatus,
-    external: true,
-  };
-}
-
-function convertToPreMarkedEiMessage(msg: ClaudeCodeMessage, sessionId: string): Message {
-  return {
-    ...convertToEiMessage(msg, sessionId),
-    f: true,
-    t: true,
-    p: true,
-    e: true,
-  };
-}
+const qualify = qualifyClaudeCodeMessage;
 
 /**
  * Ensure the single "Claude Code" persona exists.
@@ -249,7 +228,7 @@ export async function importClaudeCodeSessions(
   for (const msg of messages) {
     const msgMs = new Date(msg.timestamp).getTime();
     const isOld = cutoffMs !== null && msgMs < cutoffMs;
-    const eiMsg = isOld ? convertToPreMarkedEiMessage(msg, targetSession.id) : convertToEiMessage(msg, targetSession.id);
+    const eiMsg = isOld ? convertToPreMarkedEiMessage(msg, targetSession.id, qualify) : convertToEiMessage(msg, targetSession.id, qualify);
     stateManager.messages_append(persona.id, eiMsg);
     result.messagesImported++;
     if (!isOld) toAnalyze.push(eiMsg);

package/src/integrations/claude-code/types.ts

@@ -139,7 +139,7 @@ export const CLAUDE_CODE_TOPIC_GROUPS = ["General", "Coding", "Claude Code"];
  * Minimum session age before we import it.
  * Mirrors OpenCode's 20-minute rule — gives the session time to "settle."
  */
-export const MIN_SESSION_AGE_MS = 20 * 60 * 1000;
+export { MIN_SESSION_AGE_MS } from "../constants.js";
 
 // ============================================================================
 // Human Settings Shape (mirrors OpenCodeSettings in core/types.ts)

package/src/integrations/codex/importer.ts

@@ -1,5 +1,5 @@
 import type { StateManager } from "../../core/state-manager.js";
-import type { ContextStatus, Ei_Interface, Message, PersonaEntity, PersonaTrait } from "../../core/types.js";
+import type { Ei_Interface, Message, PersonaEntity, PersonaTrait } from "../../core/types.js";
 import { DEFAULT_SEED_TRAITS } from "../../core/constants/seed-traits.js";
 import {
   queueAllScans,
@@ -10,16 +10,16 @@ import {
   queueTopicRewritePhase,
 } from "../../core/orchestrators/ceremony.js";
 import { qualifyCodexMessage } from "../../core/utils/message-id.js";
+import { convertToEiMessage, convertToPreMarkedEiMessage } from "../shared/message-converter.js";
 import { getMachineId } from "../machine-id.js";
 import { isProcessRunning } from "../process-check.js";
 import { CodexReader } from "./reader.js";
 import {
   CODEX_PERSONA_NAME,
-  MIN_SESSION_AGE_MS,
-  type CodexMessage,
   type CodexSession,
   type ICodexReader,
 } from "./types.js";
+import { MIN_SESSION_AGE_MS, TWELVE_HOURS_MS } from "../constants.js";
 
 export interface CodexImportResult {
   sessionsProcessed: number;
@@ -35,30 +35,9 @@ export interface CodexImporterOptions {
   signal?: AbortSignal;
 }
 
-const TWELVE_HOURS_MS = 43_200_000;
 const CODEX_GROUP = "Codex";
 
-function convertToEiMessage(msg: CodexMessage, sessionId: string): Message {
-  return {
-    id: qualifyCodexMessage(getMachineId(), sessionId, msg.id),
-    role: msg.role === "user" ? "human" : "system",
-    content: msg.content,
-    timestamp: msg.timestamp,
-    read: true,
-    context_status: "default" as ContextStatus,
-    external: true,
-  };
-}
-
-function convertToPreMarkedEiMessage(msg: CodexMessage, sessionId: string): Message {
-  return {
-    ...convertToEiMessage(msg, sessionId),
-    f: true,
-    t: true,
-    p: true,
-    e: true,
-  };
-}
+const qualify = qualifyCodexMessage;
 
 function ensureCodexPersona(
   stateManager: StateManager,
@@ -212,8 +191,8 @@ export async function importCodexSessions(
     const msgMs = new Date(msg.timestamp).getTime();
     const isOld = cutoffMs !== null && msgMs < cutoffMs;
     const eiMsg = isOld
-      ? convertToPreMarkedEiMessage(msg, targetSession.id)
-      : convertToEiMessage(msg, targetSession.id);
+      ? convertToPreMarkedEiMessage(msg, targetSession.id, qualify)
+      : convertToEiMessage(msg, targetSession.id, qualify);
 
     stateManager.messages_append(persona.id, eiMsg);
     result.messagesImported++;

package/src/integrations/codex/types.ts

@@ -94,7 +94,7 @@ export const CODEX_TOPIC_GROUPS = ["General", "Coding", "Codex"];
  * Minimum session age before import.
  * Mirrors Claude Code / Cursor's 20-minute rule so active sessions can settle.
  */
-export const MIN_SESSION_AGE_MS = 20 * 60 * 1000;
+export { MIN_SESSION_AGE_MS } from "../constants.js";
 
 // ============================================================================
 // Human Settings Shape

package/src/integrations/constants.ts

@@ -0,0 +1,3 @@
+export const MIN_SESSION_AGE_MS = 20 * 60 * 1_000;
+
+export const TWELVE_HOURS_MS = 43_200_000;

package/src/integrations/cursor/importer.ts

@@ -1,15 +1,14 @@
 import type { StateManager } from "../../core/state-manager.js";
-import type { Ei_Interface, Message, ContextStatus, PersonaEntity, PersonaTrait } from "../../core/types.js";
+import type { Ei_Interface, Message, PersonaEntity, PersonaTrait } from "../../core/types.js";
 import { DEFAULT_SEED_TRAITS } from "../../core/constants/seed-traits.js";
 import type { ICursorReader, CursorSession, CursorMessage } from "./types.js";
-import {
-  CURSOR_PERSONA_NAME,
-  MIN_SESSION_AGE_MS,
-} from "./types.js";
+import { CURSOR_PERSONA_NAME } from "./types.js";
+import { MIN_SESSION_AGE_MS, TWELVE_HOURS_MS } from "../constants.js";
 import { CursorReader } from "./reader.js";
 import { isProcessRunning } from "../process-check.js";
 import { getMachineId } from "../machine-id.js";
 import { qualifyCursorMessage } from "../../core/utils/message-id.js";
+import { convertToEiMessage, convertToPreMarkedEiMessage } from "../shared/message-converter.js";
 import {
   queueAllScans,
   type ExtractionContext,
@@ -33,29 +32,12 @@ export interface CursorImporterOptions {
   signal?: AbortSignal;
 }
 
-const TWELVE_HOURS_MS = 43_200_000;
 const CURSOR_GROUP = "Cursor";
 
-function convertToEiMessage(msg: CursorMessage, sessionId: string): Message {
-  return {
-    id: qualifyCursorMessage(getMachineId(), sessionId, msg.id),
-    role: msg.type === 1 ? "human" : "system",
-    content: msg.text,
-    timestamp: msg.timestamp,
-    read: true,
-    context_status: "default" as ContextStatus,
-    external: true,
-  };
-}
+const qualify = qualifyCursorMessage;
 
-function convertToPreMarkedEiMessage(msg: CursorMessage, sessionId: string): Message {
-  return {
-    ...convertToEiMessage(msg, sessionId),
-    f: true,
-    t: true,
-    p: true,
-    e: true,
-  };
+function normalizeCursorMessage(msg: CursorMessage) {
+  return { id: msg.id, role: (msg.type === 1 ? "user" : "assistant") as "user" | "assistant", content: msg.text, timestamp: msg.timestamp };
 }
 
 function ensureCursorPersona(
@@ -209,7 +191,8 @@ export async function importCursorSessions(
   for (const msg of messages) {
     const msgMs = new Date(msg.timestamp).getTime();
     const isOld = cutoffMs !== null && msgMs < cutoffMs;
-    const eiMsg = isOld ? convertToPreMarkedEiMessage(msg, targetSession.id) : convertToEiMessage(msg, targetSession.id);
+    const normalized = normalizeCursorMessage(msg);
+    const eiMsg = isOld ? convertToPreMarkedEiMessage(normalized, targetSession.id, qualify) : convertToEiMessage(normalized, targetSession.id, qualify);
     stateManager.messages_append(persona.id, eiMsg);
     result.messagesImported++;
     if (!isOld) toAnalyze.push(eiMsg);

package/src/integrations/cursor/types.ts

@@ -116,7 +116,7 @@ export const CURSOR_TOPIC_GROUPS = ["General", "Coding", "Cursor"];
  * Minimum session age before we import it.
  * Mirrors ClaudeCode's 20-minute rule — gives the session time to "settle."
  */
-export const MIN_SESSION_AGE_MS = 20 * 60 * 1000;
+export { MIN_SESSION_AGE_MS } from "../constants.js";
 
 // ============================================================================
 // Human Settings Shape