@cortexkit/opencode-magic-context 0.45.0 → 0.46.1

package/dist/v2/{server-hfjfbg59.js → server-qp5hx1ad.js}

@@ -1,3 +1,9 @@
+import {
+  UNKNOWN_FIT_RATIO,
+  resolveDecisionCalibration,
+  hasMeasuredDecisionCalibration,
+  providerMass
+} from "./server-1zx87sdm.js";
 import {
   OMO_INTERNAL_INITIATOR_MARKER,
   isSystemDirective,
@@ -5,43 +11,70 @@ import {
   extractTexts2,
   extractToolResultBodyTokens,
   extractToolCallSummaries,
+  hasTokenizerForFit,
+  tokenCountUsesByteBound,
   estimateTokens,
+  createTokenCountMemo,
   normalizeText,
   compactRole,
   formatBlock,
   compactTextForSummary,
   mergeCommitHashes
-} from "./server-rhdgxp1t.js";
+} from "./server-51dv1pr5.js";
 import {
-  getHarness
-} from "./server-ckpc8pxy.js";
+  getHarness,
+  sessionLog
+} from "./server-1qbnzc80.js";
 import {
-  renderToolTemplate
-} from "./server-remp7e2g.js";
+  stableStringify,
+  tagOrderConstraintIndex,
+  getToolDefinitionMeasurementSignature,
+  getLargestMeasuredToolDefinitionTokens,
+  getMeasuredToolDefinitionTokens
+} from "./server-vs5gpnd4.js";
+import {
+  renderToolTemplate,
+  DEFAULT_PROTECTED_TOOLS,
+  normalizeProtectedToolName,
+  mergeProtectedTools
+} from "./server-g0fjrkta.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getRawSessionMessageCountFromDb,
   getMessageTimesFromOpenCodeDb
-} from "./server-w99cyt6a.js";
-import {
-  stableStringify,
-  getLargestMeasuredToolDefinitionTokens,
-  getMeasuredToolDefinitionTokens
-} from "./server-r7cmye3k.js";
-import {
-  UNKNOWN_FIT_RATIO,
-  resolveDecisionCalibration,
-  providerMass
-} from "./server-n96ag4rk.js";
+} from "./server-wvjvfhck.js";
 import {
   canonicalModelIdentity
 } from "./server-avwt563y.js";
 
 // src/features/magic-context/reclaim-protection.ts
-var CTX_REDUCE_KEEP = 3;
-function newestCtxReduceTagNumbers(tags) {
-  return new Set(tags.filter((tag) => tag.toolName === "ctx_reduce").sort((left, right) => right.tagNumber - left.tagNumber).slice(0, CTX_REDUCE_KEEP).map((tag) => tag.tagNumber));
+var CTX_REDUCE_KEEP = DEFAULT_PROTECTED_TOOLS.ctx_reduce;
+function adoptedProtectedToolsPolicy(current, previous, rebuilding, hasBaseline) {
+  if (rebuilding || !hasBaseline)
+    return mergeProtectedTools(current);
+  return { ...previous ?? { todowrite: 0, ctx_reduce: 3 } };
+}
+function protectedToolTagNumbers(tags, protectedTools) {
+  const counts = mergeProtectedTools(protectedTools);
+  const protectedTags = new Set;
+  for (const tag of [...tags].sort((left, right) => right.tagNumber - left.tagNumber)) {
+    if (tag.status !== undefined && tag.status !== "active")
+      continue;
+    if (tag.type !== undefined && tag.type !== "tool")
+      continue;
+    const name = normalizeProtectedToolName(tag.toolName);
+    if (!Object.hasOwn(counts, name) || counts[name] <= 0)
+      continue;
+    protectedTags.add(tag.tagNumber);
+    counts[name] -= 1;
+  }
+  return protectedTags;
+}
+function protectedToolTokenCount(tags, counts, calibration) {
+  const protectedTags = protectedToolTagNumbers(tags, counts);
+  const tokens = tags.reduce((sum, tag) => sum + (protectedTags.has(tag.tagNumber) ? tag.tokenCount ?? 0 : 0), 0);
+  return calibration && hasMeasuredDecisionCalibration(calibration) ? providerMass({ tools: tokens }, calibration) : 0;
 }
 
 // src/hooks/magic-context/tag-content-primitives.ts
@@ -413,6 +446,7 @@ function isTodoItem(value) {
 var MAX_CONTENT_MEMO_ENTRIES = 1e5;
 var MAX_CONTENT_MEMO_BYTES = 64 * 1024 * 1024;
 var contentMemo = new Map;
+var contentMemoOrder = new Set;
 var contentMemoBytes = 0;
 var FNV1A_32_OFFSET = 2166136261;
 var FNV1A_32_PRIME = 16777619;
@@ -434,25 +468,38 @@ function fnv1a32(value) {
   return hash.toString(16).padStart(8, "0");
 }
 function memoizedContent(kind, content) {
-  const key = `${kind}\x00${content}`;
-  const cached = contentMemo.get(key);
+  let byContent = contentMemo.get(kind);
+  if (!byContent) {
+    byContent = new Map;
+    contentMemo.set(kind, byContent);
+  }
+  const cached = byContent.get(content);
   if (cached)
     return cached;
+  let hash = FNV1A_32_OFFSET;
+  for (const segment of [kind, "\x00", content]) {
+    for (let index = 0;index < segment.length; index += 1) {
+      hash ^= segment.charCodeAt(index);
+      hash = Math.imul(hash, FNV1A_32_PRIME) >>> 0;
+    }
+  }
   const measured = {
-    hash: fnv1a32(key),
+    hash: hash.toString(16).padStart(8, "0"),
     tokens: kind === "excluded" ? 0 : undefined,
-    keyBytes: key.length * 2 + 32
+    keyBytes: (kind.length + 1 + content.length) * 2 + 32,
+    kind,
+    content
   };
-  contentMemo.set(key, measured);
+  byContent.set(content, measured);
+  contentMemoOrder.add(measured);
   contentMemoBytes += measured.keyBytes;
-  while (contentMemo.size > MAX_CONTENT_MEMO_ENTRIES || contentMemoBytes > MAX_CONTENT_MEMO_BYTES) {
-    const oldest = contentMemo.keys().next().value;
-    if (typeof oldest !== "string")
+  while (contentMemoOrder.size > MAX_CONTENT_MEMO_ENTRIES || contentMemoBytes > MAX_CONTENT_MEMO_BYTES) {
+    const oldest = contentMemoOrder.values().next().value;
+    if (!oldest)
       break;
-    const removed = contentMemo.get(oldest);
-    if (removed)
-      contentMemoBytes -= removed.keyBytes;
-    contentMemo.delete(oldest);
+    contentMemoBytes -= oldest.keyBytes;
+    contentMemo.get(oldest.kind)?.delete(oldest.content);
+    contentMemoOrder.delete(oldest);
   }
   return measured;
 }
@@ -624,9 +671,9 @@ function messageIdForTag(tag) {
     return tag.toolOwnerMessageId;
   return contentTagOwnerMessageId(tag.messageId);
 }
-function resolveProtectedTagNumbers(tags, protectedTagNumbersInput) {
+function resolveProtectedTagNumbers(tags, protectedTagNumbersInput, protectedToolTags) {
   const protectedNumbers = new Set(protectedTagNumbersInput);
-  const protectedCtxReduceTags = newestCtxReduceTagNumbers(tags.filter((tag) => tag.status === "active" && tag.type === "tool"));
+  const protectedCtxReduceTags = protectedToolTags ?? protectedToolTagNumbers(tags);
   for (const tagNumber of protectedCtxReduceTags)
     protectedNumbers.add(tagNumber);
   return protectedNumbers;
@@ -649,7 +696,7 @@ function neighborhoodConsistent(args) {
   return args.orphanTagNumber >= previousMax && args.orphanTagNumber <= nextMin;
 }
 function buildTagAttribution(args) {
-  const protectedNumbers = resolveProtectedTagNumbers(args.tags, args.protectedTagNumbers);
+  const protectedNumbers = resolveProtectedTagNumbers(args.tags, args.protectedTagNumbers, args.protectedToolTags);
   const messageTags = new Map;
   const exactToolTags = new Map;
   const orphanTagsByCall = new Map;
@@ -808,19 +855,34 @@ function sameTailHygieneStructuralSignature(expected, actual) {
   return expected.partCounts.every((count, index) => count === actual.partCounts[index]);
 }
 function measureTailHygiene(input) {
+  return measureWithReplay(input);
+}
+function measureWithReplay(input, replay) {
   const pendingDropTagNumbers = input.pendingDropTagNumbers ?? new Set;
+  const unchanged = input.messages.map((message, index) => {
+    const previous = replay?.messages[index];
+    return previous !== undefined && sameReplayMessage(previous, message);
+  });
   const toolIdentities = collectToolPartIdentities(input.messages);
   const attribution = buildTagAttribution({
     messages: input.messages,
     tags: input.tags,
     toolIdentities,
-    protectedTagNumbers: input.protectedTagNumbers
+    protectedTagNumbers: input.protectedTagNumbers,
+    protectedToolTags: input.protectedToolTags
+  });
+  const toolOutputs = input.messages.map((message, index) => message.parts.map((part, partIndex) => unchanged[index] ? replay?.measured.toolOutputs[index][partIndex] ?? null : isRecord(part) ? toolOutputText(part) : null));
+  const outputByPart = new Map;
+  input.messages.forEach((message, index) => {
+    message.parts.forEach((part, partIndex) => {
+      outputByPart.set(part, toolOutputs[index][partIndex]);
+    });
   });
   const droppedToolOwners = new Set;
   for (const [part, identity] of toolIdentities) {
     if (!isRecord(part))
       continue;
-    const output = toolOutputText(part);
+    const output = outputByPart.get(part) ?? null;
     if (output !== null && isDropSentinel(output)) {
       droppedToolOwners.add(`${identity.ownerMessageId}\x00${identity.callId}`);
     }
@@ -829,11 +891,47 @@ function measureTailHygiene(input) {
   let t = 0;
   let u = 0;
   let newestMessagePartStart = 0;
+  const messagePartStarts = [];
   for (let messageIndex = 0;messageIndex < input.messages.length; messageIndex += 1) {
     const message = input.messages[messageIndex];
+    messagePartStarts.push(parts.length);
     if (messageIndex === input.messages.length - 1)
       newestMessagePartStart = parts.length;
     const messageKey = messageIdentity(message, messageIndex);
+    const priorMessage = replay?.messages[messageIndex];
+    const reusable = unchanged[messageIndex] && priorMessage && message.parts.every((part, index) => {
+      const current = toolIdentities.get(part);
+      const prior = replay?.measured.toolOwners.get(priorMessage.parts[index]);
+      if (!current || !prior)
+        return current === prior;
+      const currentKey = `${current.ownerMessageId}\x00${current.callId}`;
+      const priorKey = `${prior.ownerMessageId}\x00${prior.callId}`;
+      return currentKey === priorKey && droppedToolOwners.has(currentKey) === replay?.measured.droppedToolOwners.has(priorKey);
+    });
+    if (reusable && replay) {
+      const start = replay.measured.messagePartStarts[messageIndex];
+      const end = replay.measured.messagePartStarts[messageIndex + 1] ?? replay.measured.parts.length;
+      for (let index = start;index < end; index += 1) {
+        const prior = replay.measured.parts[index];
+        const partIndex = Number(prior.key.slice(messageKey.length + 1).split("\x00")[0]);
+        const tag = prior.kind === "text" ? attribution.messageTags.get(`${message.info.id}:p${partIndex}`) : prior.kind === "file" ? attribution.messageTags.get(`${message.info.id}:file${partIndex}`) : prior.kind === "toolInput" || prior.kind === "toolOutput" ? attribution.toolTagsByPart.get(message.parts[partIndex]) : undefined;
+        const protectedPart = tag ? attribution.protectedNumbers.has(tag.tagNumber) : false;
+        const queuedForDrop = tag ? pendingDropTagNumbers.has(tag.tagNumber) : false;
+        const uTokens = tag?.status === "active" && !protectedPart && !queuedForDrop && prior.kind !== "excluded" ? prior.tokens : 0;
+        const measured = prior.tagNumber === (tag?.tagNumber ?? null) && prior.tagStatus === (tag?.status ?? null) && prior.protected === protectedPart && prior.queuedForDrop === queuedForDrop && prior.uTokens === uTokens ? prior : {
+          ...prior,
+          tagNumber: tag?.tagNumber ?? null,
+          tagStatus: tag?.status ?? null,
+          protected: protectedPart,
+          queuedForDrop,
+          uTokens
+        };
+        parts.push(measured);
+        t += measured.tokens;
+        u += measured.uTokens;
+      }
+      continue;
+    }
     const messageSynthetic = isSyntheticMessage(message);
     for (let partIndex = 0;partIndex < message.parts.length; partIndex += 1) {
       const part = message.parts[partIndex];
@@ -915,7 +1013,7 @@ function measureTailHygiene(input) {
           t += measured.tokens;
           u += measured.uTokens;
         }
-        const rawOutput = toolOutputText(part);
+        const rawOutput = outputByPart.get(part) ?? null;
         if (rawOutput !== null) {
           const output = stripChannel1ReminderSpans(rawOutput);
           if (isDropSentinel(output)) {
@@ -949,7 +1047,11 @@ function measureTailHygiene(input) {
     t: Math.max(0, t),
     contentSignature: contentSignature(parts),
     parts,
-    newestMessagePartStart
+    newestMessagePartStart,
+    messagePartStarts,
+    toolOutputs,
+    toolOwners: toolIdentities,
+    droppedToolOwners
   };
 }
 function messageIdFromPartKey(key) {
@@ -1056,6 +1158,20 @@ function sameReplayValue(before, after) {
   }
   return true;
 }
+function copyReplayValue(value) {
+  if (Array.isArray(value))
+    return value.map(copyReplayValue);
+  if (value !== null && typeof value === "object") {
+    const prototype = Object.getPrototypeOf(value);
+    if (prototype !== Object.prototype && prototype !== null)
+      return structuredClone(value);
+    const copy = Object.create(prototype);
+    for (const key of Object.keys(value))
+      copy[key] = copyReplayValue(value[key]);
+    return copy;
+  }
+  return value;
+}
 function sameNumbers(before, after) {
   if (before.size !== after.size)
     return false;
@@ -1064,19 +1180,22 @@ function sameNumbers(before, after) {
       return false;
   return true;
 }
+function sameReplayMessage(left, right) {
+  return left.info.id === right.info.id && left.info.role === right.info.role && left.info.summary === right.info.summary && sameReplayValue(left.parts, right.parts);
+}
 function sameReplayMessages(before, after) {
   if (before.length !== after.length)
     return false;
   for (let index = 0;index < before.length; index += 1) {
     const left = before[index];
     const right = after[index];
-    if (left.info.id !== right.info.id || left.info.role !== right.info.role || left.info.summary !== right.info.summary || !sameReplayValue(left.parts, right.parts))
+    if (!sameReplayMessage(left, right))
       return false;
   }
   return true;
 }
 var baselineMeasurementMemo = new Map;
-var MAX_BASELINE_MEMO_SIZE = 32 * 1024 * 1024;
+var MAX_BASELINE_MEMO_SIZE = 128 * 1024 * 1024;
 var baselineMemoSize = 0;
 function retainBaselineMeasurement(key, memo) {
   const previous = baselineMeasurementMemo.get(key);
@@ -1121,10 +1240,17 @@ function freezeTailHygieneMeasurement(measured) {
   };
 }
 function refreshTailHygieneBaseline(input) {
+  const protectedToolsPolicy = adoptedProtectedToolsPolicy(input.protectedTools, input.previous?.protectedToolsPolicy, input.cacheBusting, !!input.previous);
+  const protectedToolTags = protectedToolTagNumbers(input.tags, protectedToolsPolicy);
+  input = {
+    ...input,
+    protectedToolTags,
+    protectedTagNumbers: new Set([...input.protectedTagNumbers, ...protectedToolTags])
+  };
   const pendingDropTagNumbers = input.pendingDropTagNumbers ?? new Set;
   const cached = input.previous ? baselineMeasurementMemo.get(input.previous.baselineParts) : undefined;
   const hit = !input.cacheBusting && cached && sameReplayMessages(cached.messages, input.messages) && sameReplayValue(cached.tags, input.tags) && sameNumbers(cached.protectedTagNumbers, input.protectedTagNumbers) && sameNumbers(cached.pendingDropTagNumbers, pendingDropTagNumbers);
-  const rawMeasured = hit ? cached.measured : measureTailHygiene(input);
+  const rawMeasured = hit ? cached.measured : measureWithReplay(input, cached);
   const frozenCalibration = !input.cacheBusting && input.previous ? {
     toolsRatio: input.previous.toolsRatio,
     proseRatio: input.previous.proseRatio,
@@ -1143,26 +1269,38 @@ function refreshTailHygieneBaseline(input) {
     })
   };
   const memo = hit ? cached : {
-    messages: structuredClone(input.messages.map((message) => ({
+    messages: input.messages.map((message, index) => cached?.messages[index] && sameReplayMessage(cached.messages[index], message) ? cached.messages[index] : {
       info: {
         id: message.info.id,
         role: message.info.role,
         summary: message.info.summary
       },
-      parts: message.parts
-    }))),
+      parts: copyReplayValue(message.parts)
+    }),
     tags: structuredClone(input.tags),
     protectedTagNumbers: new Set(input.protectedTagNumbers),
     pendingDropTagNumbers: new Set(pendingDropTagNumbers),
     measured: rawMeasured,
     size: 2 * structuralSize(input.messages) + 512 * input.tags.length
   };
+  if (!hit) {
+    const owners = new Map;
+    input.messages.forEach((message, index) => {
+      message.parts.forEach((part, partIndex) => {
+        const identity = rawMeasured.toolOwners.get(part);
+        if (identity)
+          owners.set(memo.messages[index].parts[partIndex], identity);
+      });
+    });
+    rawMeasured.toolOwners = owners;
+  }
   const now = input.now ?? Date.now();
   const refrozen = (mismatch) => {
     const frozen = freezeTailHygieneMeasurement(measured);
     retainBaselineMeasurement(frozen.baselineParts, memo);
     return {
       ...frozen,
+      protectedToolsPolicy,
       hygieneUnitsVersion: frozenCalibration.hygieneUnitsVersion,
       toolsRatio: frozenCalibration.toolsRatio,
       proseRatio: frozenCalibration.proseRatio,
@@ -1191,6 +1329,7 @@ function refreshTailHygieneBaseline(input) {
   }
   return {
     ...input.previous,
+    protectedToolsPolicy,
     turnDeltaU,
     turnDeltaT,
     evaluable: true,
@@ -1210,6 +1349,11 @@ function assertTailHygieneContentUnchanged(input) {
     throw new Error(`tail hygiene walk was not the last byte-affecting operation: expected ${input.expectedSignature}, got ${actual}`);
   }
 }
+function assertTailHygieneContentUnchangedIfEnabled(input) {
+  if (process.env.MAGIC_CONTEXT_DEBUG_ASSERTIONS === "1") {
+    assertTailHygieneContentUnchanged(input);
+  }
+}
 
 // src/hooks/magic-context/ctx-reduce-nudge.ts
 var CHANNEL1_SENTINEL = "<system-reminder>";
@@ -1599,7 +1743,7 @@ function planEmergencyDrop(input) {
       reserved.add(nums[i]);
     }
   }
-  const protectedCtxReduceTags = newestCtxReduceTagNumbers(floorTags.filter((tag) => tag.status === "active" && tag.type === "tool"));
+  const protectedTags = input.protectedToolTags ?? protectedToolTagNumbers(floorTags, input.protectedTools);
   const byTier = { 1: [], 2: [], 3: [] };
   for (const tag of tags) {
     if (tag.status !== "active" || tag.type !== "tool")
@@ -1610,7 +1754,7 @@ function planEmergencyDrop(input) {
           continue;
       }
     }
-    if (protectedCtxReduceTags.has(tag.tagNumber))
+    if (protectedTags.has(tag.tagNumber))
       continue;
     const tier = resolveToolTier(tag.toolName);
     if ((tier === 1 || tier === 2) && reserved.has(tag.tagNumber))
@@ -1655,6 +1799,124 @@ function measureEmergencyTag(tag, target, calibration, skeleton) {
   return { ...tag, servedTokens: served, reclaimableTokens: 0 };
 }
 
+// src/features/magic-context/storage-ops.ts
+var queuePendingOpStatements = new WeakMap;
+var queueUnchangedDropStatements = new WeakMap;
+var getPendingOpsStatements = new WeakMap;
+var getPendingOpsCountStatements = new WeakMap;
+var hasPendingDropOpsStatements = new WeakMap;
+var clearPendingOpsStatements = new WeakMap;
+var removePendingOpStatements = new WeakMap;
+function getQueuePendingOpStatement(db) {
+  let stmt = queuePendingOpStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare(`INSERT INTO pending_ops (session_id, tag_id, operation, queued_at, harness)
+             SELECT ?, ?, ?, ?, ? WHERE NOT EXISTS (
+                 SELECT 1 FROM pending_ops WHERE session_id = ? AND tag_id = ? AND operation = ?
+             )`);
+    queuePendingOpStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getPendingOpsStatement(db) {
+  let stmt = getPendingOpsStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("SELECT id, session_id, tag_id, operation, queued_at FROM pending_ops WHERE session_id = ? ORDER BY queued_at ASC, id ASC");
+    getPendingOpsStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getClearPendingOpsStatement(db) {
+  let stmt = clearPendingOpsStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("DELETE FROM pending_ops WHERE session_id = ?");
+    clearPendingOpsStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function getRemovePendingOpStatement(db) {
+  let stmt = removePendingOpStatements.get(db);
+  if (!stmt) {
+    stmt = db.prepare("DELETE FROM pending_ops WHERE session_id = ? AND tag_id = ?");
+    removePendingOpStatements.set(db, stmt);
+  }
+  return stmt;
+}
+function isPendingOpRow(row) {
+  if (row === null || typeof row !== "object")
+    return false;
+  const r = row;
+  return typeof r.id === "number" && typeof r.session_id === "string" && typeof r.tag_id === "number" && typeof r.operation === "string" && typeof r.queued_at === "number";
+}
+function toPendingOp(row) {
+  if (row.operation !== "drop") {
+    sessionLog(row.session_id, `unknown pending operation "${row.operation}"; ignoring`);
+    return null;
+  }
+  return {
+    id: row.id,
+    sessionId: row.session_id,
+    tagId: row.tag_id,
+    operation: row.operation,
+    queuedAt: row.queued_at
+  };
+}
+function queuePendingOp(db, sessionId, tagId, operation, queuedAt = Date.now()) {
+  getQueuePendingOpStatement(db).run(sessionId, tagId, operation, queuedAt, getHarness(), sessionId, tagId, operation);
+}
+function queuePendingDropForUnchangedTag(db, sessionId, tag) {
+  let statement = queueUnchangedDropStatements.get(db);
+  if (!statement) {
+    statement = db.prepare(`INSERT INTO pending_ops (session_id, tag_id, operation, queued_at, harness)
+            SELECT session_id, tag_number, 'drop', ?, ? FROM tags
+            WHERE id = ? AND session_id = ? AND tag_number = ? AND message_id = ?
+                AND type = ? AND tool_owner_message_id IS ? AND status = 'active'
+                AND NOT EXISTS (
+                    SELECT 1 FROM pending_ops WHERE session_id = tags.session_id
+                        AND tag_id = tags.tag_number AND operation = 'drop'
+                )`);
+    queueUnchangedDropStatements.set(db, statement);
+  }
+  return statement.run(Date.now(), getHarness(), tag.id ?? null, sessionId, tag.tagNumber, tag.messageId, tag.type, tag.toolOwnerMessageId).changes > 0;
+}
+function getPendingOps(db, sessionId) {
+  const rows = getPendingOpsStatement(db).all(sessionId).filter(isPendingOpRow);
+  return rows.map(toPendingOp).filter((op) => op !== null);
+}
+function hasPendingDropOps(db, sessionId) {
+  let statement = hasPendingDropOpsStatements.get(db);
+  if (!statement) {
+    statement = db.prepare(`SELECT EXISTS (
+            SELECT 1 FROM pending_ops WHERE session_id = ? AND operation = 'drop'
+                AND typeof(id) IN ('integer', 'real')
+                AND typeof(session_id) = 'text'
+                AND typeof(tag_id) IN ('integer', 'real')
+                AND typeof(queued_at) IN ('integer', 'real')
+        ) AS present`);
+    hasPendingDropOpsStatements.set(db, statement);
+  }
+  return statement.get(sessionId).present === 1;
+}
+function getPendingOpsCount(db, sessionId) {
+  try {
+    let statement = getPendingOpsCountStatements.get(db);
+    if (!statement) {
+      statement = db.prepare("SELECT COUNT(*) AS count FROM pending_ops WHERE session_id = ?");
+      getPendingOpsCountStatements.set(db, statement);
+    }
+    const row = statement.get(sessionId);
+    return typeof row?.count === "number" && Number.isFinite(row.count) ? row.count : null;
+  } catch {
+    return null;
+  }
+}
+function clearPendingOps(db, sessionId) {
+  getClearPendingOpsStatement(db).run(sessionId);
+}
+function removePendingOp(db, sessionId, tagId) {
+  getRemovePendingOpStatement(db).run(sessionId, tagId);
+}
+
 // src/features/magic-context/storage-tags.ts
 var insertTagStatements = new WeakMap;
 var updateTagStatusStatements = new WeakMap;
@@ -1800,8 +2062,7 @@ function getActiveToolTagsForAgeReclaim(db, sessionId) {
       reclaimableTokens: outputTokens === null && inputTokens === null ? null : (outputTokens ?? 0) + (inputTokens ?? 0)
     };
   });
-  const protectedCtxReduceTags = newestCtxReduceTagNumbers(tags);
-  return tags.filter((tag) => !protectedCtxReduceTags.has(tag.tagNumber));
+  return tags;
 }
 function getTriggerTagTokenUpperBound(db, sessionId, floor = 0) {
   const sql = floor > 0 ? `SELECT
@@ -1816,13 +2077,43 @@ function getTriggerTagTokenUpperBound(db, sessionId, floor = 0) {
   const row = floor > 0 ? db.prepare(sql).get(sessionId, floor) : db.prepare(sql).get(sessionId);
   return { bound: row?.bound ?? 0, nullCount: row?.null_count ?? 0 };
 }
-function getActiveTagTokenTotalsByMessage(db, sessionId) {
-  const rows = db.prepare(`SELECT type, message_id, tool_owner_message_id, token_count, input_token_count, reasoning_token_count
+var scopedActiveTokenTotalStatements = new WeakMap;
+function getActiveTagTokenTotalsByMessage(db, sessionId, messageIds) {
+  if (messageIds?.length === 0)
+    return new Map;
+  const fields = "id, tag_number, type, message_id, tool_owner_message_id, token_count, input_token_count, reasoning_token_count".split(", ").map((field) => `tags.${field}`).join(", ");
+  let scoped = scopedActiveTokenTotalStatements.get(db);
+  if (messageIds && !scoped) {
+    scoped = db.prepare(`
+            SELECT ${fields} FROM json_each(?) AS owners
+            CROSS JOIN tags INDEXED BY idx_tags_session_message_id
+            WHERE session_id = ? AND tags.type != 'tool' AND +status = 'active'
+              AND message_id >= owners.value || ':' AND message_id < owners.value || ';'
+            UNION
+            SELECT ${fields} FROM tags INDEXED BY idx_tags_session_message_id
+            WHERE session_id = ? AND type != 'tool' AND +status = 'active'
+              AND message_id IN (SELECT value FROM json_each(?))
+            UNION
+            SELECT ${fields} FROM tags INDEXED BY idx_tags_pi_fallback_tool_owner
+            WHERE session_id = ? AND type = 'tool' AND +status = 'active'
+              AND tool_owner_message_id IN (SELECT value FROM json_each(?))
+            UNION
+            SELECT ${fields} FROM tags INDEXED BY idx_tags_session_message_id
+            WHERE session_id = ? AND type = 'tool' AND +status = 'active'
+              AND tool_owner_message_id IS NULL AND message_id IN (SELECT value FROM json_each(?))
+            ORDER BY tag_number, id`);
+    scopedActiveTokenTotalStatements.set(db, scoped);
+  }
+  const owners = messageIds ? new Set(messageIds) : undefined;
+  const encoded = owners ? JSON.stringify([...owners]) : "";
+  const rows = messageIds && scoped ? scoped.all(encoded, sessionId, sessionId, encoded, sessionId, encoded, sessionId, encoded) : db.prepare(`SELECT type, message_id, tool_owner_message_id, token_count, input_token_count, reasoning_token_count
              FROM tags
              WHERE session_id = ? AND status = 'active'`).all(sessionId);
   const out = new Map;
   for (const row of rows) {
     const owner = ownerMessageIdForTagRow(row);
+    if (owners && !owners.has(owner))
+      continue;
     let entry = out.get(owner);
     if (!entry) {
       entry = { conversation: 0, toolCall: 0, toolOutput: 0, hasNull: false };
@@ -1902,7 +2193,7 @@ function getMaxTagNumberBySessionStatement(db) {
 function getTagNumberByMessageIdStatement(db) {
   let stmt = getTagNumberByMessageIdStatements.get(db);
   if (!stmt) {
-    stmt = db.prepare("SELECT tag_number FROM tags WHERE session_id = ? AND message_id = ? ORDER BY tag_number ASC LIMIT 1");
+    stmt = db.prepare("SELECT tag_number FROM tags INDEXED BY idx_tags_session_message_id WHERE session_id = ? AND message_id = ? ORDER BY tag_number ASC LIMIT 1");
     getTagNumberByMessageIdStatements.set(db, stmt);
   }
   return stmt;
@@ -1978,20 +2269,24 @@ function markWhitespaceAssistantTagInert(db, sessionId, tagNumber, contentId) {
              entry_fingerprint = ?
          WHERE session_id = ? AND tag_number = ? AND type = 'message'`).run(`${WHITESPACE_ASSISTANT_INERT_MESSAGE_PREFIX}${tagNumber}`, `${WHITESPACE_ASSISTANT_INERT_FINGERPRINT_PREFIX}${contentId}`, sessionId, tagNumber);
 }
+var inertWhitespaceStatements = new WeakMap;
 function getInertWhitespaceAssistantTags(db, sessionId, messageIds) {
   if (messageIds) {
-    const statement = db.prepare(`SELECT tag_number AS tagNumber, entry_fingerprint AS entryFingerprint
-             FROM tags
-             WHERE session_id = ? AND type = 'message' AND status = 'compacted'
-               AND entry_fingerprint >= ? AND entry_fingerprint < ?`);
-    return [...new Set(messageIds)].flatMap((messageId) => {
-      const prefix = `${WHITESPACE_ASSISTANT_INERT_FINGERPRINT_PREFIX}${messageId}:p`;
-      const rows = statement.all(sessionId, prefix, `${prefix.slice(0, -1)}q`);
-      return rows.map((row) => ({
-        tagNumber: row.tagNumber,
-        contentId: row.entryFingerprint.slice(WHITESPACE_ASSISTANT_INERT_FINGERPRINT_PREFIX.length)
-      }));
-    });
+    let statement = inertWhitespaceStatements.get(db);
+    if (!statement) {
+      statement = db.prepare(`SELECT tag_number AS tagNumber, entry_fingerprint AS entryFingerprint
+                 FROM json_each(?) AS owners CROSS JOIN tags
+                 WHERE tags.session_id = ? AND tags.type = 'message' AND tags.status = 'compacted'
+                   AND entry_fingerprint >= ? || owners.value || ':p'
+                   AND entry_fingerprint < ? || owners.value || ':q'
+                 ORDER BY CAST(owners.key AS INTEGER), entry_fingerprint, tags.id`);
+      inertWhitespaceStatements.set(db, statement);
+    }
+    const rows = statement.all(JSON.stringify([...new Set(messageIds)]), sessionId, WHITESPACE_ASSISTANT_INERT_FINGERPRINT_PREFIX, WHITESPACE_ASSISTANT_INERT_FINGERPRINT_PREFIX);
+    return rows.map((row) => ({
+      tagNumber: row.tagNumber,
+      contentId: row.entryFingerprint.slice(WHITESPACE_ASSISTANT_INERT_FINGERPRINT_PREFIX.length)
+    }));
   }
   const rows = db.prepare(`SELECT tag_number AS tagNumber, entry_fingerprint AS entryFingerprint
              FROM tags
@@ -2201,9 +2496,9 @@ function foldShrunkPartTags(db, sessionId, messages) {
   result.foldedTagNumbers.sort((a, b) => a - b);
   return result;
 }
-function markTagsCompactedByMessageIds(db, sessionId, messageIds) {
+function markTagsCompactedByMessageIds(db, sessionId, messageIds, eligibleTagNumbers) {
   const ids = new Set(messageIds);
-  if (ids.size === 0)
+  if (ids.size === 0 || eligibleTagNumbers?.size === 0)
     return 0;
   const asciiLower = (value) => value.replace(/[A-Z]/g, (char) => char.toLowerCase());
   const foldedIds = new Set(Array.from(ids, asciiLower));
@@ -2229,7 +2524,7 @@ function markTagsCompactedByMessageIds(db, sessionId, messageIds) {
   const rows = db.prepare(`WITH ids AS MATERIALIZED (
             SELECT value AS source_id, lower(value) AS folded_id FROM json_each(?)
         )
-        SELECT id, message_id, tool_owner_message_id FROM tags INDEXED BY idx_tags_session_tag_number
+        SELECT id, tag_number, message_id, tool_owner_message_id FROM tags INDEXED BY ${tagOrderConstraintIndex(db)}
         WHERE session_id = ? AND status IN ('active', 'dropped') AND (
             message_id IN (SELECT source_id FROM ids)
             OR tool_owner_message_id IN (SELECT source_id FROM ids)
@@ -2240,14 +2535,14 @@ function markTagsCompactedByMessageIds(db, sessionId, messageIds) {
             OR (? AND instr(message_id, ':') > 0)
             OR ?
         )`).all(JSON.stringify(Array.from(ids)), sessionId, Array.from(ids).some((id) => id.includes(":")) ? 1 : 0, nulPrefixes.size > 0 ? 1 : 0);
-  const candidates = rows.filter((row) => matches(row.message_id, row.tool_owner_message_id));
+  const candidates = rows.filter((row) => (eligibleTagNumbers === undefined || eligibleTagNumbers.has(row.tag_number)) && matches(row.message_id, row.tool_owner_message_id));
   if (candidates.length === 0)
     return 0;
   const update = db.prepare(`UPDATE tags SET status = 'compacted'
          WHERE id = ? AND session_id = ?
             AND status IN ('active', 'dropped')
             AND message_id IS ? AND tool_owner_message_id IS ?
-          RETURNING id`);
+          RETURNING tag_number`);
   let cursor = 0;
   let changed = 0;
   const batch = db.transaction(() => {
@@ -2255,8 +2550,11 @@ function markTagsCompactedByMessageIds(db, sessionId, messageIds) {
     let processed = 0;
     do {
       const row = candidates[cursor++];
-      if (update.get(row.id, sessionId, row.message_id, row.tool_owner_message_id))
+      const retired = update.get(row.id, sessionId, row.message_id, row.tool_owner_message_id);
+      if (retired) {
+        removePendingOp(db, sessionId, retired.tag_number);
         changed++;
+      }
       processed++;
     } while (cursor < candidates.length && processed < 128 && performance.now() - start < 8);
   });
@@ -2324,10 +2622,6 @@ function deriveTagLoadFloor(db, sessionId, rawIds) {
   return Math.max(0, min - margin);
 }
 var TAG_SELECT_COLUMNS = "id, message_id, type, status, drop_mode, tool_name, input_byte_size, byte_size, reasoning_byte_size, session_id, tag_number, caveman_depth, tool_owner_message_id, token_count";
-function getTagsBySession(db, sessionId) {
-  const rows = db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags WHERE session_id = ? ORDER BY tag_number ASC, id ASC`).all(sessionId).filter(isTagRow);
-  return rows.map(toTagEntry);
-}
 var getActiveTagsBySessionStatements = new WeakMap;
 var getNullOwnerToolTagsBySessionStatements = new WeakMap;
 var getDroppedTagsBySessionStatements = new WeakMap;
@@ -2403,6 +2697,25 @@ function getTagsByNumbers(db, sessionId, tagNumbers) {
   const rows = db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags WHERE session_id = ? AND tag_number IN (${placeholders}) ORDER BY tag_number ASC, id ASC`).all(sessionId, ...tagNumbers).filter(isTagRow);
   return rows.map(toTagEntry);
 }
+var newestToolTagNumberStatements = new WeakMap;
+function getNewestToolTagNumbers(db, sessionId, limit) {
+  if (limit <= 0)
+    return [];
+  let statement = newestToolTagNumberStatements.get(db);
+  if (!statement) {
+    statement = db.prepare(`SELECT tag_number FROM tags
+              WHERE session_id = ? AND type = 'tool'
+                AND typeof(message_id) = 'text'
+                AND typeof(status) = 'text'
+                AND typeof(byte_size) IN ('integer', 'real')
+                AND typeof(tag_number) IN ('integer', 'real')
+              ORDER BY tag_number DESC
+              LIMIT ?`);
+    newestToolTagNumberStatements.set(db, statement);
+  }
+  return statement.all(sessionId, limit).map((row) => row.tag_number);
+}
+var droppedNumberStatements = new WeakMap;
 function getDroppedTagsByNumbers(db, sessionId, tagNumbers) {
   if (tagNumbers.length === 0)
     return [];
@@ -2413,16 +2726,26 @@ function getDroppedTagsByNumbers(db, sessionId, tagNumbers) {
     }
     return all;
   }
-  const placeholders = tagNumbers.map(() => "?").join(",");
-  const rows = db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags WHERE session_id = ? AND status = 'dropped' AND tag_number IN (${placeholders}) ORDER BY tag_number ASC, id ASC`).all(sessionId, ...tagNumbers).filter(isTagRow);
+  let statement = droppedNumberStatements.get(db);
+  if (!statement) {
+    statement = db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags WHERE session_id = ? AND status = 'dropped' AND tag_number IN (SELECT value FROM json_each(?)) ORDER BY tag_number ASC, id ASC`);
+    droppedNumberStatements.set(db, statement);
+  }
+  const rows = statement.all(sessionId, JSON.stringify(tagNumbers)).filter(isTagRow);
   return rows.map(toTagEntry);
 }
 function getMaxDroppedTagNumber(db, sessionId) {
   const row = getMaxDroppedTagNumberStatement(db).get(sessionId);
   return isMaxTagNumberRow(row) ? row.max_tag_number : 0;
 }
+var tagByIdStatements = new WeakMap;
 function getTagById(db, sessionId, tagId) {
-  const result = db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags WHERE session_id = ? AND tag_number = ?`).get(sessionId, tagId);
+  let statement = tagByIdStatements.get(db);
+  if (!statement) {
+    statement = db.prepare(`SELECT ${TAG_SELECT_COLUMNS} FROM tags WHERE session_id = ? AND tag_number = ?`);
+    tagByIdStatements.set(db, statement);
+  }
+  const result = statement.get(sessionId, tagId);
   if (!isTagRow(result)) {
     return null;
   }
@@ -2840,19 +3163,25 @@ function countRawSessionMessageOrdinalsFromDb(db, sessionId) {
                )`).get(sessionId);
   return typeof row?.count === "number" ? row.count : 0;
 }
-function readRawSessionMessageIdOrdinalsFromDb(db, sessionId) {
-  const messageRows = db.prepare("SELECT id, data FROM message WHERE session_id = ? ORDER BY time_created ASC, id ASC").all(sessionId).filter(isRawMessageRow);
-  const ordinalById = new Map;
-  let ordinal = 0;
-  for (const row of messageRows) {
-    const info = parseJsonRecord(row.data);
-    if (isRawCompactionSummaryInfo(info))
-      continue;
-    ordinal += 1;
-    if (info)
-      ordinalById.set(row.id, ordinal);
+function readRawSessionMessageIdOrdinalsForRangeFromDb(db, sessionId, fromOrdinal, toOrdinal) {
+  const from = Math.max(1, Math.floor(fromOrdinal));
+  const to = Math.floor(toOrdinal);
+  if (to < from)
+    return new Map;
+  const rows = db.prepare(`
+        SELECT id, data FROM message WHERE session_id = ?
+          AND CASE WHEN json_valid(data) THEN NOT (
+            COALESCE(json_type(data, '$.summary'), '') = 'true'
+            AND COALESCE(json_extract(data, '$.finish'), '') = 'stop'
+          ) ELSE 1 END
+        ORDER BY time_created, id LIMIT ? OFFSET ?
+    `).all(sessionId, to - from + 1, from - 1).filter(isRawMessageRow);
+  const result = new Map;
+  for (const [index, row] of rows.entries()) {
+    if (parseJsonRecord(row.data))
+      result.set(row.id, from + index);
   }
-  return ordinalById;
+  return result;
 }
 function readRawSessionMessageOrdinalPageFromDb(db, sessionId, after, limit) {
   const pageSize = Math.max(1, Math.floor(limit));
@@ -3061,6 +3390,17 @@ function readRawSessionMessageByIdFromDb(db, sessionId, messageId) {
     version: row.time_updated ?? null
   };
 }
+function hasRawSessionMessageByIdFromDb(db, sessionId, messageId) {
+  const row = db.prepare("SELECT id, data, time_created FROM message WHERE session_id = ? AND id = ?").get(sessionId, messageId);
+  if (!row || !isRawMessageRow(row) || typeof row.time_created !== "number")
+    return false;
+  const info = parseJsonRecord(row.data);
+  if (!info || isRawCompactionSummaryInfo(info))
+    return false;
+  if (info.summary === 1 && info.finish === "stop")
+    return readRawSessionMessageByIdFromDb(db, sessionId, messageId) !== null;
+  return true;
+}
 function readRawSeedTailFromDb(db, sessionId, boundaryId) {
   const rows = db.prepare(`
         WITH canonical AS (
@@ -3109,6 +3449,7 @@ var MAX_MESSAGE_CACHE_KEY_BYTES = 64 * 1024 * 1024;
 var FNV1A_32_OFFSET2 = 2166136261;
 var FNV1A_32_PRIME2 = 16777619;
 var messageEstimateCache = new Map;
+var messageEstimateKeysByField = new Map;
 var messageEstimateCacheBytes = 0;
 var EMPTY_BREAKDOWN = {
   text: 0,
@@ -3316,16 +3657,33 @@ function setCachedEstimate(key, breakdown) {
   const existing = messageEstimateCache.get(key);
   if (existing)
     messageEstimateCacheBytes -= existing.keyEstimateBytes;
+  else {
+    for (const field of new Set(key.split("\x00").slice(1, -1))) {
+      const keys = messageEstimateKeysByField.get(field) ?? new Set;
+      keys.add(key);
+      messageEstimateKeysByField.set(field, keys);
+    }
+  }
   messageEstimateCache.set(key, { breakdown, keyEstimateBytes });
   messageEstimateCacheBytes += keyEstimateBytes;
   while (messageEstimateCache.size > MAX_MESSAGE_CACHE_ENTRIES || messageEstimateCacheBytes > MAX_MESSAGE_CACHE_KEY_BYTES) {
     const first = messageEstimateCache.keys().next().value;
     if (typeof first !== "string")
       break;
-    const removed = messageEstimateCache.get(first);
-    if (removed)
-      messageEstimateCacheBytes -= removed.keyEstimateBytes;
-    messageEstimateCache.delete(first);
+    deleteCachedEstimate(first);
+  }
+}
+function deleteCachedEstimate(key) {
+  const removed = messageEstimateCache.get(key);
+  if (!removed)
+    return;
+  messageEstimateCacheBytes -= removed.keyEstimateBytes;
+  messageEstimateCache.delete(key);
+  for (const field of new Set(key.split("\x00").slice(1, -1))) {
+    const keys = messageEstimateKeysByField.get(field);
+    keys?.delete(key);
+    if (keys?.size === 0)
+      messageEstimateKeysByField.delete(field);
   }
 }
 function cloneBreakdown(value) {
@@ -4046,9 +4404,12 @@ function serializedText(value) {
     return "";
   return (typeof value === "string" ? value : JSON.stringify(value)) ?? "";
 }
-function serializedTokens(value) {
+var wireTextTokens = createTokenCountMemo(1e5, 128 * 1024 * 1024);
+function serializedTokens(value, bounded = false) {
   const serialized = serializedText(value);
-  return serialized ? estimateTokens(serialized) : 0;
+  if (bounded && tokenCountUsesByteBound(serialized))
+    return Buffer.byteLength(serialized);
+  return serialized ? wireTextTokens(serialized) : 0;
 }
 function visitWireContent(message, visit) {
   for (const part of message.parts) {
@@ -4108,11 +4469,11 @@ function visitWireContent(message, visit) {
     }
   }
 }
-function estimateMessageTokens(message) {
+function estimateMessageTokens(message, bounded = false) {
   const total = { conversation: 0, toolCall: 0 };
   visitWireContent(message, {
     text: (bucket, value) => {
-      total[bucket] += serializedTokens(value);
+      total[bucket] += serializedTokens(value, bounded);
     },
     image: (bucket, tokens) => {
       total[bucket] += tokens;
@@ -4140,9 +4501,99 @@ function wireContentBytes(messages, abortAboveBytes, bytesPerToken) {
   }
   return { bytes, aborted: false };
 }
+function createFinalWireUsageTracker() {
+  const served = new Map;
+  const wireRows = (input) => input.messages.filter((message) => message.parts.some((part) => !part || typeof part !== "object" || !["step-start", "step-finish"].includes(String(part.type))));
+  const rowBytes = (message) => JSON.stringify({ id: message.info.id, role: message.info.role, parts: message.parts });
+  const envelopeFor = (input) => {
+    if (!input.providerID || !input.modelID || !input.systemPromptHash)
+      return;
+    const tools = getToolDefinitionMeasurementSignature(input.providerID, input.modelID, input.agentName);
+    if (!tools)
+      return;
+    return JSON.stringify([
+      input.providerID,
+      input.modelID,
+      input.agentName,
+      input.systemPromptHash,
+      input.systemPromptTokens,
+      tools
+    ]);
+  };
+  return {
+    estimate(sessionId, input, limit) {
+      let measuredPrefix;
+      try {
+        const previous = served.get(sessionId);
+        const rows = wireRows(input);
+        if (previous && previous.envelope === envelopeFor(input) && rows.length > previous.prefix.length && previous.prefix.every((bytes, i) => rowBytes(rows[i]) === bytes)) {
+          const reply = rows[previous.prefix.length]?.info;
+          const tokens = reply.tokens;
+          const time = reply.time;
+          const counts = [tokens?.input, tokens?.cache?.read, tokens?.cache?.write];
+          if (reply.role === "assistant" && reply.parentID === previous.parent && reply.providerID === input.providerID && reply.modelID === input.modelID && ["stop", "tool-calls", "length"].includes(String(reply.finish)) && !reply.error && typeof time?.completed === "number" && time.completed >= previous.at && counts.every((n) => typeof n === "number" && Number.isSafeInteger(n) && n >= 0)) {
+            const inputTokens = counts.reduce((sum, n) => sum + (n ?? 0), 0);
+            if (inputTokens > 0)
+              measuredPrefix = {
+                inputTokens,
+                appendedMessages: rows.slice(previous.prefix.length)
+              };
+          }
+        }
+      } catch {}
+      return estimateOutgoingWireForRefusal({ ...input, measuredPrefix }, limit);
+    },
+    capture(sessionId, input) {
+      served.delete(sessionId);
+      try {
+        const envelope = envelopeFor(input);
+        const rows = wireRows(input);
+        const parent = [...rows].reverse().find((row) => row.info.role === "user")?.info.id;
+        if (!envelope || typeof parent !== "string" || !rows.every(hasCountableParts))
+          return;
+        const prefix = rows.map(rowBytes);
+        if (prefix.reduce((sum, text) => sum + text.length, 0) > 4 * 1024 * 1024)
+          return;
+        if (served.size >= 16)
+          served.delete(served.keys().next().value);
+        served.set(sessionId, { envelope, prefix, parent, at: Date.now() });
+      } catch {}
+    }
+  };
+}
+function estimateOutgoingWireForRefusal(input, limit) {
+  if (typeof limit === "number" && Number.isFinite(limit) && limit > 0) {
+    const measured = input.measuredPrefix;
+    const baseline = measured?.inputTokens ?? 0;
+    const pricedMessages = measured?.appendedMessages ?? input.messages;
+    const bytes = wireContentBytes(pricedMessages, Math.max(0, limit - baseline) * 4, 4);
+    if (bytes) {
+      const lower = baseline + Math.ceil(bytes.bytes / 4);
+      const calibration = resolveDecisionCalibration(input.providerID, input.modelID);
+      const tools = input.providerID && input.modelID ? getMeasuredToolDefinitionTokens(input.providerID, input.modelID, input.agentName) : undefined;
+      const envelope = measured ? baseline : tools !== undefined && Number.isFinite(input.systemPromptTokens) && input.systemPromptTokens > 0 ? providerMass({ system: input.systemPromptTokens, tools }, calibration, true) : undefined;
+      const upper = envelope === undefined ? undefined : envelope + Math.ceil(bytes.bytes * Math.max(UNKNOWN_FIT_RATIO, calibration.toolsRatio, calibration.proseRatio));
+      if (bytes.aborted || lower > limit || upper !== undefined && upper <= limit) {
+        const over = bytes.aborted || lower > limit;
+        return {
+          tokens: over ? lower : upper,
+          trusted: !over,
+          refusalGrade: over && envelope !== undefined,
+          refusalTokens: over ? lower : undefined,
+          refusalBasis: "byte-bound",
+          messageTokens: { conversation: 0, toolCall: 0 },
+          systemTokens: input.systemPromptTokens,
+          toolDefinitionTokens: tools,
+          toolDefinitionsMeasured: tools !== undefined
+        };
+      }
+    }
+  }
+  return estimateFinalWireInputTokens({ ...input, boundedTokenization: true });
+}
 function estimateFinalWireInputTokens(input) {
   const messageTokens = input.messages.reduce((total, message) => {
-    const next = estimateMessageTokens(message);
+    const next = estimateMessageTokens(message, input.boundedTokenization);
     total.conversation += next.conversation;
     total.toolCall += next.toolCall;
     return total;
@@ -4158,11 +4609,25 @@ function estimateFinalWireInputTokens(input) {
   };
   const tokens = providerMass(rawComponents, calibration, true);
   const complete = Number.isFinite(tokens) && tokens > 0 && Number.isFinite(input.systemPromptTokens) && input.systemPromptTokens > 0 && toolDefinitions !== undefined && input.messages.every(hasCountableParts);
+  const refusalGrade = complete && hasTokenizerForFit() && measuredToolDefinitions !== undefined && hasMeasuredDecisionCalibration(calibration) && input.messages.every(hasRefusalCountableParts);
+  const measured = input.measuredPrefix;
+  const useMeasured = refusalGrade && measured && Number.isSafeInteger(measured.inputTokens) && measured.inputTokens > 0 && measured.appendedMessages.every(hasCountableParts);
+  const tail = useMeasured ? measured.appendedMessages.reduce((sum, message) => {
+    const next = estimateMessageTokens(message, input.boundedTokenization);
+    return {
+      conversation: sum.conversation + next.conversation,
+      toolCall: sum.toolCall + next.toolCall
+    };
+  }, { conversation: 0, toolCall: 0 }) : undefined;
+  const refusalTokens = refusalGrade ? tail && measured ? measured.inputTokens + providerMass({ tools: tail.toolCall, prose: tail.conversation }, calibration) : providerMass(rawComponents, calibration) : undefined;
   const systemTokens = Math.round(Math.max(0, input.systemPromptTokens) * calibration.systemRatio);
   const toolDefinitionTokens = toolDefinitions === undefined ? undefined : Math.round(toolDefinitions * (calibration.seeded ? calibration.toolsRatio : UNKNOWN_FIT_RATIO));
   return {
     tokens,
     trusted: complete,
+    refusalGrade,
+    refusalTokens,
+    refusalBasis: refusalGrade ? useMeasured ? "provider-prefix" : "calibrated" : undefined,
     rawTokens: rawComponents.system + rawComponents.tools + rawComponents.prose,
     rawComponents,
     completeness: complete ? "complete" : "partial",
@@ -4173,6 +4638,33 @@ function estimateFinalWireInputTokens(input) {
     toolDefinitionsMeasured: measuredToolDefinitions !== undefined
   };
 }
+function hasRefusalCountableParts(message) {
+  let exact = true;
+  visitWireContent(message, {
+    text: (_bucket, value) => {
+      if (tokenCountUsesByteBound(serializedText(value)))
+        exact = false;
+    },
+    image: () => {}
+  });
+  return exact;
+}
+function estimateAppendedWireTokens(input) {
+  const messageTokens = input.messages.reduce((total, message) => {
+    const next = estimateMessageTokens(message);
+    total.conversation += next.conversation;
+    total.toolCall += next.toolCall;
+    return total;
+  }, { conversation: 0, toolCall: 0 });
+  const tokens = providerMass({ prose: messageTokens.conversation, tools: messageTokens.toolCall }, resolveDecisionCalibration(input.providerID, input.modelID), true);
+  return {
+    tokens,
+    trusted: hasTokenizerForFit() && Number.isFinite(tokens) && tokens >= 0 && input.messages.every(hasCountableParts),
+    messageTokens,
+    systemTokens: 0,
+    toolDefinitionTokens: 0
+  };
+}
 function hasCountableParts(message) {
   return message.parts.every((part) => {
     if (!part || typeof part !== "object")
@@ -4779,12 +5271,15 @@ class ToolMutationBatch {
     }
     const scopedSweep = this.resolveScopedSweep();
     const removed = new Set;
-    for (let i = this.messages.length - 1;i >= 0; i -= 1) {
+    let writeIndex = 0;
+    for (let i = 0;i < this.messages.length; i += 1) {
       if ((!scopedSweep || this.affectedMessages.has(this.messages[i])) && !this.messages[i].parts.some(hasMeaningfulPart)) {
         removed.add(this.messages[i]);
-        this.messages.splice(i, 1);
+      } else {
+        this.messages[writeIndex++] = this.messages[i];
       }
     }
+    this.messages.length = writeIndex;
     this.pruneServedRows(removed);
     this.partsToRemove.clear();
     this.affectedMessages.clear();
@@ -5101,17 +5596,17 @@ function readRawSessionMessages2(sessionId) {
   }
   return readRawSessionMessagesFromSource(sessionId);
 }
-function readRawSessionMessagePage2(sessionId, afterOrdinal, limit, finalWatermark) {
+function readRawSessionMessagePage2(sessionId, afterOrdinal, limit, finalWatermark, after) {
   const provider = sessionProviders.get(sessionId)?.provider;
   if (provider?.readMessagePage) {
-    return provider.readMessagePage(afterOrdinal, limit, finalWatermark);
+    return provider.readMessagePage(afterOrdinal, limit, finalWatermark, after);
   }
   if (provider) {
     return provider.readMessages().filter((message) => message.ordinal > afterOrdinal && message.ordinal <= finalWatermark).slice(0, limit);
   }
   if (!openCodeDbExists())
     return [];
-  return withReadOnlySessionDb((db) => readRawSessionMessagePageFromDb(db, sessionId, afterOrdinal, limit, finalWatermark));
+  return withReadOnlySessionDb((db) => readRawSessionMessagePageFromDb(db, sessionId, afterOrdinal, limit, finalWatermark, after));
 }
 function getRawSessionMessageOrdinalCount2(sessionId) {
   const provider = sessionProviders.get(sessionId)?.provider;
@@ -5324,7 +5819,10 @@ function readRawSessionMessageIdOrdinalsForRange2(sessionId, fromOrdinal, toOrdi
   if (provider?.readMessageIdOrdinalsForRange) {
     return provider.readMessageIdOrdinalsForRange(from, to);
   }
-  const all = provider?.readMessageIdOrdinals ? provider.readMessageIdOrdinals() : provider ? new Map(provider.readMessages().map((message) => [message.id, message.ordinal])) : !openCodeDbExists() ? new Map : withReadOnlySessionDb((db) => readRawSessionMessageIdOrdinalsFromDb(db, sessionId));
+  if (!provider) {
+    return !openCodeDbExists() ? new Map : withReadOnlySessionDb((db) => readRawSessionMessageIdOrdinalsForRangeFromDb(db, sessionId, from, to));
+  }
+  const all = provider?.readMessageIdOrdinals ? provider.readMessageIdOrdinals() : new Map(provider.readMessages().map((message) => [message.id, message.ordinal]));
   return new Map([...all].filter(([, ordinal]) => ordinal >= from && ordinal <= to));
 }
 function readRawSessionMessageIdOrdinals2(sessionId) {
@@ -5348,6 +5846,8 @@ function hasRawSessionMessageById2(sessionId, messageId) {
   const provider = sessionProviders.get(sessionId)?.provider;
   if (provider?.hasMessageById)
     return provider.hasMessageById(messageId);
+  if (!provider)
+    return openCodeDbExists() && withReadOnlySessionDb((db) => hasRawSessionMessageByIdFromDb(db, sessionId, messageId));
   return readRawSessionMessageById2(sessionId, messageId) !== null;
 }
 function readRawSessionMessageOrdinalById2(sessionId, messageId) {
@@ -5491,8 +5991,9 @@ async function getRawSessionTagKeysThrough2(sessionId, upToMessageIndex, options
   };
   const firstOrdinal = Number.isFinite(options.fromMessageIndex) ? Math.max(1, Math.floor(options.fromMessageIndex ?? 1)) : 1;
   let afterOrdinal = firstOrdinal - 1;
+  let after;
   while (afterOrdinal < finalWatermark) {
-    const messages = readRawSessionMessages2.readPage(sessionId, afterOrdinal, pageSize, finalWatermark);
+    const messages = readRawSessionMessages2.readPage(sessionId, afterOrdinal, pageSize, finalWatermark, after);
     if (messages.length === 0)
       break;
     let nextOrdinal = afterOrdinal;
@@ -5534,6 +6035,8 @@ async function getRawSessionTagKeysThrough2(sessionId, upToMessageIndex, options
     if (nextOrdinal <= afterOrdinal)
       break;
     afterOrdinal = nextOrdinal;
+    const last = messages.at(-1);
+    after = last ? { timeCreated: last.createdAt ?? 0, id: last.id } : undefined;
     if (afterOrdinal < finalWatermark)
       await yieldToEventLoop();
   }
@@ -5860,4 +6363,4 @@ function readRawSessionSeedTail2(sessionId, boundaryId, onQuery) {
   });
 }
 
-export { isPrefixBoundThinkingModel, detectOverflow, CTX_REDUCE_KEEP, newestCtxReduceTagNumbers, stripWellFormedLeadingTagPrefix, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isThinkingPart, isRecord, contentTagOwnerMessageId, estimateImageTokensFromDataUrl, estimateToolAttachmentImageTokens, normalizeTodoStateJson, buildSyntheticTodoPart, computeSyntheticCallId, isSyntheticTodoPart, countRealUserMessages, tailHygieneStructuralSignature, sameTailHygieneStructuralSignature, formatTailHygienePrefixMismatch, refreshTailHygieneBaseline, effectiveTailHygiene, assertTailHygieneContentUnchanged, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, isDroppedToolOutput, toolOutputTokens, decideChannel1, evaluateChannel2, formatChannel1Evaluation, formatChannel2Evaluation, reclaimableToolOutputCount, buildChannel2Reminder, buildChannel1Reminder, estimateEmergencyDropReclaimTokens, planEmergencyDrop, measureEmergencyTag, getRecentTagOwnerMessageIds, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, getActiveTagTokenTotalsByMessage, getAllStatusTagTokenTotalsFlat, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, markWhitespaceAssistantTagInert, getInertWhitespaceAssistantTags, updateTagDropMode, updateCavemanDepth, updateTagMessageId, foldShrunkPartTags, markTagsCompactedByMessageIds, getMaxTagNumberBySession, getTagNumberByMessageId, getAssignableTagNumberByMessageId, deriveTagLoadFloor, TAG_SELECT_COLUMNS, getTagsBySession, getActiveTagsBySession, getTailHygieneTags, getDroppedTagsBySession, getTagsByNumbers, getDroppedTagsByNumbers, getMaxDroppedTagNumber, getTagById, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, getCandidateToolOwners, pickNearestPriorOwner, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, isStrictGapHealingMessage, isRawCompactionSummaryInfo, extractInMemoryMessageViews, buildInMemoryTailRawMessages, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, toolPartHasUserAnswer, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, isEditTool, describeFinalWireTail, estimateMessageTokens, wireContentBytes, estimateFinalWireInputTokens, modelAcceptsEmptyContent, isAnthropicFamilyRoute, neutralizeDroppedReasoningPart, restoreNeutralizedReasoningPart, isNeutralizedReasoningPart, variantChangeBustsProviderCache, makeSentinel, makeWholeMessageSentinel, isSentinel, replaySentinelByMessageIds, SKELETON_REAL_INPUT_MAX_BYTES, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, setBoundedRawMessageProvider2, withRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, RAW_MESSAGE_VISIT_PAGE_SIZE2, visitRawSessionMessages2, readRawSessionMessageRange2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageOrdinalPage2, getRawSessionStoredMessageCount2, readRawSessionMessageIdOrdinalsForRange2, readRawSessionMessageIdOrdinals2, readRawSessionMessagePartsById2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, RAW_SESSION_TAG_KEY_PAGE_SIZE2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, getProtectedTailStartOrdinal2, readSessionChunk2, getRawSessionMessageIdsThrough2, readRawSessionSeedTail2 };
+export { isPrefixBoundThinkingModel, detectOverflow, protectedToolTagNumbers, protectedToolTokenCount, stripWellFormedLeadingTagPrefix, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isThinkingPart, isRecord, contentTagOwnerMessageId, estimateImageTokensFromDataUrl, estimateToolAttachmentImageTokens, normalizeTodoStateJson, buildSyntheticTodoPart, computeSyntheticCallId, isSyntheticTodoPart, countRealUserMessages, tailHygieneStructuralSignature, sameTailHygieneStructuralSignature, formatTailHygienePrefixMismatch, refreshTailHygieneBaseline, effectiveTailHygiene, assertTailHygieneContentUnchangedIfEnabled, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, isDroppedToolOutput, toolOutputTokens, decideChannel1, evaluateChannel2, formatChannel1Evaluation, formatChannel2Evaluation, reclaimableToolOutputCount, buildChannel2Reminder, buildChannel1Reminder, estimateEmergencyDropReclaimTokens, planEmergencyDrop, measureEmergencyTag, queuePendingOp, queuePendingDropForUnchangedTag, getPendingOps, hasPendingDropOps, getPendingOpsCount, clearPendingOps, removePendingOp, getRecentTagOwnerMessageIds, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, getActiveTagTokenTotalsByMessage, getAllStatusTagTokenTotalsFlat, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, markWhitespaceAssistantTagInert, getInertWhitespaceAssistantTags, updateTagDropMode, updateCavemanDepth, updateTagMessageId, foldShrunkPartTags, markTagsCompactedByMessageIds, getMaxTagNumberBySession, getTagNumberByMessageId, getAssignableTagNumberByMessageId, deriveTagLoadFloor, TAG_SELECT_COLUMNS, getActiveTagsBySession, getTailHygieneTags, getDroppedTagsBySession, getTagsByNumbers, getNewestToolTagNumbers, getDroppedTagsByNumbers, getMaxDroppedTagNumber, getTagById, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, getCandidateToolOwners, pickNearestPriorOwner, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, isStrictGapHealingMessage, isRawCompactionSummaryInfo, extractInMemoryMessageViews, buildInMemoryTailRawMessages, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, toolPartHasUserAnswer, DreamTokenBudgetExceeded, TOKEN_BUDGET_FINALIZE_MESSAGE, registerBudgetFinalizeChild, releaseBudgetFinalizeChild, createDreamTokenBudget, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, isEditTool, describeFinalWireTail, estimateMessageTokens, wireContentBytes, createFinalWireUsageTracker, estimateFinalWireInputTokens, estimateAppendedWireTokens, modelAcceptsEmptyContent, isAnthropicFamilyRoute, neutralizeDroppedReasoningPart, restoreNeutralizedReasoningPart, isNeutralizedReasoningPart, variantChangeBustsProviderCache, makeSentinel, makeWholeMessageSentinel, isSentinel, replaySentinelByMessageIds, SKELETON_REAL_INPUT_MAX_BYTES, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, setBoundedRawMessageProvider2, withRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, RAW_MESSAGE_VISIT_PAGE_SIZE2, visitRawSessionMessages2, readRawSessionMessageRange2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageOrdinalPage2, getRawSessionStoredMessageCount2, readRawSessionMessageIdOrdinalsForRange2, readRawSessionMessageIdOrdinals2, readRawSessionMessagePartsById2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, RAW_SESSION_TAG_KEY_PAGE_SIZE2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, getProtectedTailStartOrdinal2, readSessionChunk2, getRawSessionMessageIdsThrough2, readRawSessionSeedTail2 };