@retaw106/mmc-pi 2.4.0 → 2.6.0

package/dist/{index-zmx631ey.js → index-07rh0nr2.js}

@@ -2,7 +2,7 @@ import {
   getTagIdentityWriteGeneration,
   Database,
   getSqliteDatabasePath
-} from "./index-cr4hzd76.js";
+} from "./index-vhs0y3s0.js";
 import {
   getHarness,
   harnessOwnsOpenCodeStore,
@@ -592,7 +592,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;
 }
 
 // ../plugin/src/hooks/magic-context/token-count-exact.ts
@@ -1255,13 +1275,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;
@@ -2382,9 +2405,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;
@@ -2439,16 +2464,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) {
@@ -4162,6 +4187,70 @@ function expandToolPart(part, overrides, legacyPreview = false) {
   return renderToolTemplate(template, input, state?.output ?? state?.error, legacyPreview);
 }
 
+// ../plugin/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);
+}
+
 // ../plugin/src/hooks/magic-context/host-served-rows.ts
 var HOST_UNSERVED_ROW = "hostUnservedRow";
 function markHostUnservedRow(target) {
@@ -4748,6 +4837,9 @@ var ordinalWatermarks = new WeakMap;
 var ordinalWatermarkEpochs = new Map;
 var ordinalRowsVisited = 0;
 var STABLE_STORE_ATTEMPTS = 3;
+function forgetRawSessionOrdinalWatermark(sessionId) {
+  ordinalWatermarkEpochs.set(sessionId, (ordinalWatermarkEpochs.get(sessionId) ?? 0) + 1);
+}
 function compareOrdinalKeys(left, right) {
   if (left.timeCreated !== right.timeCreated)
     return left.timeCreated < right.timeCreated ? -1 : 1;
@@ -4774,6 +4866,11 @@ var writtenSummaryIds = new Map;
 var indexedCountUnsupported = new WeakSet;
 var ordinalJsonRowsRead = 0;
 var summaryFullScans = 0;
+function forgetRawSessionSummaryRows(sessionId) {
+  summaryCandidateEpochs.set(sessionId, (summaryCandidateEpochs.get(sessionId) ?? 0) + 1);
+  writtenSummaryIds.delete(sessionId);
+  forgetRawSessionOrdinalWatermark(sessionId);
+}
 var ANCHOR_ROWS_SQL = `SELECT rowid AS rid, id, 1 AS kind FROM message
     WHERE rowid > (SELECT MAX(rowid) FROM message) - ${SUMMARY_ANCHOR_SPAN}`;
 var SUMMARY_FULL_SCAN_SQL = `${ANCHOR_ROWS_SQL}
@@ -4794,6 +4891,20 @@ function survivingAnchor(db, set) {
 }
 var ordinalCheckpoints = new WeakMap;
 var ordinalSummarySeeds = new WeakMap;
+function hasLateCommitBehindCheckpoint(db, sessionId, scan) {
+  const tail = scan.checkpoints?.at(-1);
+  if (!tail || scan.maxRowid === undefined)
+    return false;
+  const row = db.prepare(`SELECT COUNT(*) AS count FROM message
+             WHERE rowid > ? AND +session_id = ?
+               AND (time_created, id) <= (?, ?)
+               AND NOT (${EXCLUDED_ROW_SQL})`).get(scan.maxRowid, sessionId, tail.timeCreated, tail.id);
+  return typeof row?.count === "number" && row.count > 0;
+}
+function discardRetainedOrdinalRanks(db, sessionId) {
+  ordinalCheckpoints.get(db)?.delete(sessionId);
+  ordinalSummarySeeds.get(db)?.delete(sessionId);
+}
 var ORDINAL_LOOKUP_LIMIT = 512;
 function currentOrdinalCheckpoints(db, sessionId) {
   const cached = ordinalCheckpoints.get(db)?.get(sessionId);
@@ -4824,10 +4935,16 @@ function extendOrdinalCheckpoints(db, sessionId, scan, limit) {
     scan.sessionRows = points.at(-1)?.storedCount ?? 0;
   }
   const tail = points.at(-1);
-  const rows = db.prepare(`SELECT id, time_created AS timeCreated, ${EXCLUDED_ROW_SQL} AS excluded FROM message
+  const rows = db.prepare(`SELECT id, time_created AS timeCreated, rowid AS rowid, ${EXCLUDED_ROW_SQL} AS excluded FROM message
         WHERE session_id=?${tail ? " AND (time_created,id) > (?,?)" : ""}
         ORDER BY time_created,id${limit === undefined ? "" : ` LIMIT ${limit + 1}`}`).all(sessionId, ...tail ? [tail.timeCreated, tail.id] : []);
   ordinalJsonRowsRead += rows.length;
+  if (hasLateCommitBehindCheckpoint(db, sessionId, scan)) {
+    discardRetainedOrdinalRanks(db, sessionId);
+    if (isMainThread)
+      forgetRawSessionSummaryRows(sessionId);
+    return false;
+  }
   if (limit !== undefined && rows.length > limit)
     return false;
   let total = scan.total ?? 0;
@@ -4844,6 +4961,13 @@ function extendOrdinalCheckpoints(db, sessionId, scan, limit) {
   scan.checkpoints = points;
   scan.sessionRows += rows.length;
   scan.total = total;
+  if (rows.length > 0) {
+    let maxRowid = scan.maxRowid ?? -1;
+    for (const row of rows)
+      if (row.rowid > maxRowid)
+        maxRowid = row.rowid;
+    scan.maxRowid = maxRowid;
+  }
   return true;
 }
 function warmRawSessionOrdinalsForDb(db, sessionId) {
@@ -4919,8 +5043,7 @@ function boundedOrdinalPrefixBounded(db, sessionId, through) {
 }
 function scanRawSessionSummaryRows(db, sessionId, previous) {
   return withReadSnapshot(db, () => {
-    if (previous?.checkpoints) {
-      extendOrdinalCheckpoints(db, sessionId, previous);
+    if (previous?.checkpoints && extendOrdinalCheckpoints(db, sessionId, previous)) {
       return previous;
     }
     if (previous) {
@@ -4952,12 +5075,15 @@ function scanRawSessionSummaryRows(db, sessionId, previous) {
     }
     anchors.sort((left, right) => right.rowid - left.rowid);
     anchors.length = Math.min(anchors.length, SUMMARY_ANCHOR_LIMIT);
-    const keys = db.prepare(`SELECT id, time_created AS timeCreated, ${EXCLUDED_ROW_SQL} AS excluded FROM message WHERE session_id = ?
+    const keys = db.prepare(`SELECT id, time_created AS timeCreated, rowid AS rowid, ${EXCLUDED_ROW_SQL} AS excluded FROM message WHERE session_id = ?
         ORDER BY time_created, id`).all(sessionId);
     const checkpoints = [];
     let total = 0;
+    let maxRowid;
     for (let index = 0;index < keys.length; index++) {
       const key = keys[index];
+      if (typeof key.rowid === "number")
+        maxRowid = maxRowid === undefined ? key.rowid : Math.max(maxRowid, key.rowid);
       if (key.excluded !== 1)
         total++;
       if (index % 256 === 255 || index === keys.length - 1)
@@ -4968,7 +5094,7 @@ function scanRawSessionSummaryRows(db, sessionId, previous) {
           storedCount: index + 1
         });
     }
-    return { anchors, ids, sessionRows, checkpoints, total };
+    return { anchors, ids, sessionRows, checkpoints, total, maxRowid };
   });
 }
 function getRawSessionSummaryEpoch(sessionId) {
@@ -5221,48 +5347,53 @@ function hasRawSessionMessageByIdFromDb(db, sessionId, messageId) {
 var boundaryEndpointCaches = new WeakMap;
 
 // ../plugin/src/hooks/magic-context/read-session-db.ts
-function openCodeDbExists() {
-  return harnessOwnsOpenCodeStore() && openCodeDbPathExists(resolveOpenCodeDbPath());
+function openCodeDbExists(generation = "v1") {
+  return harnessOwnsOpenCodeStore() && openCodeDbPathExists(resolveOpenCodeDbPath(generation));
 }
-var cachedReadOnlyDb = null;
-function closeCachedReadOnlyDb() {
-  if (!cachedReadOnlyDb) {
+var cachedReadOnlyDbs = {
+  v1: null,
+  v2: null
+};
+function closeCachedReadOnlyDb(generation) {
+  const cached = cachedReadOnlyDbs[generation];
+  if (!cached) {
     return;
   }
   try {
-    closeQuietly(cachedReadOnlyDb.db);
+    closeQuietly(cached.db);
   } catch (error) {
     log("[magic-context] failed to close cached OpenCode read-only DB:", error);
   } finally {
-    cachedReadOnlyDb = null;
+    cachedReadOnlyDbs[generation] = null;
   }
 }
-function getReadOnlySessionDb() {
+function getReadOnlySessionDb(generation = "v1") {
   if (!harnessOwnsOpenCodeStore()) {
     throw new Error("OpenCode session database is not readable from a Pi-compatible process; its history lives in Pi sessions");
   }
-  const resolution = resolveOpenCodeDbPath();
+  const resolution = resolveOpenCodeDbPath(generation);
   const dbPath = resolution.path;
   if (!openCodeDbPathExists(resolution)) {
     throw new Error(`OpenCode session database is unavailable at ${dbPath} (source=${resolution.source})`);
   }
-  if (cachedReadOnlyDb?.path === dbPath) {
-    return cachedReadOnlyDb.db;
+  const cached = cachedReadOnlyDbs[generation];
+  if (cached?.path === dbPath) {
+    return cached.db;
   }
-  closeCachedReadOnlyDb();
+  closeCachedReadOnlyDb(generation);
   const db = new Database(dbPath, { readonly: true });
   try {
-    assertOpenCodeStoreGeneration(db, "v1", dbPath);
+    assertOpenCodeStoreGeneration(db, generation, dbPath);
   } catch (error) {
     closeQuietly(db);
     throw error;
   }
-  cachedReadOnlyDb = { path: dbPath, db };
+  cachedReadOnlyDbs[generation] = { path: dbPath, db };
   clearOpenCodeDbReadFailure();
   return db;
 }
-function withReadOnlySessionDb(fn) {
-  return fn(getReadOnlySessionDb());
+function withReadOnlySessionDb(fn, generation = "v1") {
+  return fn(getReadOnlySessionDb(generation));
 }
 function getRawSessionMessageCountFromDb(db, sessionId) {
   const row = db.prepare(`SELECT COUNT(*) as count FROM message WHERE session_id = ?
@@ -5286,15 +5417,14 @@ function getMessageTimesFromOpenCodeDb(sessionId, messageIds) {
   if (messageIds.length === 0 || !harnessOwnsOpenCodeStore())
     return result;
   try {
-    withReadOnlySessionDb((db) => {
-      const placeholders = messageIds.map(() => "?").join(",");
-      const rows = db.prepare(`SELECT id, time_created FROM message WHERE +session_id = ? AND id IN (${placeholders})`).all(sessionId, ...messageIds);
-      for (const row of rows) {
-        if (typeof row.id === "string" && typeof row.time_created === "number") {
-          result.set(row.id, row.time_created);
-        }
+    const placeholders = messageIds.map(() => "?").join(",");
+    const rows = getHarness() === "opencode2" ? getReadOnlySessionDb("v2").prepare(`SELECT id, COALESCE(time_created, json_extract(data, '$.time.created')) AS time_created
+                             FROM session_message WHERE +session_id = ? AND id IN (${placeholders})`).all(sessionId, ...messageIds) : withReadOnlySessionDb((db) => db.prepare(`SELECT id, time_created FROM message WHERE +session_id = ? AND id IN (${placeholders})`).all(sessionId, ...messageIds));
+    for (const row of rows) {
+      if (typeof row.id === "string" && typeof row.time_created === "number") {
+        result.set(row.id, row.time_created);
       }
-    });
+    }
   } catch (error) {
     logProbeFailureOnce(resolveOpenCodeDbPath(), error);
   }
@@ -6131,34 +6261,170 @@ function applyEditMarkerToInput(input) {
   }
 }
 
+// ../plugin/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;
+  }
+}
+
 // ../plugin/src/features/magic-context/tool-definition-tokens.ts
-var measurements = new Map;
-var fingerprints = new Map;
+var ACTIVITY_WINDOW_MS = 10 * 60000;
+var MAX_ACTIVITY_GAP_MS = 60000;
+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 routeFor(providerID, modelID, agentName) {
+  const key = keyFor(providerID, modelID, agentName);
+  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 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 readWindowedSince(db) {
+  try {
+    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;
+  }
+}
+function markWindowed() {
+  if (windowedSince !== undefined || !persistenceDb)
+    return;
+  try {
+    persistenceDb.prepare("INSERT OR IGNORE INTO schema_migrations_meta (key, value) VALUES (?, ?)").run(WINDOWED_SINCE_KEY, String(boundAt));
+    windowedSince = readWindowedSince(persistenceDb);
+  } catch {}
 }
 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;
+      }
+      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 loadToolDefinitionMeasurements(db) {
   let rows = [];
   try {
-    rows = db.prepare("SELECT provider_id, model_id, agent_name, tool_id, token_count FROM tool_definition_measurements").all();
+    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 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);
+    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);
   }
 }
 
@@ -6596,9 +6862,11 @@ function withRawMessageProvider2(sessionId, provider, fn) {
   cleanup();
   return result;
 }
-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) {
@@ -6616,7 +6884,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;
@@ -7222,6 +7490,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))
@@ -7268,8 +7540,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))
@@ -7278,6 +7552,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);
@@ -7286,7 +7563,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);
@@ -7368,4 +7645,4 @@ function readSessionChunk2(sessionId, tokenBudget, offset = 1, eligibleEndOrdina
     toolResultBoundaries
   };
 }
-export { canonicalModelIdentity, piModelRefToCanonical, resolveModelRefForPi, modelRefLookupOrder, toolTemplateError, DEFAULT_PROTECTED_TOOLS, normalizeProtectedToolName, mergeProtectedTools, detectThinkingBindingMismatch, detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, stableStringify, UNKNOWN_FIT_RATIO, resolveDecisionCalibration, hasMeasuredDecisionCalibration, providerMass, localBudget, calibrationForModelKey, historyLocalBudget, adoptedProtectedToolsPolicy, protectedToolTagNumbers, protectedToolTokenCount, removeSystemReminders, hasMeaningfulUserText2, extractTexts2, preloadTokenizer, hasTokenizerForFit, tokenCountUsesByteBound, estimateTokens, estimateFixedPromptTokens, stripWellFormedLeadingTagPrefix, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, rememberCurrentToolOutputCount, isRecord, TEXT_TAG_IDENTITY_MARKER, PI_FALLBACK_PREFIXES_JSON, contentTagOwnerMessageId, TailHygieneJsonMemo, piJsonHash, estimateImageTokensFromDataUrl, providerVisibleMessage, TODO_STATUSES, TODO_PRIORITIES, TITLE_DONE_STATUSES, normalizeTodoStateJson, buildSyntheticTodoPart, stripChannel1ReminderSpans, compareMeasuredTailPrefix, formatTailHygienePrefixMismatch, freezeTailHygieneMeasurement, effectiveTailHygiene, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, decideChannel1, evaluateChannel2, reclaimableToolOutputCount, buildChannel2Reminder, buildChannel1Reminder, planEmergencyDrop, measureEmergencyTag, closeQuietly, isKnownAutocommit, installV3PerfSchema, queuePendingOp, queuePendingDropForUnchangedTag, getPendingOps, getPendingOpsCount, clearPendingOps, removePendingOp, tagRevisionIncarnationSql, tagRevisionCountSql, tagRevisionKey, tagIdentityRevisionKey, TAG_INSERT_CONFLICT_ROWS, installTagIdentityRevisionTrigger, updateTagByteSize, getRecentTagOwnerMessageIds, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, updateTagInputByteSize, updateTagTokenCount, getPersistedToolTagAccounting, getAllStatusTagTokenTotalsFlat, getReasoningTokenEstimatesByMessage, updateTagInputTokenCount, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, markTagDropped, getInertWhitespaceAssistantTagsByNumbers, updateTagDropMode, updateCavemanDepth, hasPiFallbackMessageTags, findAdoptableFallbackTags, hasPiFallbackToolOwnerTags, findPiFallbackToolOwnerTags, PiTagIdentityConflictError, getPiMessageTagCandidates, findPiTagIdentityConflict, adoptPiFallbackToolOwnerTag, adoptPiFallbackMessageTag, getMaxTagNumberBySession, getTagNumberByMessageId, getAssignableTagNumberByMessageId, deriveTagLoadFloor, TAG_SELECT_COLUMNS, getTagsBySession, getActiveTagsBySession, getTagsForPendingOperations, getTagsByNumbers, getNewestToolTagNumbers, getDroppedTagsByNumbers, getMaxDroppedTagNumber, getTagById, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, resolveOpenCodeDbPath, hasV1MessageTables, assertOpenCodeStoreGeneration, withReadOnlySessionDb, expandToolPart, retreatPastHostUnservedRows, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, stripSystemInjection, hasUserAnswerMetadata, droppedInputMarker, createDroppedInputGuard, isEditTool, applyEditMarkerToInput, setDatabase, loadToolDefinitionMeasurements, estimatePartImageTokens, modelAcceptsEmptyContent, isAnthropicFamilyRoute, variantChangeBustsProviderCache, SKELETON_REAL_INPUT_MAX_BYTES, toolInputStringBytes, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, withRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, visitRawSessionMessages2, readRawSessionMessageRange2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageIdOrdinalsForRange2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, readSessionChunk2 };
+export { canonicalModelIdentity, piModelRefToCanonical, resolveModelRefForPi, modelRefLookupOrder, toolTemplateError, DEFAULT_PROTECTED_TOOLS, normalizeProtectedToolName, mergeProtectedTools, detectThinkingBindingMismatch, detectLatestTurnThinkingMismatch, isPrefixBoundThinkingModel, detectOverflow, stableStringify, UNKNOWN_FIT_RATIO, resolveDecisionCalibration, hasMeasuredDecisionCalibration, providerMass, localBudget, calibrationForModelKey, historyLocalBudget, adoptedProtectedToolsPolicy, protectedToolTagNumbers, protectedToolTokenCount, removeSystemReminders, removeNestedBlocks, hasMeaningfulUserText2, extractTexts2, preloadTokenizer, hasTokenizerForFit, tokenCountUsesByteBound, estimateTokens, estimateFixedPromptTokens, stripWellFormedLeadingTagPrefix, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, rememberCurrentToolOutputCount, isRecord, TEXT_TAG_IDENTITY_MARKER, PI_FALLBACK_PREFIXES_JSON, contentTagOwnerMessageId, TailHygieneJsonMemo, piJsonHash, estimateImageTokensFromDataUrl, providerVisibleMessage, TODO_STATUSES, TODO_PRIORITIES, TITLE_DONE_STATUSES, normalizeTodoStateJson, buildSyntheticTodoPart, stripChannel1ReminderSpans, compareMeasuredTailPrefix, formatTailHygienePrefixMismatch, freezeTailHygieneMeasurement, effectiveTailHygiene, CHANNEL1_SENTINEL, CHANNEL1_FLOOR_TOKENS, decideChannel1, evaluateChannel2, reclaimableToolOutputCount, buildChannel2Reminder, buildChannel1Reminder, planEmergencyDrop, measureEmergencyTag, closeQuietly, isKnownAutocommit, installV3PerfSchema, queuePendingOp, queuePendingDropForUnchangedTag, getPendingOps, getPendingOpsCount, clearPendingOps, removePendingOp, tagRevisionIncarnationSql, tagRevisionCountSql, tagRevisionKey, tagIdentityRevisionKey, TAG_INSERT_CONFLICT_ROWS, installTagIdentityRevisionTrigger, updateTagByteSize, getRecentTagOwnerMessageIds, AGE_RECLAIM_MIN_TOKENS, getOldestActiveUnprotectedToolTags, getActiveToolTagsForAgeReclaim, getTriggerTagTokenUpperBound, updateTagInputByteSize, updateTagTokenCount, getPersistedToolTagAccounting, getAllStatusTagTokenTotalsFlat, getReasoningTokenEstimatesByMessage, updateTagInputTokenCount, tagTokenCountIsNull, backfillTagTokenCounts, insertTag, updateTagStatus, markTagDropped, getInertWhitespaceAssistantTagsByNumbers, updateTagDropMode, updateCavemanDepth, hasPiFallbackMessageTags, findAdoptableFallbackTags, hasPiFallbackToolOwnerTags, findPiFallbackToolOwnerTags, PiTagIdentityConflictError, getPiMessageTagCandidates, findPiTagIdentityConflict, adoptPiFallbackToolOwnerTag, adoptPiFallbackMessageTag, getMaxTagNumberBySession, getTagNumberByMessageId, getAssignableTagNumberByMessageId, deriveTagLoadFloor, TAG_SELECT_COLUMNS, getTagsBySession, getActiveTagsBySession, getTagsForPendingOperations, getTagsByNumbers, getNewestToolTagNumbers, getDroppedTagsByNumbers, getMaxDroppedTagNumber, getTagById, getToolTagNumberByOwner, getNullOwnerToolTag, adoptNullOwnerToolTag, BoundedSessionMap, resolveOpenCodeDbPath, hasV1MessageTables, assertOpenCodeStoreGeneration, withReadOnlySessionDb, expandToolPart, retreatPastHostUnservedRows, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForCompletedToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, stripSystemInjection, isFilePart, hasUserAnswerMetadata, droppedInputMarker, createDroppedInputGuard, isEditTool, applyEditMarkerToInput, setDatabase, loadToolDefinitionMeasurements, estimatePartImageTokens, modelAcceptsEmptyContent, isAnthropicFamilyRoute, variantChangeBustsProviderCache, SKELETON_REAL_INPUT_MAX_BYTES, toolInputStringBytes, resolveHostServedBoundaryId2, hasRawMessageProvider2, setRawMessageProvider2, withRawMessageProvider2, cleanUserText2, withRawSessionMessageCache2, readRawSessionMessages2, readRawSessionMessagePage2, getRawSessionMessageOrdinalCount2, visitRawSessionMessages2, readRawSessionMessageRange2, primeTailRawMessageCache2, getCachedAbsoluteMessageCount2, primeInMemoryTailRawMessageCache2, readRawSessionMessageIdOrdinalsForRange2, hasRawSessionMessageById2, readRawSessionMessageOrdinalById2, compareRawSessionMessageOrder2, readRawSessionMessageById2, getRawSessionMessageCount2, getRawSessionTagKeysThrough2, getLegacyProtectedTailStartOrdinal2, readSessionChunk2 };