@cortexkit/pi-magic-context 0.49.21 → 0.49.23

package/dist/historian-calibration-extension.js

@@ -7,7 +7,7 @@ import {
   ceilProviderOutputTokens2,
   withoutProviderTemperature2,
   historianCalibrationExtension
-} from "./index-fa485mqs.js";
+} from "./index-0b5kqg7n.js";
 import"./index-4knyh1kt.js";
 import"./index-6x556c2q.js";
 import"./index-fgs78jyd.js";

package/dist/{index-fa485mqs.js → index-0b5kqg7n.js}

@@ -404,6 +404,41 @@ class SubagentTelemetry {
   }
 }
 
+// src/subagent-tool-boundary.ts
+var SUBAGENT_TOOL_ALLOWLIST_FLAG = "magic-context-tool-allowlist";
+var OMP_CHILD_TOOL_CONFIG = `tools:
+  xdev: false
+plan:
+  enabled: false
+  defaultOnStartup: false
+`;
+function registerSubagentToolBoundary(pi) {
+  pi.registerFlag(SUBAGENT_TOOL_ALLOWLIST_FLAG, {
+    description: "Exact active tool names for a Magic Context hidden child.",
+    type: "string"
+  });
+  pi.on("session_start", async () => {
+    const value = pi.getFlag(SUBAGENT_TOOL_ALLOWLIST_FLAG);
+    if (value === undefined)
+      return;
+    try {
+      const names = typeof value === "string" ? JSON.parse(value) : null;
+      if (!Array.isArray(names) || !names.every((name) => typeof name === "string")) {
+        throw new Error("Invalid Magic Context child tool allowlist");
+      }
+      await pi.setActiveTools(names);
+      const allowed = new Set(names);
+      if (pi.getActiveTools().some((name) => !allowed.has(name))) {
+        throw new Error("Host activated tools outside the Magic Context child allowlist");
+      }
+    } catch (error) {
+      process.stderr.write(`Magic Context child tool restriction failed: ${String(error)}
+`);
+      process.exit(1);
+    }
+  });
+}
+
 // src/historian-calibration-extension.ts
 var HISTORIAN_TEMPERATURE_ENV2 = "MAGIC_CONTEXT_HISTORIAN_TEMPERATURE";
 var HISTORIAN_CACHE_TAIL_ENV2 = "MAGIC_CONTEXT_HISTORIAN_CACHE_TAIL";
@@ -517,6 +552,7 @@ function withoutProviderTemperature2(payload) {
   return clean;
 }
 function historianCalibrationExtension(pi) {
+  registerSubagentToolBoundary(pi);
   if (process.env[HISTORIAN_CACHE_TAIL_ENV2] === "skip") {
     let requests = 0;
     let warned = false;
@@ -577,4 +613,4 @@ function historianCalibrationExtension(pi) {
   });
 }
 
-export { DREAMER_PRIMER_INVESTIGATOR_ALLOWED_TOOLS, buildHiddenAgentRegistrations, logTemperatureDecision, readHostSystemPrompt, subagentStepCap, SubagentTelemetry, HISTORIAN_TEMPERATURE_ENV2, HISTORIAN_CACHE_TAIL_ENV2, HISTORIAN_MAX_OUTPUT_TOKENS_ENV2, SUBAGENT_OUTPUT_CEILING_ENV2, calibrateHistorianProviderPayload2, ceilProviderOutputTokens2, withoutProviderTemperature2, historianCalibrationExtension };
+export { DREAMER_PRIMER_INVESTIGATOR_ALLOWED_TOOLS, buildHiddenAgentRegistrations, logTemperatureDecision, readHostSystemPrompt, subagentStepCap, SubagentTelemetry, OMP_CHILD_TOOL_CONFIG, HISTORIAN_TEMPERATURE_ENV2, HISTORIAN_CACHE_TAIL_ENV2, HISTORIAN_MAX_OUTPUT_TOKENS_ENV2, SUBAGENT_OUTPUT_CEILING_ENV2, calibrateHistorianProviderPayload2, ceilProviderOutputTokens2, withoutProviderTemperature2, historianCalibrationExtension };

package/dist/{index-w6r3ggnp.js → index-2bx7ge3x.js}

@@ -10006,6 +10006,24 @@ async function ensureProjectRegisteredFromPiDirectory(directory, db, options = {
   }
 }
 
+// src/omp-mentions.ts
+function neutralizeOmpMentions(text) {
+  return text.replace(/(^|[\s([{<"'`])@/g, "$1⁠@");
+}
+function restoreOmpMentions(value) {
+  if (typeof value === "string")
+    return value.replaceAll("⁠@", "@");
+  if (Array.isArray(value))
+    return value.map(restoreOmpMentions);
+  if (value !== null && typeof value === "object") {
+    return Object.fromEntries(Object.entries(value).map(([key, entry]) => [
+      key,
+      restoreOmpMentions(entry)
+    ]));
+  }
+  return value;
+}
+
 // src/pi-harness-kind.ts
 import { existsSync as existsSync8, readFileSync as readFileSync8, realpathSync as realpathSync2 } from "node:fs";
 import { dirname as dirname5, join as join5, parse as parse2, resolve as resolve3 } from "node:path";
@@ -13565,12 +13583,18 @@ function registerMagicContextTools(pi, opts) {
   });
   const registration = promptSurfaceRuntime.resolveRegistration(opts.promptSurface);
   const smartNotesAvailable = opts.smartNotesEnabled !== false && opts.dreamerEnabled !== false;
+  const restoreChildMentions = process.env.MAGIC_CONTEXT_PI_SUBAGENT === "1" && resolvePiHarnessKind() === "omp";
   const surfaceTool = (definition) => {
     const parameters = structuredClone(definition.parameters);
     applyJsonSchemaParameterDescriptions(definition.name, parameters, registration.preset, smartNotesAvailable ? opts.smartNotesEnabled : false);
     return setOmpEssentialLoadMode(throwReturnedToolErrors({
       ...definition,
       parameters,
+      execute: (...args) => {
+        if (restoreChildMentions)
+          args[1] = restoreOmpMentions(args[1]);
+        return definition.execute(...args);
+      },
       description: definition.name === "ctx_note" && !smartNotesAvailable ? withoutSmartNoteText(registration.preset === "light" ? CTX_NOTE_LIGHT_DESCRIPTION : definition.description) : registration.descriptionFor(definition.name, definition.description)
     }));
   };
@@ -13625,4 +13649,4 @@ function registerMagicContextTools(pi, opts) {
   }
 }
 
-export { COMPACTION_ENABLED_PATH, isDreamerRunnable, isCompactionEnabled, formatConfigParseStatusLine, formatConfigParseNotice, claimConfigParseFailuresOnce, parseJsoncRecovering, detectConfigFile, OPENCODE_OUTPUT_CAP, MIN_PLAUSIBLE_CONTEXT_LIMIT, catalogOutputReserve, deriveWindowGeometry, hasTrustedAbsoluteWall, applyProvenInputFloor, formatWindowDerivationLine, formatWindowSource, isSaneLimit, resolveOutputReserve, getSdkWindowGeometry, getSdkContextLimit, getSdkOutputLimit, getSdkInputLimit, cortexKitUserConfigBasePath, cortexKitProjectConfigBasePath, migrateMagicContextConfigLocations, getProtectedTokensTierOverrides, rememberUnpublishedAutoSearchNoHint, getUnpublishedAutoSearchNoHint, forgetUnpublishedAutoSearchNoHint, registerAutoSearchWork, cancelAutoSearchWork, readSessionMeta, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, retryPendingSessionCleanups, retryPendingRustSessionCleanupsForProject, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, isNoContentCompartment, HAS_COMPARTMENT_CONTENT_SQL, queueM0Mutation, getMaxM0MutationId, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getCompartmentsByEndMessageId, appendCompartments, saveRecompStagingPass, getRecompStaging, clearRecompStaging, getRecompPartialRange, setRecompPartialRange, escapeXmlAttr, escapeXmlContent, getUncoveredCompartmentEndThrough, isPartialCompartmentEnd, readProjectDocsCanonical, providerResponseFailed, isSuccessfulProviderCompletion, requestPendingMaterialization, pendingMaterializationOrigin, hasPendingMaterializationOrigin, clearPendingMaterialization, recordSystemRefreshOwnership, recordSystemPromptForRequest, recordHeldHeadForRequest, bindSystemPromptResponse, acknowledgeSystemPromptDelivery, deferDeliveredSystemRefresh, clearSystemPromptDelivery, saveLkgSlotToDb, loadPersistedLkgSlot, drainStaleLkgSlots, createDbLkgPersistence, replayLkg, registerLkgPersistence, LKG_SNAPSHOT_ARRAY, LKG_SNAPSHOT_OBJECT, LKG_SNAPSHOT_KEY, LKG_SNAPSHOT_STRING, LKG_SNAPSHOT_NUMBER, LKG_SNAPSHOT_BOOLEAN, LKG_SNAPSHOT_NULL, LKG_SNAPSHOT_UNDEFINED, contentSnapshotValue, signatureForFields, lkgContentFields, lkgContentDigestFromFields, isLegacyLkgDigest, legacyLkgDigestFromFields, lkgFieldsMatchDigest, exactReusablePrefix, incrementalLkgContentDigests, lkgSlotRejection, captureSlot, getInMemorySlot, getSlot, dropSlot, TOOL_SWEEP_SCOPED_MARKER, encodePiContentDecision, decodePiContentDecision, getPiContentDecisions, freezePiContentDecision, getNativeReplayState, saveNativeToolInputs, addNativeReasoningIds, copySessionStateForClone, externalHistorianFailureReason, subprocessExitHistorianFailureReason, countHistorianRuns, recordHistorianRun, summarizeImportance, tallyFactsByCategory, queueMemoryMutation, getMemoryMutationsForRender, getMemoryMutationsForRenderByProjects, getMaxMemoryMutationId, getMaxMemoryMutationIdForProjects, GLOBAL_USER_PROFILE_PROJECT_PATH, getProjectState, bumpProjectUserProfileVersion, saveSourceContent, getSourceContents, recordSubagentInvocation, getLatestHistorianInvocationId, noteTouchedAt, noteNudgePickIndex, formatNoteNudge, systemPromptFingerprint, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, SYNTH_USER_ID_PREFIX, resolvePiStableId, resolvePiRealStableId, isPiContentFallbackId, isPiIndexFallbackId, piContentFallbackIds, readPiSessionSnapshot, readPiSessionMessages, readPiSessionMessagePage, findRestartModelSeedFromBranch, iterateEntriesToRawMessageRange, iterateAsyncEntriesToRawMessageRange, convertEntriesToRawMessages, convertPiAssistantEntryById, convertEntriesToRawMessagePage, countPiRawMessages, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, getTaskScheduleState, getFailingDreamTasks, getSkippedDreamTasks, getMostRecentTaskRunAt, pruneNonCanonicalTaskRows, deleteTaskScheduleRowsForProject, seedTaskScheduleState, writeTaskScheduleState, isRetrospectiveWindowProcessed, recordRetrospectiveWindowProcessed, curateCategoryForMemoryCategory, peekCurateCategoryScope, beginCurateCategoryRun, curateTaskStateAfterSuccess, MEMORY_MURAL_BLOCK, buildMagicContextSection, resolveMuralWire, updateCompactionMarkerAfterPublication, COMPARTMENT_RENDER_EPOCH, MEMORY_RENDER_FORMAT_EPOCH, encodeCachedM0UpgradeIdentity, decodeCachedM0UpgradeIdentity, withCachedM0MemoryIds, readCachedM0MemoryIds, renderBudgetIdentityChanged, renderedBudgetSnapshot, renderedBudgetShrinkReason, DEFAULT_HISTORY_BUDGET_TOKENS, renderCompartmentAtTier, renderDecayedCompartments, extractM0Block, TEMPORAL_MARKER_PATTERN, TEMPORAL_MARKER_REPLAY_PATTERN, temporalMarkerPrefix, renderUserProfileContent, clearInjectionCache, getVisibleMemoryIds, orderHistorianMemories, renderHistorianMemoryBlock, DEFAULT_MEMORY_BUDGET_TOKENS, DEFAULT_USER_PROFILE_BUDGET_TOKENS, trimMemoriesToBudgetV2, trimWorkspaceMemoriesToBudgetV2, trimUserMemoriesToBudget, renderMemoryBlockV2, stripMemoryMuralBlock, resetPrefixTrimFallbackState, isDirectiveShapedProjectRule, takeCurateSafetyRefusalCount, wakePlaneStatus, loadPiConfig, loadPiConfigDetailed, unregisterPiProjectEmbeddings, ensureProjectRegisteredFromPiDirectory, resolvePiHarnessDetection, resolvePiHarnessKind, resolvePiOrdinalAlignment, piRawOrdinalOffsetSource, resolvePiOrdinalAlignmentForContext, isPiOrdinalAlignmentUnanchored, clearPiOrdinalAlignmentSession, rememberTodowriteToolCallTodos, parseTodos, setTodoSnapshot, registerTodoOverlay, registerTodoStateLifecycle, syncCtxMemoryToolEnabled, registerMagicContextTools };
+export { COMPACTION_ENABLED_PATH, isDreamerRunnable, isCompactionEnabled, formatConfigParseStatusLine, formatConfigParseNotice, claimConfigParseFailuresOnce, parseJsoncRecovering, detectConfigFile, OPENCODE_OUTPUT_CAP, MIN_PLAUSIBLE_CONTEXT_LIMIT, catalogOutputReserve, deriveWindowGeometry, hasTrustedAbsoluteWall, applyProvenInputFloor, formatWindowDerivationLine, formatWindowSource, isSaneLimit, resolveOutputReserve, getSdkWindowGeometry, getSdkContextLimit, getSdkOutputLimit, getSdkInputLimit, cortexKitUserConfigBasePath, cortexKitProjectConfigBasePath, migrateMagicContextConfigLocations, getProtectedTokensTierOverrides, rememberUnpublishedAutoSearchNoHint, getUnpublishedAutoSearchNoHint, forgetUnpublishedAutoSearchNoHint, registerAutoSearchWork, cancelAutoSearchWork, readSessionMeta, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, retryPendingSessionCleanups, retryPendingRustSessionCleanupsForProject, COMPARTMENT_LEASE_RENEWAL_MS, acquireCompartmentLease, renewCompartmentLease, releaseCompartmentLease, releaseCompartmentLeaseBestEffort, isCompartmentLeaseHeld, isNoContentCompartment, HAS_COMPARTMENT_CONTENT_SQL, queueM0Mutation, getMaxM0MutationId, getCompartments, getLastCompartmentEndMessage, getLastCompartmentEndMessageId, getCompartmentsByEndMessageId, appendCompartments, saveRecompStagingPass, getRecompStaging, clearRecompStaging, getRecompPartialRange, setRecompPartialRange, escapeXmlAttr, escapeXmlContent, getUncoveredCompartmentEndThrough, isPartialCompartmentEnd, readProjectDocsCanonical, providerResponseFailed, isSuccessfulProviderCompletion, requestPendingMaterialization, pendingMaterializationOrigin, hasPendingMaterializationOrigin, clearPendingMaterialization, recordSystemRefreshOwnership, recordSystemPromptForRequest, recordHeldHeadForRequest, bindSystemPromptResponse, acknowledgeSystemPromptDelivery, deferDeliveredSystemRefresh, clearSystemPromptDelivery, saveLkgSlotToDb, loadPersistedLkgSlot, drainStaleLkgSlots, createDbLkgPersistence, replayLkg, registerLkgPersistence, LKG_SNAPSHOT_ARRAY, LKG_SNAPSHOT_OBJECT, LKG_SNAPSHOT_KEY, LKG_SNAPSHOT_STRING, LKG_SNAPSHOT_NUMBER, LKG_SNAPSHOT_BOOLEAN, LKG_SNAPSHOT_NULL, LKG_SNAPSHOT_UNDEFINED, contentSnapshotValue, signatureForFields, lkgContentFields, lkgContentDigestFromFields, isLegacyLkgDigest, legacyLkgDigestFromFields, lkgFieldsMatchDigest, exactReusablePrefix, incrementalLkgContentDigests, lkgSlotRejection, captureSlot, getInMemorySlot, getSlot, dropSlot, TOOL_SWEEP_SCOPED_MARKER, encodePiContentDecision, decodePiContentDecision, getPiContentDecisions, freezePiContentDecision, getNativeReplayState, saveNativeToolInputs, addNativeReasoningIds, copySessionStateForClone, externalHistorianFailureReason, subprocessExitHistorianFailureReason, countHistorianRuns, recordHistorianRun, summarizeImportance, tallyFactsByCategory, queueMemoryMutation, getMemoryMutationsForRender, getMemoryMutationsForRenderByProjects, getMaxMemoryMutationId, getMaxMemoryMutationIdForProjects, GLOBAL_USER_PROFILE_PROJECT_PATH, getProjectState, bumpProjectUserProfileVersion, saveSourceContent, getSourceContents, recordSubagentInvocation, getLatestHistorianInvocationId, noteTouchedAt, noteNudgePickIndex, formatNoteNudge, systemPromptFingerprint, createPromptSurfaceRuntime, createPromptSurfaceGuidanceEpochCache, SYNTH_USER_ID_PREFIX, resolvePiStableId, resolvePiRealStableId, isPiContentFallbackId, isPiIndexFallbackId, piContentFallbackIds, readPiSessionSnapshot, readPiSessionMessages, readPiSessionMessagePage, findRestartModelSeedFromBranch, iterateEntriesToRawMessageRange, iterateAsyncEntriesToRawMessageRange, convertEntriesToRawMessages, convertPiAssistantEntryById, convertEntriesToRawMessagePage, countPiRawMessages, USER_MEMORY_CANDIDATE_TTL_MS, insertUserMemoryCandidates, getUserMemoryCandidates, deleteUserMemoryCandidates, pruneExpiredUserMemoryCandidates, insertUserMemory, getActiveUserMemories, updateUserMemoryContent, dismissUserMemory, getTaskScheduleState, getFailingDreamTasks, getSkippedDreamTasks, getMostRecentTaskRunAt, pruneNonCanonicalTaskRows, deleteTaskScheduleRowsForProject, seedTaskScheduleState, writeTaskScheduleState, isRetrospectiveWindowProcessed, recordRetrospectiveWindowProcessed, curateCategoryForMemoryCategory, peekCurateCategoryScope, beginCurateCategoryRun, curateTaskStateAfterSuccess, MEMORY_MURAL_BLOCK, buildMagicContextSection, resolveMuralWire, updateCompactionMarkerAfterPublication, COMPARTMENT_RENDER_EPOCH, MEMORY_RENDER_FORMAT_EPOCH, encodeCachedM0UpgradeIdentity, decodeCachedM0UpgradeIdentity, withCachedM0MemoryIds, readCachedM0MemoryIds, renderBudgetIdentityChanged, renderedBudgetSnapshot, renderedBudgetShrinkReason, DEFAULT_HISTORY_BUDGET_TOKENS, renderCompartmentAtTier, renderDecayedCompartments, extractM0Block, TEMPORAL_MARKER_PATTERN, TEMPORAL_MARKER_REPLAY_PATTERN, temporalMarkerPrefix, renderUserProfileContent, clearInjectionCache, getVisibleMemoryIds, orderHistorianMemories, renderHistorianMemoryBlock, DEFAULT_MEMORY_BUDGET_TOKENS, DEFAULT_USER_PROFILE_BUDGET_TOKENS, trimMemoriesToBudgetV2, trimWorkspaceMemoriesToBudgetV2, trimUserMemoriesToBudget, renderMemoryBlockV2, stripMemoryMuralBlock, resetPrefixTrimFallbackState, isDirectiveShapedProjectRule, takeCurateSafetyRefusalCount, wakePlaneStatus, loadPiConfig, loadPiConfigDetailed, unregisterPiProjectEmbeddings, ensureProjectRegisteredFromPiDirectory, neutralizeOmpMentions, restoreOmpMentions, resolvePiHarnessDetection, resolvePiHarnessKind, resolvePiOrdinalAlignment, piRawOrdinalOffsetSource, resolvePiOrdinalAlignmentForContext, isPiOrdinalAlignmentUnanchored, clearPiOrdinalAlignmentSession, rememberTodowriteToolCallTodos, parseTodos, setTodoSnapshot, registerTodoOverlay, registerTodoStateLifecycle, syncCtxMemoryToolEnabled, registerMagicContextTools };

package/dist/index.js

@@ -235,6 +235,8 @@ import {
   loadPiConfigDetailed,
   unregisterPiProjectEmbeddings,
   ensureProjectRegisteredFromPiDirectory,
+  neutralizeOmpMentions,
+  restoreOmpMentions,
   resolvePiHarnessDetection,
   resolvePiHarnessKind,
   resolvePiOrdinalAlignment,
@@ -249,7 +251,7 @@ import {
   registerTodoStateLifecycle,
   syncCtxMemoryToolEnabled,
   registerMagicContextTools
-} from "./index-w6r3ggnp.js";
+} from "./index-2bx7ge3x.js";
 import"./index-4knyh1kt.js";
 import {
   canonicalModelIdentity,
@@ -789,10 +791,11 @@ import {
   readHostSystemPrompt,
   subagentStepCap,
   SubagentTelemetry,
+  OMP_CHILD_TOOL_CONFIG,
   HISTORIAN_CACHE_TAIL_ENV2,
   HISTORIAN_MAX_OUTPUT_TOKENS_ENV2,
   SUBAGENT_OUTPUT_CEILING_ENV2
-} from "./index-fa485mqs.js";
+} from "./index-0b5kqg7n.js";
 import {
   PI_CONTEXT_BUDGET,
   PiContextDeadlineError,
@@ -3552,7 +3555,7 @@ function startHostStallProfilerSwitch() {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.49.21",
+  version: "0.49.23",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -20990,6 +20993,12 @@ class PiSubagentRunner {
     }
   }
   async runOnce(options, runMode, modelRefOverride) {
+    if (this.invocation.targetHarness === "omp") {
+      options = {
+        ...options,
+        userMessage: neutralizeOmpMentions(options.userMessage)
+      };
+    }
     const startTime = Date.now();
     const zenChild = STRICT_TOOL_ALLOWLIST.has(options.agent) && isZenModel(options.model);
     let deferredZenStderr = "";
@@ -21069,6 +21078,7 @@ class PiSubagentRunner {
     const deliverViaStdin = !rpcBudget && (promptBytes > PROMPT_ARGV_MAX_BYTES || this.platform === "win32");
     let systemPromptTempDir;
     let systemPromptPath;
+    let ompToolConfigPath;
     const cleanupSystemPromptFile = () => {
       if (!systemPromptTempDir)
         return;
@@ -21089,13 +21099,24 @@ class PiSubagentRunner {
         return failBeforeSpawn("spawn_failed", `failed to prepare pi system prompt file: ${error instanceof Error ? error.message : String(error)}`);
       }
     }
-    if (rpcBudget && !systemPromptTempDir) {
+    if ((rpcBudget || this.invocation.targetHarness === "omp") && !systemPromptTempDir) {
       try {
         systemPromptTempDir = mkdtempSync2(join10(tmpdir2(), "mc-pi-prompt-"));
       } catch (error) {
         return failBeforeSpawn("spawn_failed", `failed to prepare pi budget guard: ${error instanceof Error ? error.message : String(error)}`);
       }
     }
+    if (this.invocation.targetHarness === "omp") {
+      try {
+        if (!systemPromptTempDir)
+          throw new Error("child temp directory is unavailable");
+        ompToolConfigPath = join10(systemPromptTempDir, "tool-boundary.yml");
+        writeFileSync4(ompToolConfigPath, OMP_CHILD_TOOL_CONFIG, "utf8");
+      } catch (error) {
+        cleanupSystemPromptFile();
+        return failBeforeSpawn("spawn_failed", `failed to prepare OMP child tool config: ${String(error)}`);
+      }
+    }
     const budgetGuardFile = rpcBudget && systemPromptTempDir ? join10(systemPromptTempDir, "budget-guard") : undefined;
     if (budgetGuardFile) {
       try {
@@ -21112,6 +21133,7 @@ class PiSubagentRunner {
       hostToolNames: this.readHostToolNames(),
       omitPositionalMessage: deliverViaStdin || rpcBudget,
       systemPromptPath,
+      ompToolConfigPath,
       modelRef: modelRefOverride,
       rpc: rpcBudget
     });
@@ -21345,7 +21367,7 @@ class PiSubagentRunner {
       rl.on("line", (line) => {
         if (settled || line.length === 0)
           return;
-        const parsed = parsePiEventLine(line);
+        const parsed = parsePiEventLine(line, this.invocation.targetHarness);
         if (!parsed.ok) {
           if ("noise" in parsed)
             return;
@@ -21804,6 +21826,10 @@ var PROMPT_ARGV_MAX_BYTES = 96 * 1024;
 function buildArgs(options, opts) {
   const targetHarness = opts?.targetHarness ?? resolvePiHarnessKind();
   const ompTarget = targetHarness === "omp";
+  const ompToolConfigPath = opts?.ompToolConfigPath;
+  if (ompTarget && !ompToolConfigPath) {
+    throw new Error("OMP child requires a tool-boundary config overlay");
+  }
   const args = [
     ...opts?.rpc ? [] : ["--print"],
     "--mode",
@@ -21812,6 +21838,9 @@ function buildArgs(options, opts) {
     "--no-skills",
     ...ompTarget ? ["--no-rules"] : ["--no-prompt-templates", "--no-context-files"]
   ];
+  if (ompTarget && ompToolConfigPath) {
+    args.push("--config", ompToolConfigPath);
+  }
   if (opts?.disableDiscoveredExtensions || opts?.subagentExtensions !== undefined) {
     args.push("--no-extensions");
   }
@@ -21828,17 +21857,24 @@ function buildArgs(options, opts) {
       args.push("--magic-context-dreamer-actions");
     }
   }
-  const historianCalibrationEntryPath = opts?.historianCalibrationEntryPath === undefined ? HISTORIAN_CALIBRATION_ENTRY_PATH : opts.historianCalibrationEntryPath;
-  if (subagentStepCap(options.agent) !== undefined && historianCalibrationEntryPath) {
+  const historianCalibrationEntryPath = opts?.historianCalibrationEntryPath === undefined ? HISTORIAN_CALIBRATION_ENTRY_PATH ?? (ompTarget ? resolveSiblingEntryPath("historian-calibration-extension.ts") : undefined) : opts.historianCalibrationEntryPath;
+  if (ompTarget && !historianCalibrationEntryPath) {
+    throw new Error("OMP child requires the tool-boundary startup extension");
+  }
+  if ((ompTarget || subagentStepCap(options.agent) !== undefined) && historianCalibrationEntryPath) {
     args.push("--extension", historianCalibrationEntryPath);
   }
   const strictTools = STRICT_TOOL_ALLOWLIST.get(options.agent);
+  let activeToolNames = [];
   if (strictTools === undefined) {
     sessionLog2(options.accountingSessionId ?? "pi-subagent", `Pi subagent agent "${options.agent}" has no strict tool allow-list; forcing --no-tools`);
     args.push("--no-tools");
   } else {
     const resolution = resolveHostToolAllowlistDetails(strictTools, ompTarget, ompTarget ? opts?.hostToolNames : undefined);
     const hostTools = resolution.tools;
+    activeToolNames = [
+      ...new Set(strictTools.map((tool) => ompTarget ? OMP_TOOL_ALIASES[tool] ?? tool : tool).filter((tool) => !resolution.dropped.includes(tool)))
+    ];
     for (const tool of resolution.dropped) {
       const warningKey = `${options.agent}\x00${tool}`;
       if (loggedUnavailableBuiltinTools.has(warningKey))
@@ -21853,6 +21889,9 @@ function buildArgs(options, opts) {
       args.push("--no-tools");
     }
   }
+  if (ompTarget) {
+    args.push("--magic-context-tool-allowlist", JSON.stringify(activeToolNames));
+  }
   if (opts?.systemPromptPath) {
     args.push("--system-prompt", opts.systemPromptPath);
   }
@@ -21946,12 +21985,16 @@ function countToolCalls(messages) {
   }
   return count;
 }
-function parsePiEventLine(line) {
+function parsePiEventLine(line, targetHarness = "pi") {
   if (!line.trimStart().startsWith("{")) {
     return { ok: false, noise: true };
   }
   try {
-    return { ok: true, event: JSON.parse(line) };
+    const event = JSON.parse(line);
+    return {
+      ok: true,
+      event: targetHarness === "omp" ? restoreOmpMentions(event) : event
+    };
   } catch (error) {
     return {
       ok: false,

package/dist/subagent-entry.js

@@ -31,7 +31,7 @@ import {
   ensureProjectRegisteredFromPiDirectory,
   resolvePiHarnessKind,
   registerMagicContextTools
-} from "./index-w6r3ggnp.js";
+} from "./index-2bx7ge3x.js";
 import"./index-ccanzg8p.js";
 import"./index-gwxaz0z5.js";
 import"./index-vx6f7wff.js";

package/package.json

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