@cortexkit/pi-magic-context 0.36.1 → 0.37.0

package/dist/index.js

@@ -87,6 +87,7 @@ import {
   deleteUserMemoryCandidates,
   deliverNoteNudgeAtomic,
   deriveTagLoadFloor,
+  deriveWindowGeometry,
   describeError,
   dismissUserMemory,
   drainCommitBacklogForProject,
@@ -113,6 +114,7 @@ import {
   findAdoptableFallbackTags,
   findLastModelKeyFromBranch,
   findPiFallbackToolOwnerTags,
+  formatWindowDerivationLine,
   getActivePrimers,
   getActiveTagTokenAggregate,
   getActiveTagsBySession,
@@ -205,6 +207,7 @@ import {
   getUnmappedMemoryIds,
   getUserMemoryCandidates,
   getVisibleMemoryIds,
+  getWindowOverlay,
   getWrapupInProgressState,
   hasMeaningfulUserText,
   hasMemoryClassifiedAtColumn,
@@ -242,6 +245,7 @@ import {
   markProtectedTailPolicyV3Seeded,
   memoryNeedsCue,
   migrateMagicContextConfigLocations,
+  modelRefLookupOrder,
   nextDueAtMs,
   nextOccurrence,
   normalizeText,
@@ -275,7 +279,6 @@ import {
   readGitChangedFilesSince,
   readGitFileChangeTimesSince,
   readGitHead,
-  readNewMemoriesForM1Union,
   readPiSessionMessages,
   readProjectDocsCanonical,
   readRawSessionMessages,
@@ -310,7 +313,6 @@ import {
   resetLastNudgeCycleIfTailShrank,
   resolveCompactionModeRecord,
   resolveGitTopLevel,
-  resolveLimit,
   resolveModelConfigOrDefault,
   resolveModelRefForOmp,
   resolveModelRefForPi,
@@ -319,6 +321,7 @@ import {
   resolveProjectIdentity,
   resolveProjectIdentityForSession,
   resolveProjectIdentityStrict,
+  resolveWindowOverlayFacts,
   resolveWorkspaceIdentitySet,
   resolveWorkspaceShareCategories,
   retryPendingSessionCleanups,
@@ -373,11 +376,12 @@ import {
   updateUserMemoryContent,
   updateWrapupInProgress,
   verificationFileExists,
+  wakePlaneStatus,
   withContentLanguageDirective,
   withMigrationLanguageDirective,
   withRawMessageProvider,
   withRawSessionMessageCache
-} from "./index-zxgbtsnj.js";
+} from "./index-kvttksef.js";
 import {
   pushNotification
 } from "./index-hw34xmzk.js";
@@ -389,7 +393,7 @@ import {
   log,
   sessionLog,
   setHarness
-} from "./index-npnqc564.js";
+} from "./index-hk6sj7dn.js";
 import {
   __require,
   __toESM
@@ -887,7 +891,7 @@ var LIMIT_EXTRACTION_PATTERNS = [
     pattern: /too large for model with (\d+) maximum context length/i,
     provenance: "combined"
   },
-  { pattern: /context size.*(\d+) tokens?/i, provenance: "combined" },
+  { pattern: /context size[^0-9]{0,40}(\d{4,})\s*tokens?/i, provenance: "combined" },
   { pattern: /exceeds? the context length of (\d+)/i, provenance: "combined" },
   {
     pattern: />\s*(\d+)\s*(?:tokens?\s*)?(?:maximum|max|limit)\b/i,
@@ -1510,11 +1514,13 @@ function isFinitePositive(v) {
 }
 function* modelKeyLookupOrder(modelKey) {
   const slash = modelKey.indexOf("/");
-  const provider = slash >= 0 ? modelKey.slice(0, slash) : "";
+  const providerRefs = slash >= 0 ? modelRefLookupOrder(modelKey) : [];
   let modelId = slash >= 0 ? modelKey.slice(slash + 1) : modelKey;
   while (modelId.length > 0) {
-    if (provider)
-      yield `${provider}/${modelId}`;
+    for (const providerRef of providerRefs) {
+      const providerSlash = providerRef.indexOf("/");
+      yield `${providerRef.slice(0, providerSlash)}/${modelId}`;
+    }
     yield modelId;
     const lastDash = modelId.lastIndexOf("-");
     if (lastDash <= 0)
@@ -3761,7 +3767,7 @@ async function sendIgnoredMessageNow(client, sessionId, text, params, forcePersi
     queueIgnoredNotification({ client, sessionId, text, params, forcePersist });
     return "queued";
   }
-  const { waitForSafeNotificationTarget } = await import("./safe-notification-target-0s6j4m9f.js");
+  const { waitForSafeNotificationTarget } = await import("./safe-notification-target-7n7s6xv7.js");
   if (await waitForSafeNotificationTarget(client, sessionId) === "skip") {
     sessionLog(sessionId, "notification skipped (session not titled yet)");
     return "skipped";
@@ -7272,6 +7278,9 @@ var DEFAULT_MAX_CHECKS = 10;
 var DEFAULT_SWEEP_BUDGET_MS = 15000;
 var MAX_FAILURES_BEFORE_REAUTHOR = 3;
 async function runDueCompiledSmartNoteChecks(args) {
+  if (await wakePlaneStatus() === "present") {
+    return { ran: 0, surfaced: 0, failed: 0, networkFailed: 0 };
+  }
   const startedAt = Date.now();
   const now = args.now ?? startedAt;
   const due = getDueCompiledSmartNoteChecks(args.db, args.projectIdentity, now, args.maxChecks ?? DEFAULT_MAX_CHECKS, args.retinaHandoff);
@@ -7401,6 +7410,11 @@ function createPromptAbortSignal(parent, timeoutMs, timeoutMessage) {
   };
 }
 async function evaluateSmartNotes(args) {
+  if (await wakePlaneStatus() === "present") {
+    const pending = getPendingSmartNotes(args.db, args.projectIdentity).length;
+    log("[dreamer] evaluate-smart-notes: skipped (wake plane active)");
+    return { surfaced: 0, pending, ran: false };
+  }
   const projectRoot = args.sessionDirectory ?? args.projectIdentity;
   const moduleBridge = getModuleNoteEvaluationBridge(args.projectIdentity);
   await moduleBridge?.sync();
@@ -16370,6 +16384,7 @@ function getPiToolResultCallId(message) {
   return typeof callId === "string" && callId.length > 0 ? callId : null;
 }
 var PI_M1_PLACEHOLDER = "<session-history-since>(no new content since last materialization)</session-history-since>";
+var MAX_FORCED_MEMORIES_PER_DELTA = 10;
 var PI_M0_UPGRADE_STATE = "pi-m0m1-v2";
 var EMPTY_MAX_COMPARTMENT_SEQ = -1;
 function historySliceTokensPi(m0Text) {
@@ -16600,7 +16615,7 @@ function readCurrentMarkersFromCompartments(db, state2, compartments, projectDoc
     compartmentRenderEpoch: COMPARTMENT_RENDER_EPOCH,
     lastBaselineEndMessageId: lastBaselineEndMessageId(compartments),
     systemHash: (state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).systemHash,
-    modelKey: (state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).modelKey,
+    modelKey: piModelRefToCanonical((state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).modelKey),
     projectIdentity: state2.projectIdentity,
     muralEnabled: state2.muralEnabled === true,
     renderBudgetIdentity: renderBudgetIdentityPi(state2)
@@ -16628,7 +16643,9 @@ function mustMaterializePi(state2, db, currentCompartmentsOverride) {
     return { value: true, reason: "render_config" };
   }
   const hard = state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS;
-  if (hard.modelKey !== "" && hard.modelKey !== (meta.cachedM0ModelKey ?? "")) {
+  const canonicalHardModelKey = piModelRefToCanonical(hard.modelKey);
+  const canonicalCachedModelKey = piModelRefToCanonical(meta.cachedM0ModelKey ?? "");
+  if (canonicalHardModelKey !== "" && canonicalHardModelKey !== canonicalCachedModelKey) {
     return { value: true, reason: "model_change" };
   }
   if (hard.systemHash !== "" && hard.systemHash !== (meta.cachedM0SystemHash ?? "")) {
@@ -16763,7 +16780,7 @@ function readFrozenM0InputsPi(state2, db, docs = readProjectDocsForPiM0(state2),
       compartmentRenderEpoch: COMPARTMENT_RENDER_EPOCH,
       lastBaselineEndMessageId: lastBaselineEndMessageId(compartments),
       systemHash: (state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).systemHash,
-      modelKey: (state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).modelKey,
+      modelKey: piModelRefToCanonical((state2.hardSignals ?? EMPTY_PI_HARD_SIGNALS).modelKey),
       projectIdentity: state2.projectIdentity,
       muralEnabled: state2.muralEnabled === true,
       renderBudgetIdentity: renderBudgetIdentityPi(state2)
@@ -16889,49 +16906,74 @@ function materializeM0PiWithRetry(state2, db, maxRetries = 3) {
   throw lastError ?? new PiMaterializeContentionError("materialization contention exhausted");
 }
 function renderMemoryUpdatesBlockPi(args) {
-  if (args.renderedMemoryIds.length === 0)
-    return { block: "", count: 0 };
   const renderedIds = new Set(args.renderedMemoryIds);
   const mutations = args.workspace.isWorkspaced ? getMemoryMutationsForRenderByProjects(args.db, args.workspace.expandedIdentities, args.afterId, args.renderedMemoryIds) : getMemoryMutationsForRender(args.db, args.projectPath, args.afterId, args.renderedMemoryIds);
-  if (mutations.length === 0)
-    return { block: "", count: 0 };
+  if (mutations.length === 0) {
+    return { block: "", count: 0, forcedMemoryIds: [] };
+  }
+  const forcedIds = new Set;
   const lines = [
     "These memories changed since the snapshot below — trust these:"
   ];
   for (const mutation of mutations) {
-    if (mutation.mutationType === "update") {
-      lines.push(`  <updated id="${mutation.targetMemoryId}">${escapeXmlContent(mutation.newContent ?? "")}</updated>`);
-      continue;
-    }
     if (mutation.mutationType === "superseded") {
-      if (mutation.supersededById !== null && renderedIds.has(mutation.supersededById)) {
-        lines.push(`  <superseded id="${mutation.targetMemoryId}" by="${mutation.supersededById}"/>`);
+      const replacementId = mutation.supersededById;
+      if (replacementId !== null && !renderedIds.has(replacementId) && args.eligibleMemoryIds.has(replacementId)) {
+        forcedIds.add(replacementId);
+      }
+      if (!renderedIds.has(mutation.targetMemoryId))
+        continue;
+      if (replacementId !== null && args.eligibleMemoryIds.has(replacementId)) {
+        lines.push(`  <superseded id="${mutation.targetMemoryId}" by="${replacementId}"/>`);
       } else {
         lines.push(`  <removed id="${mutation.targetMemoryId}"/>`);
       }
       continue;
     }
+    if (!renderedIds.has(mutation.targetMemoryId)) {
+      if (mutation.visibilityChanged && args.eligibleMemoryIds.has(mutation.targetMemoryId)) {
+        forcedIds.add(mutation.targetMemoryId);
+      }
+      continue;
+    }
+    if (!args.eligibleMemoryIds.has(mutation.targetMemoryId)) {
+      lines.push(`  <removed id="${mutation.targetMemoryId}"/>`);
+      continue;
+    }
+    if (mutation.visibilityChanged && mutation.newContent === null)
+      continue;
+    if (mutation.mutationType === "update") {
+      lines.push(`  <updated id="${mutation.targetMemoryId}">${escapeXmlContent(mutation.newContent ?? "")}</updated>`);
+      continue;
+    }
     lines.push(`  <removed id="${mutation.targetMemoryId}"/>`);
   }
+  const forcedMemoryIds = [...forcedIds].sort((left, right) => left - right).slice(0, MAX_FORCED_MEMORIES_PER_DELTA);
+  if (lines.length === 1)
+    return { block: "", count: 0, forcedMemoryIds };
   return {
     block: `<memory-updates>
 ${lines.join(`
 `)}
 </memory-updates>`,
-    count: mutations.length
+    count: lines.length - 1,
+    forcedMemoryIds
   };
 }
 function renderM1PiWithMetadata(state2, db, markers, renderedMemoryIds, compartmentsOverride) {
   const sections = [];
   const workspace = resolveWorkspaceRenderContextPi(state2, db);
   const memPath = memoryProjectPath(state2);
+  const eligibleMemories = memPath ? workspace.isWorkspaced ? getMemoriesByProjects(db, workspace.expandedIdentities, ["active", "permanent"], markers.materializedAt, workspace.ownIdentities, workspace.shareCategories) : getMemoriesByProject(db, memPath, ["active", "permanent"], markers.materializedAt) : [];
+  const eligibleMemoryIds = new Set(eligibleMemories.map((memory) => memory.id));
   const memoryUpdates = memPath ? renderMemoryUpdatesBlockPi({
     db,
     projectPath: memPath,
     workspace,
     afterId: markers.maxMemoryMutationId,
-    renderedMemoryIds
-  }) : { block: undefined, count: 0 };
+    renderedMemoryIds,
+    eligibleMemoryIds
+  }) : { block: undefined, count: 0, forcedMemoryIds: [] };
   if (memoryUpdates.block)
     sections.push(memoryUpdates.block);
   const newCompartments = (compartmentsOverride ?? getRenderableCompartmentsPi(db, state2)).filter((compartment) => compartment.sequence > markers.maxCompartmentSeq);
@@ -16943,21 +16985,24 @@ function renderM1PiWithMetadata(state2, db, markers, renderedMemoryIds, compartm
 ${body}
 </new-compartments>`);
   }
-  const newMemories = memPath ? workspace.isWorkspaced ? readNewMemoriesForM1Union(db, workspace.expandedIdentities, markers.maxMemoryId, markers.materializedAt, workspace.ownIdentities, workspace.shareCategories) : getMemoriesByProject(db, memPath, ["active", "permanent"], markers.materializedAt).filter((memory) => memory.id > markers.maxMemoryId) : [];
-  if (newMemories.length > 0) {
-    const memoryBudget = state2.injectionBudgetTokens ?? DEFAULT_MEMORY_BUDGET_TOKENS;
-    const memoryRenderOptions = {
-      sourceNameByMemoryId: sourceNamesForPiMemories({
-        memories: newMemories,
-        projectPath: memPath,
-        workspace
-      })
-    };
-    const trimmedNewMemories = trimMemoriesToBudgetV2(state2.sessionId, newMemories, Math.max(1, Math.floor(memoryBudget * 0.25)), memoryRenderOptions).renderOrder;
-    const newMemoriesBlock = renderMemoryBlockV2(trimmedNewMemories, "new-memories", memoryRenderOptions);
-    if (newMemoriesBlock)
-      sections.push(newMemoriesBlock);
-  }
+  const forcedMemoryIds = new Set(memoryUpdates.forcedMemoryIds);
+  const newMemories = eligibleMemories.filter((memory) => memory.id > markers.maxMemoryId && !forcedMemoryIds.has(memory.id));
+  const memoryBudget = state2.injectionBudgetTokens ?? DEFAULT_MEMORY_BUDGET_TOKENS;
+  const memoryRenderOptions = {
+    sourceNameByMemoryId: sourceNamesForPiMemories({
+      memories: eligibleMemories,
+      projectPath: memPath,
+      workspace
+    })
+  };
+  const trimmedNewMemories = trimMemoriesToBudgetV2(state2.sessionId, newMemories, Math.max(1, Math.floor(memoryBudget * 0.25)), memoryRenderOptions).renderOrder;
+  const deltaMemories = [
+    ...trimmedNewMemories,
+    ...eligibleMemories.filter((memory) => forcedMemoryIds.has(memory.id))
+  ];
+  const newMemoriesBlock = renderMemoryBlockV2(deltaMemories, "new-memories", memoryRenderOptions);
+  if (newMemoriesBlock)
+    sections.push(newMemoriesBlock);
   const currentUserProfileVersion = getProjectState(db, GLOBAL_USER_PROFILE_PROJECT_PATH)?.projectUserProfileVersion ?? 0;
   if (currentUserProfileVersion !== markers.projectUserProfileVersion) {
     const profileBudget = state2.userProfileBudgetTokens ?? DEFAULT_USER_PROFILE_BUDGET_TOKENS;
@@ -17072,7 +17117,7 @@ function cachedPiRowMatchesSnapshot(args) {
   const rowMarkers = markersFromCachedPiRow(args.row, args.compartmentsForNormalization);
   if (!rowMarkers)
     return false;
-  return bufferEqualsNullable(args.row.cached_m0_bytes, args.m0Bytes) && rowMarkers.projectMemoryEpoch === args.markers.projectMemoryEpoch && rowMarkers.projectUserProfileVersion === args.markers.projectUserProfileVersion && rowMarkers.maxCompartmentSeq === args.markers.maxCompartmentSeq && rowMarkers.maxMemoryId === args.markers.maxMemoryId && rowMarkers.maxMutationId === args.markers.maxMutationId && rowMarkers.maxMemoryMutationId === args.markers.maxMemoryMutationId && rowMarkers.materializedAt === args.markers.materializedAt && rowMarkers.sessionFactsVersion === args.markers.sessionFactsVersion && (rowMarkers.upgradeState ?? null) === (args.markers.upgradeState ?? null) && rowMarkers.compartmentRenderEpoch === args.markers.compartmentRenderEpoch && (rowMarkers.systemHash ?? "") === (args.markers.systemHash ?? "") && (rowMarkers.modelKey ?? "") === (args.markers.modelKey ?? "") && (rowMarkers.projectIdentity ?? null) === (args.markers.projectIdentity ?? null) && (rowMarkers.workspaceFingerprint ?? null) === (args.markers.workspaceFingerprint ?? null);
+  return bufferEqualsNullable(args.row.cached_m0_bytes, args.m0Bytes) && rowMarkers.projectMemoryEpoch === args.markers.projectMemoryEpoch && rowMarkers.projectUserProfileVersion === args.markers.projectUserProfileVersion && rowMarkers.maxCompartmentSeq === args.markers.maxCompartmentSeq && rowMarkers.maxMemoryId === args.markers.maxMemoryId && rowMarkers.maxMutationId === args.markers.maxMutationId && rowMarkers.maxMemoryMutationId === args.markers.maxMemoryMutationId && rowMarkers.materializedAt === args.markers.materializedAt && rowMarkers.sessionFactsVersion === args.markers.sessionFactsVersion && (rowMarkers.upgradeState ?? null) === (args.markers.upgradeState ?? null) && rowMarkers.compartmentRenderEpoch === args.markers.compartmentRenderEpoch && (rowMarkers.systemHash ?? "") === (args.markers.systemHash ?? "") && piModelRefToCanonical(rowMarkers.modelKey ?? "") === piModelRefToCanonical(args.markers.modelKey ?? "") && (rowMarkers.projectIdentity ?? null) === (args.markers.projectIdentity ?? null) && (rowMarkers.workspaceFingerprint ?? null) === (args.markers.workspaceFingerprint ?? null);
 }
 function adoptCachedPiProjectIdentity(db, state2) {
   db.prepare("UPDATE session_meta SET cached_m0_project_identity = ? WHERE session_id = ? AND cached_m0_project_identity IS NULL").run(state2.projectIdentity, state2.sessionId);
@@ -17386,13 +17431,44 @@ function isSentinelPart(part) {
 }
 
 // src/pi-context-limit.ts
-function resolvePiUsableContextLimit(args) {
-  const rawContext = isSaneLimit(args.rawContextWindow) ? args.rawContextWindow : undefined;
-  const detected = typeof args.detectedContextLimit === "number" && Number.isFinite(args.detectedContextLimit) && args.detectedContextLimit >= 1024 ? args.detectedContextLimit : undefined;
-  const context = rawContext !== undefined && detected !== undefined ? Math.min(rawContext, detected) : rawContext ?? detected;
-  if (context === undefined)
+var MIN_SANE_LIMIT = 16000;
+var MAX_SANE_LIMIT = 1e7;
+function isSaneLimit2(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= MIN_SANE_LIMIT && value <= MAX_SANE_LIMIT;
+}
+function resolvePiWindowGeometry(args) {
+  const runtimeWindow = isSaneLimit2(args.rawContextWindow) ? args.rawContextWindow : isSaneLimit2(args.model?.contextWindow) ? args.model.contextWindow : undefined;
+  const persistedUsable = isSaneLimit2(args.persistedInputTokens) && typeof args.persistedPercentage === "number" && Number.isFinite(args.persistedPercentage) && args.persistedPercentage > 0 ? args.persistedInputTokens / (args.persistedPercentage / 100) : undefined;
+  const persistedWindow = isSaneLimit2(args.persistedInputTokens) && typeof args.persistedPercentage === "number" && Number.isFinite(args.persistedPercentage) && args.persistedPercentage > 0 ? args.persistedInputTokens / (args.persistedPercentage / 100) : undefined;
+  const context = runtimeWindow ?? persistedWindow;
+  if (!isSaneLimit2(context))
     return;
-  return resolveLimit({ context, output: args.model?.maxTokens }, args.model?.provider ?? "unknown", args.model?.id ?? "unknown");
+  const providerID = args.model?.provider ?? "unknown";
+  const modelID = args.model?.id ?? "unknown";
+  const result = deriveWindowGeometry(providerID, modelID, {
+    context,
+    output: args.model?.maxTokens
+  }, {
+    overlay: resolveWindowOverlayFacts(providerID, modelID, getWindowOverlay()),
+    contextCap: isSaneLimit2(args.detectedContextLimit) ? args.detectedContextLimit : undefined,
+    reserveConfig: args.reserveConfig,
+    harness: "pi"
+  });
+  if (!result || !isSaneLimit2(persistedUsable))
+    return result;
+  const usableSoft = Math.round(persistedUsable);
+  return {
+    ...result,
+    usableSoft,
+    usableHard: Math.max(usableSoft, result.usableHard),
+    derivation: {
+      ...result.derivation,
+      reserve: Math.max(0, result.derivation.window - usableSoft)
+    }
+  };
+}
+function resolvePiUsableContextLimit(args) {
+  return resolvePiWindowGeometry(args)?.usableSoft;
 }
 
 // src/pi-historian-runner.ts
@@ -22796,6 +22872,9 @@ function extractStableId(msg, index, entryIds) {
 // src/context-handler.ts
 var EMERGENCY_BLOCK_PERCENTAGE = 95;
 var FORWARD_PRESSURE_LIMIT_FACTOR = 0.85;
+function isPiHardCacheExpired(lastResponseTime, ttlMs, now) {
+  return lastResponseTime > 0 && now - lastResponseTime > ttlMs;
+}
 function applyForwardPressureFloor(trailingPercentage, trailingInputTokens, piUsageTokens, correctedLimit) {
   const forwardTokens = typeof piUsageTokens === "number" && piUsageTokens > 0 ? piUsageTokens : 0;
   if (forwardTokens === 0 || !isSaneLimit(correctedLimit)) {
@@ -23632,7 +23711,7 @@ function registerPiContextHandler(pi, baseOptions) {
       }
       const previousModelKey = liveModelBySession.get(sessionId);
       const currentModelKey = resolvePiContextModelKey(ctx);
-      const modelChanged = previousModelKey !== undefined && currentModelKey !== undefined && previousModelKey !== currentModelKey;
+      const modelChanged = previousModelKey !== undefined && currentModelKey !== undefined && piModelRefToCanonical(previousModelKey) !== piModelRefToCanonical(currentModelKey);
       if (currentModelKey !== undefined) {
         liveModelBySession.set(sessionId, currentModelKey);
       }
@@ -23731,11 +23810,12 @@ function registerPiContextHandler(pi, baseOptions) {
           usageContextLimit = modelWindow;
         }
       }
-      usageContextLimit = resolvePiUsableContextLimit({
+      const windowGeometry = resolvePiWindowGeometry({
         rawContextWindow: usageContextLimit,
         model: ctx.model,
         detectedContextLimit
       });
+      usageContextLimit = windowGeometry?.usableSoft;
       const effectiveExecuteThresholdPercentage = resolveExecuteThreshold(schedulerConfig.executeThresholdPercentage, modelKey, 65, {
         tokensConfig: schedulerConfig.executeThresholdTokens,
         contextLimit: usageContextLimit,
@@ -23807,7 +23887,9 @@ function registerPiContextHandler(pi, baseOptions) {
       schedulerDecision = midTurnAdjustedSchedulerDecision;
       sessionLog(sessionId, `[boundary-exec] base=${schedulerDecisionEarly} bypass=${bypassReason} midTurn=${midTurn} effective=${midTurnAdjustedSchedulerDecision} sideEffect=${sideEffect}`);
       const forceMaterialization = !options.compactionOff && usagePercentage >= forceMaterializationPercentage;
-      const isEmergency = !options.compactionOff && usagePercentage >= EMERGENCY_BLOCK_PERCENTAGE;
+      const hardUsagePercentage = needsEmergencyBump ? Math.max(EMERGENCY_BLOCK_PERCENTAGE, usagePercentage) : windowGeometry?.usableHard && usageInputTokens > 0 ? usageInputTokens / windowGeometry.usableHard * 100 : usagePercentage;
+      const emergencyPercentage = ctx.model ? hardUsagePercentage : usagePercentage;
+      const isEmergency = !options.compactionOff && emergencyPercentage >= EMERGENCY_BLOCK_PERCENTAGE;
       if (isEmergency) {
         const lastNotifiedAt = lastEmergencyNotificationAtMs.get(sessionId) ?? 0;
         const now = Date.now();
@@ -24618,7 +24700,7 @@ async function runPipeline(args) {
     return {
       systemHash: typeof hardMeta.systemPromptHash === "string" ? hardMeta.systemPromptHash : "",
       modelKey: liveModelBySession.get(args.sessionId) ?? "",
-      cacheExpired: hardMeta.lastResponseTime > 0 && Date.now() - hardMeta.lastResponseTime >= piTtlMs,
+      cacheExpired: isPiHardCacheExpired(hardMeta.lastResponseTime, piTtlMs, Date.now()),
       lastResponseTime: hardMeta.lastResponseTime
     };
   })() : undefined;
@@ -24689,8 +24771,9 @@ async function runPipeline(args) {
   }
   const deferredMaterializationWasPending = deferredMaterializationSessions.has(args.sessionId);
   const deferredHistoryRefreshWasPending = deferredHistoryWasPendingAtPassStart;
-  const pendingOps = getPendingOps(args.db, args.sessionId);
-  const pendingOperationTags = getTagsForPendingOperations(args.db, args.sessionId, pendingOps.map((operation) => operation.tagId), args.protectedTags, RECENT_TOOL_SKELETON_WINDOW);
+  const shouldReadPendingOps = !args.compactionOff && (args.schedulerDecision === "execute" || args.forceMaterialization || hasPendingMaterializeSignal || m0HardFoldThisPass || historianRunning);
+  const pendingOps = shouldReadPendingOps ? getPendingOps(args.db, args.sessionId) : [];
+  const pendingOperationTags = pendingOps.length > 0 ? getTagsForPendingOperations(args.db, args.sessionId, pendingOps.map((operation) => operation.tagId), args.protectedTags, RECENT_TOOL_SKELETON_WINDOW) : [];
   const baseShouldApplyPendingOps = args.schedulerDecision === "execute" || args.forceMaterialization || hasPendingMaterializeSignal || m0HardFoldThisPass;
   const deferredMaterialize = canConsumeDeferredLate && deferredMaterializationWasPending;
   const deferredHistoryRefresh = canConsumeDeferredLate && deferredHistoryRefreshWasPending;
@@ -27542,7 +27625,7 @@ function formatExecuteThreshold(detail, contextLimit) {
   }
   return `${percentage}%${clampNote}`;
 }
-function executeStatus(db, sessionId, protectedTags, executeThresholdPercentageConfig = DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, liveModelKey, historyBudgetPercentage, commitClusterTrigger, executeThresholdTokens, contextLimit, dreamer) {
+function executeStatus(db, sessionId, protectedTags, executeThresholdPercentageConfig = DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, liveModelKey, historyBudgetPercentage, commitClusterTrigger, executeThresholdTokens, contextLimit, dreamer, windowGeometry) {
   const thresholdDetail = resolveExecuteThresholdDetail(executeThresholdPercentageConfig, liveModelKey, DEFAULT_EXECUTE_THRESHOLD_PERCENTAGE, {
     tokensConfig: executeThresholdTokens,
     contextLimit,
@@ -27603,7 +27686,7 @@ function executeStatus(db, sessionId, protectedTags, executeThresholdPercentageC
       ] : [], ...formatDreamTaskBacklogs(dreamer.backlog).split("\\n"));
     }
     if (meta.lastContextPercentage > 0 || meta.lastInputTokens > 0) {
-      lines.push("", "### Context Usage", `- Last percentage: ${meta.lastContextPercentage.toFixed(1)}%`, `- Last input tokens: ${meta.lastInputTokens.toLocaleString()}`, `- Resolved context limit: ${displayContextLimit > 0 ? displayContextLimit.toLocaleString() : "unknown"}`, `- Proactive compartment evaluation: ${proactiveCompartmentTrigger}%`, `- Post-drop target for historian: ${(executeThresholdPercentage * POST_DROP_TARGET_RATIO).toFixed(0)}% (${executeThresholdPercentage}% * ${POST_DROP_TARGET_RATIO})`, `- Commit cluster trigger: ${commitClusterTrigger?.enabled !== false ? `enabled (min ${commitClusterTrigger?.min_clusters ?? 3} clusters)` : "disabled"}, tail-size trigger: > 3x compartment budget`);
+      lines.push("", "### Context Usage", `- Last percentage: ${meta.lastContextPercentage.toFixed(1)}%`, `- Last input tokens: ${meta.lastInputTokens.toLocaleString()}`, `- Resolved context limit: ${displayContextLimit > 0 ? displayContextLimit.toLocaleString() : "unknown"}`, ...windowGeometry ? [`- ${formatWindowDerivationLine(meta.lastInputTokens, windowGeometry)}`] : [], `- Proactive compartment evaluation: ${proactiveCompartmentTrigger}%`, `- Post-drop target for historian: ${(executeThresholdPercentage * POST_DROP_TARGET_RATIO).toFixed(0)}% (${executeThresholdPercentage}% * ${POST_DROP_TARGET_RATIO})`, `- Commit cluster trigger: ${commitClusterTrigger?.enabled !== false ? `enabled (min ${commitClusterTrigger?.min_clusters ?? 3} clusters)` : "disabled"}, tail-size trigger: > 3x compartment budget`);
     }
     const compartments = getCompartments(db, sessionId);
     let historyBlockTokens = 0;
@@ -27704,7 +27787,7 @@ ${c.content}
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.36.1",
+  version: "0.37.0",
   type: "module",
   description: "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",
@@ -27744,6 +27827,7 @@ var package_default = {
     prepublishOnly: "bun run build"
   },
   dependencies: {
+    "@cortexkit/subc-client": "0.4.1",
     "@huggingface/transformers": "^4.1.0",
     "@jitl/quickjs-singlefile-cjs-release-asyncify": "0.32.0",
     "ai-tokenizer": "^1.0.6",
@@ -27871,6 +27955,9 @@ function renderInner(s, theme, innerWidth) {
   lines.push(`${theme.fg("accent", theme.bold("⚡ Magic Context Status"))}   ${theme.fg("muted", `v${package_default.version}`)}`);
   lines.push("");
   lines.push(`Context  ${theme.fg(pctColor, theme.bold(`${s.usagePercentage.toFixed(1)}%`))} · ${fmt2(s.inputTokens)} / ${s.contextLimit > 0 ? fmt2(s.contextLimit) : "?"} tokens`);
+  if (s.windowGeometry) {
+    lines.push(formatWindowDerivationLine(s.inputTokens, s.windowGeometry));
+  }
   lines.push(`Work tokens ${fmt2(s.newWorkTokens)} new · ${fmt2(s.totalInputTokens)} total input`);
   lines.push(renderBar(s, innerWidth));
   for (const seg of breakdownSegments(s)) {
@@ -27931,18 +28018,22 @@ function drawBorder(inner, width, theme) {
 function buildPiStatusDetail(pi, ctx, deps, sessionId) {
   const usage = ctx.getContextUsage?.();
   const meta = getOrCreateSessionMeta(deps.db, sessionId);
-  const inputTokens = typeof usage?.tokens === "number" ? usage.tokens : meta.lastInputTokens;
+  const hasPersistedPressure = meta.lastInputTokens > 0 && meta.lastContextPercentage > 0;
+  const inputTokens = hasPersistedPressure ? meta.lastInputTokens : typeof usage?.tokens === "number" ? usage.tokens : 0;
   let detectedContextLimit;
   try {
     const detected = getOverflowState(deps.db, sessionId).detectedContextLimit;
     if (detected > 0)
       detectedContextLimit = detected;
   } catch {}
-  const contextLimit = resolvePiUsableContextLimit({
+  const windowGeometry = resolvePiWindowGeometry({
     rawContextWindow: usage?.contextWindow ?? ctx.model?.contextWindow,
     model: ctx.model,
-    detectedContextLimit
-  }) ?? (meta.lastContextPercentage > 0 ? Math.round(inputTokens / (meta.lastContextPercentage / 100)) : 0);
+    detectedContextLimit,
+    persistedInputTokens: meta.lastInputTokens,
+    persistedPercentage: meta.lastContextPercentage
+  });
+  const contextLimit = windowGeometry?.usableSoft ?? 0;
   const usagePercentage = contextLimit > 0 && inputTokens > 0 ? inputTokens / contextLimit * 100 : meta.lastContextPercentage;
   const compartments = getCompartments(deps.db, sessionId);
   const metaRow = readSessionMetaRow(deps.db, sessionId);
@@ -28036,6 +28127,7 @@ ${safeStringify(tool.parameters)}`);
     lastTransformError: meta.lastTransformError,
     isSubagent: meta.isSubagent,
     contextLimit,
+    windowGeometry,
     executeThreshold: threshold.percentage,
     executeThresholdMode: threshold.mode,
     executeThresholdClamped: threshold.clamped,
@@ -28223,14 +28315,18 @@ No active Pi session is available.`,
           if (detected > 0)
             detectedContextLimit = detected;
         } catch {}
-        const usableContextLimit = resolvePiUsableContextLimit({
+        const meta = getOrCreateSessionMeta(currentDeps.db, sessionId);
+        const windowGeometry = resolvePiWindowGeometry({
           rawContextWindow: usage?.contextWindow ?? ctx.model?.contextWindow,
           model: ctx.model,
-          detectedContextLimit
+          detectedContextLimit,
+          persistedInputTokens: meta.lastInputTokens,
+          persistedPercentage: meta.lastContextPercentage
         });
+        const usableContextLimit = windowGeometry?.usableSoft;
         const statusText = executeStatus(currentDeps.db, sessionId, currentDeps.protectedTags ?? 20, currentDeps.executeThresholdPercentage, modelKey, currentDeps.historyBudgetPercentage, currentDeps.commitClusterTrigger, currentDeps.executeThresholdTokens, usableContextLimit, {
           backlog: getDreamTaskBacklogs(currentDeps.db, currentDeps.projectIdentity, CANONICAL_DREAM_TASKS)
-        });
+        }, windowGeometry);
         const details = buildStatusDetails(currentDeps, sessionId);
         sendCtxStatusMessage(pi, { title: "/ctx-status", text: statusText, level: "info" }, details);
       } catch (error) {

package/dist/{safe-notification-target-0s6j4m9f.js → safe-notification-target-7n7s6xv7.js}

@@ -1,6 +1,6 @@
 import {
   log
-} from "./index-npnqc564.js";
+} from "./index-hk6sj7dn.js";
 import"./index-wckvcay0.js";
 
 // ../plugin/src/shared/safe-notification-target.ts

package/dist/subagent-entry.js

@@ -5,11 +5,11 @@ import {
   registerMagicContextTools,
   resolveProjectIdentityForSession,
   setStoragePrivatePermissionEnforcement
-} from "./index-zxgbtsnj.js";
+} from "./index-kvttksef.js";
 import {
   log,
   setHarness
-} from "./index-npnqc564.js";
+} from "./index-hk6sj7dn.js";
 import"./index-wckvcay0.js";
 
 // src/subagent-entry.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/pi-magic-context",
-  "version": "0.36.1",
+  "version": "0.37.0",
   "type": "module",
   "description": "Pi and OMP coding agent extension for Magic Context — cross-session memory and context management",
   "main": "dist/index.js",
@@ -40,6 +40,7 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
+    "@cortexkit/subc-client": "0.4.1",
     "@huggingface/transformers": "^4.1.0",
     "@jitl/quickjs-singlefile-cjs-release-asyncify": "0.32.0",
     "ai-tokenizer": "^1.0.6",