@cortexkit/opencode-magic-context 0.49.7 → 0.49.9

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

@@ -6,7 +6,7 @@ import {
   getTemporalDecisions,
   freezeTemporalDecisions,
   stableStringify
-} from "./index-1bt88epp.js";
+} from "./index-g7jkrz0x.js";
 import {
   protectedToolTagNumbers,
   byteSize,
@@ -69,30 +69,31 @@ import {
   adoptNullOwnerToolTag2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./index-tmtty2x5.js";
+} from "./index-f8cn4xqa.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
   estimateTokens
-} from "./index-qx53vezw.js";
+} from "./index-gjvjh960.js";
 import {
   log2,
   sessionLog2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 import {
+  inRootAsyncContext2,
   getTagIdentityWriteGeneration2,
   getSqliteDatabasePath2,
   assertTransformWrite2,
   isTransientSqliteError2
-} from "./index-j8epsc0g.js";
+} from "./index-wafzvyhg.js";
 import {
   isValidLanguageCode
-} from "./index-k6xvbj2e.js";
+} from "./index-w28y7d0z.js";
 import {
   getProjectEmbeddingSnapshot2,
   embedTextForProject2,
   embedBatchForProject2
-} from "./index-sf94at64.js";
+} from "./index-rg1cezmj.js";
 import {
   isEmbeddingHostBusy2
 } from "./index-qt1qqasc.js";
@@ -182,12 +183,13 @@ import {
   reasoningStepCost,
   reasoningTextAndOpaque,
   opencodeReasoningBudgetCutoff,
+  estimatePartImageTokens,
   SKELETON_REAL_INPUT_MAX_BYTES,
   partHasCompletedResult,
   extractToolCallObservation,
   ToolMutationBatch,
   createToolDropTarget
-} from "./index-n5a170gs.js";
+} from "./index-wpwpn7nj.js";
 import {
   getMaxM0MutationId,
   rememberUnpublishedAutoSearchNoHint,
@@ -221,21 +223,21 @@ import {
   peekNoteNudgeText,
   markNoteNudgeDelivered,
   getActiveCompartmentRun
-} from "./index-5tbvdff4.js";
+} from "./index-3403gbzj.js";
 import {
   runSessionWarmupWorker
-} from "./index-37q80veb.js";
+} from "./index-angx1s0k.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-a8acx4gc.js";
+} from "./index-q76br5zn.js";
 import {
   BoundedSessionMap
-} from "./index-wq16ahsn.js";
+} from "./index-0x9cn9w1.js";
 import {
   renderUserFacingFailure
-} from "./index-n7kwfw2r.js";
+} from "./index-16vwdyy5.js";
 import {
   getErrorMessage
 } from "./index-y8v6yerm.js";
@@ -245,7 +247,7 @@ import {
 } from "./index-d9vfe7xq.js";
 import {
   logSlowWriteTransaction
-} from "./index-4mjhqadz.js";
+} from "./index-150zz6fh.js";
 
 // src/features/magic-context/tagger.ts
 var TOOL_COMPOSITE_KEY_SEP = "\x00";
@@ -1339,7 +1341,7 @@ function queueAutoSearchBackfill(db, sessionId, projectPath, query) {
       pending.delete(key);
       resolve();
     };
-    const queued = setTimeout(() => {
+    const queued = inRootAsyncContext2(() => setTimeout(() => {
       lifecycle.signal.removeEventListener("abort", cancel);
       if (lifecycle.signal.aborted)
         return done();
@@ -1350,7 +1352,7 @@ function queueAutoSearchBackfill(db, sessionId, projectPath, query) {
         clearTimeout(timeout);
         done();
       });
-    }, 0);
+    }, 0));
     const cancel = () => {
       clearTimeout(queued);
       done();
@@ -1397,7 +1399,7 @@ async function executeAutoSearchWorker(db, sessionId, projectPath, query, option
     deadlineUnixMs: autoSearchDeadlineUnixMs(deadlineSignal)
   };
   return new Promise((resolve, reject) => {
-    const worker = new Worker(entry, { workerData: input });
+    const worker = inRootAsyncContext2(() => new Worker(entry, { workerData: input }));
     let settled = false;
     const finish = (results, error) => {
       if (settled)
@@ -1509,7 +1511,7 @@ function searchMessageHistoryOffThread(db, request, entry = defaultAutoSearchWor
       deadline.unref?.();
     };
     try {
-      worker = new Worker(entry, { workerData: input });
+      worker = inRootAsyncContext2(() => new Worker(entry, { workerData: input }));
     } catch (error) {
       finish(null, "start-failed", error);
       return;
@@ -3735,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))
@@ -3833,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);
@@ -3864,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"]);
@@ -5416,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 ?? [],
@@ -5759,6 +5871,7 @@ async function runPostTransformPhase2(args) {
           }
         }
         const editReclaim = buildEditSupersessionReclaim({
+          watermark: args.sessionMeta.toolReclaimWatermark ?? 0,
           db: args.db,
           sessionId: args.sessionId,
           targets: newTargets,
@@ -5797,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) {
@@ -6476,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,
@@ -6492,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 ? {
@@ -6504,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)
         });
@@ -6542,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})`);
       }
@@ -6550,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-ax2jhztn.js → index-7bjgyaj1.js}

@@ -1,19 +1,19 @@
 import {
   getTokenEstimatorFingerprint,
   estimateTokens
-} from "./index-qx53vezw.js";
+} from "./index-gjvjh960.js";
 import {
   getHarness2
 } from "./index-pavzsdc6.js";
 import {
   log2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 import {
   isSynapseEmbeddingTruncated
-} from "./index-vkbqdnkj.js";
+} from "./index-kvw6xew3.js";
 import {
   messageFtsOrdinalRangeIsMapped
-} from "./index-rzmjkdd6.js";
+} from "./index-mp2kghkv.js";
 
 // src/features/magic-context/compartment-chunk-embedding.ts
 import { createHash } from "node:crypto";

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

@@ -1,9 +1,9 @@
 import {
   estimateTokens
-} from "./index-qx53vezw.js";
+} from "./index-gjvjh960.js";
 import {
   stableStringify
-} from "./index-1bt88epp.js";
+} from "./index-g7jkrz0x.js";
 
 // src/features/magic-context/tool-definition-tokens.ts
 import { createHash } from "node:crypto";

package/dist/{index-w6bd03dc.js → index-a43xq1pg.js}

@@ -1,21 +1,21 @@
 import {
   DEFAULT_LOCAL_EMBEDDING_MODEL
-} from "./index-k6xvbj2e.js";
+} from "./index-w28y7d0z.js";
 import {
   log2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 import {
   isSynapseEmbeddingTruncated,
   SynapseEmbeddingProvider
-} from "./index-vkbqdnkj.js";
+} from "./index-kvw6xew3.js";
 import {
   LocalEmbeddingProvider
-} from "./index-gbmqa9x9.js";
+} from "./index-bmwfzz28.js";
 import {
   OpenAICompatibleEmbeddingProvider,
   getProjectEmbeddingSnapshot2,
   embedBatchForProject2
-} from "./index-sf94at64.js";
+} from "./index-rg1cezmj.js";
 import {
   isEmbeddingHostBusy2
 } from "./index-qt1qqasc.js";

package/dist/{index-tqf7yg27.js → index-a4b0gbyg.js}

@@ -1,6 +1,6 @@
 import {
   log2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 
 // src/shared/safe-notification-target.ts
 var DEFAULT_TITLE_RE = /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;

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

@@ -3,12 +3,12 @@ import {
 } from "./index-fr0wbhdn.js";
 import {
   log2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 import {
   ensureColumn,
   healAllNullColumns,
   installV95PerfSchema
-} from "./index-1bt88epp.js";
+} from "./index-g7jkrz0x.js";
 import {
   resolveOpenCodeDbPath,
   openCodeDbPathExists,
@@ -16,14 +16,14 @@ import {
 } from "./index-58e3y90n.js";
 import {
   Database2
-} from "./index-j8epsc0g.js";
+} from "./index-wafzvyhg.js";
 import {
   normalizeStoredProjectPath,
   storedPathBelongsToIdentity
-} from "./index-g8qbdb03.js";
+} from "./index-0jz47061.js";
 import {
   logSlowWriteTransaction
-} from "./index-4mjhqadz.js";
+} from "./index-150zz6fh.js";
 
 // src/features/magic-context/lkg-prefix-chunks.ts
 import { createHash } from "node:crypto";

package/dist/{index-37q80veb.js → index-angx1s0k.js}

@@ -1,13 +1,14 @@
 import {
+  inRootAsyncContext2,
   getSqliteDatabasePath2,
   releaseIndexOwner2
-} from "./index-j8epsc0g.js";
+} from "./index-wafzvyhg.js";
 import {
   registerExitAbort
 } from "./index-v0p37hm2.js";
 import {
   log2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 
 // src/hooks/magic-context/read-session-raw.ts
 import { isMainThread } from "node:worker_threads";
@@ -69,7 +70,7 @@ function runSessionWarmupWorker(input, options) {
       deadline.unref?.();
     };
     try {
-      worker = new Worker(options.entry ?? defaultEntry(), { workerData: input });
+      worker = inRootAsyncContext2(() => new Worker(options.entry ?? defaultEntry(), { workerData: input }));
     } catch (error) {
       finish({ failure: "start-failed", detail: String(error) });
       return;

package/dist/{index-z1tjp257.js → index-b64n4d0h.js}

@@ -3,7 +3,7 @@ import {
 } from "./index-sd3egckz.js";
 import {
   log2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 
 // src/shared/conflict-detector.ts
 import { homedir as homedir2 } from "node:os";

package/dist/{index-gbmqa9x9.js → index-bmwfzz28.js}

@@ -1,9 +1,9 @@
 import {
   DEFAULT_LOCAL_EMBEDDING_MODEL
-} from "./index-k6xvbj2e.js";
+} from "./index-w28y7d0z.js";
 import {
   getSynapseLaneIdentity
-} from "./index-vkbqdnkj.js";
+} from "./index-kvw6xew3.js";
 import {
   getHarness2
 } from "./index-pavzsdc6.js";
@@ -13,7 +13,10 @@ import {
 import {
   importPluginModule,
   log2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
+import {
+  inRootAsyncContext2
+} from "./index-wafzvyhg.js";
 import {
   computeNormalizedHash
 } from "./index-2bvekkfy.js";
@@ -309,7 +312,7 @@ class EmbeddingWorkerClient {
   start() {
     if (this.startPromise)
       return this.startPromise;
-    this.startPromise = this.startOwner().finally(() => {
+    this.startPromise = inRootAsyncContext2(() => this.startOwner()).finally(() => {
       this.startPromise = null;
     });
     return this.startPromise;
@@ -558,10 +561,10 @@ async function acquireModelLoadLock(lockPath) {
 }
 function startLockHeartbeat(lockPath) {
   const HEARTBEAT_MS = Math.floor(STALE_LOCK_MS / 3);
-  const timer = setInterval(() => {
+  const timer = inRootAsyncContext2(() => setInterval(() => {
     writeStorageFileAsync(lockPath, `pid=${process.pid} alive=${Date.now()}
 `).catch(() => {});
-  }, HEARTBEAT_MS);
+  }, HEARTBEAT_MS));
   timer.unref?.();
   return () => clearInterval(timer);
 }