@cortexkit/pi-magic-context 0.21.1 → 0.21.4

package/dist/index.js

@@ -8163,10 +8163,10 @@ var require_stringify = __commonJS((exports, module) => {
     replacer = null;
     indent = EMPTY;
   };
-  var join8 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(one, gap)), gap) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two, gap)), gap) : EMPTY;
+  var join9 = (one, two, gap) => one ? two ? one + two.trim() + LF + gap : one.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(one, gap)), gap) : two ? two.trimRight() + repeat_line_breaks(Math.max(1, count_trailing_line_breaks(two, gap)), gap) : EMPTY;
   var join_content = (inside, value, gap) => {
     const comment = process_comments(value, PREFIX_BEFORE, gap + indent, true);
-    return join8(comment, inside, gap);
+    return join9(comment, inside, gap);
   };
   var stringify_string = (holder, key, value) => {
     const raw = get_raw_string_literal(holder, key);
@@ -8188,13 +8188,13 @@ var require_stringify = __commonJS((exports, module) => {
       if (i !== 0) {
         inside += COMMA;
       }
-      const before = join8(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
+      const before = join9(after_comma, process_comments(value, BEFORE(i), deeper_gap), deeper_gap);
       inside += before || LF + deeper_gap;
       inside += stringify(i, value, deeper_gap) || STR_NULL;
       inside += process_comments(value, AFTER_VALUE(i), deeper_gap);
       after_comma = process_comments(value, AFTER(i), deeper_gap);
     }
-    inside += join8(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join9(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
     return BRACKET_OPEN + join_content(inside, value, gap) + BRACKET_CLOSE;
   };
   var object_stringify = (value, gap) => {
@@ -8215,13 +8215,13 @@ var require_stringify = __commonJS((exports, module) => {
         inside += COMMA;
       }
       first = false;
-      const before = join8(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
+      const before = join9(after_comma, process_comments(value, BEFORE(key), deeper_gap), deeper_gap);
       inside += before || LF + deeper_gap;
       inside += quote(key) + process_comments(value, AFTER_PROP(key), deeper_gap) + COLON + process_comments(value, AFTER_COLON(key), deeper_gap) + SPACE + sv + process_comments(value, AFTER_VALUE(key), deeper_gap);
       after_comma = process_comments(value, AFTER(key), deeper_gap);
     };
     keys.forEach(iteratee);
-    inside += join8(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
+    inside += join9(after_comma, process_comments(value, PREFIX_AFTER, deeper_gap), deeper_gap);
     return CURLY_BRACKET_OPEN + join_content(inside, value, gap) + CURLY_BRACKET_CLOSE;
   };
   function stringify(key, holder, gap) {
@@ -8342,8 +8342,8 @@ var init_rpc_notifications = __esm(() => {
 });
 
 // src/index.ts
-import { createRequire as createRequire3 } from "node:module";
-import { join as join18 } from "node:path";
+import { createRequire as createRequire4 } from "node:module";
+import { join as join19 } from "node:path";
 
 // ../plugin/src/features/magic-context/memory/project-identity.ts
 import { execSync } from "node:child_process";
@@ -145216,9 +145216,22 @@ init_logger();
 // src/subagent-runner.ts
 import * as childProcess from "node:child_process";
 import { existsSync as existsSync6 } from "node:fs";
-import { dirname as dirname3, resolve as resolvePath } from "node:path";
+import { createRequire as createRequire3 } from "node:module";
+import { dirname as dirname3, join as join8, resolve as resolvePath } from "node:path";
 import { createInterface } from "node:readline";
 import { fileURLToPath } from "node:url";
+function resolveBundledPiCli() {
+  try {
+    const require_ = createRequire3(import.meta.url);
+    const pkgJson = require_.resolve("@earendil-works/pi-coding-agent/package.json");
+    const cliPath = join8(dirname3(pkgJson), "dist/cli.js");
+    if (existsSync6(cliPath))
+      return cliPath;
+    return null;
+  } catch {
+    return null;
+  }
+}
 function resolveSubagentEntryPath() {
   try {
     const here = dirname3(fileURLToPath(import.meta.url));
@@ -145242,7 +145255,16 @@ class PiSubagentRunner {
   piBinary;
   spawnImpl;
   constructor(options = {}) {
-    this.piBinary = options.piBinary ?? "pi";
+    if (options.piBinary) {
+      this.piBinary = options.piBinary;
+    } else {
+      const bundled = resolveBundledPiCli();
+      if (bundled) {
+        this.piBinary = bundled;
+      } else {
+        this.piBinary = "pi";
+      }
+    }
     this.spawnImpl = options.spawnImpl ?? childProcess.spawn;
   }
   async run(options) {
@@ -145853,7 +145875,7 @@ function clearStaleEntries(db, maxAgeMs) {
 init_logger();
 // ../plugin/src/features/magic-context/dreamer/runner.ts
 import { existsSync as existsSync8 } from "node:fs";
-import { join as join10 } from "node:path";
+import { join as join11 } from "node:path";
 
 // ../plugin/src/shared/index.ts
 init_logger();
@@ -146148,14 +146170,14 @@ await init_sqlite();
 
 // ../plugin/src/features/magic-context/key-files/identify-key-files.ts
 import { readFileSync as readFileSync4 } from "node:fs";
-import { join as join9 } from "node:path";
+import { join as join10 } from "node:path";
 init_logger();
 
 // ../plugin/src/features/magic-context/key-files/aft-availability.ts
 var import_comment_json = __toESM(require_src2(), 1);
 import { existsSync as existsSync7, readFileSync as readFileSync3 } from "node:fs";
 import { homedir as homedir3 } from "node:os";
-import { join as join8 } from "node:path";
+import { join as join9 } from "node:path";
 var overrideAvailability = null;
 function parseConfig(path5) {
   if (!existsSync7(path5))
@@ -146182,10 +146204,10 @@ function hasAftAtKeys(value, keys) {
 function getAftAvailability() {
   const home = process.env.HOME || homedir3();
   const opencodePaths = [
-    join8(home, ".config", "opencode", "opencode.jsonc"),
-    join8(home, ".config", "opencode", "opencode.json")
+    join9(home, ".config", "opencode", "opencode.jsonc"),
+    join9(home, ".config", "opencode", "opencode.json")
   ];
-  const piPaths = [join8(home, ".pi", "agent", "settings.json")];
+  const piPaths = [join9(home, ".pi", "agent", "settings.json")];
   const checkedPaths = [...opencodePaths, ...piPaths];
   let opencode = false;
   for (const path5 of opencodePaths) {
@@ -146275,6 +146297,43 @@ function normalizeProjectRelativePath(projectPath, filePath) {
     return null;
   return rel;
 }
+function isDocumentationOrMetaFile(rel) {
+  const lower = rel.toLowerCase();
+  if (lower.endsWith(".md") || lower.endsWith(".mdx") || lower.endsWith(".rst"))
+    return true;
+  if (lower.endsWith(".txt"))
+    return true;
+  const base = lower.split("/").pop() ?? "";
+  const baseNoExt = base.replace(/\.[^.]+$/, "");
+  const META_BASENAMES = new Set([
+    "license",
+    "licence",
+    "notice",
+    "copying",
+    "authors",
+    "contributors",
+    "changelog",
+    "changes",
+    "history",
+    "readme",
+    "contributing",
+    "code_of_conduct",
+    "security",
+    "support",
+    "maintainers",
+    "governance",
+    "package-lock",
+    "bun.lock",
+    "bun.lockb",
+    "yarn.lock",
+    "pnpm-lock",
+    "cargo.lock",
+    "uv.lock",
+    "poetry.lock",
+    "gemfile.lock"
+  ]);
+  return META_BASENAMES.has(base) || META_BASENAMES.has(baseNoExt);
+}
 function primarySessionIds(db) {
   try {
     const rows = db.prepare("SELECT session_id AS sessionId FROM session_meta WHERE is_subagent = 0").all();
@@ -146306,6 +146365,8 @@ function collectKeyFileCandidates(args) {
     const rel = normalizeProjectRelativePath(args.projectPath, row.file_path);
     if (!rel)
       continue;
+    if (isDocumentationOrMetaFile(rel))
+      continue;
     const timestamp = toMs(row.time_created);
     const candidate = byPath.get(rel) ?? {
       path: rel,
@@ -146442,7 +146503,8 @@ Rules:
 - Total approx_token_estimate must be < ${args.config.token_budget}.
 - path must be relative, no .., no absolute paths, no symlinks escaping project root.
 - path must be unique case-sensitively and case-insensitively.
-- content must be plain text; no XML tags inside.`;
+- content must be plain text; no XML tags inside.
+- DO NOT pick prose documentation (README.md, CONTRIBUTING.md, CHANGELOG, LICENSE, *.md/*.mdx/*.rst/*.txt) or lockfiles. Key files are project SOURCE the agent needs repeated orientation context on, not reference docs. Project docs are surfaced through a separate injection path.`;
 }
 function validateLlmOutput(raw, config, projectPath) {
   let obj;
@@ -146572,7 +146634,7 @@ async function runKeyFilesLlm(args) {
     });
     const messagesResponse = await args.client.session.messages({
       path: { id: agentSessionId },
-      query: { directory: args.projectPath }
+      query: { directory: args.projectPath, limit: 50 }
     });
     const messages = normalizeSDKResponse(messagesResponse, [], {
       preferResponseOnMissingData: true
@@ -146609,7 +146671,7 @@ async function runKeyFilesTask(args) {
     if (row.staleReason !== null || row.generationConfigHash !== configHash)
       return false;
     try {
-      return sha256(readFileSync4(join9(projectPath, row.path))) === row.contentHash;
+      return sha256(readFileSync4(join10(projectPath, row.path))) === row.contentHash;
     } catch {
       return false;
     }
@@ -147680,7 +147742,7 @@ If no promotions are warranted, return empty arrays. Always consume reviewed can
     });
     const messagesResponse = await args.client.session.messages({
       path: { id: agentSessionId },
-      query: { directory: args.sessionDirectory }
+      query: { directory: args.sessionDirectory, limit: 50 }
     });
     const messages = normalizeSDKResponse(messagesResponse, [], {
       preferResponseOnMissingData: true
@@ -147806,7 +147868,7 @@ function logWithStackHead(message, stackHead) {
   log(message, stackHead ? { stackHead } : undefined);
 }
 function getOpenCodeDbPath2() {
-  return join10(getDataDir(), "opencode", "opencode.db");
+  return join11(getDataDir(), "opencode", "opencode.db");
 }
 function openOpenCodeDb() {
   const dbPath = getOpenCodeDbPath2();
@@ -147941,8 +148003,8 @@ async function runDream(args) {
       try {
         const docsDir = args.sessionDirectory ?? args.projectIdentity;
         const existingDocs = taskName === "maintain-docs" ? {
-          architecture: existsSync8(join10(docsDir, "ARCHITECTURE.md")),
-          structure: existsSync8(join10(docsDir, "STRUCTURE.md"))
+          architecture: existsSync8(join11(docsDir, "ARCHITECTURE.md")),
+          structure: existsSync8(join11(docsDir, "STRUCTURE.md"))
         } : undefined;
         const userMemories = taskName === "archive-stale" ? getActiveUserMemories(args.db).map((um) => ({
           id: um.id,
@@ -147986,7 +148048,7 @@ async function runDream(args) {
         }
         const messagesResponse = await args.client.session.messages({
           path: { id: agentSessionId },
-          query: { directory: args.sessionDirectory ?? args.projectIdentity }
+          query: { directory: args.sessionDirectory ?? args.projectIdentity, limit: 50 }
         });
         const messages = normalizeSDKResponse(messagesResponse, [], {
           preferResponseOnMissingData: true
@@ -148247,6 +148309,13 @@ async function evaluateSmartNotes(args) {
 For each note below, determine whether its surface condition has been met.
 You have access to tools like GitHub CLI (gh), web search, and the local codebase to verify conditions.
 
+You DO NOT have access to:
+- Any conversation between the user and the original agent that wrote the note
+- The state of any active session, including whether messages have been sent
+- The current task, mood, or intent of the human user
+
+If a condition references conversation context the user is having ("When the user mentions X", "When they ask to do Y", "When we revisit Z", "When relevant to current discussion", etc.), it is UNEVALUATABLE — skip it (do not include in results) so the note stays pending. These are misuse cases that should never have been written as smart notes; leaving them pending is the correct outcome, the dreamer's archive-stale task will eventually retire them.
+
 ## Pending Smart Notes
 
 ${noteDescriptions}
@@ -148255,7 +148324,8 @@ ${noteDescriptions}
 
 1. Check each condition using the tools available to you.
 2. Be conservative — only mark a condition as met when you have clear evidence.
-3. Respond with a JSON array of results:
+3. Skip conditions that depend on session/conversation context you cannot observe — do not invent a "false" verdict for them, just omit them from your response.
+4. Respond with a JSON array of results:
 
 \`\`\`json
 [
@@ -148263,7 +148333,7 @@ ${noteDescriptions}
 ]
 \`\`\`
 
-Only include notes whose conditions you could definitively evaluate. Skip notes where you cannot determine the status (they will be re-evaluated next run).`;
+Only include notes whose conditions you could definitively evaluate against external signals. Skip notes where you cannot determine the status (they will be re-evaluated next run, or eventually archived as stale).`;
   const taskStartedAt = Date.now();
   let agentSessionId = null;
   const abortController = new AbortController;
@@ -148309,7 +148379,7 @@ Only include notes whose conditions you could definitively evaluate. Skip notes
     });
     const messagesResponse = await args.client.session.messages({
       path: { id: agentSessionId },
-      query: { directory: args.sessionDirectory ?? args.projectIdentity }
+      query: { directory: args.sessionDirectory ?? args.projectIdentity, limit: 50 }
     });
     const messages = normalizeSDKResponse(messagesResponse, [], {
       preferResponseOnMissingData: true
@@ -163017,7 +163087,6 @@ var MagicContextConfigSchema = exports_external.object({
     enabled: exports_external.boolean().default(true),
     min_clusters: exports_external.number().min(1).default(3)
   }).default({ enabled: true, min_clusters: 3 }),
-  compaction_markers: exports_external.boolean().default(true),
   system_prompt_injection: exports_external.object({
     enabled: exports_external.boolean().default(true),
     skip_signatures: exports_external.array(exports_external.string()).default(["<!-- magic-context: skip -->"])
@@ -163130,7 +163199,7 @@ function getEmbeddingProviderIdentity(config2) {
 // ../plugin/src/features/magic-context/memory/embedding-local.ts
 import { mkdirSync as mkdirSync4 } from "node:fs";
 import { open, stat, unlink, writeFile } from "node:fs/promises";
-import { dirname as dirname4, join as join11 } from "node:path";
+import { dirname as dirname4, join as join12 } from "node:path";
 import { pathToFileURL } from "node:url";
 init_data_path();
 init_logger();
@@ -163197,7 +163266,7 @@ async function injectWasmOrtForElectron() {
       const { createRequire: createRequireFn } = await import("node:module");
       const requireFn = createRequireFn(import.meta.url);
       const pkgPath = requireFn.resolve("onnxruntime-web/package.json");
-      const distDir = join11(dirname4(pkgPath), "dist");
+      const distDir = join12(dirname4(pkgPath), "dist");
       const wasmPathsPrefix = `${pathToFileURL(distDir).href}/`;
       if (ortWeb.env?.wasm) {
         ortWeb.env.wasm.wasmPaths = wasmPathsPrefix;
@@ -163308,7 +163377,7 @@ class LocalEmbeddingProvider {
         if (LogLevel && "ERROR" in LogLevel) {
           env.logLevel = LogLevel.ERROR;
         }
-        const modelCacheDir = join11(getMagicContextStorageDir(), "models");
+        const modelCacheDir = join12(getMagicContextStorageDir(), "models");
         try {
           mkdirSync4(modelCacheDir, { recursive: true });
           env.cacheDir = modelCacheDir;
@@ -163316,7 +163385,7 @@ class LocalEmbeddingProvider {
           log("[magic-context] could not create model cache dir, using library default");
         }
         const createPipeline = transformersModule.pipeline;
-        const lockPath = join11(modelCacheDir, ".load.lock");
+        const lockPath = join12(modelCacheDir, ".load.lock");
         const releaseLock = await acquireModelLoadLock(lockPath);
         const stopHeartbeat = startLockHeartbeat(lockPath);
         try {
@@ -164670,7 +164739,7 @@ function handleUntrustedLoad(db, projectIdentity, directory, detailed) {
 // src/config/index.ts
 import { existsSync as existsSync10, readFileSync as readFileSync6 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
-import { join as join12 } from "node:path";
+import { join as join13 } from "node:path";
 
 // ../plugin/src/config/variable.ts
 import { existsSync as existsSync9, readFileSync as readFileSync5 } from "node:fs";
@@ -164738,12 +164807,12 @@ function substituteConfigVariables(input) {
 var import_comment_json2 = __toESM(require_src2(), 1);
 var CONFIG_FILE_NAME = "magic-context";
 function getProjectConfigPaths(cwd) {
-  const basePath = join12(cwd, ".pi", CONFIG_FILE_NAME);
+  const basePath = join13(cwd, ".pi", CONFIG_FILE_NAME);
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function getUserConfigPaths() {
   const home = process.env.HOME ?? homedir5();
-  const basePath = join12(home, ".pi", "agent", CONFIG_FILE_NAME);
+  const basePath = join13(home, ".pi", "agent", CONFIG_FILE_NAME);
   return [`${basePath}.jsonc`, `${basePath}.json`];
 }
 function resolveFirstExisting(paths) {
@@ -169243,7 +169312,7 @@ function getReducedRecompTokenBudget(currentBudget) {
 // ../plugin/src/hooks/magic-context/historian-state-file.ts
 init_data_path();
 import { mkdirSync as mkdirSync5, unlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
-import { join as join13 } from "node:path";
+import { join as join14 } from "node:path";
 var HISTORIAN_STATE_INLINE_THRESHOLD = 30000;
 function maybeWriteHistorianStateFile(sessionId, existingState, directory) {
   if (existingState.length <= HISTORIAN_STATE_INLINE_THRESHOLD)
@@ -169251,7 +169320,7 @@ function maybeWriteHistorianStateFile(sessionId, existingState, directory) {
   try {
     const dir = getProjectMagicContextHistorianDir(directory);
     mkdirSync5(dir, { recursive: true });
-    const path5 = join13(dir, `state-${sessionId}-${Date.now()}.xml`);
+    const path5 = join14(dir, `state-${sessionId}-${Date.now()}.xml`);
     writeFileSync2(path5, existingState, "utf8");
     return path5;
   } catch {
@@ -170211,7 +170280,7 @@ function stripPiDroppedPlaceholderMessages(args) {
 // src/system-prompt.ts
 import { createHash as createHash8 } from "node:crypto";
 import { existsSync as existsSync11, readFileSync as readFileSync8 } from "node:fs";
-import { join as join15 } from "node:path";
+import { join as join16 } from "node:path";
 
 // ../plugin/src/agents/magic-context-prompt.ts
 function getToolHistoryGuidance(dropToolStructure) {
@@ -170302,7 +170371,7 @@ Prefer many small targeted operations over one large blanket operation. Compress
 
 // ../plugin/src/hooks/magic-context/key-files-block.ts
 import { readFileSync as readFileSync7, realpathSync as realpathSync3 } from "node:fs";
-import { join as join14, sep as sep2 } from "node:path";
+import { join as join15, sep as sep2 } from "node:path";
 init_logger();
 var cachedKeyFilesBySession = new Map;
 var staleUpdates = new Map;
@@ -170355,7 +170424,7 @@ function buildKeyFilesBlock(db, projectPath, config2 = { enabled: true, tokenBud
     let nextStale = null;
     let observed = false;
     try {
-      const absPath = join14(projectPath, row.path);
+      const absPath = join15(projectPath, row.path);
       const real = realpathSync3(absPath);
       if (!isUnderProject(projectPath, real)) {
         nextStale = "missing";
@@ -170438,7 +170507,7 @@ var DOC_FILES = ["ARCHITECTURE.md", "STRUCTURE.md"];
 function readProjectDocs(directory) {
   const sections = [];
   for (const filename of DOC_FILES) {
-    const filePath = join15(directory, filename);
+    const filePath = join16(directory, filename);
     try {
       if (existsSync11(filePath)) {
         const content = readFileSync8(filePath, "utf-8").trim();
@@ -171329,104 +171398,52 @@ function resolveSessionId2(ctx) {
     return;
   }
 }
-function collectMessageEntryIds(ctx, expectedLength, sessionId, strict = false) {
+function collectMessageEntryIdsByRef(ctx, messages, sessionId) {
   const sm = ctx.sessionManager;
   if (typeof sm?.getBranch !== "function")
-    return;
+    return null;
   let entries;
   try {
     entries = sm.getBranch.call(sm);
-  } catch {
-    return;
+  } catch (error51) {
+    sessionLog(sessionId ?? "pi", `collectMessageEntryIdsByRef getBranch failed: ${error51 instanceof Error ? error51.message : String(error51)}`);
+    return null;
   }
   if (!Array.isArray(entries))
-    return;
-  let compactionIndex = -1;
-  let firstKeptEntryId;
-  for (let i = entries.length - 1;i >= 0; i--) {
-    const e = entries[i];
-    if (e && typeof e === "object" && e.type === "compaction") {
-      compactionIndex = i;
-      if (typeof e.firstKeptEntryId === "string") {
-        firstKeptEntryId = e.firstKeptEntryId;
-      }
-      break;
-    }
-  }
-  const ids = [];
-  const isEmitEligible = (entry) => {
+    return null;
+  const entryIdByMsgRef = new Map;
+  for (const entry of entries) {
     if (!entry || typeof entry !== "object")
-      return false;
-    const t = entry.type;
-    const id = entry.id;
-    if (typeof id !== "string")
-      return false;
-    if (t === "message")
-      return true;
-    if (t === "custom_message")
-      return true;
-    if (t === "branch_summary") {
-      const summary = entry.summary;
-      return typeof summary === "string" && summary.length > 0;
-    }
-    return false;
-  };
-  if (compactionIndex >= 0) {
-    ids.push(undefined);
-    if (firstKeptEntryId !== undefined) {
-      let foundFirstKept = false;
-      for (let i = 0;i < compactionIndex; i++) {
-        const entry = entries[i];
-        const entryId = entry?.id;
-        if (typeof entryId === "string" && entryId === firstKeptEntryId) {
-          foundFirstKept = true;
-        }
-        if (!foundFirstKept)
-          continue;
-        if (isEmitEligible(entry)) {
-          ids.push(entry.id);
-        }
-      }
-    }
-    for (let i = compactionIndex + 1;i < entries.length; i++) {
-      const entry = entries[i];
-      if (isEmitEligible(entry)) {
-        ids.push(entry.id);
-      }
-    }
-  } else {
-    for (const entry of entries) {
-      if (isEmitEligible(entry)) {
-        ids.push(entry.id);
-      }
-    }
+      continue;
+    const e = entry;
+    if (e.type !== "message")
+      continue;
+    if (typeof e.id !== "string")
+      continue;
+    if (!e.message || typeof e.message !== "object")
+      continue;
+    entryIdByMsgRef.set(e.message, e.id);
   }
-  if (ids.length !== expectedLength) {
-    const sm2 = sm;
-    const totalEntries = entries.length;
-    log(`[magic-context][pi]${sessionId ? `[${sessionId}]` : ""} collectMessageEntryIds length mismatch: ` + `expected=${expectedLength} got=${ids.length} (compactionIndex=${compactionIndex} ` + `firstKeptEntryId=${firstKeptEntryId ?? "<none>"} totalBranchEntries=${totalEntries})` + ` — best-effort mapping returned; boundary trim may not match exactly`);
-    if (strict)
-      return;
-    const _unused = sm2;
-    if (ids.length < expectedLength) {
-      const padded = [];
-      for (let i = 0;i < expectedLength - ids.length; i++) {
-        padded.push(undefined);
-      }
-      padded.push(...ids);
-      return padded;
+  const result = new Array(messages.length);
+  let resolved = 0;
+  for (let i = 0;i < messages.length; i++) {
+    const msg = messages[i];
+    if (!msg || typeof msg !== "object") {
+      result[i] = undefined;
+      continue;
+    }
+    const id = entryIdByMsgRef.get(msg);
+    if (typeof id === "string") {
+      result[i] = id;
+      resolved += 1;
+    } else {
+      result[i] = undefined;
     }
-    return ids.slice(ids.length - expectedLength);
   }
-  return ids;
-}
-function collectMessageEntryIdsStrict(ctx, expectedLength, sessionId) {
-  try {
-    return collectMessageEntryIds(ctx, expectedLength, sessionId, true) ?? null;
-  } catch (error51) {
-    sessionLog(sessionId ?? "pi", `collectMessageEntryIdsStrict failed: ${error51 instanceof Error ? error51.message : String(error51)}`);
-    return null;
+  if (resolved < messages.length) {
+    log(`[magic-context][pi]${sessionId ? `[${sessionId}]` : ""} ` + `collectMessageEntryIdsByRef: resolved=${resolved}/${messages.length} ` + `(branchEntries=${entries.length}, messageEntries=${entryIdByMsgRef.size}) — ` + `unmapped slots fall through to synthesized ids; boundary lookup still works ` + `for any compartment whose start/end message is among the resolved set`);
   }
+  return result;
 }
 function registerPiContextHandler(pi, options) {
   const tagger = createTagger();
@@ -171467,7 +171484,7 @@ function registerPiContextHandler(pi, options) {
       const unregisterRaw = setRawMessageProvider(sessionId, rawMessageProvider);
       rawMessageProviderUnregistersBySession.set(sessionId, unregisterRaw);
       scheduleReconciliation(options.db, sessionId, readRawSessionMessages);
-      const strictEntryIds = collectMessageEntryIdsStrict(ctx, event.messages.length, sessionId);
+      const strictEntryIds = collectMessageEntryIdsByRef(ctx, event.messages, sessionId);
       const tLastUser = performance.now();
       const latestUser = findLatestUserMessageIdPi(event.messages, buildPiMessageIdByIndex(event.messages, strictEntryIds));
       logTransformTiming(sessionId, "findLastUserMessageId", tLastUser);
@@ -171600,7 +171617,7 @@ function registerPiContextHandler(pi, options) {
       const isCacheBusting = historyRefreshSessions.has(sessionId);
       sessionLog(sessionId, `transform: usage=${usagePercentage.toFixed(1)}% (${usageInputTokens} tokens, limit=${usageContextLimit ?? "?"}) decision=${schedulerDecision}${forceMaterialization ? " force=true" : ""}${isEmergency ? " EMERGENCY=true" : ""}${isCacheBusting ? " busting=true" : ""}`);
       logTransformTiming(sessionId, "emergencyRecoveryBlock", tEmergencyRecovery);
-      const entryIds = collectMessageEntryIds(ctx, event.messages.length, sessionId);
+      const entryIds = collectMessageEntryIdsByRef(ctx, event.messages, sessionId) ?? undefined;
       const result = await runPipeline({
         db: options.db,
         tagger,
@@ -172468,7 +172485,7 @@ init_logger();
 init_data_path();
 init_logger();
 await init_sqlite();
-import { join as join16 } from "node:path";
+import { join as join17 } from "node:path";
 var BASE62_CHARS = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 function randomBase62(length) {
   const chars = [];
@@ -172489,7 +172506,7 @@ function generatePartId(timestampMs, counter = 0n) {
   return generateId("prt", timestampMs, counter);
 }
 function getOpenCodeDbPath3() {
-  return join16(getDataDir(), "opencode", "opencode.db");
+  return join17(getDataDir(), "opencode", "opencode.db");
 }
 var cachedWriteDb = null;
 var REQUIRED_MESSAGE_COLUMNS = ["id", "session_id", "time_created", "time_updated", "data"];
@@ -173009,7 +173026,7 @@ async function runCompressorPass2(args) {
     });
     const messagesResponse = await client.session.messages({
       path: { id: agentSessionId },
-      query: { directory }
+      query: { directory, limit: 50 }
     });
     const messages = normalizeSDKResponse(messagesResponse, [], {
       preferResponseOnMissingData: true
@@ -173047,7 +173064,7 @@ async function runCompressorPass2(args) {
 
 // ../plugin/src/hooks/magic-context/compartment-runner-historian.ts
 import { mkdirSync as mkdirSync6, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "node:fs";
-import { join as join17 } from "node:path";
+import { join as join18 } from "node:path";
 init_data_path();
 function historianResponseDumpDir(directory) {
   return getProjectMagicContextHistorianDir(directory);
@@ -173194,7 +173211,7 @@ async function runHistorianPrompt(args) {
     }
     const messagesResponse = await client.session.messages({
       path: { id: agentSessionId },
-      query: { directory: sessionDirectory }
+      query: { directory: sessionDirectory, limit: 50 }
     });
     const messages = normalizeSDKResponse(messagesResponse, [], {
       preferResponseOnMissingData: true
@@ -173301,7 +173318,7 @@ function dumpHistorianResponse(sessionId, directory, label, text) {
     mkdirSync6(dumpDir, { recursive: true });
     const safeSessionId = sanitizeDumpName(sessionId);
     const safeLabel = sanitizeDumpName(label);
-    const dumpPath = join17(dumpDir, `${safeSessionId}-${safeLabel}-${Date.now()}.xml`);
+    const dumpPath = join18(dumpDir, `${safeSessionId}-${safeLabel}-${Date.now()}.xml`);
     writeFileSync3(dumpPath, text, "utf8");
     sessionLog(sessionId, "compartment agent: historian response dumped", {
       label,
@@ -173531,7 +173548,7 @@ async function executePartialRecompInternal(deps, range) {
       }
       deps.onCompartmentStatePublished?.(sessionId);
       const lastEnd = merged[merged.length - 1]?.endMessage ?? snapEnd;
-      if (deps.experimentalCompactionMarkers && lastEnd > 0) {
+      if (lastEnd > 0) {
         updateCompactionMarkerAfterPublication(db, sessionId, lastEnd, deps.directory);
         const stalePending = getPendingCompactionMarkerState(db, sessionId);
         if (stalePending) {
@@ -173790,7 +173807,7 @@ Found ${existingStaging.compartments.length} staged compartment(s) from ${existi
       if (lastCompartmentEnd2 > 0) {
         queueDropsForCompartmentalizedMessages(db, sessionId, lastCompartmentEnd2);
       }
-      if (deps.experimentalCompactionMarkers && lastCompartmentEnd2 > 0) {
+      if (lastCompartmentEnd2 > 0) {
         updateCompactionMarkerAfterPublication(db, sessionId, lastCompartmentEnd2, deps.directory);
         const stalePending = getPendingCompactionMarkerState(db, sessionId);
         if (stalePending) {
@@ -174507,7 +174524,7 @@ import {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.21.1",
+  version: "0.21.4",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -180210,7 +180227,7 @@ async function persistPiPressureFromMessageEnd(args) {
 }
 var PLUGIN_VERSION = (() => {
   try {
-    const req = createRequire3(import.meta.url);
+    const req = createRequire4(import.meta.url);
     return req("../package.json").version;
   } catch {
     return "0.0.0";
@@ -180288,7 +180305,7 @@ function resolveDreamerFromConfig(config2) {
 }
 async function src_default2(pi) {
   const storageDir = getMagicContextStorageDir();
-  const dbPath = join18(storageDir, "context.db");
+  const dbPath = join19(storageDir, "context.db");
   let db;
   try {
     db = openDatabase();

package/dist/subagent-entry.js

@@ -156796,7 +156796,6 @@ var MagicContextConfigSchema = exports_external.object({
     enabled: exports_external.boolean().default(true),
     min_clusters: exports_external.number().min(1).default(3)
   }).default({ enabled: true, min_clusters: 3 }),
-  compaction_markers: exports_external.boolean().default(true),
   system_prompt_injection: exports_external.object({
     enabled: exports_external.boolean().default(true),
     skip_signatures: exports_external.array(exports_external.string()).default(["<!-- magic-context: skip -->"])

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cortexkit/pi-magic-context",
-	"version": "0.21.1",
+	"version": "0.21.4",
 	"type": "module",
 	"description": "Pi coding agent extension for Magic Context — cross-session memory and context management",
 	"main": "dist/index.js",