@cortexkit/opencode-magic-context 0.15.7 → 0.16.0

package/dist/cli.js

@@ -8260,8 +8260,24 @@ function matchesPackageName(entry, canonicalNames) {
   const nameOnly = lastAt > 0 ? entry.slice(0, lastAt) : entry;
   return canonicalNames.has(nameOnly);
 }
+function extractPluginName(entry) {
+  if (typeof entry === "string")
+    return entry;
+  if (Array.isArray(entry) && typeof entry[0] === "string")
+    return entry[0];
+  return null;
+}
 function collectPluginEntries(directory) {
   const plugins = [];
+  const pushFrom = (entries) => {
+    if (!entries)
+      return;
+    for (const entry of entries) {
+      const name = extractPluginName(entry);
+      if (name)
+        plugins.push(name);
+    }
+  };
   for (const configPath of [
     join2(directory, ".opencode", "opencode.jsonc"),
     join2(directory, ".opencode", "opencode.json"),
@@ -8269,17 +8285,13 @@ function collectPluginEntries(directory) {
     join2(directory, "opencode.json")
   ]) {
     const config = readJsoncFile(configPath);
-    if (config?.plugin) {
-      plugins.push(...config.plugin);
-    }
+    pushFrom(config?.plugin);
   }
   try {
     const paths = getOpenCodeConfigPaths({ binary: "opencode" });
     for (const configPath of [paths.configJsonc, paths.configJson]) {
       const config = readJsoncFile(configPath);
-      if (config?.plugin) {
-        plugins.push(...config.plugin);
-      }
+      pushFrom(config?.plugin);
     }
   } catch {}
   return plugins;
@@ -8495,6 +8507,12 @@ function fixConflicts(directory, conflicts) {
 // src/shared/data-path.ts
 import * as os from "node:os";
 import * as path from "node:path";
+function getDataDir() {
+  return process.env.XDG_DATA_HOME ?? path.join(os.homedir(), ".local", "share");
+}
+function getMagicContextStorageDir() {
+  return path.join(getDataDir(), "cortexkit", "magic-context");
+}
 function getCacheDir() {
   return process.env.XDG_CACHE_HOME ?? path.join(os.homedir(), ".cache");
 }
@@ -8561,6 +8579,17 @@ if (!isTestEnv) {
 // src/shared/tui-config.ts
 var PLUGIN_NAME = "@cortexkit/opencode-magic-context";
 var PLUGIN_ENTRY = `${PLUGIN_NAME}@latest`;
+function isMagicContextEntry(entry) {
+  if (!entry)
+    return false;
+  if (entry === PLUGIN_NAME)
+    return true;
+  if (entry.startsWith(`${PLUGIN_NAME}@`))
+    return true;
+  if (entry.includes("opencode-magic-context"))
+    return true;
+  return false;
+}
 function resolveTuiConfigPath() {
   const configDir = getOpenCodeConfigPaths({ binary: "opencode" }).configDir;
   const jsoncPath = join6(configDir, "tui.jsonc");
@@ -8580,12 +8609,12 @@ function ensureTuiPluginEntry() {
       config = import_comment_json.parse(raw) ?? {};
     }
     const plugins = Array.isArray(config.plugin) ? config.plugin.filter((p) => typeof p === "string") : [];
-    const existingIdx = plugins.findIndex((p) => p === PLUGIN_NAME || p.startsWith(`${PLUGIN_NAME}@`));
+    const existingIdx = plugins.findIndex(isMagicContextEntry);
     if (existingIdx >= 0) {
-      if (plugins[existingIdx] === PLUGIN_ENTRY) {
+      const existing = plugins[existingIdx];
+      if (existing === PLUGIN_ENTRY) {
         return false;
       }
-      const existing = plugins[existingIdx];
       if (existing === PLUGIN_NAME) {
         plugins[existingIdx] = PLUGIN_ENTRY;
       } else {
@@ -8835,7 +8864,7 @@ function getPluginCacheInfo() {
 }
 function getStorageDir() {
   const dataHome = process.env.XDG_DATA_HOME || join8(homedir5(), ".local", "share");
-  return join8(dataHome, "opencode", "storage", "plugin", "magic-context");
+  return join8(dataHome, "cortexkit", "magic-context");
 }
 function fileSize(path3) {
   try {
@@ -10509,7 +10538,7 @@ async function runIssueFlow() {
         "issue",
         "create",
         "-R",
-        "cortexkit/opencode-magic-context",
+        "cortexkit/magic-context",
         "--title",
         title,
         "--body-file",
@@ -10524,7 +10553,7 @@ async function runIssueFlow() {
     } else if (shouldSubmit && !isGhInstalled()) {
       R2.warn("gh CLI not found — falling back to browser");
     }
-    const url = `https://github.com/cortexkit/opencode-magic-context/issues/new?title=${encodeURIComponent(title)}&template=bug_report.yml`;
+    const url = `https://github.com/cortexkit/magic-context/issues/new?title=${encodeURIComponent(title)}&template=bug_report.yml`;
     R2.info(`Open this URL and paste the contents of ${bundled.path} into the Diagnostics field:`);
     R2.info(url);
     openBrowser(url);
@@ -10965,15 +10994,614 @@ async function runDoctor(options = {}) {
   return 0;
 }
 
+// src/cli/migrate.ts
+import { randomBytes } from "node:crypto";
+import { existsSync as existsSync8, mkdirSync as mkdirSync3, writeFileSync as writeFileSync5 } from "node:fs";
+import { homedir as homedir8 } from "node:os";
+import { join as join11 } from "node:path";
+
+// src/shared/sqlite.ts
+var isBun = typeof process !== "undefined" && typeof process.versions?.bun === "string";
+var bunSpec = "bun:" + "sqlite";
+var betterSpec = "better-" + "sqlite3";
+var sqliteModule = isBun ? await import(bunSpec) : await import(betterSpec);
+var DatabaseImpl = isBun ? sqliteModule.Database : sqliteModule.default;
+var Database = DatabaseImpl;
+
+// src/cli/migrate.ts
+var DEFAULT_PROVIDER = "openai-codex";
+var DEFAULT_MODEL = "gpt-5.5";
+var MIGRATION_COMPACTION_SUMMARY = "Magic Context compacted prior conversation. See <session-history> block for the structured summary.";
+function defaultOpenCodeDbPath() {
+  return join11(homedir8(), ".local", "share", "opencode", "opencode.db");
+}
+function defaultCortexkitDbPath() {
+  return join11(getMagicContextStorageDir(), "context.db");
+}
+function defaultPiSessionsRoot() {
+  return join11(homedir8(), ".pi", "agent", "sessions");
+}
+function defaultFs() {
+  return { existsSync: existsSync8, mkdirSync: mkdirSync3, writeFileSync: writeFileSync5 };
+}
+function stmt(db, sql) {
+  return db.prepare(sql);
+}
+function projectPathToPiDirSlug(projectPath) {
+  return `--${projectPath.replace(/^\/+|\/+$/g, "").replaceAll("/", "-")}--`;
+}
+function formatPiFilenameTimestamp(date) {
+  return date.toISOString().replaceAll(":", "-").replace(".", "-");
+}
+function generateUuidV7(date = new Date) {
+  const bytes = randomBytes(16);
+  let ms = BigInt(date.getTime());
+  for (let i = 5;i >= 0; i--) {
+    bytes[i] = Number(ms & 0xffn);
+    ms >>= 8n;
+  }
+  bytes[6] = bytes[6] & 15 | 112;
+  bytes[8] = bytes[8] & 63 | 128;
+  const hex = bytes.toString("hex");
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+}
+function shortId() {
+  return randomBytes(4).toString("hex");
+}
+function parseJsonObject(text2) {
+  const parsed = JSON.parse(text2);
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw new Error("Expected JSON object");
+  }
+  return parsed;
+}
+function isoFromMs(ms, fallback) {
+  return new Date(typeof ms === "number" && Number.isFinite(ms) ? ms : fallback.getTime()).toISOString();
+}
+function textFromUnknown(value) {
+  if (value === undefined || value === null)
+    return "";
+  if (typeof value === "string")
+    return value;
+  return JSON.stringify(value, null, 2);
+}
+function roleFromMessage(row) {
+  const data = parseJsonObject(row.data);
+  return data.role === "user" || data.role === "assistant" ? data.role : undefined;
+}
+function tokensFromMessage(row) {
+  try {
+    const data = parseJsonObject(row.data);
+    return data.tokens ?? {};
+  } catch {
+    return {};
+  }
+}
+function extractModel(rows) {
+  for (const row of rows) {
+    try {
+      const data = parseJsonObject(row.data);
+      const provider = data.providerID ?? data.model?.providerID;
+      const modelId = data.modelID ?? data.model?.modelID;
+      if (provider && modelId)
+        return { provider, modelId };
+    } catch {}
+  }
+  return { provider: DEFAULT_PROVIDER, modelId: DEFAULT_MODEL };
+}
+function normalizeOpenCodeTool(part) {
+  const callId = part.callID ?? part.call_id ?? part.toolCallId ?? part.tool_call_id ?? `migrated_${shortId()}`;
+  const name = part.tool ?? part.tool_name ?? part.name ?? part.state?.title ?? "unknown_tool";
+  const input = part.input ?? part.state?.input ?? {};
+  const output = part.output ?? part.state?.output ?? part.state?.metadata?.output ?? "";
+  return { callId, name, input, output };
+}
+function tokensToPiUsage(tokens) {
+  const input = tokens?.input ?? 0;
+  const output = tokens?.output ?? 0;
+  const cacheRead = tokens?.cache?.read ?? 0;
+  const cacheWrite = tokens?.cache?.write ?? 0;
+  const total = tokens?.total ?? input + output + cacheRead + cacheWrite;
+  return {
+    input,
+    output,
+    cacheRead,
+    cacheWrite,
+    totalTokens: total,
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 }
+  };
+}
+function makeMessageEntry(role, text2, timestamp, parentId, usage) {
+  const message = {
+    role,
+    content: [{ type: "text", text: text2 }],
+    timestamp: Date.parse(timestamp)
+  };
+  if (role === "assistant") {
+    message.usage = usage;
+  }
+  return {
+    type: "message",
+    id: shortId(),
+    parentId,
+    timestamp,
+    message
+  };
+}
+function makeThinkingEntry(text2, timestamp, parentId, usage) {
+  return {
+    type: "message",
+    id: shortId(),
+    parentId,
+    timestamp,
+    message: {
+      role: "assistant",
+      content: [{ type: "thinking", thinking: text2, thinkingSignature: null }],
+      timestamp: Date.parse(timestamp),
+      usage
+    }
+  };
+}
+function makeToolCallEntry(tool, timestamp, parentId, usage) {
+  return {
+    type: "message",
+    id: shortId(),
+    parentId,
+    timestamp,
+    message: {
+      role: "assistant",
+      content: [
+        {
+          type: "toolCall",
+          id: tool.callId,
+          name: tool.name,
+          arguments: tool.input ?? {}
+        }
+      ],
+      timestamp: Date.parse(timestamp),
+      usage
+    }
+  };
+}
+function makeToolResultEntry(tool, timestamp, parentId) {
+  return {
+    type: "message",
+    id: shortId(),
+    parentId,
+    timestamp,
+    message: {
+      role: "toolResult",
+      toolCallId: tool.callId,
+      toolName: tool.name,
+      content: [{ type: "text", text: textFromUnknown(tool.output) }],
+      isError: false,
+      timestamp: Date.parse(timestamp)
+    }
+  };
+}
+function convertPartToEntries(ctx) {
+  const part = parseJsonObject(ctx.row.data);
+  switch (part.type) {
+    case "step-start":
+    case "step-finish":
+    case "patch":
+      return [];
+    case "text":
+      return part.text ? [makeMessageEntry(ctx.role, part.text, ctx.timestamp, ctx.parentId, ctx.usage)] : [];
+    case "reasoning":
+      return part.text ? [makeThinkingEntry(part.text, ctx.timestamp, ctx.parentId, ctx.usage)] : [];
+    case "tool": {
+      const tool = normalizeOpenCodeTool(part);
+      const call = makeToolCallEntry(tool, ctx.timestamp, ctx.parentId, ctx.usage);
+      const result = makeToolResultEntry(tool, ctx.timestamp, call.id);
+      return [call, result];
+    }
+    case "file": {
+      const name = part.filename ?? part.name ?? "attachment";
+      return [
+        makeMessageEntry(ctx.role, `<file omitted: ${name}>`, ctx.timestamp, ctx.parentId, ctx.usage)
+      ];
+    }
+    default:
+      return [];
+  }
+}
+function buildPiEntries(params) {
+  const sessionUuid = generateUuidV7(params.now);
+  const nowIso = params.now.toISOString();
+  const entries = [
+    {
+      type: "session",
+      version: 3,
+      id: sessionUuid,
+      timestamp: nowIso,
+      cwd: params.session.directory ?? params.session.path ?? process.cwd()
+    },
+    {
+      type: "model_change",
+      id: shortId(),
+      parentId: null,
+      timestamp: nowIso,
+      provider: params.provider,
+      modelId: params.modelId
+    }
+  ];
+  const boundary = makeMessageEntry("user", `<!-- migrated from OpenCode session ${params.session.id} at ${nowIso} -->
+
+The following conversation was migrated from a different harness. Reasoning context from prior turns may be incomplete; tool calls reference tools that may not exist in this environment.`, nowIso, null, {
+    input: 0,
+    output: 0,
+    cacheRead: 0,
+    cacheWrite: 0,
+    totalTokens: 0,
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 }
+  });
+  entries.push(boundary);
+  const partsByMessage = new Map;
+  for (const part of params.parts) {
+    const list = partsByMessage.get(part.message_id) ?? [];
+    list.push(part);
+    partsByMessage.set(part.message_id, list);
+  }
+  const messageIdToLastPiEntryId = new Map;
+  const orderedSourceMessageIds = [];
+  let parentId = boundary.id;
+  for (const message of params.messages) {
+    const role = roleFromMessage(message);
+    if (!role)
+      continue;
+    const timestamp = isoFromMs(message.time_created, params.now);
+    const tokens = tokensFromMessage(message);
+    const usage = tokensToPiUsage(tokens);
+    let lastEntryIdForMessage = null;
+    for (const part of partsByMessage.get(message.id) ?? []) {
+      const newEntries = convertPartToEntries({
+        role,
+        row: part,
+        timestamp,
+        parentId,
+        usage
+      });
+      for (const entry of newEntries) {
+        if (entry.parentId === undefined || entry.parentId === parentId)
+          entry.parentId = parentId;
+        entries.push(entry);
+        parentId = entry.id;
+        lastEntryIdForMessage = parentId;
+      }
+    }
+    if (lastEntryIdForMessage !== null) {
+      messageIdToLastPiEntryId.set(message.id, lastEntryIdForMessage);
+      orderedSourceMessageIds.push(message.id);
+    }
+  }
+  return {
+    entries,
+    piSessionId: sessionUuid,
+    messageIdToLastPiEntryId,
+    orderedSourceMessageIds
+  };
+}
+function fetchRows(db, sessionId, maxMessages) {
+  const session = stmt(db, "SELECT id, title, directory, path, time_created FROM session WHERE id = ?").get(sessionId);
+  if (!session)
+    throw new Error(`OpenCode session not found: ${sessionId}`);
+  const sourceMessageCount = stmt(db, "SELECT COUNT(*) AS count FROM message WHERE session_id = ?").get(sessionId)?.count ?? 0;
+  const limitClause = maxMessages ? "LIMIT ?" : "";
+  const params = maxMessages ? [sessionId, maxMessages] : [sessionId];
+  const newestFirst = stmt(db, `SELECT id, time_created, data FROM message WHERE session_id = ? ORDER BY time_created DESC, id DESC ${limitClause}`).all(...params);
+  const messages = newestFirst.reverse();
+  const ids = messages.map((row) => row.id);
+  const parts = ids.length ? stmt(db, `SELECT id, message_id, time_created, data FROM part WHERE message_id IN (${ids.map(() => "?").join(",")}) ORDER BY time_created, id`).all(...ids) : [];
+  return { session, sourceMessageCount, messages, parts };
+}
+function remapBoundaryId(openCodeMessageId, messageIdToLastPiEntryId, orderedSourceMessageIds) {
+  const direct = messageIdToLastPiEntryId.get(openCodeMessageId);
+  if (direct !== undefined)
+    return { piEntryId: direct, exact: true };
+  let nearestAtOrBefore;
+  for (const id of orderedSourceMessageIds) {
+    if (id <= openCodeMessageId) {
+      nearestAtOrBefore = id;
+    } else {
+      break;
+    }
+  }
+  if (nearestAtOrBefore === undefined)
+    return;
+  const piEntryId = messageIdToLastPiEntryId.get(nearestAtOrBefore);
+  if (piEntryId === undefined)
+    return;
+  return { piEntryId, exact: false };
+}
+function insertCompactionMarker(entries, boundaryEntryId) {
+  if (boundaryEntryId === undefined)
+    return { written: false };
+  const boundaryIndex = entries.findIndex((entry) => entry.id === boundaryEntryId);
+  if (boundaryIndex < 0)
+    return { written: false };
+  const firstKept = entries[boundaryIndex + 1];
+  if (!firstKept?.id)
+    return { written: false };
+  const compactedPrefixChars = entries.slice(0, boundaryIndex + 1).reduce((total, entry) => total + JSON.stringify(entry.message ?? "").length, 0);
+  const compactionId = shortId();
+  const marker = {
+    type: "compaction",
+    id: compactionId,
+    parentId: boundaryEntryId,
+    timestamp: String(entries[boundaryIndex].timestamp),
+    summary: MIGRATION_COMPACTION_SUMMARY,
+    firstKeptEntryId: firstKept.id,
+    tokensBefore: Math.ceil(compactedPrefixChars / 4),
+    fromHook: true
+  };
+  firstKept.parentId = compactionId;
+  entries.splice(boundaryIndex + 1, 0, marker);
+  return {
+    written: true,
+    boundaryEntryId,
+    firstKeptEntryId: firstKept.id
+  };
+}
+function copyMagicContextState(args) {
+  const sourceCompartments = stmt(args.cortexkitDb, `SELECT sequence, start_message, end_message, start_message_id, end_message_id,
+              title, content, created_at
+         FROM compartments
+        WHERE session_id = ? AND harness = 'opencode'
+     ORDER BY sequence ASC`).all(args.sourceSessionId);
+  const sourceFacts = stmt(args.cortexkitDb, `SELECT category, content, created_at, updated_at
+         FROM session_facts
+        WHERE session_id = ? AND harness = 'opencode'
+     ORDER BY category ASC, id ASC`).all(args.sourceSessionId);
+  let boundariesApproximated = 0;
+  const remappedCompartments = [];
+  for (const c of sourceCompartments) {
+    const startRemap = remapBoundaryId(c.start_message_id, args.messageIdToLastPiEntryId, args.orderedSourceMessageIds);
+    const endRemap = remapBoundaryId(c.end_message_id, args.messageIdToLastPiEntryId, args.orderedSourceMessageIds);
+    if (!startRemap || !endRemap)
+      continue;
+    if (!startRemap.exact || !endRemap.exact)
+      boundariesApproximated++;
+    remappedCompartments.push({
+      sequence: c.sequence,
+      start_message: c.start_message,
+      end_message: c.end_message,
+      start_message_id: startRemap.piEntryId,
+      end_message_id: endRemap.piEntryId,
+      title: c.title,
+      content: c.content
+    });
+  }
+  if (args.dryRun) {
+    return {
+      compartmentsCopied: remappedCompartments.length,
+      factsCopied: sourceFacts.length,
+      boundariesApproximated,
+      lastCompartmentEndPiEntryId: remappedCompartments.at(-1)?.end_message_id
+    };
+  }
+  const insertCompartment = stmt(args.cortexkitDb, `INSERT INTO compartments (
+       session_id, sequence, start_message, end_message,
+       start_message_id, end_message_id, title, content,
+       created_at, harness
+     ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 'pi')`);
+  for (const c of remappedCompartments) {
+    insertCompartment.run(args.piSessionId, c.sequence, c.start_message, c.end_message, c.start_message_id, c.end_message_id, c.title, c.content, args.now);
+  }
+  const insertFact = stmt(args.cortexkitDb, `INSERT INTO session_facts (
+       session_id, category, content, created_at, updated_at, harness
+     ) VALUES (?, ?, ?, ?, ?, 'pi')`);
+  for (const f of sourceFacts) {
+    insertFact.run(args.piSessionId, f.category, f.content, f.created_at, f.updated_at);
+  }
+  return {
+    compartmentsCopied: remappedCompartments.length,
+    factsCopied: sourceFacts.length,
+    boundariesApproximated,
+    lastCompartmentEndPiEntryId: remappedCompartments.at(-1)?.end_message_id
+  };
+}
+function ensureValidOptions(opts) {
+  if (!opts.from)
+    throw new Error("Missing required flag: --from <opencode>");
+  if (!opts.to)
+    throw new Error("Missing required flag: --to <pi>");
+  if (opts.from !== "opencode" || opts.to !== "pi") {
+    if (opts.from === "pi" && opts.to === "opencode") {
+      throw new Error("Migration pi → opencode is not yet supported (V1 supports only opencode → pi)");
+    }
+    throw new Error(`Unsupported migration: ${opts.from} → ${opts.to} (V1 supports only opencode → pi)`);
+  }
+  if (!opts.session)
+    throw new Error("Missing required flag: --session <id>");
+  if (opts.maxMessages !== undefined && (!Number.isInteger(opts.maxMessages) || opts.maxMessages <= 0)) {
+    throw new Error("--max-messages must be a positive integer");
+  }
+}
+function migrateOpenCodeSessionToPi(opts) {
+  const fs2 = opts.fs ?? defaultFs();
+  const now = opts.now ?? new Date;
+  const opencodeDbPath = opts.opencodeDbPath ?? defaultOpenCodeDbPath();
+  const piSessionsRoot = opts.piSessionsRoot ?? defaultPiSessionsRoot();
+  const ownsDb = !opts.db;
+  const db = opts.db ?? new Database(opencodeDbPath, { readonly: true });
+  let cortexkitDb;
+  let ownsCortexkitDb = false;
+  if (opts.cortexkitDb === null) {
+    cortexkitDb = null;
+  } else if (opts.cortexkitDb !== undefined) {
+    cortexkitDb = opts.cortexkitDb;
+  } else {
+    try {
+      cortexkitDb = new Database(defaultCortexkitDbPath());
+      ownsCortexkitDb = true;
+    } catch {
+      cortexkitDb = null;
+    }
+  }
+  try {
+    const { session, sourceMessageCount, messages, parts } = fetchRows(db, opts.sessionId, opts.maxMessages);
+    const model = extractModel(messages);
+    const provider = opts.provider ?? model.provider;
+    const modelId = opts.modelId ?? model.modelId;
+    const cwd = session.directory ?? session.path ?? process.cwd();
+    const outputDir = join11(piSessionsRoot, projectPathToPiDirSlug(cwd));
+    const buildResult = buildPiEntries({
+      session,
+      messages,
+      parts,
+      now,
+      provider,
+      modelId
+    });
+    let copyResult = {
+      compartmentsCopied: 0,
+      factsCopied: 0,
+      boundariesApproximated: 0
+    };
+    if (cortexkitDb !== null) {
+      copyResult = copyMagicContextState({
+        cortexkitDb,
+        sourceSessionId: session.id,
+        piSessionId: buildResult.piSessionId,
+        messageIdToLastPiEntryId: buildResult.messageIdToLastPiEntryId,
+        orderedSourceMessageIds: buildResult.orderedSourceMessageIds,
+        now: now.getTime(),
+        dryRun: Boolean(opts.dryRun)
+      });
+    }
+    const compactionMarker = insertCompactionMarker(buildResult.entries, copyResult.lastCompartmentEndPiEntryId);
+    const outputPath = join11(outputDir, `${formatPiFilenameTimestamp(now)}_${buildResult.piSessionId}.jsonl`);
+    const jsonl = `${buildResult.entries.map((entry) => JSON.stringify(entry)).join(`
+`)}
+`;
+    if (!opts.dryRun) {
+      if (!fs2.existsSync(outputDir))
+        fs2.mkdirSync(outputDir, { recursive: true });
+      fs2.writeFileSync(outputPath, jsonl);
+    }
+    return {
+      outputPath,
+      piSessionId: buildResult.piSessionId,
+      messageCount: buildResult.entries.length - 2,
+      byteCount: Buffer.byteLength(jsonl, "utf8"),
+      sourceMessageCount,
+      compartmentsCopied: copyResult.compartmentsCopied,
+      factsCopied: copyResult.factsCopied,
+      boundariesApproximated: copyResult.boundariesApproximated,
+      compactionMarkerWritten: compactionMarker.written,
+      compactionBoundaryEntryId: compactionMarker.boundaryEntryId,
+      compactionFirstKeptEntryId: compactionMarker.firstKeptEntryId,
+      dryRun: Boolean(opts.dryRun)
+    };
+  } finally {
+    if (ownsDb)
+      db.close();
+    if (ownsCortexkitDb && cortexkitDb !== null)
+      cortexkitDb.close();
+  }
+}
+function parseMigrateArgs(args) {
+  const opts = {};
+  for (let i = 0;i < args.length; i++) {
+    const arg = args[i];
+    const readValue = (flag) => {
+      const value = args[++i];
+      if (!value || value.startsWith("--"))
+        throw new Error(`Missing value for ${flag}`);
+      return value;
+    };
+    if (arg === "--from")
+      opts.from = readValue(arg);
+    else if (arg === "--to")
+      opts.to = readValue(arg);
+    else if (arg === "--session")
+      opts.session = readValue(arg);
+    else if (arg === "--max-messages")
+      opts.maxMessages = Number(readValue(arg));
+    else if (arg === "--dry-run")
+      opts.dryRun = true;
+    else if (arg === "--help" || arg === "-h")
+      throw new Error("HELP");
+    else
+      throw new Error(`Unknown migrate flag: ${arg}`);
+  }
+  return opts;
+}
+function printMigrateHelp() {
+  console.log(`
+  Magic Context doctor migrate
+  ─────────────────────────────
+
+  Copy OpenCode session message content into a new Pi JSONL session,
+  PLUS the source session's Magic Context state (compartments + facts)
+  into the shared cortexkit database under the new Pi session id.
+
+  Supported pairs (V1):
+    --from opencode --to pi
+
+  Usage:
+    bunx --bun @cortexkit/opencode-magic-context@latest doctor migrate \\
+      --from opencode --to pi --session ses_xxx [--max-messages N] [--dry-run]
+
+  Fidelity:
+    - text, reasoning text, tool calls, and tool results are preserved
+    - assistant 'usage' fields carry real input/output/cache token counts
+      from the source so Pi's getContextUsage() reports realistic numbers
+    - reasoning signatures are stripped; step-start/step-finish are skipped
+    - file bytes are replaced with <file omitted: name> markers
+    - compartments + session_facts are copied to the new Pi session_id;
+      compartment boundary message IDs are remapped to the corresponding
+      Pi entry IDs (nearest-at-or-before for boundaries that don't have
+      a direct message-level Pi entry)
+`);
+}
+async function runMigrateCli(args) {
+  try {
+    const parsed = parseMigrateArgs(args);
+    ensureValidOptions(parsed);
+    const result = migrateOpenCodeSessionToPi({
+      sessionId: parsed.session,
+      maxMessages: parsed.maxMessages,
+      dryRun: parsed.dryRun
+    });
+    const action = result.dryRun ? "Would write" : "Wrote";
+    console.log(`${action} Pi session JSONL:`);
+    console.log(`  path: ${result.outputPath}`);
+    console.log(`  pi session id: ${result.piSessionId}`);
+    console.log(`  source messages: ${result.sourceMessageCount}`);
+    console.log(`  migrated entries: ${result.messageCount}`);
+    console.log(`  bytes: ${result.byteCount}`);
+    console.log(`  compartments copied: ${result.compartmentsCopied}`);
+    console.log(`  session facts copied: ${result.factsCopied}`);
+    console.log(`  compaction marker: ${result.compactionMarkerWritten ? "yes" : "no"}${result.compactionMarkerWritten ? ` (boundary: ${result.compactionBoundaryEntryId}, first kept: ${result.compactionFirstKeptEntryId})` : ""}`);
+    if (result.boundariesApproximated > 0) {
+      console.log(`  boundaries approximated: ${result.boundariesApproximated} (nearest-at-or-before)`);
+    }
+    if (!result.dryRun) {
+      console.log("Pi may need to be restarted to pick up the new session file.");
+    }
+    return 0;
+  } catch (error) {
+    if (error instanceof Error && error.message === "HELP") {
+      printMigrateHelp();
+      return 0;
+    }
+    console.error(error instanceof Error ? error.message : String(error));
+    console.error("Run `doctor migrate --help` for usage.");
+    return 1;
+  }
+}
+
 // src/cli/setup.ts
 var import_comment_json4 = __toESM(require_src2(), 1);
-import { existsSync as existsSync8, mkdirSync as mkdirSync3, readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "node:fs";
+import { existsSync as existsSync9, mkdirSync as mkdirSync4, readFileSync as readFileSync7, writeFileSync as writeFileSync6 } from "node:fs";
 import { dirname as dirname4 } from "node:path";
 var PLUGIN_NAME4 = "@cortexkit/opencode-magic-context";
 var PLUGIN_ENTRY2 = "@cortexkit/opencode-magic-context@latest";
 function ensureDir(dir) {
-  if (!existsSync8(dir)) {
-    mkdirSync3(dir, { recursive: true });
+  if (!existsSync9(dir)) {
+    mkdirSync4(dir, { recursive: true });
   }
 }
 function readJsonc(path3) {
@@ -10992,7 +11620,7 @@ function addPluginToOpenCodeConfig(configPath, format) {
       plugin: [PLUGIN_ENTRY2],
       compaction: { auto: false, prune: false }
     };
-    writeFileSync5(configPath, `${import_comment_json4.stringify(config, null, 2)}
+    writeFileSync6(configPath, `${import_comment_json4.stringify(config, null, 2)}
 `);
     return;
   }
@@ -11011,13 +11639,13 @@ function addPluginToOpenCodeConfig(configPath, format) {
   compaction.auto = false;
   compaction.prune = false;
   existing.compaction = compaction;
-  writeFileSync5(configPath, `${import_comment_json4.stringify(existing, null, 2)}
+  writeFileSync6(configPath, `${import_comment_json4.stringify(existing, null, 2)}
 `);
 }
 function addPluginToTuiConfig(configPath, format) {
   ensureDir(dirname4(configPath));
   if (format === "none") {
-    writeFileSync5(configPath, `${import_comment_json4.stringify({ plugin: [PLUGIN_ENTRY2] }, null, 2)}
+    writeFileSync6(configPath, `${import_comment_json4.stringify({ plugin: [PLUGIN_ENTRY2] }, null, 2)}
 `);
     return;
   }
@@ -11032,13 +11660,13 @@ function addPluginToTuiConfig(configPath, format) {
     plugins.push(PLUGIN_ENTRY2);
   }
   existing.plugin = plugins;
-  writeFileSync5(configPath, `${import_comment_json4.stringify(existing, null, 2)}
+  writeFileSync6(configPath, `${import_comment_json4.stringify(existing, null, 2)}
 `);
 }
 function writeMagicContextConfig(configPath, options) {
-  const config = (existsSync8(configPath) ? readJsonc(configPath) : null) ?? {};
+  const config = (existsSync9(configPath) ? readJsonc(configPath) : null) ?? {};
   if (!config.$schema) {
-    config.$schema = "https://raw.githubusercontent.com/cortexkit/opencode-magic-context/master/assets/magic-context.schema.json";
+    config.$schema = "https://raw.githubusercontent.com/cortexkit/magic-context/master/assets/magic-context.schema.json";
   }
   if (options.historianModel) {
     const historian = config.historian ?? {};
@@ -11073,7 +11701,7 @@ function writeMagicContextConfig(configPath, options) {
     cacheTtl["anthropic/claude-opus-4-6"] = "59m";
     config.cache_ttl = cacheTtl;
   }
-  writeFileSync5(configPath, `${import_comment_json4.stringify(config, null, 2)}
+  writeFileSync6(configPath, `${import_comment_json4.stringify(config, null, 2)}
 `);
 }
 async function runSetup() {
@@ -11102,7 +11730,7 @@ async function runSetup() {
     R2.warn("You can configure models manually in magic-context.jsonc later");
   }
   const paths = detectConfigPaths();
-  const hadExistingSetup = paths.opencodeConfigFormat !== "none" || existsSync8(paths.magicContextConfig) || paths.tuiConfigFormat !== "none";
+  const hadExistingSetup = paths.opencodeConfigFormat !== "none" || existsSync9(paths.magicContextConfig) || paths.tuiConfigFormat !== "none";
   addPluginToOpenCodeConfig(paths.opencodeConfig, paths.opencodeConfigFormat);
   R2.success(`Plugin added to ${paths.opencodeConfig}`);
   R2.info("Disabled built-in compaction (auto=false, prune=false)");
@@ -11120,7 +11748,7 @@ async function runSetup() {
         if (shouldRemove) {
           plugins.splice(dcpIndex, 1);
           ocConfig.plugin = plugins;
-          writeFileSync5(paths.opencodeConfig, `${import_comment_json4.stringify(ocConfig, null, 2)}
+          writeFileSync6(paths.opencodeConfig, `${import_comment_json4.stringify(ocConfig, null, 2)}
 `);
           R2.success("Removed opencode-dcp from plugin list");
         } else {
@@ -11248,11 +11876,14 @@ async function runSetup() {
   if (shouldStar) {
     try {
       const { execSync: execSync3 } = await import("node:child_process");
-      execSync3("gh api --silent --method PUT /user/starred/cortexkit/opencode-magic-context", { stdio: "ignore", timeout: 1e4 });
+      execSync3("gh api --silent --method PUT /user/starred/cortexkit/magic-context", {
+        stdio: "ignore",
+        timeout: 1e4
+      });
       R2.success("Thanks for starring! ★");
     } catch {
       R2.info(`Couldn't star automatically. You can star manually:
-  https://github.com/cortexkit/opencode-magic-context`);
+  https://github.com/cortexkit/magic-context`);
     }
   }
   Gt("Run 'opencode' to start!");
@@ -11264,9 +11895,13 @@ var command = process.argv[2];
 if (command === "setup") {
   runSetup().then((code) => process.exit(code));
 } else if (command === "doctor") {
-  const force = process.argv.includes("--force");
-  const issue = process.argv.includes("--issue");
-  runDoctor({ force, issue }).then((code) => process.exit(code));
+  if (process.argv[3] === "migrate") {
+    runMigrateCli(process.argv.slice(4)).then((code) => process.exit(code));
+  } else {
+    const force = process.argv.includes("--force");
+    const issue = process.argv.includes("--issue");
+    runDoctor({ force, issue }).then((code) => process.exit(code));
+  }
 } else {
   console.log("");
   console.log("  Magic Context CLI");
@@ -11277,11 +11912,13 @@ if (command === "setup") {
   console.log("    doctor           Check and fix configuration issues");
   console.log("    doctor --force   Force clear plugin cache (fixes broken dependencies)");
   console.log("    doctor --issue   Collect diagnostics and open a GitHub issue");
+  console.log("    doctor migrate   Migrate OpenCode session content to Pi JSONL");
   console.log("");
   console.log("  Usage:");
   console.log("    bunx --bun @cortexkit/opencode-magic-context@latest setup");
   console.log("    bunx --bun @cortexkit/opencode-magic-context@latest doctor");
   console.log("    bunx --bun @cortexkit/opencode-magic-context@latest doctor --issue");
+  console.log("    bunx --bun @cortexkit/opencode-magic-context@latest doctor migrate --from opencode --to pi --session ses_xxx --dry-run");
   console.log("");
   process.exit(command ? 1 : 0);
 }