@cortexkit/opencode-magic-context 0.49.8 → 0.49.10

package/dist/{index-gzg9ekc1.js → index-6k86es2p.js}

@@ -6,7 +6,7 @@ import {
   getTemporalDecisions,
   freezeTemporalDecisions,
   stableStringify
-} from "./index-bd9cjab3.js";
+} from "./index-g7jkrz0x.js";
 import {
   protectedToolTagNumbers,
   byteSize,
@@ -69,7 +69,7 @@ import {
   adoptNullOwnerToolTag2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./index-xpn05jxq.js";
+} from "./index-f8cn4xqa.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -183,12 +183,13 @@ import {
   reasoningStepCost,
   reasoningTextAndOpaque,
   opencodeReasoningBudgetCutoff,
+  estimatePartImageTokens,
   SKELETON_REAL_INPUT_MAX_BYTES,
   partHasCompletedResult,
   extractToolCallObservation,
   ToolMutationBatch,
   createToolDropTarget
-} from "./index-9g1c4bt9.js";
+} from "./index-wpwpn7nj.js";
 import {
   getMaxM0MutationId,
   rememberUnpublishedAutoSearchNoHint,
@@ -222,7 +223,7 @@ import {
   peekNoteNudgeText,
   markNoteNudgeDelivered,
   getActiveCompartmentRun
-} from "./index-hxrvx6cy.js";
+} from "./index-3403gbzj.js";
 import {
   runSessionWarmupWorker
 } from "./index-angx1s0k.js";
@@ -233,10 +234,10 @@ import {
 } from "./index-q76br5zn.js";
 import {
   BoundedSessionMap
-} from "./index-b4gcb3rk.js";
+} from "./index-0x9cn9w1.js";
 import {
   renderUserFacingFailure
-} from "./index-ydjgz36f.js";
+} from "./index-16vwdyy5.js";
 import {
   getErrorMessage
 } from "./index-y8v6yerm.js";
@@ -3736,7 +3737,7 @@ function buildEditSupersessionReclaim(input) {
       seenFile.add(filePath);
       continue;
     }
-    if (input.recentMessageIds && (tag.toolOwnerMessageId === null || input.recentMessageIds.has(tag.toolOwnerMessageId))) {
+    if (tag.tagNumber > input.watermark || input.recentMessageIds && (tag.toolOwnerMessageId === null || input.recentMessageIds.has(tag.toolOwnerMessageId))) {
       continue;
     }
     if (realPendingTagIds.has(tag.tagNumber))
@@ -3834,6 +3835,51 @@ async function waitForTagOwners(db, sessionId, ratio, waitMs = 250) {
   }
 }
 
+// src/shared/reclaim-distance.ts
+var RECLAIM_DISTANCE_USER_TURNS = 3;
+var RECLAIM_DISTANCE_WINDOW_FRACTION = 0.25;
+function isReclaimUserTurn(args) {
+  return args.role === "user" && !args.syntheticHead && !args.synthetic && !args.ignored && args.parts.some((part) => {
+    if (part.synthetic || part.ignored)
+      return false;
+    if (part.kind !== "text" && part.kind !== "image" && part.kind !== "file")
+      return false;
+    if (part.kind !== "text")
+      return true;
+    return stripReclaimMcText(part.text ?? "").trim().length > 0;
+  });
+}
+function stripReclaimMcText(text) {
+  return text.replace(/^§\d+§\s*/, "").replace(/<system-reminder>[\s\S]*?<\/system-reminder>/g, (reminder) => /^(?:Your next step: call ctx_reduce on the outputs you've already used|Still unstamped:|Housekeeping: .* are reclaimable\. Stamp each output with ctx_reduce|.* are reclaimable\. Make a ctx_reduce pass now|.* are still unstamped\. Call ctx_reduce now)/.test(reminder.slice("<system-reminder>".length).trimStart()) ? "" : reminder).replace(/<instruction name="deferred_notes">[\s\S]*?<\/instruction>/g, "");
+}
+function farBehindToolBookmark(entries, usableWindow) {
+  let newerTurns = 0;
+  let newerTokens = 0;
+  const farTags = [];
+  let firstYoungTag = Infinity;
+  const seenOutputs = new Set;
+  const tokenDistance = usableWindow > 0 && Number.isFinite(usableWindow) ? usableWindow * RECLAIM_DISTANCE_WINDOW_FRACTION : Infinity;
+  for (let index = entries.length - 1;index >= 0; index--) {
+    const entry = entries[index];
+    if (!entry)
+      continue;
+    const tag = entry.toolOutputTag;
+    if (tag !== undefined && !seenOutputs.has(tag)) {
+      seenOutputs.add(tag);
+      if (newerTurns >= RECLAIM_DISTANCE_USER_TURNS || newerTokens >= tokenDistance) {
+        farTags.push(tag);
+      } else {
+        firstYoungTag = Math.min(firstYoungTag, tag);
+      }
+    }
+    if (entry.userTurn)
+      newerTurns++;
+    if (Number.isFinite(entry.tokens) && entry.tokens > 0)
+      newerTokens += entry.tokens;
+  }
+  return farTags.reduce((bookmark, tag) => tag < firstYoungTag ? Math.max(bookmark, tag) : bookmark, 0);
+}
+
 // src/hooks/magic-context/tool-reclaim.ts
 function buildSyntheticToolReclaimOps(input) {
   const watermark = Math.max(0, input.watermark);
@@ -3865,10 +3911,74 @@ function buildSyntheticToolReclaimOps(input) {
   }
   return synthetic;
 }
-function advanceToolReclaimWatermarkToCurrentMax(db, sessionId) {
-  const maxTagNumber = getMaxTagNumberBySession2(db, sessionId);
-  advanceToolReclaimWatermark(db, sessionId, maxTagNumber);
-  return maxTagNumber;
+function advanceToolReclaimWatermarkByDistance(db, sessionId, entries, usableWindow) {
+  const bookmark = farBehindToolBookmark(entries, usableWindow);
+  advanceToolReclaimWatermark(db, sessionId, bookmark);
+  return bookmark;
+}
+function toolReclaimDistanceEntries(messages, targets) {
+  const outputTags = new Map;
+  for (const [tag, target] of targets) {
+    for (const location of target.mutationParts ?? []) {
+      const part = distancePart(location.part);
+      if (part.kind === "tool_result" || part.kind === "tool")
+        outputTags.set(location.part, tag);
+    }
+  }
+  const entries = [];
+  for (const message of messages) {
+    const parts = message.parts.map(distancePart);
+    let userTurn = isReclaimUserTurn({ ...message.info, parts });
+    for (const [index, part] of parts.entries()) {
+      const authored = isReclaimUserTurn({ role: "user", parts: [part] });
+      entries.push({
+        tokens: message.info.syntheticHead ? 0 : estimateTokens(stripReclaimMcText(part.text ?? "")) + part.imageTokens,
+        userTurn: userTurn && authored,
+        toolOutputTag: outputTags.get(message.parts[index])
+      });
+      if (authored)
+        userTurn = false;
+    }
+  }
+  return entries;
+}
+function distancePart(raw) {
+  if (!raw || typeof raw !== "object")
+    return { kind: "structural", imageTokens: 0 };
+  const part = raw;
+  const provenance = { synthetic: part.synthetic === true, ignored: part.ignored === true };
+  if (typeof part.getText === "function") {
+    const text = part.getText();
+    return {
+      ...provenance,
+      kind: String(part.kind),
+      text: typeof text === "string" ? text : undefined,
+      imageTokens: typeof part.imageTokens === "function" ? Number(part.imageTokens()) : 0
+    };
+  }
+  const metadata = { ...provenance, imageTokens: estimatePartImageTokens(raw) };
+  if (part.type === "tool") {
+    const state = part.state;
+    return {
+      ...metadata,
+      kind: "tool",
+      text: `${JSON.stringify(state?.input ?? {})}
+${typeof state?.output === "string" ? state.output : JSON.stringify(state?.output ?? "")}`
+    };
+  }
+  if (part.type === "tool_use")
+    return { ...metadata, kind: "tool_use", text: JSON.stringify(part.input ?? {}) };
+  if (part.type === "tool_result")
+    return {
+      ...metadata,
+      kind: "tool_result",
+      text: typeof part.content === "string" ? part.content : JSON.stringify(part.content ?? "")
+    };
+  return {
+    ...metadata,
+    kind: String(part.type),
+    text: typeof part.text === "string" ? part.text : typeof part.thinking === "string" ? part.thinking : undefined
+  };
 }
 // src/hooks/magic-context/strip-structural-noise.ts
 var STRUCTURAL_PART_TYPES = new Set(["meta", "step-start", "step-finish", "reasoning"]);
@@ -5417,6 +5527,7 @@ async function runPostTransformPhase2(args) {
   const shouldApplyPendingOps = publishedWorkDrainAllowed;
   const shouldRunHeuristics = publishedWorkDrainAllowed && (rideSignals.publishedHistory || materializationRequested || forceMaterialization || foldBustsServedPrefixThisPass || firstRenderBust || heldIdleExpiryRebuild || emergencyDropEligible || args.schedulerDecision === "execute" && (!alreadyRanThisTurn || !args.fullFeatureMode));
   const isCacheBustingPass = publishedWorkDrainAllowed;
+  const reclaimDistance = isCacheBustingPass ? toolReclaimDistanceEntries(args.messages, args.targets) : [];
   const canEditWholePrefix = isCacheBustingPass && !activeThinkingPrefixHold;
   const previousTemporalDecisions = args.temporalCandidates && !compactionOff ? new Map([
     ...args.temporalObservedDecisions ?? [],
@@ -5760,6 +5871,7 @@ async function runPostTransformPhase2(args) {
           }
         }
         const editReclaim = buildEditSupersessionReclaim({
+          watermark: args.sessionMeta.toolReclaimWatermark ?? 0,
           db: args.db,
           sessionId: args.sessionId,
           targets: newTargets,
@@ -5798,7 +5910,7 @@ async function runPostTransformPhase2(args) {
     const tBatchFinalize = performance.now();
     args.batch?.finalize();
     if (toolReclaimApplicationOpportunity) {
-      const maxTagNumber = advanceToolReclaimWatermarkToCurrentMax(args.db, args.sessionId);
+      const maxTagNumber = advanceToolReclaimWatermarkByDistance(args.db, args.sessionId, reclaimDistance, args.usableWindow);
       args.sessionMeta.toolReclaimWatermark = Math.max(args.sessionMeta.toolReclaimWatermark ?? 0, maxTagNumber);
     }
     if (autoReclaimTargetCount > 0) {
@@ -6477,6 +6589,7 @@ async function runPostTransformPhase2(args) {
         const hygieneCalibration = sessionDecisionCalibration(args.db, args.sessionId);
         const hygieneUnitsVersion = transitionSessionHygieneUnits(args.db, args.sessionId, bustedThisPass, hygieneCalibration);
         const baseline = refreshTailHygieneBaseline({
+          opencode2: args.opencode2,
           messages: args.messages,
           tags,
           protectedTagNumbers: args.protectedTagNumbers,
@@ -6493,7 +6606,7 @@ async function runPostTransformPhase2(args) {
           sessionLog2(args.sessionId, formatTailHygienePrefixMismatch(baseline.lastPrefixMismatch, baseline.baselineGeneration));
         }
         const tTailState = performance.now();
-        const structuralSignature = tailHygieneStructuralSignature(args.messages);
+        const structuralSignature = tailHygieneStructuralSignature(args.messages, args.opencode2);
         const effective = effectiveTailHygiene(baseline);
         const durableGrace = baseline.evaluable && !baseline.generationInvalidated ? captureChannel1PostReduceGraceBaseline(args.db, args.sessionId, effective.u) : getChannel1NudgeState(args.db, args.sessionId);
         baseline.channel1PostReduceGrace = durableGrace.postReduceGracePending || durableGrace.postReduceGraceBaselineU !== undefined ? {
@@ -6505,7 +6618,7 @@ async function runPostTransformPhase2(args) {
           ...baseline,
           usableWindow: args.usableWindow,
           realUserTurnCount: countRealUserMessages(args.messages),
-          reducedSinceRefresh: baseline.baselineGeneration !== previous?.baselineGeneration ? false : previous?.reducedSinceRefresh ?? false,
+          reducedSinceRefresh: baseline.baselineGeneration !== previous?.baselineGeneration || (previous?.generationInvalidated === true || previous?.evaluable === false) && baseline.evaluable && !baseline.generationInvalidated ? false : previous?.reducedSinceRefresh ?? false,
           agentDropsAppliedThisPass: pendingOpsDidMutate,
           oldestReclaimableToolTags: postprocessOldestTags(args.db, args.sessionId, args.protectedTagNumbers)
         });
@@ -6543,7 +6656,7 @@ async function runPostTransformPhase2(args) {
   const tTailGuard = performance.now();
   if (assertedBaseline) {
     try {
-      const servedSignature = tailHygieneStructuralSignature(args.messages);
+      const servedSignature = tailHygieneStructuralSignature(args.messages, args.opencode2);
       if (!sameTailHygieneStructuralSignature(assertedBaseline.structuralSignature, servedSignature)) {
         sessionLog2(args.sessionId, `ERROR [tail-hygiene-last-writer-mismatch]: served messages changed after tail-hygiene baseline refresh (expected messages=${assertedBaseline.structuralSignature.messageCount}, parts=[${assertedBaseline.structuralSignature.partCounts.join(",")}], bytes=${assertedBaseline.structuralSignature.totalBytes}; actual messages=${servedSignature.messageCount}, parts=[${servedSignature.partCounts.join(",")}], bytes=${servedSignature.totalBytes})`);
       }
@@ -6551,6 +6664,7 @@ async function runPostTransformPhase2(args) {
       sessionLog2(args.sessionId, "ERROR [tail-hygiene-last-writer-check-failed]: structural production guard failed open:", error);
     }
     assertTailHygieneContentUnchangedIfEnabled({
+      opencode2: args.opencode2,
       messages: args.messages,
       tags: assertedBaseline.tags,
       protectedTagNumbers: assertedBaseline.protectedTagNumbers,

package/dist/{index-8kk7yh6m.js → index-9jvab89d.js}

@@ -3,7 +3,7 @@ import {
 } from "./index-gjvjh960.js";
 import {
   stableStringify
-} from "./index-bd9cjab3.js";
+} from "./index-g7jkrz0x.js";
 
 // src/features/magic-context/tool-definition-tokens.ts
 import { createHash } from "node:crypto";

package/dist/{index-qgp5vnt4.js → index-a865mj02.js}

@@ -8,7 +8,7 @@ import {
   ensureColumn,
   healAllNullColumns,
   installV95PerfSchema
-} from "./index-bd9cjab3.js";
+} from "./index-g7jkrz0x.js";
 import {
   resolveOpenCodeDbPath,
   openCodeDbPathExists,