@cortexkit/opencode-magic-context 0.49.24 → 0.49.26

package/dist/v2/{context-zbydzq4g.js → context-10pj3bwd.js}

@@ -286,7 +286,7 @@ import {
   startCompartmentAgent,
   setRecompStarting2,
   setRecompTerminal2
-} from "./server-r209n2fk.js";
+} from "./server-9zh78t8y.js";
 import {
   resolveHistorianModel2
 } from "./server-5kym00ag.js";
@@ -311,7 +311,7 @@ import {
   openDatabaseAsync,
   isDatabasePersisted,
   getDatabasePersistenceError
-} from "./server-y9ncq4ck.js";
+} from "./server-317f3x9y.js";
 import {
   pruneMissingProjectIdentities,
   setHomeProjectPermission,
@@ -337,7 +337,6 @@ import {
   inspectProcessesAsync
 } from "./server-k3t06fxr.js";
 import {
-  BoundedSessionMap,
   LkgRecoveryFenceError,
   lkgServedArrayDigest,
   takeLkgRecoveryLockSweepPage,
@@ -362,7 +361,7 @@ import {
   clearIndexedMessages2,
   indexMessagesAfterOrdinal2,
   sweepOrphanedOpenCodeMessageIndexesCooperatively2
-} from "./server-mefps930.js";
+} from "./server-k46ec388.js";
 import"./server-51779zs2.js";
 import {
   inRootAsyncContext2,
@@ -388,7 +387,7 @@ import {
   buildInMemoryTailRawMessages2,
   RawOrdinalsNotReady2,
   runSessionWarmupWorker
-} from "./server-swvhxhxz.js";
+} from "./server-erk2bvdf.js";
 import {
   resolveOpenCodeDbPath,
   assertOpenCodeStoreGeneration,
@@ -717,13 +716,14 @@ import {
   readRawSessionMessageById2,
   readSessionChunk2,
   readRawSessionSeedTail2
-} from "./server-gwmshgx9.js";
+} from "./server-jcsw05aa.js";
 import {
+  BoundedSessionMap,
+  recordToolDefinitionSet,
   getCurrentToolSetHash,
-  recordToolDefinition,
   getMeasuredToolDefinitionTokens
-} from "./server-d1dzgvwd.js";
-import"./server-wxrdher8.js";
+} from "./server-7d6m1p2b.js";
+import"./server-4frtg2z1.js";
 import {
   SubcClient,
   connectionFileExists,
@@ -734,7 +734,7 @@ import {
 } from "./server-ab1g0wn9.js";
 import {
   deleteChunkEmbedBackoffForSession2
-} from "./server-pw21ypwb.js";
+} from "./server-7dpnt0ys.js";
 import {
   embedPauseBySession,
   embedRunStateBySession,
@@ -764,7 +764,7 @@ import {
   embedSessionCompartmentChunks2,
   getEmbeddingCoverageStatus2,
   getAutoEmbeddingSessionCoverage2
-} from "./server-q5z0gag0.js";
+} from "./server-hnmm8yzq.js";
 import {
   V2_MEMORY_CATEGORIES,
   CATEGORY_PRIORITY
@@ -823,7 +823,7 @@ import {
   readGitFileChangeTimesSince,
   verificationFileExists,
   normalizeVerificationFiles
-} from "./server-9xbbaekh.js";
+} from "./server-nmwhe524.js";
 import {
   deriveTriggerBudget2,
   deriveHistorianChunkTokens2,
@@ -857,7 +857,7 @@ import {
 } from "./server-vr4szghm.js";
 import {
   cosineSimilarity
-} from "./server-8j2e7t31.js";
+} from "./server-wj8h2q21.js";
 import {
   computeCueContentHash,
   hasMuralCueColumns,
@@ -914,14 +914,14 @@ import {
   resolveMemoriesByIdsForSearch2,
   unifiedSearch2,
   formatSearchResults2
-} from "./server-9e55n4wx.js";
+} from "./server-vjer2jdn.js";
 import {
   resolvePromptContext2
 } from "./server-fmsr7v69.js";
 import"./server-kaqs6h31.js";
 import {
   renderSearchArchiveOffThread2
-} from "./server-16dpnz56.js";
+} from "./server-w7x9wgm0.js";
 import {
   compareSemverCore
 } from "./server-84w6rvvf.js";
@@ -7448,7 +7448,8 @@ function measureLkgReplayRequest(args) {
       systemPromptTokens: args.systemPromptTokens,
       providerID: args.model?.providerID,
       modelID: args.model?.modelID,
-      agentName: args.agentName
+      agentName: args.agentName,
+      sessionId: args.sessionId
     })
   });
 }
@@ -8288,6 +8289,23 @@ function applyCompressedText(target, tagNumber, originalText, depth, state) {
   target.setContent(`${target.textPrefix ?? ""}${compressed}`, { keepReasoning: true });
   return target.getContent ? target.getContent() !== before : true;
 }
+function cavemanReplayText(tagNumber, originalText, depth, state, textPrefix) {
+  const level = DEPTH_TO_LEVEL[depth];
+  if (!level)
+    return null;
+  let served = null;
+  if (!state.currentRules || state.legacyReasoningTags.has(tagNumber)) {
+    const legacy = cavemanCompress(originalText, level, "ascii-v1");
+    if (legacy.length > 0)
+      served = { text: legacy, dropsReasoning: true };
+    if (!state.currentRules)
+      return served;
+  }
+  const compressed = cavemanCompress(originalText, level, CURRENT_CAVEMAN_RULES, wordRulesFor(state));
+  if (compressed.length === 0)
+    return served;
+  return { text: `${textPrefix}${compressed}`, dropsReasoning: served?.dropsReasoning ?? false };
+}
 function replayCavemanCompression(sessionId, db, targets, tags) {
   const compressedTags = tags.filter((tag) => tag.type === "message" && tag.status === "active" && tag.cavemanDepth > 0 && targets.has(tag.tagNumber));
   if (compressedTags.length === 0)
@@ -8996,6 +9014,42 @@ function stripStructuralNoise(messages) {
   }
   return strippedParts;
 }
+// src/hooks/magic-context/foreign-text-parts.ts
+function hasStringId(part) {
+  return part !== null && typeof part === "object" && typeof part.id === "string";
+}
+function lastStoredPartIndex(parts) {
+  for (let index = parts.length - 1;index >= 0; index -= 1) {
+    if (hasStringId(parts[index]))
+      return index;
+  }
+  return -1;
+}
+var legacyForeignTextTags = new Map;
+function rememberLegacyForeignTextTags(sessionId, tagNumbers) {
+  for (const tagNumber of tagNumbers) {
+    let known = legacyForeignTextTags.get(sessionId);
+    if (!known) {
+      known = new Set;
+      legacyForeignTextTags.set(sessionId, known);
+    }
+    known.add(tagNumber);
+  }
+}
+function isLegacyForeignTextTag(sessionId, tagNumber) {
+  return legacyForeignTextTags.get(sessionId)?.has(tagNumber) ?? false;
+}
+var pendingOpForTagStatements = new WeakMap;
+function discardPendingOpForForeignTag(db, sessionId, tagNumber) {
+  let statement = pendingOpForTagStatements.get(db);
+  if (!statement) {
+    statement = db.prepare("SELECT 1 AS present FROM pending_ops WHERE session_id = ? AND tag_id = ? LIMIT 1");
+    pendingOpForTagStatements.set(db, statement);
+  }
+  if (statement.get(sessionId, tagNumber))
+    removePendingOp(db, sessionId, tagNumber);
+}
+
 // src/hooks/magic-context/tag-id-fallback.ts
 function parseScopedContentId(contentId) {
   const match = /^(.*):(p|file)(\d+)$/.exec(contentId);
@@ -9187,6 +9241,62 @@ function deriveToolOwnerMessageId(sessionId, db, message, obs, unpaired, cache,
   }
   return obs.callId;
 }
+function serveLegacyForeignText(legacy, current, options) {
+  const prefixed = options.skipPrefixInjection ? current : prependTag(legacy.tagNumber, current);
+  if (options.pastPartialEnd)
+    return { text: prefixed, dropsReasoning: false };
+  if (legacy.status === "dropped") {
+    return { text: buildReplacementContent(legacy.tagNumber), dropsReasoning: true };
+  }
+  const unchanged = legacy.savedText !== undefined && stripTagPrefix(current) === legacy.savedText;
+  if (legacy.status === "active" && legacy.cavemanDepth > 0 && options.caveman && unchanged && legacy.savedText) {
+    const replayed = cavemanReplayText(legacy.tagNumber, legacy.savedText, legacy.cavemanDepth, options.caveman, options.skipPrefixInjection ? "" : prependTag(legacy.tagNumber, ""));
+    if (replayed)
+      return replayed;
+  }
+  return { text: prefixed, dropsReasoning: false };
+}
+function findLegacyForeignTextTags(sessionId, messages, assignments, db, isForeignTextPart, inertWhitespaceTagNumbers) {
+  const legacy = new Map;
+  for (const message of messages) {
+    const messageId = typeof message.info.id === "string" ? message.info.id : null;
+    if (!messageId)
+      continue;
+    const firstTrailingIndex = lastStoredPartIndex(message.parts) + 1;
+    for (let partIndex = firstTrailingIndex;partIndex < message.parts.length; partIndex += 1) {
+      const part = message.parts[partIndex];
+      if (!isTextPart(part) || !isForeignTextPart(part))
+        continue;
+      const contentId = `${messageId}:p${partIndex}`;
+      const tagNumber = assignments.get(contentId) ?? getTagNumberByMessageId2(db, sessionId, contentId);
+      if (tagNumber === null || tagNumber === undefined)
+        continue;
+      if (inertWhitespaceTagNumbers.has(tagNumber))
+        continue;
+      const tag = getTagById2(db, sessionId, tagNumber);
+      if (tag?.type !== "message")
+        continue;
+      legacy.set(part, {
+        tagNumber,
+        status: tag.status,
+        cavemanDepth: tag.cavemanDepth
+      });
+    }
+  }
+  if (legacy.size > 0) {
+    const tagNumbers = [...legacy.values()].map((entry) => entry.tagNumber);
+    rememberLegacyForeignTextTags(sessionId, tagNumbers);
+    for (const tagNumber of tagNumbers)
+      discardPendingOpForForeignTag(db, sessionId, tagNumber);
+    const compressed = [...legacy.values()].filter((entry) => entry.status === "active" && entry.cavemanDepth > 0);
+    if (compressed.length > 0) {
+      const saved = getSourceContents(db, sessionId, compressed.map((entry) => entry.tagNumber));
+      for (const entry of compressed)
+        entry.savedText = saved.get(entry.tagNumber);
+    }
+  }
+  return legacy;
+}
 function collectRelevantSourceTagIds(messages, assignments) {
   const currentMessageIds = new Set(messages.flatMap((message) => typeof message.info.id === "string" ? [message.info.id] : []));
   const relevantTagIds = new Set;
@@ -9309,8 +9419,17 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
   logTransformTiming(sessionId, "tag.inertWhitespace", tInertWhitespace);
   const assignments = tagger.getAssignments(sessionId);
   const resolver = createExistingTagResolver(sessionId, tagger, db);
+  const foreignTextParts = options.foreignTextParts;
+  const isForeignTextPart = (part) => foreignTextParts !== undefined && part !== null && typeof part === "object" && foreignTextParts.has(part);
+  const legacyForeignTags = findLegacyForeignTextTags(sessionId, messages, assignments, db, isForeignTextPart, inertWhitespaceTagNumbers);
+  const legacyForeignTagNumbers = new Set([...legacyForeignTags.values()].map((legacy) => legacy.tagNumber));
+  let cavemanState;
+  const legacyCavemanState = () => {
+    cavemanState ??= options.replaysCaveman ? getCavemanReplayState(db, sessionId) : null;
+    return cavemanState;
+  };
   const tGetSourceContents = performance.now();
-  const sourceContents = getSourceContents(db, sessionId, collectRelevantSourceTagIds(messages, assignments));
+  const sourceContents = getSourceContents(db, sessionId, collectRelevantSourceTagIds(messages, assignments).filter((tagNumber) => !legacyForeignTagNumbers.has(tagNumber)));
   logTransformTiming(sessionId, "tag.getSourceContents", tGetSourceContents);
   let partialEndsCache;
   const loadPartialEnds = () => {
@@ -9404,6 +9523,28 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
         }
         ownerByPartKey.set(part, { ownerMsgId, callId: toolObservation.callId });
       }
+      if (messageId && isTextPart(part) && isForeignTextPart(part)) {
+        const legacy = legacyForeignTags.get(part);
+        if (legacy) {
+          const partialEnd = getPartialEnds().get(messageId);
+          const served = serveLegacyForeignText(legacy, part.text, {
+            skipPrefixInjection,
+            pastPartialEnd: partialEnd !== undefined && partIndex > partialEnd,
+            caveman: legacy.cavemanDepth > 0 ? legacyCavemanState() : null
+          });
+          part.text = served.text;
+          if (served.dropsReasoning) {
+            for (const thinkingPart of messageThinkingParts) {
+              if (protectedThinkingParts.has(thinkingPart))
+                continue;
+              if (partialEnd !== undefined && message.parts.indexOf(thinkingPart) > partialEnd)
+                continue;
+              neutralizeDroppedReasoningPart(thinkingPart);
+            }
+          }
+        }
+        continue;
+      }
       if (messageId && isTextPart(part)) {
         const textPart = part;
         const thinkingParts = messageThinkingParts;
@@ -9445,7 +9586,7 @@ function tagMessages(sessionId, messages, tagger, db, options = {}) {
           }
         } else {
           existingTagId = resolver.resolve(messageId, "message", contentId, textOrdinal, {
-            accept: (tagNumber) => !inertWhitespaceTagNumbers.has(tagNumber)
+            accept: (tagNumber) => !inertWhitespaceTagNumbers.has(tagNumber) && !legacyForeignTagNumbers.has(tagNumber)
           });
           if (existingTagId === undefined && inertWhitespaceTagNumbers.has(tagger.getTag(sessionId, contentId, "message") ?? -1)) {
             tagger.unbindTag(sessionId, contentId);
@@ -16920,7 +17061,8 @@ function createRustModeTransform(deps, options) {
             systemPromptTokens: sessionMeta.systemPromptTokens,
             providerID: model?.providerID,
             modelID: model?.modelID,
-            agentName: deps.getNotificationParams?.(sessionId)?.agent
+            agentName: deps.getNotificationParams?.(sessionId)?.agent,
+            sessionId
           })
         });
         if (measure.fit !== "under") {
@@ -17491,7 +17633,8 @@ function createRustModeTransform(deps, options) {
         systemPromptTokens: sessionMeta.systemPromptTokens,
         providerID: model?.providerID,
         modelID: model?.modelID,
-        agentName: deps.getNotificationParams?.(sessionId)?.agent
+        agentName: deps.getNotificationParams?.(sessionId)?.agent,
+        sessionId
       }) : undefined;
       const renderIdentityFields = {
         modelKey: modelKey ?? null,
@@ -18023,6 +18166,7 @@ function createRustModeTransform(deps, options) {
             providerID: model?.providerID,
             modelID: model?.modelID,
             agentName: deps.getNotificationParams?.(sessionId)?.agent,
+            sessionId,
             systemPromptHash: sessionMeta.systemPromptHash
           }, resolvedWindowGeometry?.usableHard ?? resolvedContextLimit);
           const refusal = outgoingContextRefusal(servedFinalWireEstimate, resolvedWindowGeometry?.usableHard ?? resolvedContextLimit, protectedToolTokenCount(getActiveTagsBySession2(deps.db, sessionId), deps.protectedTools, resolveDecisionCalibration(model?.providerID, model?.modelID))) ?? (signedThinkingReset ? signedTurnContextRefusal(servedFinalWireEstimate, resolvedWindowGeometry?.usableHard ?? resolvedContextLimit) : undefined);
@@ -18258,6 +18402,7 @@ function createRustModeTransform(deps, options) {
         providerID: model?.providerID,
         modelID: model?.modelID,
         agentName: deps.getNotificationParams?.(sessionId)?.agent,
+        sessionId,
         systemPromptHash: sessionMeta.systemPromptHash
       });
       captureOpencodeReasoningBudgetStatus(sessionId, output.messages, resolveKeepReasoningTokens(deps.keepReasoningTokens, modelKey ?? undefined), isPrefixBoundThinkingModel(model?.providerID, model?.modelID));
@@ -18521,6 +18666,27 @@ function createRustModeTransform(deps, options) {
   return adapter;
 }
 
+// src/hooks/magic-context/signed-thinking-fit-snapshot.ts
+function takeSignedThinkingFitSnapshot(args) {
+  let snapshot = null;
+  if (args.held && !args.compactionOff) {
+    try {
+      snapshot = cloneKeepingCoveredInstructionMarks(args.entryOrder);
+    } catch (error) {
+      sessionLog2(args.sessionId, `signed thinking fit: could not copy the pass input (${error instanceof Error ? error.message : String(error)}); an over-window held request will be refused rather than retried`);
+    }
+  }
+  snapshotObserver?.({
+    sessionId: args.sessionId,
+    held: args.held,
+    activeAnthropicThinkingTurn: args.activeAnthropicThinkingTurn,
+    compactionOff: args.compactionOff,
+    snapshot
+  });
+  return snapshot;
+}
+var snapshotObserver;
+
 // src/hooks/magic-context/signed-thinking-hold.ts
 var HEAVY_REASONING_TOKENS = 1500;
 var HEAVY_REASONING_WINDOW_STEPS = 15;
@@ -19132,7 +19298,8 @@ function createTransform(deps) {
     const startTime = performance.now();
     const historianRun = deps.resolveHistorianRun?.();
     const messages = output.messages;
-    const originalForThinkingFit = messages.some((message) => message.parts.some((part) => isRecord(part) && ["reasoning", "thinking", "redacted_thinking"].includes(String(part.type)))) ? cloneKeepingCoveredInstructionMarks(messages) : null;
+    const foreignTextParts = deps.transformMode === "rust" ? undefined : deps.collectForeignTextParts?.(messages);
+    const entryOrderForThinkingFit = messages.slice();
     const coveredHostInstructions = takeCoveredInstructionRows(messages);
     const passOutcome = createPassOutcome();
     const tSessionId = performance.now();
@@ -19486,7 +19653,8 @@ function createTransform(deps) {
           systemPromptTokens: sessionMeta.systemPromptTokens,
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
-          agentName: runNotificationParams(sessionId)?.agent
+          agentName: runNotificationParams(sessionId)?.agent,
+          sessionId
         });
         const incomingTokens = incoming.messageTokens.conversation + incoming.messageTokens.toolCall;
         if (unmanagedOverWindowCarried || isClearlyOverWindow(incomingTokens, resolvedContextLimit)) {
@@ -19532,6 +19700,13 @@ function createTransform(deps) {
     }) : null;
     activeThinkingPrefixHold = signedThinkingPrefixBound && (compactionOff || signedThinkingHold?.held === true);
     freezeM0M1 ||= activeThinkingPrefixHold;
+    const originalForThinkingFit = takeSignedThinkingFitSnapshot({
+      sessionId,
+      entryOrder: entryOrderForThinkingFit,
+      held: activeThinkingPrefixHold,
+      activeAnthropicThinkingTurn: activeThinkingTurn,
+      compactionOff
+    });
     const prefixHoldLogKey = signedThinkingHold ? `${currentTurnId}:${signedThinkingHold.reason}:${signedThinkingHold.heavyStepsBack ?? "none"}` : freezeM0M1 ? `${currentTurnId}:directory` : null;
     if (prefixHoldLogKey !== null && prefixHoldLogTurnIds.get(sessionId) !== prefixHoldLogKey) {
       prefixHoldLogTurnIds.set(sessionId, prefixHoldLogKey);
@@ -19788,6 +19963,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
       }
       logTransformTiming(sessionId, "injectTemporalMarkers", tTemporal);
     }
+    const replaysCaveman = !reducedMode && !compactionOff && deps.cavemanTextCompression?.enabled === true;
     let taggingSucceeded = false;
     let recoveryBatch = null;
     let recoveryNormalized = false;
@@ -19800,7 +19976,9 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         skipPrefixInjection: !ctxReduceCallable,
         servedMessages: messages,
         normalizeRestoredAssistantText: deps.normalizeRestoredAssistantText,
-        refreshSourceContents: deps.refreshSourceContents?.(sessionId)
+        refreshSourceContents: deps.refreshSourceContents?.(sessionId),
+        foreignTextParts,
+        replaysCaveman
       });
       for (const [number, target] of tagged.targets)
         targets.set(number, target);
@@ -19826,7 +20004,9 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           scopedToolSweep,
           servedMessages: messages,
           normalizeRestoredAssistantText: deps.normalizeRestoredAssistantText,
-          refreshSourceContents: deps.refreshSourceContents?.(sessionId)
+          refreshSourceContents: deps.refreshSourceContents?.(sessionId),
+          foreignTextParts,
+          replaysCaveman
         });
         targets = result.targets;
         if (thinkingRecovery.restore)
@@ -19882,7 +20062,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
     const t3 = performance.now();
     const strippedStructuralNoise = canUseEmptySentinels && !compactionOff ? stripStructuralNoise(messages) : 0;
     logTransformTiming(sessionId, "stripStructuralNoise", t3, `strippedParts=${strippedStructuralNoise}`);
-    if (!reducedMode && !compactionOff && deps.cavemanTextCompression?.enabled) {
+    if (replaysCaveman) {
       const tCavemanReplay = performance.now();
       const replayedCaveman = replayCavemanCompression(sessionId, db, targets, activeTags);
       if (replayedCaveman > 0) {
@@ -20023,7 +20203,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           systemPromptTokens: sessionMeta.systemPromptTokens,
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
-          agentName: notificationParams.agent
+          agentName: notificationParams.agent,
+          sessionId
         });
       } catch (error) {
         sessionLog2(sessionId, `transform: wire-estimate pressure fallback unavailable: ${getErrorMessage(error)}`);
@@ -20191,6 +20372,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
           agentName: notificationParams.agent,
+          sessionId,
           systemPromptHash: sessionMeta.systemPromptHash
         }, boundaryContextLimit);
       } catch {
@@ -20205,13 +20387,15 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         providerID: modelForBudget?.providerID,
         modelID: modelForBudget?.modelID,
         agentName: notificationParams.agent,
+        sessionId,
         systemPromptHash: sessionMeta.systemPromptHash
       }, boundaryContextLimit) : undefined);
       if (finalWireEstimate) {
         sessionLog2(sessionId, `transform: final-wire telemetry estimate=${finalWireEstimate.tokens} trusted=${finalWireEstimate.trusted} conversation=${finalWireEstimate.messageTokens.conversation} tools=${finalWireEstimate.messageTokens.toolCall} system=${finalWireEstimate.systemTokens} toolDefinitions=${finalWireEstimate.toolDefinitionTokens ?? "unknown"} tail=${finalWireTail}`);
       }
       if ((finalWireEstimate?.refusalGrade || finalWireEstimate?.refusalBasis === "byte-bound" && finalWireEstimate.refusalTokens !== undefined) && boundaryContextLimit > 0 && (finalWireEstimate.refusalTokens ?? finalWireEstimate.tokens) > boundaryContextLimit) {
-        if (!thinkingFitRetries.has(sessionId) && activeThinkingPrefixHold && originalForThinkingFit && hasActiveAnthropicThinkingTurn(messages, resolvedProviderID, modelForBudget?.modelID)) {
+        const signedFitRetryWanted = !thinkingFitRetries.has(sessionId) && activeThinkingPrefixHold && hasActiveAnthropicThinkingTurn(messages, resolvedProviderID, modelForBudget?.modelID);
+        if (signedFitRetryWanted && originalForThinkingFit) {
           thinkingFitRetries.add(sessionId);
           requestPendingMaterialization(deps.pendingMaterializationSessions, sessionId, "fit_retry");
           messages.splice(0, messages.length, ...originalForThinkingFit);
@@ -20222,7 +20406,10 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           }
           return;
         }
-        if (thinkingFitRetries.has(sessionId) || postTransformResult.thinkingReleasedForFit || signedFitPreviouslyRefused) {
+        if (signedFitRetryWanted) {
+          sessionLog2(sessionId, "signed thinking fit: the held request is over the window and no copy of the pass input exists to retry from; refusing it");
+        }
+        if (signedFitRetryWanted || thinkingFitRetries.has(sessionId) || postTransformResult.thinkingReleasedForFit || signedFitPreviouslyRefused) {
           if (!signedFitPreviouslyRefused && !addMergedReasoningStrippedIds(db, sessionId, [SIGNED_FIT_REFUSED_MARKER]))
             throw contextRefusalError("Cannot persist the signed-fit refusal");
           throw contextRefusalError("The request remains over the model window after stripping signed thinking and reclaiming context");
@@ -20234,7 +20421,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           systemPromptTokens: sessionMeta.systemPromptTokens,
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
-          agentName: notificationParams.agent
+          agentName: notificationParams.agent,
+          sessionId
         });
         if (untrimmed.tokens > boundaryContextLimit) {
           sessionLog2(sessionId, `history boundary unresolved: prefix trim refused and the untrimmed request estimate ${untrimmed.tokens} (trusted=${untrimmed.trusted}) exceeds the context limit ${boundaryContextLimit}; not sending it`);
@@ -20247,7 +20435,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
           systemPromptTokens: sessionMeta.systemPromptTokens,
           providerID: modelForBudget?.providerID,
           modelID: modelForBudget?.modelID,
-          agentName: notificationParams.agent
+          agentName: notificationParams.agent,
+          sessionId
         });
         const servedTokens = served.toolDefinitionsMeasured ? served.rawTokens ?? served.tokens : Math.max(0, sessionMeta.systemPromptTokens) + served.messageTokens.conversation + served.messageTokens.toolCall;
         if (!Number.isFinite(servedTokens) || servedTokens > unmanagedOverWindowPass.limit) {
@@ -20325,7 +20514,8 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
             systemPromptTokens: sessionMeta.systemPromptTokens,
             providerID: modelForBudget?.providerID,
             modelID: modelForBudget?.modelID,
-            agentName: notificationParams.agent
+            agentName: notificationParams.agent,
+            sessionId
           });
         } catch (error) {
           sessionLog2(sessionId, "degraded pass size guard could not estimate:", error);
@@ -20541,6 +20731,7 @@ Historian previously failed ${historianFailureState.failureCount} time(s), so Ma
         providerID: modelForBudget?.providerID,
         modelID: modelForBudget?.modelID,
         agentName: notificationParams.agent,
+        sessionId,
         systemPromptHash: sessionMeta.systemPromptHash
       });
   };
@@ -23066,7 +23257,7 @@ function buildSidebarSnapshot(db, sessionId, directory, liveSessionState, inject
       if (model) {
         activeProviderID = model.providerID;
         activeModelID = model.modelID;
-        measuredToolDefTokens = getMeasuredToolDefinitionTokens(model.providerID, model.modelID, agent) ?? 0;
+        measuredToolDefTokens = getMeasuredToolDefinitionTokens(model.providerID, model.modelID, agent, sessionId) ?? 0;
       }
     }
     const contextLimit = typeof moduleContextLimit === "number" && moduleContextLimit > 0 ? moduleContextLimit : activeProviderID && activeModelID ? resolveContextLimit(activeProviderID, activeModelID, {
@@ -23780,8 +23971,8 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-nmt9y25j.js"));
-    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-f8scq6ae.js"));
+    const { runManagedRecomp } = await importPluginModule(() => import("./recomp-orchestrator-b44s2snm.js"));
+    const { sendIgnoredMessage } = await importPluginModule(() => import("./send-session-notification-gd21f5rq.js"));
     log2(`[rpc] recomp requested for session ${sessionId}`);
     if (!args.client && !args.hiddenCompletionExecutor) {
       return {
@@ -23865,7 +24056,7 @@ function registerRpcHandlers(rpcServer, args) {
     const db = readDatabase();
     if (!db)
       return { ok: false, error: "db unavailable" };
-    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-9z81xj66.js"));
+    const { runManagedWrapup } = await importPluginModule(() => import("./wrapup-orchestrator-gwww44st.js"));
     const model = liveSessionState.liveModelBySession.get(sessionId);
     const contextLimit = model ? resolveContextLimit(model.providerID, model.modelID, { db, sessionID: sessionId }) : 128000;
     const ctx = {
@@ -52155,23 +52346,26 @@ function createCtxReduceTool(deps) {
       dropIds = dropIds.filter((id) => !ctxReduceSelfStampIds.has(id));
       const tagStatusMap = new Map(allTags.map((tag) => [tag.tagNumber, tag.status]));
       const inertWhitespaceTagNumbers = new Set(getInertWhitespaceAssistantTagsByNumbers2(deps.db, sessionId, dropIds).map((tag) => tag.tagNumber));
-      const inertDropIds = [
-        ...new Set(dropIds.filter((id) => inertWhitespaceTagNumbers.has(id)))
-      ];
-      const inertNote = inertDropIds.length > 0 ? `Skipped: ${inertDropIds.map((id) => `§${id}§ is provider framing, nothing to reclaim`).join("; ")}.` : "";
+      const foreignTextTagNumbers = new Set(dropIds.filter((id) => isLegacyForeignTextTag(sessionId, id)));
+      const skippedTagNumbers = new Set([
+        ...inertWhitespaceTagNumbers,
+        ...foreignTextTagNumbers
+      ]);
+      const skippedDropIds = [...new Set(dropIds.filter((id) => skippedTagNumbers.has(id)))];
+      const inertNote = skippedDropIds.length > 0 ? `Skipped: ${skippedDropIds.map((id) => inertWhitespaceTagNumbers.has(id) ? `§${id}§ is provider framing, nothing to reclaim` : `§${id}§ is another plugin's text, nothing to reclaim`).join("; ")}.` : "";
       const pendingOps = getPendingOps(deps.db, sessionId);
       const pendingMap = new Map(pendingOps.map((op) => [op.tagId, op.operation]));
       const conflicts = [];
       for (const id of dropIds) {
-        if (tagStatusMap.get(id) === "compacted" && !inertWhitespaceTagNumbers.has(id)) {
+        if (tagStatusMap.get(id) === "compacted" && !skippedTagNumbers.has(id)) {
           conflicts.push(`§${id}§ is from before compaction`);
         }
       }
       if (conflicts.length > 0) {
         return `Error: Conflicting operations — ${conflicts.join("; ")}.`;
       }
-      const stampedCount = new Set(dropIds.filter((id) => !inertWhitespaceTagNumbers.has(id))).size;
-      dropIds = dropIds.filter((id) => !inertWhitespaceTagNumbers.has(id) && tagStatusMap.get(id) !== "dropped" && pendingMap.get(id) !== "drop");
+      const stampedCount = new Set(dropIds.filter((id) => !skippedTagNumbers.has(id))).size;
+      dropIds = dropIds.filter((id) => !skippedTagNumbers.has(id) && tagStatusMap.get(id) !== "dropped" && pendingMap.get(id) !== "drop");
       if (dropIds.length === 0) {
         const reply = formatCtxReduceReply(stampedCount, ctxReduceSelfStampCount);
         if (reply)
@@ -52903,12 +53097,18 @@ function applyV2PromptSurfaceTools(draft, runtime, config, smartNotesEnabled = t
 function recordV2ToolDefinitions(draft) {
   if (!draft.tools)
     return;
+  const tools = [];
   for (const [id, tool] of Object.entries(draft.tools)) {
     if (!tool)
       continue;
     recordToolParameters(id, tool.input);
-    recordToolDefinition(draft.model.providerID, draft.model.id, draft.agent, id, typeof tool.description === "string" ? tool.description : "", tool.input);
+    tools.push({
+      id,
+      description: typeof tool.description === "string" ? tool.description : "",
+      parameters: tool.input
+    });
   }
+  recordToolDefinitionSet(draft.model.providerID, draft.model.id, draft.agent, tools, draft.sessionID);
 }
 async function applyV2SystemPrompt(systemPrompt, draft) {
   resolveCtxReduceAvailabilityFromMessages(draft.sessionID, draft.messages.map((message) => ({
@@ -53561,7 +53761,7 @@ async function registerContext(context) {
       projectDirectory: directory,
       hardSignals: {
         systemHash: state.systemPromptHash ?? "",
-        toolSetHash: getCurrentToolSetHash(draft.model.providerID, draft.model.id, draft.agent),
+        toolSetHash: getCurrentToolSetHash(draft.model.providerID, draft.model.id, draft.agent, draft.sessionID),
         modelKey: `${draft.model.providerID}/${draft.model.id}`,
         cacheExpired: false,
         lastResponseTime: state.lastResponseTime
@@ -53949,7 +54149,7 @@ async function registerContext(context) {
           const model = liveModels.get(sessionId);
           if (!model)
             return "";
-          return getCurrentToolSetHash(model.providerID, model.modelID, agents.get(sessionId));
+          return getCurrentToolSetHash(model.providerID, model.modelID, agents.get(sessionId), sessionId);
         },
         channel1StateBySession: channel1,
         historyRefreshSessions,

package/dist/v2/{embedding-backfill-w5qp7t28.js → embedding-backfill-r9mzt2eg.js}

@@ -1,17 +1,17 @@
 import {
   ensureMemoryEmbeddings2
-} from "./server-8j2e7t31.js";
-import"./server-q5z0gag0.js";
+} from "./server-wj8h2q21.js";
+import"./server-hnmm8yzq.js";
 import"./server-4dhv7mqz.js";
 import"./server-qt1qqasc.js";
 import"./server-vr4szghm.js";
 import"./server-24g8r2d0.js";
 import"./server-bsgd4dk1.js";
-import"./server-pw21ypwb.js";
+import"./server-7dpnt0ys.js";
 import"./server-ab1g0wn9.js";
 import"./server-qjvk4a9t.js";
-import"./server-wxrdher8.js";
-import"./server-swvhxhxz.js";
+import"./server-4frtg2z1.js";
+import"./server-erk2bvdf.js";
 import"./server-51779zs2.js";
 import"./server-gyy4k6mf.js";
 import"./server-3mz2qh5a.js";

package/dist/v2/hooks/context.d.ts

@@ -72,6 +72,10 @@ export declare function applyV2PromptSurfaceTools(draft: SessionContext, runtime
  * the wire, and it is keyed by the same {provider, model, agent} triple the status and sidebar
  * handlers look the measurement up by.
  *
+ * The draft is the request's exact tool set, so it replaces the route's measured set and becomes
+ * this session's figure: a tool an earlier request carried, or another session's request carried,
+ * does not count toward this request's size.
+ *
  * Measuring changes no served byte: the resulting tool-set hash is an attribution marker that the
  * m[0] materialization decision records but never folds on.
  */