@retaw106/mmc-oc 2.4.0 → 2.6.0

package/dist/{index-48e9znrc.js → index-t0zx3tgz.js}

@@ -7,7 +7,7 @@ import {
 } from "./index-x37vg474.js";
 import {
   getTagIdentityWriteGeneration
-} from "./index-dwh99z66.js";
+} from "./index-pte3cfs9.js";
 import {
   getHarness,
   sessionLog
@@ -28,7 +28,7 @@ import {
   withReadOnlySessionDb,
   getRawSessionMessageCountFromDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-ykq24x1n.js";
+} from "./index-8rmt6s4f.js";
 
 // src/shared/protected-tools-policy.ts
 var DEFAULT_PROTECTED_TOOLS = {
@@ -102,7 +102,27 @@ function isSystemDirective(text) {
   return text.trimStart().startsWith(SYSTEM_DIRECTIVE_PREFIX);
 }
 function removeSystemReminders(text) {
-  return text.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/gi, "").trim();
+  return removeNestedBlocks(text, ["system-reminder"]).trim();
+}
+function removeNestedBlocks(text, names) {
+  const tags = new RegExp(`<(/?)(${names.join("|")})(?:\\s[^<>]*?)?\\s*(/?)>`, "gi");
+  const stack = [];
+  let end = 0;
+  let result = "";
+  for (const match of text.matchAll(tags)) {
+    if (stack.length === 0)
+      result += text.slice(end, match.index);
+    const name = match[2].toLowerCase();
+    if (match[1]) {
+      if (stack[stack.length - 1] === name)
+        stack.pop();
+    } else if (!match[3])
+      stack.push(name);
+    end = match.index + match[0].length;
+  }
+  if (stack.length === 0)
+    result += text.slice(end);
+  return result;
 }
 
 // src/hooks/magic-context/token-count-exact.ts
@@ -807,13 +827,16 @@ function stripDanglingTagNotationGlobally(value) {
 function stripTagSectionCharacters(value) {
   return value.replace(STRAY_SECTION_CHAR_REGEX, "");
 }
-function stripPersistedAssistantText(value) {
+function stripPersistedAssistantText(value, acceptsEmpty = true) {
+  if (!acceptsEmpty && !value.includes("§") && !value.trim())
+    return value;
   let text = stripWellFormedLeadingTagPrefix(value);
   text = stripCompleteTagPairsGlobally(text);
   text = stripMalformedTagNotationGlobally(text);
   text = stripDanglingTagNotationGlobally(text);
   text = stripTagSectionCharacters(text);
-  return text.trim();
+  const stripped = text.trim();
+  return !acceptsEmpty && value.trim().length > 0 && stripped.length === 0 ? value : stripped;
 }
 function byteSize(value) {
   return encoder.encode(value).length;
@@ -2832,9 +2855,11 @@ function planEmergencyDrop(input) {
   const workingSpan = Math.max(ceilingTokens - fixedFloor, 0);
   const target = fixedFloor + TARGET_FRACTION * workingSpan;
   const reclaimTokens = Math.round(currentTotalInputTokens - target);
-  const floorNote = fixedFloor > ceilingTokens ? `; fixed floor ≈${Math.round(fixedFloor)} already exceeds ceiling ${Math.round(ceilingTokens)}: tool drops cannot reach the target` : "";
+  if (fixedFloor > ceilingTokens) {
+    return noop(`fixed floor ≈${Math.round(fixedFloor)} already exceeds ceiling ${Math.round(ceilingTokens)}: tool drops cannot reach the target`);
+  }
   if (reclaimTokens <= EMERGENCY_REARM_MIN_TOKENS) {
-    return noop(`reclaim<=min (${reclaimTokens} <= ${EMERGENCY_REARM_MIN_TOKENS})${floorNote}`);
+    return noop(`reclaim<=min (${reclaimTokens} <= ${EMERGENCY_REARM_MIN_TOKENS})`);
   }
   const cutoff = input.protectedCutoff;
   const windowYields = absoluteEmergency;
@@ -2889,16 +2914,16 @@ function planEmergencyDrop(input) {
       }
     }
   if (selected.length === 0) {
-    return noop(`no-candidates${floorNote}`);
+    return noop("no-candidates");
   }
   if (!input.passAlreadyPriced && reclaimed < EMERGENCY_MIN_ACHIEVABLE_RECLAIM_TOKENS) {
-    return noop(`achievable reclaim below minimum (${selected.length} tags, reclaim≈${Math.round(reclaimed)} < ${EMERGENCY_MIN_ACHIEVABLE_RECLAIM_TOKENS} against gap ${reclaimTokens})${floorNote}`);
+    return noop(`achievable reclaim below minimum (${selected.length} tags, reclaim≈${Math.round(reclaimed)} < ${EMERGENCY_MIN_ACHIEVABLE_RECLAIM_TOKENS} against gap ${reclaimTokens})`);
   }
   return {
     shouldDrop: true,
     tagNumbers: selected,
     reclaimTokens,
-    reason: `tiered drop: ${selected.length} tags, reclaim≈${reclaimed}/${reclaimTokens} tokens (floor≈${fixedFloor}, ceiling=${Math.round(ceilingTokens)})${floorNote}`
+    reason: `tiered drop: ${selected.length} tags, reclaim≈${reclaimed}/${reclaimTokens} tokens (floor≈${fixedFloor}, ceiling=${Math.round(ceilingTokens)})`
   };
 }
 function measureEmergencyTag(tag, target, calibration, skeleton) {
@@ -4665,6 +4690,70 @@ function expandToolPart(part, overrides, legacyPreview = false) {
   return renderToolTemplate(template, input, state?.output ?? state?.error, legacyPreview);
 }
 
+// src/hooks/magic-context/ask-answer-notice.ts
+var ANSWER_HEADER_PREFIX = /^Inbox [^\n]* notice from user via user_answer \(user_answer\)/;
+var ANSWER_TRAILER = /\n([\s\S]*?)\nThis ask is now closed; no dismiss is needed\. Continue accordingly\.$/;
+var ANSWER_ANSWER_LINE = /^The user answered your parked question (\S+)\.\nQuestion: ([^\n]+)\nAnswer: /;
+var ANSWER_QUESTION_LINE = /^Question: ([^\n]+)\nAnswer: /;
+var reminderEnvelopePattern = /<system-reminder>([\s\S]*?)<\/system-reminder>/gi;
+function reminderBodies(text) {
+  reminderEnvelopePattern.lastIndex = 0;
+  const bodies = [];
+  for (const match of text.matchAll(reminderEnvelopePattern)) {
+    const body = match[1];
+    if (body !== undefined)
+      bodies.push(body);
+  }
+  return bodies;
+}
+function parseAnswerBody(body) {
+  const lines = body.replace(/\r\n/g, `
+`).replace(/^\n+|\n+$/g, "");
+  if (!ANSWER_HEADER_PREFIX.test(lines))
+    return null;
+  if (lines.includes("The user dismissed this question"))
+    return null;
+  const framed = ANSWER_TRAILER.exec(lines);
+  if (framed === null)
+    return null;
+  const content = framed[1] ?? "";
+  const narrated = ANSWER_ANSWER_LINE.exec(content);
+  if (narrated !== null) {
+    const question = narrated[2] ?? "";
+    const answer = content.slice(narrated[0].length);
+    return closedAnswer(question, answer);
+  }
+  const bare = ANSWER_QUESTION_LINE.exec(content);
+  if (bare !== null) {
+    const question = bare[1] ?? "";
+    const answer = content.slice(bare[0].length);
+    return closedAnswer(question, answer);
+  }
+  return null;
+}
+function closedAnswer(question, answer) {
+  if (question.trim().length === 0)
+    return null;
+  if (answer.trim().length === 0)
+    return null;
+  return { question, answer };
+}
+function extractAskAnswerNotices(text) {
+  const notices = [];
+  for (const body of reminderBodies(text)) {
+    const notice = parseAnswerBody(body);
+    if (notice !== null)
+      notices.push(notice);
+  }
+  return notices;
+}
+function formatAskAnswerNotice(notice) {
+  return `U (answered "${notice.question}"): ${notice.answer}`;
+}
+function askAnswerLines(text) {
+  return extractAskAnswerNotices(text).map(formatAskAnswerNotice);
+}
+
 // src/hooks/magic-context/host-served-rows.ts
 var HOST_UNSERVED_ROW = "hostUnservedRow";
 function markHostUnservedRow(target) {
@@ -4723,6 +4812,35 @@ function isHostRenderedSystemMessage(message) {
   const id = message.info.id;
   return (typeof id !== "string" || id.length === 0) && message.info.role === "system";
 }
+var COVERED_INSTRUCTION_ROW = "coveredInstructionRow";
+function markCoveredInstructionRow(target) {
+  Object.defineProperty(target, COVERED_INSTRUCTION_ROW, {
+    value: true,
+    enumerable: false,
+    configurable: true
+  });
+  return target;
+}
+function isCoveredInstructionRow(value) {
+  return typeof value === "object" && value !== null && value[COVERED_INSTRUCTION_ROW] === true;
+}
+function takeCoveredInstructionRows(messages) {
+  const taken = messages.filter((message) => isCoveredInstructionRow(message.info));
+  if (taken.length > 0) {
+    const kept = messages.filter((message) => !isCoveredInstructionRow(message.info));
+    messages.splice(0, messages.length, ...kept);
+  }
+  return taken;
+}
+function cloneKeepingCoveredInstructionMarks(messages) {
+  const copy = structuredClone(messages);
+  messages.forEach((message, index) => {
+    const copied = copy[index];
+    if (copied && isCoveredInstructionRow(message.info))
+      markCoveredInstructionRow(copied.info);
+  });
+  return copy;
+}
 
 // src/hooks/magic-context/read-session-true-raw-tokens.ts
 function completedToolArcCrossesBoundary(invOrdinal, resOrdinal, boundary) {
@@ -5355,11 +5473,6 @@ function isFilePart(part) {
   const p = part;
   return p.type === "file" && typeof p.url === "string";
 }
-function buildFileSourceContent(parts) {
-  const content = parts.filter(isTextPart).map((part) => stripTagPrefix(part.text)).join(`
-`).trim();
-  return content.length > 0 ? content : null;
-}
 
 // src/shared/user-answer.ts
 function hasUserAnswerMetadata(value) {
@@ -5582,114 +5695,355 @@ function applyEditMarkerToInput(input) {
 
 // src/features/magic-context/tool-definition-tokens.ts
 import { createHash as createHash2 } from "node:crypto";
-var measurements = new Map;
-var fingerprints = new Map;
+
+// src/shared/bounded-session-map.ts
+class BoundedSessionMap {
+  maxEntries;
+  store = new Map;
+  constructor(maxEntries) {
+    if (!Number.isFinite(maxEntries) || maxEntries < 1) {
+      throw new Error(`BoundedSessionMap: maxEntries must be >= 1, got ${maxEntries}`);
+    }
+    this.maxEntries = maxEntries;
+  }
+  get(sessionId) {
+    const value = this.store.get(sessionId);
+    if (value === undefined)
+      return;
+    this.store.delete(sessionId);
+    this.store.set(sessionId, value);
+    return value;
+  }
+  peek(sessionId) {
+    return this.store.get(sessionId);
+  }
+  has(sessionId) {
+    return this.store.has(sessionId);
+  }
+  set(sessionId, value) {
+    if (this.store.has(sessionId)) {
+      this.store.delete(sessionId);
+    } else if (this.store.size >= this.maxEntries) {
+      const oldest = this.store.keys().next().value;
+      if (oldest !== undefined)
+        this.store.delete(oldest);
+    }
+    this.store.set(sessionId, value);
+  }
+  delete(sessionId) {
+    return this.store.delete(sessionId);
+  }
+  clear() {
+    this.store.clear();
+  }
+  get size() {
+    return this.store.size;
+  }
+}
+
+// src/features/magic-context/tool-definition-tokens.ts
+var ACTIVITY_WINDOW_MS = 10 * 60000;
+var MAX_ACTIVITY_GAP_MS = 60000;
+var RETIRED_CACHE_LIMIT = 64;
+var WRITE_RETRY_MS = 5000;
+var WINDOWED_SINCE_KEY = "tool_definition_measurements:windowed_since";
+var routes = new Map;
+var sessionFlights = new BoundedSessionMap(1000);
 var persistenceDb = null;
+var windowedSince;
+var boundAt = 0;
 var cachedInsertStmt = null;
+var cachedDeleteStmt = null;
+function agentKey(agentName) {
+  return agentName && agentName.length > 0 ? agentName : "default";
+}
 function keyFor(providerID, modelID, agentName) {
-  const agent = agentName && agentName.length > 0 ? agentName : "default";
-  return `${providerID}/${modelID}/${agent}`;
+  return `${providerID}/${modelID}/${agentKey(agentName)}`;
 }
 function fingerprintFor(description, parameters) {
   return createHash2("sha256").update(description).update("\x00").update(stableStringify(parameters)).digest("hex");
 }
-function getCurrentToolSetHash(providerID, modelID, agentName) {
-  if (!providerID || !modelID)
-    return "";
-  const toolIds = measurements.get(keyFor(providerID, modelID, agentName));
-  if (!toolIds || toolIds.size === 0)
-    return "";
-  return createHash2("sha256").update(Array.from(toolIds.keys()).sort().join("\x00")).digest("hex");
+function measure(description, parameters) {
+  let paramsText = "";
+  try {
+    paramsText = parameters === undefined ? "" : JSON.stringify(parameters);
+  } catch {
+    paramsText = "";
+  }
+  return estimateTokens(description) + estimateTokens(paramsText);
 }
-function getToolDefinitionMeasurementSignature(providerID, modelID, agentName) {
+function routeFor(providerID, modelID, agentName) {
   const key = keyFor(providerID, modelID, agentName);
-  const measured = measurements.get(key);
-  const observed = fingerprints.get(key);
-  if (!measured || !observed || [...measured.keys()].some((id) => !observed.has(id)))
-    return;
-  return createHash2("sha256").update(JSON.stringify([...measured.keys()].sort().map((id) => [id, observed.get(id)]))).digest("hex");
+  let route = routes.get(key);
+  if (!route) {
+    route = {
+      providerID,
+      modelID,
+      agentName: agentKey(agentName),
+      tools: new Map,
+      live: false,
+      clock: 0,
+      lastWallAt: Date.now(),
+      oldestFireAt: Number.POSITIVE_INFINITY,
+      retired: new Map,
+      legacyRows: new Set
+    };
+    routes.set(key, route);
+  }
+  return { key, route };
 }
-function setDatabase(db) {
-  persistenceDb = db;
-  cachedInsertStmt = null;
+function advanceClock(route) {
+  const now = Date.now();
+  const gap = Math.min(Math.max(now - route.lastWallAt, 0), MAX_ACTIVITY_GAP_MS);
+  route.clock += gap;
+  route.lastWallAt = Math.max(route.lastWallAt, now);
+  return route.clock;
 }
-function loadToolDefinitionMeasurements(db) {
-  let rows = [];
+function counts(route, slot) {
+  if (!route.live)
+    return true;
+  if (slot.legacy)
+    return false;
+  return slot.lastFireAt >= route.clock - ACTIVITY_WINDOW_MS;
+}
+function currentTools(route) {
+  return [...route.tools.entries()].filter(([, slot]) => counts(route, slot));
+}
+function summarize(entries, live) {
+  let total = 0;
+  for (const [, slot] of entries)
+    total += slot.tokens;
+  const ids = entries.map(([id]) => id).sort();
+  const fingerprints = new Map(entries.map(([id, slot]) => [
+    id,
+    slot.fingerprint ?? (live ? `stored:${slot.tokens}` : undefined)
+  ]));
+  const complete = ids.every((id) => fingerprints.get(id) !== undefined);
+  return {
+    total,
+    signature: complete ? createHash2("sha256").update(JSON.stringify(ids.map((id) => [id, fingerprints.get(id)]))).digest("hex") : undefined,
+    hash: ids.length === 0 ? "" : createHash2("sha256").update(ids.join("\x00")).digest("hex")
+  };
+}
+function resolve2(providerID, modelID, agentName, sessionId) {
+  if (!providerID || !modelID)
+    return;
+  const key = keyFor(providerID, modelID, agentName);
+  if (sessionId) {
+    const flight = sessionFlights.peek(sessionId);
+    if (flight?.key === key && flight.exact)
+      return flight.exact;
+  }
+  const route = routes.get(key);
+  if (!route)
+    return;
+  const entries = currentTools(route);
+  if (!route.live && entries.length === 0)
+    return;
+  return summarize(entries, route.live);
+}
+function readWindowedSince(db) {
   try {
-    rows = db.prepare("SELECT provider_id, model_id, agent_name, tool_id, token_count FROM tool_definition_measurements").all();
+    const row = db.prepare("SELECT value FROM schema_migrations_meta WHERE key = ?").get(WINDOWED_SINCE_KEY);
+    if (!row)
+      return;
+    const value = Number(row.value);
+    return Number.isFinite(value) ? value : undefined;
   } catch {
     return;
   }
-  for (const row of rows) {
-    const key = keyFor(row.provider_id, row.model_id, row.agent_name);
-    let inner = measurements.get(key);
-    if (!inner) {
-      inner = new Map;
-      measurements.set(key, inner);
-    }
-    inner.set(row.tool_id, row.token_count);
-  }
 }
-function recordToolDefinition(providerID, modelID, agentName, toolID, description, parameters) {
-  if (!providerID || !modelID || !toolID)
-    return;
-  const key = keyFor(providerID, modelID, agentName);
-  const fp = fingerprintFor(description ?? "", parameters);
-  let innerFp = fingerprints.get(key);
-  if (innerFp && innerFp.get(toolID) === fp)
+function markWindowed() {
+  if (windowedSince !== undefined || !persistenceDb)
     return;
-  let paramsText = "";
   try {
-    paramsText = parameters === undefined ? "" : JSON.stringify(parameters);
+    persistenceDb.prepare("INSERT OR IGNORE INTO schema_migrations_meta (key, value) VALUES (?, ?)").run(WINDOWED_SINCE_KEY, String(boundAt));
+    windowedSince = readWindowedSince(persistenceDb);
+  } catch {}
+}
+function persistInsert(route, toolID, tokens) {
+  if (!persistenceDb)
+    return false;
+  try {
+    cachedInsertStmt ??= persistenceDb.prepare(`INSERT OR REPLACE INTO tool_definition_measurements
+             (provider_id, model_id, agent_name, tool_id, token_count, recorded_at)
+             VALUES (?, ?, ?, ?, ?, ?)`);
+    cachedInsertStmt.run(route.providerID, route.modelID, route.agentName, toolID, tokens, Date.now());
   } catch {
-    paramsText = "";
+    cachedInsertStmt = null;
+    return false;
   }
-  const tokens = estimateTokens(description ?? "") + estimateTokens(paramsText);
-  let inner = measurements.get(key);
-  if (!inner) {
-    inner = new Map;
-    measurements.set(key, inner);
+  if (route.legacyRows.delete(toolID) && route.legacyRows.size === 0)
+    markWindowed();
+  return true;
+}
+function persistDelete(route, toolIDs) {
+  if (!persistenceDb)
+    return false;
+  try {
+    cachedDeleteStmt ??= persistenceDb.prepare(`DELETE FROM tool_definition_measurements
+             WHERE provider_id = ? AND model_id = ? AND agent_name = ?
+               AND tool_id IN (SELECT value FROM json_each(?))`);
+    cachedDeleteStmt.run(route.providerID, route.modelID, route.agentName, JSON.stringify(toolIDs));
+  } catch {
+    cachedDeleteStmt = null;
+    return false;
   }
-  inner.set(toolID, tokens);
-  if (!innerFp) {
-    innerFp = new Map;
-    fingerprints.set(key, innerFp);
+  for (const id of toolIDs)
+    route.legacyRows.delete(id);
+  markWindowed();
+  return true;
+}
+function writeSlot(route, toolID, slot) {
+  if (slot.persisted || !persistenceDb)
+    return;
+  const now = Date.now();
+  if (slot.writeFailedAt !== undefined && now - slot.writeFailedAt < WRITE_RETRY_MS)
+    return;
+  if (persistInsert(route, toolID, slot.tokens)) {
+    slot.persisted = true;
+    slot.writeFailedAt = undefined;
+  } else {
+    slot.writeFailedAt = now;
   }
-  innerFp.set(toolID, fp);
-  if (persistenceDb) {
-    try {
-      const agent = agentName && agentName.length > 0 ? agentName : "default";
-      if (!cachedInsertStmt) {
-        cachedInsertStmt = persistenceDb.prepare(`INSERT OR REPLACE INTO tool_definition_measurements
-                     (provider_id, model_id, agent_name, tool_id, token_count, recorded_at)
-                     VALUES (?, ?, ?, ?, ?, ?)`);
+}
+function retire(route, toolID, slot, rowDeleted) {
+  if (slot.fingerprint === undefined)
+    return;
+  route.retired.delete(toolID);
+  route.retired.set(toolID, {
+    fingerprint: slot.fingerprint,
+    tokens: slot.tokens,
+    rowKept: slot.persisted && !rowDeleted
+  });
+  if (route.retired.size > RETIRED_CACHE_LIMIT) {
+    const oldest = route.retired.keys().next().value;
+    if (oldest !== undefined)
+      route.retired.delete(oldest);
+  }
+}
+function freshSlot(route, toolID, description, parameters, fingerprint, now) {
+  const retired = route.retired.get(toolID);
+  if (retired)
+    route.retired.delete(toolID);
+  const reuse = retired?.fingerprint === fingerprint ? retired : undefined;
+  return {
+    tokens: reuse ? reuse.tokens : measure(description, parameters),
+    fingerprint,
+    lastFireAt: now,
+    legacy: false,
+    persisted: reuse?.rowKept === true
+  };
+}
+function setDatabase(db) {
+  const rebound = persistenceDb !== null && persistenceDb !== db;
+  persistenceDb = db;
+  boundAt = Date.now();
+  cachedInsertStmt = null;
+  cachedDeleteStmt = null;
+  if (rebound) {
+    for (const route of routes.values()) {
+      for (const slot of route.tools.values()) {
+        slot.persisted = false;
+        slot.writeFailedAt = undefined;
       }
-      cachedInsertStmt.run(providerID, modelID, agent, toolID, tokens, Date.now());
-    } catch {
-      cachedInsertStmt = null;
+      for (const retired of route.retired.values())
+        retired.rowKept = false;
+      route.legacyRows.clear();
     }
   }
+  windowedSince = readWindowedSince(db);
+  if (windowedSince !== undefined)
+    return;
+  try {
+    if (!db.prepare("SELECT 1 FROM tool_definition_measurements LIMIT 1").get())
+      markWindowed();
+  } catch {}
 }
-function getLargestMeasuredToolDefinitionTokens() {
-  let largest = 0;
-  for (const tools of measurements.values()) {
-    let total = 0;
-    for (const tokens of tools.values())
-      total += tokens;
-    largest = Math.max(largest, total);
+function loadToolDefinitionMeasurements(db) {
+  let rows = [];
+  try {
+    rows = db.prepare("SELECT provider_id, model_id, agent_name, tool_id, token_count, recorded_at FROM tool_definition_measurements").all();
+  } catch {
+    return;
+  }
+  const since = readWindowedSince(db);
+  const loadedAt = new Map;
+  for (const row of rows) {
+    const { route } = routeFor(row.provider_id, row.model_id, row.agent_name);
+    if (route.live)
+      continue;
+    let now = loadedAt.get(route);
+    if (now === undefined) {
+      now = advanceClock(route);
+      loadedAt.set(route, now);
+    }
+    const legacy = since === undefined || !(Number(row.recorded_at) >= since);
+    route.tools.set(row.tool_id, {
+      tokens: row.token_count,
+      fingerprint: undefined,
+      lastFireAt: now,
+      legacy,
+      persisted: !legacy
+    });
+    route.oldestFireAt = Math.min(route.oldestFireAt, now);
+    if (legacy)
+      route.legacyRows.add(row.tool_id);
+    else
+      route.legacyRows.delete(row.tool_id);
   }
-  return largest > 0 ? largest : undefined;
 }
-function getMeasuredToolDefinitionTokens(providerID, modelID, agentName) {
+function recordToolDefinitionSet(providerID, modelID, agentName, tools, sessionId) {
   if (!providerID || !modelID)
     return;
-  const inner = measurements.get(keyFor(providerID, modelID, agentName));
-  if (!inner || inner.size === 0)
+  const { key, route } = routeFor(providerID, modelID, agentName);
+  const now = advanceClock(route);
+  route.live = true;
+  const next = new Map;
+  for (const tool of tools) {
+    if (!tool.id)
+      continue;
+    const fingerprint = fingerprintFor(tool.description ?? "", tool.parameters);
+    const previous = route.tools.get(tool.id);
+    if (previous && previous.fingerprint === fingerprint) {
+      previous.lastFireAt = now;
+      next.set(tool.id, previous);
+      continue;
+    }
+    next.set(tool.id, freshSlot(route, tool.id, tool.description ?? "", tool.parameters, fingerprint, now));
+  }
+  const removed = [...route.tools].filter(([id]) => !next.has(id));
+  route.tools = next;
+  route.oldestFireAt = now;
+  if (removed.length > 0) {
+    const deleted = persistDelete(route, removed.map(([id]) => id));
+    for (const [id, slot] of removed)
+      retire(route, id, slot, deleted);
+  }
+  for (const [toolID, slot] of next)
+    writeSlot(route, toolID, slot);
+  if (sessionId)
+    sessionFlights.set(sessionId, { key, exact: summarize([...next.entries()], true) });
+}
+function getCurrentToolSetHash(providerID, modelID, agentName, sessionId) {
+  return resolve2(providerID, modelID, agentName, sessionId)?.hash ?? "";
+}
+function getToolDefinitionMeasurementSignature(providerID, modelID, agentName, sessionId) {
+  return resolve2(providerID, modelID, agentName, sessionId)?.signature;
+}
+function getMeasuredToolDefinitionTokens(providerID, modelID, agentName, sessionId) {
+  return resolve2(providerID, modelID, agentName, sessionId)?.total;
+}
+function getSessionToolDefinitionTokens(sessionId) {
+  if (!sessionId)
     return;
-  let total = 0;
-  for (const tokens of inner.values())
-    total += tokens;
-  return total;
+  const flight = sessionFlights.peek(sessionId);
+  if (!flight)
+    return;
+  if (flight.exact)
+    return flight.exact.total;
+  const route = routes.get(flight.key);
+  return route ? summarize(currentTools(route), route.live).total : undefined;
 }
 
 // src/hooks/magic-context/final-wire-token-estimate.ts
@@ -5834,7 +6188,7 @@ function createFinalWireUsageTracker() {
   const envelopeFor = (input) => {
     if (!input.providerID || !input.modelID || !input.systemPromptHash)
       return;
-    const tools = getToolDefinitionMeasurementSignature(input.providerID, input.modelID, input.agentName);
+    const tools = getToolDefinitionMeasurementSignature(input.providerID, input.modelID, input.agentName, input.sessionId);
     if (!tools)
       return;
     return JSON.stringify([
@@ -5847,7 +6201,8 @@ function createFinalWireUsageTracker() {
     ]);
   };
   return {
-    estimate(sessionId, input, limit) {
+    estimate(sessionId, request, limit) {
+      const input = { ...request, sessionId: request.sessionId ?? sessionId };
       let measuredPrefix;
       try {
         const previous = served.get(sessionId);
@@ -5869,7 +6224,8 @@ function createFinalWireUsageTracker() {
       } catch {}
       return estimateOutgoingWireForRefusal({ ...input, measuredPrefix }, limit);
     },
-    capture(sessionId, input) {
+    capture(sessionId, request) {
+      const input = { ...request, sessionId: request.sessionId ?? sessionId };
       served.delete(sessionId);
       try {
         const envelope = envelopeFor(input);
@@ -5899,7 +6255,7 @@ function estimateOutgoingWireForRefusal(input, limit) {
     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 tools = input.providerID && input.modelID ? getMeasuredToolDefinitionTokens(input.providerID, input.modelID, input.agentName, input.sessionId) : 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) {
@@ -5927,10 +6283,10 @@ function estimateFinalWireInputTokens(input) {
     total.toolCall += next.toolCall;
     return total;
   }, { conversation: 0, toolCall: 0 });
-  const measuredToolDefinitions = input.toolDefinitionTokens ?? (input.providerID && input.modelID ? getMeasuredToolDefinitionTokens(input.providerID, input.modelID, input.agentName) : undefined);
+  const measuredToolDefinitions = input.toolDefinitionTokens ?? (input.providerID && input.modelID ? getMeasuredToolDefinitionTokens(input.providerID, input.modelID, input.agentName, input.sessionId) : undefined);
   const calibration = resolveDecisionCalibration(input.providerID, input.modelID);
-  const largestToolDefinitions = measuredToolDefinitions === undefined ? getLargestMeasuredToolDefinitionTokens() : undefined;
-  const toolDefinitions = measuredToolDefinitions ?? (largestToolDefinitions === undefined ? undefined : Math.ceil(largestToolDefinitions * UNKNOWN_FIT_RATIO / (calibration.seeded ? calibration.toolsRatio : UNKNOWN_FIT_RATIO)));
+  const borrowedToolDefinitions = measuredToolDefinitions === undefined ? getSessionToolDefinitionTokens(input.sessionId) : undefined;
+  const toolDefinitions = measuredToolDefinitions ?? (borrowedToolDefinitions === undefined ? undefined : Math.ceil(borrowedToolDefinitions * UNKNOWN_FIT_RATIO / (calibration.seeded ? calibration.toolsRatio : UNKNOWN_FIT_RATIO)));
   const rawComponents = {
     system: input.systemPromptTokens,
     tools: (toolDefinitions ?? 0) + messageTokens.toolCall,
@@ -6616,7 +6972,7 @@ class ToolMutationBatch {
     this.partsToRemove.add(servedPart(occurrence));
     this.affectedMessages.add(occurrence.message);
   }
-  wouldStrandConversationEnd(occurrences) {
+  wouldStrandConversationEnd(occurrences, plannedRemovals) {
     const served = this.servedMessages ?? this.messages;
     let end;
     for (let i = served.length - 1;i >= 0 && end === undefined; i -= 1) {
@@ -6626,7 +6982,7 @@ class ToolMutationBatch {
     if (!end || !occurrences.some((occurrence) => occurrence.message === end))
       return false;
     const leaving = new Set(occurrences.map(servedPart));
-    const survives = (part) => !leaving.has(part) && !this.partsToRemove.has(part);
+    const survives = (part) => !leaving.has(part) && !this.partsToRemove.has(part) && !plannedRemovals?.has(part);
     return end.info.role === "assistant" ? !end.parts.some((part) => partHasCompletedResult(part) && survives(part)) : !end.parts.some((part) => hasMeaningfulPart(part) && survives(part));
   }
   finalize() {
@@ -6800,11 +7156,16 @@ function createToolDropTarget(compositeKey, thinkingParts, index, batch, tagId)
         return null;
       return toolInputStringBytes(readRawInput());
     },
-    wouldStrandConversationEnd: () => {
+    wouldStrandConversationEnd: (plannedRemovals) => {
       const entry = index.get(compositeKey);
       if (!entry || entry.occurrences.length === 0)
         return false;
-      return batch.wouldStrandConversationEnd(entry.occurrences);
+      return batch.wouldStrandConversationEnd(entry.occurrences, plannedRemovals);
+    },
+    notePlannedRemoval: (plannedRemovals) => {
+      for (const occurrence of index.get(compositeKey)?.occurrences ?? []) {
+        plannedRemovals.add(servedPart(occurrence));
+      }
     },
     prepareDrop: () => {
       const entry = index.get(compositeKey);
@@ -6896,9 +7257,11 @@ function setBoundedRawMessageProvider2(sessionId, provider) {
   }
   return setRawMessageProvider(sessionId, wrapper);
 }
-var SYSTEM_REMINDER_BLOCK_REGEX = /<system-reminder>[\s\S]*?<\/system-reminder>/gi;
 function cleanUserText2(text) {
-  return stripOutsideSteeringWrappers(text, (segment) => segment.replace(SYSTEM_REMINDER_BLOCK_REGEX, "").replace(OMO_INTERNAL_INITIATOR_MARKER, "")).trim();
+  return stripOutsideSteeringWrappers(text, (segment) => removeSystemReminders(segment).replace(OMO_INTERNAL_INITIATOR_MARKER, "")).trim();
+}
+function answerLineParts(rawText) {
+  return askAnswerLines(rawText).map(normalizeText).filter((value) => value.length > 0);
 }
 function hasMeaningfulChunkUserText(parts) {
   for (const part of parts) {
@@ -6916,7 +7279,7 @@ function hasMeaningfulChunkUserText(parts) {
       continue;
     return true;
   }
-  return false;
+  return parts.some((part) => part !== null && typeof part === "object" && part.type === "text" && typeof part.text === "string" && part.ignored !== true && askAnswerLines(part.text).length > 0);
 }
 function withRawSessionMessageCache2(fn) {
   const outerCache = activeRawMessageCache;
@@ -7522,6 +7885,10 @@ function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdina
     const meta = { ordinal: msg.ordinal, messageId: msg.id };
     if (isHostUnservedRow(msg))
       markHostUnservedRow(meta);
+    if (msg.role === "system") {
+      recordFilteredNoise(meta);
+      continue;
+    }
     if (msg.role === "user" && !hasMeaningfulChunkUserText(msg.parts)) {
       const tcSummaries = msg.parts.flatMap((part) => {
         if (expandedResults.has(part))
@@ -7568,8 +7935,10 @@ function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdina
     }
     const role = compactRole(msg.role);
     const textParts = extractTexts2(msg.parts).map((t) => msg.role === "user" ? cleanUserText2(t) : t).map(normalizeText).filter((value) => value.length > 0);
+    const answerParts = msg.role === "user" ? extractTexts2(msg.parts).flatMap((text) => answerLineParts(text)) : [];
+    const userParts = answerParts.length > 0 ? [...textParts, ...answerParts] : textParts;
     const allParts = options.expand === false ? [
-      ...textParts,
+      ...userParts,
       ...textParts.length === 0 ? extractToolCallSummaries(msg.parts) : []
     ] : msg.parts.flatMap((part) => {
       if (expandedResults.has(part))
@@ -7578,6 +7947,9 @@ function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdina
       if (expansion !== null)
         return [`TC: ${expansion}`];
       const texts = extractTexts2([part]).map((t) => msg.role === "user" ? cleanUserText2(t) : t).map(normalizeText).filter(Boolean);
+      if (msg.role === "user") {
+        texts.push(...extractTexts2([part]).flatMap((text) => answerLineParts(text)));
+      }
       return texts.length ? texts : textParts.length === 0 ? extractToolCallSummaries([part]) : [];
     });
     const compacted = compactTextForSummary(allParts.join(" / "), msg.role);
@@ -7586,7 +7958,7 @@ function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdina
       recordFilteredNoise(meta);
       continue;
     }
-    const msgHasNarrative = textParts.length > 0;
+    const msgHasNarrative = userParts.length > 0;
     if (currentBlock && currentBlock.role === role) {
       currentBlock.endOrdinal = msg.ordinal;
       currentBlock.parts.push(text);
@@ -7668,4 +8040,4 @@ function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdina
     toolResultBoundaries
   };
 }
-export { toolTemplateError, DEFAULT_PROTECTED_TOOLS, normalizeProtectedToolName, mergeProtectedTools, detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, stripWellFormedLeadingTagPrefix, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isThinkingPart, isRecord, protectedToolTagNumbers, protectedToolTokenCount, textMentionsRecentCommit, removeSystemReminders, hasMeaningfulUserText2, extractTexts2, getTokenizerNativeMemoryStats, preloadTokenizer, estimateTokens, estimateFixedPromptTokens, currentReclaimableToolOutputCount, stableStringify, contentTagOwnerMessageId, estimateImageTokensFromDataUrl, estimateToolAttachmentImageTokens, providerVisibleMessage, normalizeTodoStateJson, buildSyntheticTodoPart, 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, installV3PerfSchema, queuePendingOp, queuePendingDropForUnchangedTag, getPendingOps, getPendingOpsCount, clearPendingOps, removePendingOp, tagTombstoneOwnerRange, tagTombstoneOwnerKey, tagRevisionKey, tagIdentityRevisionKey, installTagIdentityRevisionTrigger, deleteTagIdentityRevisions, getRecentTagOwnerMessageIds, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, getActiveTagTokenTotalsByMessage, getAllStatusTagTokenTotalsFlat, getReasoningTokenEstimatesByMessage, tryGetReasoningTokenEstimatesByMessage, getMaxTagNumberByOwnerMessage, scanTagOwnerSummary, isTagOwnerSummaryReady, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, markTagDropped, markWhitespaceAssistantTagInert, getInertWhitespaceAssistantTags, getInertWhitespaceAssistantTagsByNumbers, updateTagDropMode, updateCavemanDepth, updateTagMessageId, foldShrunkPartTags, markTagsCompactedByMessageIds, getMaxTagNumberBySession, getTagNumberByMessageId, getAssignableTagNumberByMessageId, deriveTagLoadFloor, TAG_SELECT_COLUMNS, getTagsBySession, getActiveTagsBySession, getTailHygieneTags, getTagsByNumbers, getNewestToolTagNumbers, getDroppedTagsByNumbers, getMaxDroppedTagNumber, getTagById, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, getCandidateToolOwners, pickNearestPriorOwner, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, toolPartHasUserAnswer, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, isEditTool, getCurrentToolSetHash, setDatabase, loadToolDefinitionMeasurements, recordToolDefinition, getMeasuredToolDefinitionTokens, describeFinalWireTail, estimatePartImageTokens, estimateMessageTokens, wireContentBytes, createFinalWireUsageTracker, estimateFinalWireInputTokens, modelAcceptsEmptyContent, isAnthropicFamilyRoute, neutralizeDroppedReasoningPart, restoreNeutralizedReasoningPart, isNeutralizedReasoningPart, neutralizedReasoningSource, variantChangeBustsProviderCache, makeSentinel, makeWholeMessageSentinel, neutralizeWholeMessage, isSentinel, replaySentinelByMessageIds, SKELETON_REAL_INPUT_MAX_BYTES, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, resolveHostServedBoundaryId2, hasRawMessageProvider2, setBoundedRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, visitRawSessionMessages2, readRawSessionMessageRange2, prepareRawSessionOrdinals2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageIdOrdinalsForRange2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, readSessionChunk2 };
+export { toolTemplateError, DEFAULT_PROTECTED_TOOLS, normalizeProtectedToolName, mergeProtectedTools, detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, stripWellFormedLeadingTagPrefix, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isThinkingPart, isRecord, protectedToolTagNumbers, protectedToolTokenCount, textMentionsRecentCommit, removeSystemReminders, removeNestedBlocks, hasMeaningfulUserText2, extractTexts2, getTokenizerNativeMemoryStats, preloadTokenizer, estimateTokens, estimateFixedPromptTokens, currentReclaimableToolOutputCount, stableStringify, contentTagOwnerMessageId, estimateImageTokensFromDataUrl, estimateToolAttachmentImageTokens, providerVisibleMessage, normalizeTodoStateJson, buildSyntheticTodoPart, 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, installV3PerfSchema, queuePendingOp, queuePendingDropForUnchangedTag, getPendingOps, getPendingOpsCount, clearPendingOps, removePendingOp, tagTombstoneOwnerRange, tagTombstoneOwnerKey, tagRevisionKey, tagIdentityRevisionKey, installTagIdentityRevisionTrigger, deleteTagIdentityRevisions, getRecentTagOwnerMessageIds, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, getActiveTagTokenTotalsByMessage, getAllStatusTagTokenTotalsFlat, getReasoningTokenEstimatesByMessage, tryGetReasoningTokenEstimatesByMessage, getMaxTagNumberByOwnerMessage, scanTagOwnerSummary, isTagOwnerSummaryReady, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, markTagDropped, markWhitespaceAssistantTagInert, getInertWhitespaceAssistantTags, getInertWhitespaceAssistantTagsByNumbers, updateTagDropMode, updateCavemanDepth, updateTagMessageId, foldShrunkPartTags, markTagsCompactedByMessageIds, getMaxTagNumberBySession, getTagNumberByMessageId, getAssignableTagNumberByMessageId, deriveTagLoadFloor, TAG_SELECT_COLUMNS, getTagsBySession, getActiveTagsBySession, getTailHygieneTags, getTagsByNumbers, getNewestToolTagNumbers, getDroppedTagsByNumbers, getMaxDroppedTagNumber, getTagById, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, getCandidateToolOwners, pickNearestPriorOwner, expandToolPart, markHostUnservedRow, retreatPastHostUnservedRows, snapTerminalCompartmentToServedRow, isHostRenderedSystemMessage, markCoveredInstructionRow, isCoveredInstructionRow, takeCoveredInstructionRows, cloneKeepingCoveredInstructionMarks, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, stripSystemInjection, isTextPart, isToolPartWithOutput, isFilePart, toolPartHasUserAnswer, recordToolParameters, createDroppedInputGuard, assertExecutableToolInput, isEditTool, BoundedSessionMap, setDatabase, loadToolDefinitionMeasurements, recordToolDefinitionSet, getCurrentToolSetHash, getMeasuredToolDefinitionTokens, describeFinalWireTail, estimatePartImageTokens, estimateMessageTokens, wireContentBytes, createFinalWireUsageTracker, estimateFinalWireInputTokens, modelAcceptsEmptyContent, isAnthropicFamilyRoute, neutralizeDroppedReasoningPart, restoreNeutralizedReasoningPart, isNeutralizedReasoningPart, neutralizedReasoningSource, variantChangeBustsProviderCache, makeSentinel, makeWholeMessageSentinel, neutralizeWholeMessage, isSentinel, replaySentinelByMessageIds, SKELETON_REAL_INPUT_MAX_BYTES, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, resolveHostServedBoundaryId2, hasRawMessageProvider2, setBoundedRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, visitRawSessionMessages2, readRawSessionMessageRange2, prepareRawSessionOrdinals2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageIdOrdinalsForRange2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, readSessionChunk2 };