omp-fabric 1.23.0 → 1.24.0

package/dist/compaction/lcm-runtime.js

@@ -10,24 +10,29 @@ import {
 import {
   sessionDirNamesForCwd,
   sessionsDirRoot
-} from "../chunks/chunk-MQSRZC2O.js";
-import "../chunks/chunk-BPMSLBX4.js";
+} from "../chunks/chunk-MJOGV6CR.js";
+import "../chunks/chunk-5LNZXB4X.js";
 import {
+  DEFAULT_LCM_MAX_INPUT_CHARS,
   LcmModelAdapter,
+  activeRequestBlock,
   buildLcmPrompt,
-  emergencyReduce
-} from "../chunks/chunk-WCV26AOT.js";
+  emergencyReduce,
+  tailDigest
+} from "../chunks/chunk-CBQOS3IW.js";
 import {
+  canonicalLcmEntry,
   canonicalLcmPayload,
   canonicalProjectIdentity,
   defaultLedgerPath,
   defaultLedgerRoot,
   hash,
   hashLcmPayload,
+  isPrunedLcmEntry,
   lcmSummaryAddress,
   renderLcmChildAddresses,
   renderLcmSourceAddresses
-} from "../chunks/chunk-NX2G7BRO.js";
+} from "../chunks/chunk-QW5LEEFV.js";
 import {
   writeJsonAtomic
 } from "../chunks/chunk-KAD7UWT2.js";
@@ -40,9 +45,9 @@ import {
   clipUtf8,
   utf8Bytes
 } from "../chunks/chunk-3XPR2AZL.js";
-import "../chunks/chunk-YBNCEX5E.js";
-import "../chunks/chunk-52JBWP2C.js";
-import "../chunks/chunk-ZFMSJLQE.js";
+import "../chunks/chunk-IH3JJDYL.js";
+import "../chunks/chunk-K5YUDXMV.js";
+import "../chunks/chunk-S3CWAHSO.js";
 
 // src/compaction/lcm-runtime.ts
 import fs4 from "node:fs";
@@ -141,6 +146,28 @@ var sweepLedgers = (rootDir, options) => {
 // src/storage/lcm-ledger.ts
 var LCM_LEDGER_WARNING_BYTES = 8 * 1024 ** 3;
 var LCM_LEDGER_MAINTENANCE_BYTES = 10 * 1024 ** 3;
+var rowFilter = (options, alias = "") => {
+  const column = (name) => alias ? `${alias}.${name}` : name;
+  const clauses = [];
+  const params = [];
+  const list = (values, operator) => {
+    if (!values || values.length === 0) return;
+    clauses.push(`${column("role")} ${operator} (${values.map(() => "?").join(",")})`);
+    params.push(...values);
+  };
+  list(options.roles, "IN");
+  list(options.excludeRoles, "NOT IN");
+  if (options.since !== void 0) {
+    clauses.push(`${column("created_at")}>=?`);
+    params.push(options.since);
+  }
+  if (options.until !== void 0) {
+    clauses.push(`${column("created_at")}<=?`);
+    params.push(options.until);
+  }
+  return { sql: clauses.map((clause) => ` AND ${clause}`).join(""), params };
+};
+var validSearchFilter = (options) => [options.roles, options.excludeRoles].every((values) => values === void 0 || Array.isArray(values) && values.every((value) => typeof value === "string" && value.length > 0)) && [options.since, options.until].every((value) => value === void 0 || Number.isFinite(value));
 var LEDGER_SCHEMA_VERSION = 4;
 var BACKUP_MANIFEST_VERSION = 3;
 var DELETE_MANIFEST_VERSION = 2;
@@ -405,8 +432,8 @@ ALTER TABLE summary_node_revisions_next RENAME TO summary_node_revisions;`);
       throw new Error("invalid payload JSON");
     }
     if (!payload || typeof payload !== "object" || typeof payload.type !== "string" || typeof payload.id !== "string" || payload.id !== entry.entryId) throw new Error("payload must be a full SessionEntry");
-    const payloadJson = canonicalLcmPayload(payload);
-    const contentHash = hashLcmPayload(payload);
+    const payloadJson = canonicalLcmEntry(payload);
+    const contentHash = hash(payloadJson);
     const ownsTransaction = this.transactionDepth === 0;
     if (ownsTransaction) this.db.exec("BEGIN IMMEDIATE");
     try {
@@ -415,6 +442,11 @@ ALTER TABLE summary_node_revisions_next RENAME TO summary_node_revisions;`);
         if (ownsTransaction) this.db.exec("COMMIT");
         return { ...entry, payloadJson, payloadHash: contentHash, revision: existing.revision, contentHash, createdAt: existing.created_at };
       }
+      const prior = this.priorRevision(entry.projectKey, entry.sessionId, entry.entryId, contentHash, isPrunedLcmEntry(payload));
+      if (prior) {
+        if (ownsTransaction) this.db.exec("COMMIT");
+        return prior;
+      }
       const latest = this.db.prepare("SELECT COALESCE(MAX(revision),0) revision FROM raw_entries WHERE project_key=? AND session_id=? AND entry_id=?").get(entry.projectKey, entry.sessionId, entry.entryId);
       const revision = latest.revision + 1;
       const createdAt = entry.createdAt ?? this.now();
@@ -429,6 +461,28 @@ ALTER TABLE summary_node_revisions_next RENAME TO summary_node_revisions;`);
       throw new LedgerDegradedError("ledger write failed", error);
     }
   }
+  identities = /* @__PURE__ */ new Map();
+  /** A stored revision the host only rewrote (pruned, re-signed, blob-externalized) stays the entry's source. */
+  priorRevision(projectKey, sessionId, entryId, identity, pruned) {
+    const rows = this.db.prepare("SELECT * FROM raw_entries WHERE project_key=? AND session_id=? AND entry_id=? ORDER BY revision DESC").all(projectKey, sessionId, entryId);
+    if (rows.length === 0) return void 0;
+    if (pruned) return toRawEntry(rows[0]);
+    const match = rows.find((row) => this.identityOf(row) === identity);
+    return match ? toRawEntry(match) : void 0;
+  }
+  identityOf(row) {
+    const stored = row.content_hash;
+    const cached = this.identities.get(stored);
+    if (cached !== void 0) return cached;
+    let identity = stored;
+    try {
+      identity = hash(canonicalLcmEntry(JSON.parse(row.payload_json)));
+    } catch {
+    }
+    if (this.identities.size >= 5e4) this.identities.clear();
+    this.identities.set(stored, identity);
+    return identity;
+  }
   readRaw(projectKey = this.project.key, sessionId) {
     this.guard();
     this.assertProjectKey(projectKey);
@@ -456,8 +510,9 @@ ALTER TABLE summary_node_revisions_next RENAME TO summary_node_revisions;`);
     if (!Number.isSafeInteger(offset) || offset < 0 || !Number.isSafeInteger(limit) || limit < 1) throw new Error("invalid raw page");
     const scanLimit = options.scanLimit ?? LCM_SEARCH_SCAN_LIMIT;
     if (!Number.isSafeInteger(scanLimit) || scanLimit < 1) throw new Error("invalid scan limit");
+    if (!validSearchFilter(options)) throw new Error("invalid raw search filter");
     const query = options.query?.trim() ?? "";
-    if (query.length === 0) return this.recentPage(key, sessionId, offset, limit);
+    if (query.length === 0) return this.recentPage(key, sessionId, offset, limit, rowFilter(options));
     if (options.mode === "regex") {
       let pattern;
       try {
@@ -465,40 +520,43 @@ ALTER TABLE summary_node_revisions_next RENAME TO summary_node_revisions;`);
       } catch {
         return { rows: [], total: 0, scanned: 0, complete: false };
       }
-      return this.scanPage(key, sessionId, (content) => pattern.test(content), offset, limit, scanLimit, false);
+      return this.scanPage(key, sessionId, (content) => pattern.test(content), offset, limit, scanLimit, false, rowFilter(options));
     }
     const match = options.match ?? "any";
     const phrases = searchPhrases(query, options.mode);
     if (phrases.length === 0) return { rows: [], total: 0, scanned: 0, complete: true };
     if (this.fts) {
       try {
-        return this.indexPage(key, sessionId, ftsExpression(phrases, match), offset, limit);
+        return this.indexPage(key, sessionId, ftsExpression(phrases, match), offset, limit, rowFilter(options, "r"), options.order === "relevance");
       } catch {
       }
     }
-    return this.scanPage(key, sessionId, phrasePredicate(phrases, match), offset, limit, scanLimit, true);
+    return this.scanPage(key, sessionId, phrasePredicate(phrases, match), offset, limit, scanLimit, true, rowFilter(options));
   }
-  recentPage(key, sessionId, offset, limit) {
-    const counted = sessionId ? this.db.prepare("SELECT count(*) n FROM raw_entries WHERE project_key=? AND session_id=?").get(key, sessionId) : this.db.prepare("SELECT count(*) n FROM raw_entries WHERE project_key=?").get(key);
-    const total = Number(counted.n);
-    const rows = sessionId ? this.db.prepare("SELECT * FROM raw_entries WHERE project_key=? AND session_id=? ORDER BY created_at DESC, revision DESC, rowid DESC LIMIT ? OFFSET ?").all(key, sessionId, limit, offset) : this.db.prepare("SELECT * FROM raw_entries WHERE project_key=? ORDER BY created_at DESC, revision DESC, rowid DESC LIMIT ? OFFSET ?").all(key, limit, offset);
+  recentPage(key, sessionId, offset, limit, filter) {
+    const scope = `FROM raw_entries WHERE project_key=?${sessionId ? " AND session_id=?" : ""}${filter.sql}`;
+    const params = [key, ...sessionId ? [sessionId] : [], ...filter.params];
+    const total = Number(this.db.prepare(`SELECT count(*) n ${scope}`).get(...params).n);
+    const rows = this.db.prepare(`SELECT * ${scope} ORDER BY created_at DESC, revision DESC, rowid DESC LIMIT ? OFFSET ?`).all(...params, limit, offset);
     return { rows: toRawEntries(rows), total, scanned: total, complete: true };
   }
-  indexPage(key, sessionId, expression, offset, limit) {
-    const source = "FROM raw_entries_fts JOIN raw_entries r ON r.project_key=raw_entries_fts.project_key AND r.session_id=raw_entries_fts.session_id AND r.entry_id=raw_entries_fts.entry_id AND r.revision=CAST(raw_entries_fts.revision AS INTEGER) WHERE raw_entries_fts MATCH ? AND raw_entries_fts.project_key=?" + (sessionId ? " AND raw_entries_fts.session_id=?" : "");
-    const filters = sessionId ? [expression, key, sessionId] : [expression, key];
+  indexPage(key, sessionId, expression, offset, limit, filter, relevance) {
+    const source = "FROM raw_entries_fts JOIN raw_entries r ON r.project_key=raw_entries_fts.project_key AND r.session_id=raw_entries_fts.session_id AND r.entry_id=raw_entries_fts.entry_id AND r.revision=CAST(raw_entries_fts.revision AS INTEGER) WHERE raw_entries_fts MATCH ? AND raw_entries_fts.project_key=?" + (sessionId ? " AND raw_entries_fts.session_id=?" : "") + filter.sql;
+    const filters = [expression, key, ...sessionId ? [sessionId] : [], ...filter.params];
     const total = Number(this.db.prepare(`SELECT count(*) n ${source}`).get(...filters).n);
-    const rows = this.db.prepare(`SELECT r.* ${source} ORDER BY r.created_at DESC, r.revision DESC, r.rowid DESC LIMIT ? OFFSET ?`).all(...filters, limit, offset);
+    const order = relevance ? "bm25(raw_entries_fts), r.created_at DESC, r.revision DESC, r.rowid DESC" : "r.created_at DESC, r.revision DESC, r.rowid DESC";
+    const rows = this.db.prepare(`SELECT r.* ${source} ORDER BY ${order} LIMIT ? OFFSET ?`).all(...filters, limit, offset);
     return { rows: toRawEntries(rows), total, scanned: total, complete: true };
   }
-  scanPage(key, sessionId, matches, offset, limit, scanLimit, degraded) {
-    const statement = sessionId ? this.db.prepare("SELECT session_id,entry_id,revision,content FROM raw_entries WHERE project_key=? AND session_id=? ORDER BY created_at DESC, revision DESC, rowid DESC LIMIT ? OFFSET ?") : this.db.prepare("SELECT session_id,entry_id,revision,content FROM raw_entries WHERE project_key=? ORDER BY created_at DESC, revision DESC, rowid DESC LIMIT ? OFFSET ?");
+  scanPage(key, sessionId, matches, offset, limit, scanLimit, degraded, filter) {
+    const statement = this.db.prepare(`SELECT session_id,entry_id,revision,content FROM raw_entries WHERE project_key=?${sessionId ? " AND session_id=?" : ""}${filter.sql} ORDER BY created_at DESC, revision DESC, rowid DESC LIMIT ? OFFSET ?`);
+    const scope = [key, ...sessionId ? [sessionId] : [], ...filter.params];
     const found = [];
     let scanned = 0;
     let exhausted = false;
     while (scanned < scanLimit) {
       const size = Math.min(LCM_SCAN_BATCH, scanLimit - scanned);
-      const batch = sessionId ? statement.all(key, sessionId, size, scanned) : statement.all(key, size, scanned);
+      const batch = statement.all(...scope, size, scanned);
       scanned += batch.length;
       for (const row of batch) if (matches(row.content)) found.push({ sessionId: row.session_id, entryId: row.entry_id, revision: Number(row.revision) });
       if (batch.length < size) {
@@ -954,13 +1012,13 @@ function migrateSessions(options) {
         }
         counts.eligible++;
         const payloadJson = canonicalLcmPayload(row);
-        const contentHash = hashLcmPayload(row);
+        const contentHash = hash2(canonicalLcmEntry(row));
         const identity = JSON.stringify([projectKey, sessionId, row.id, contentHash]);
         const progress = { projectKey, sessionPath: file, sourceHash, lineOrdinal: ordinal, entryId: row.id, contentHash };
         const duplicate = drySeen.has(identity) || database?.prepare("SELECT 1 FROM raw_entries WHERE project_key=? AND session_id=? AND entry_id=? AND content_hash=?").get(projectKey, sessionId, row.id, contentHash) !== void 0;
         if (duplicate) counts.skippedDuplicate++;
         else if (ledger) {
-          ledger.appendRaw({
+          const persisted = ledger.appendRaw({
             projectKey,
             sessionId,
             entryId: row.id,
@@ -972,7 +1030,8 @@ function migrateSessions(options) {
             ...cwd ? { recordedCwd: cwd } : {},
             createdAt: at
           });
-          counts.imported++;
+          if (persisted.contentHash === contentHash) counts.imported++;
+          else counts.skippedDuplicate++;
         } else if (!duplicate) counts.imported++;
         drySeen.add(identity);
         if (ledger) database.prepare("INSERT OR IGNORE INTO migration_checkpoints(project_key,session_path,source_hash,line_ordinal,entry_id,content_hash) VALUES(?,?,?,?,?,?)").run(projectKey, file, sourceHash, ordinal, row.id, contentHash);
@@ -996,6 +1055,7 @@ function migrateSessions(options) {
 import crypto3 from "node:crypto";
 var DEFAULT_LCM_BUDGET = { calls: Number.POSITIVE_INFINITY, inputTokens: Number.POSITIVE_INFINITY, outputTokens: Number.POSITIVE_INFINITY, cost: Number.POSITIVE_INFINITY, wallMs: Number.POSITIVE_INFINITY, sessionCalls: Number.POSITIVE_INFINITY };
 var DEFAULT_LEAF_ENTRIES = 32;
+var EMPTY_TAINT = /* @__PURE__ */ new Set();
 var DEFAULT_MAINTENANCE_CONCURRENCY = 3;
 var LEASE_MS = 3e4;
 var LEASE_SWEEP_GRACE_MS = 6e4;
@@ -1133,8 +1193,26 @@ var LcmMaintenance = class {
     });
   }
   /** Scoped by the live source set when given; drops a condensed child and a contained node. */
+  /** The oversized deterministic leaves and every ancestor that inherited one. */
+  tainted(nodes) {
+    const oversized = nodes.filter((node) => node.kind === "leaf" && node.modelHash === "emergency" && node.sources.length > this.maxLeaf).map((node) => node.nodeId);
+    if (oversized.length === 0) return EMPTY_TAINT;
+    const parents = /* @__PURE__ */ new Map();
+    for (const node of nodes) for (const child of node.children) parents.set(child, [...parents.get(child) ?? [], node.nodeId]);
+    const excluded = /* @__PURE__ */ new Set();
+    const queue = [...oversized];
+    while (queue.length > 0) {
+      const nodeId = queue.pop();
+      if (excluded.has(nodeId)) continue;
+      excluded.add(nodeId);
+      for (const parent of parents.get(nodeId) ?? []) queue.push(parent);
+    }
+    return excluded;
+  }
   getFrontier(sessionId, activeSources) {
-    const nodes = this.listNodes(1e5).filter((n) => n.state === "ready" && n.policyHash === this.policyHash && (!sessionId || activeSources !== void 0 || n.sessionId === sessionId) && (!activeSources || n.sources.every((s) => activeSources.has(this.sourceKey(s)))));
+    const all = this.listNodes(1e5);
+    const taint = this.tainted(all);
+    const nodes = all.filter((n) => !taint.has(n.nodeId) && n.state === "ready" && n.policyHash === this.policyHash && (!sessionId || activeSources !== void 0 || n.sessionId === sessionId) && (!activeSources || n.sources.every((s) => activeSources.has(this.sourceKey(s)))));
     const condensed = new Set(nodes.flatMap((n) => n.children));
     const standing = nodes.filter((n) => !condensed.has(n.nodeId));
     const ranked = [...standing].sort((a, b) => b.sources.length - a.sources.length || a.nodeId.localeCompare(b.nodeId));
@@ -1267,7 +1345,9 @@ var LcmMaintenance = class {
   selectLeaf(entries = this.ledger.readRaw(this.projectKey), activeSources) {
     const first = entries[0];
     if (!first) return [];
-    const nodes = this.listNodes(1e5).filter((n) => n.state !== "failed" && n.policyHash === this.policyHash && (n.sessionId === first.sessionId || activeSources !== void 0 && n.state === "ready") && (!activeSources || n.sources.every((s) => activeSources.has(this.sourceKey(s)))));
+    const all = this.listNodes(1e5);
+    const taint = this.tainted(all);
+    const nodes = all.filter((n) => !taint.has(n.nodeId) && n.state !== "failed" && n.policyHash === this.policyHash && (n.sessionId === first.sessionId || activeSources !== void 0 && n.state === "ready") && (!activeSources || n.sources.every((s) => activeSources.has(this.sourceKey(s)))));
     const covered = new Set(nodes.flatMap((n) => n.sources.map((s) => this.sourceKey(s))));
     const candidates = entries.filter((e) => e.sessionId === first.sessionId && !covered.has(this.sourceKey(e)));
     const picked = [];
@@ -1282,7 +1362,9 @@ var LcmMaintenance = class {
     return picked;
   }
   selectCondensation(sessionId, activeSources) {
-    const nodes = this.listNodes(1e5).filter((n) => n.state === "ready" && n.policyHash === this.policyHash && (!sessionId || n.sessionId === sessionId) && (!activeSources || n.sources.every((s) => activeSources.has(this.sourceKey(s)))));
+    const all = this.listNodes(1e5);
+    const taint = this.tainted(all);
+    const nodes = all.filter((n) => !taint.has(n.nodeId) && n.state === "ready" && n.policyHash === this.policyHash && (!sessionId || n.sessionId === sessionId) && (!activeSources || n.sources.every((s) => activeSources.has(this.sourceKey(s)))));
     const eligible = new Set(nodes.map((n) => n.nodeId));
     const edges = this.ledger.readOnly((db) => db.prepare("SELECT e.parent_id,e.child_id FROM summary_edges e JOIN summary_nodes parent ON parent.node_id=e.parent_id AND parent.project_key=? JOIN summary_nodes child ON child.node_id=e.child_id AND child.project_key=parent.project_key WHERE parent.project_key=?").all(this.projectKey, this.projectKey));
     const consumed = new Set(edges.filter((e) => eligible.has(e.parent_id)).map((e) => e.child_id));
@@ -1574,6 +1656,11 @@ var MAX_REPAIR_LOG = 8;
 var CLAIMABLE_JOB_LIMIT = 256;
 var FAILED_JOB_WINDOW_MS = 24 * 60 * 60 * 1e3;
 var NODE_ADDRESS_LABEL = "address: ";
+var TAIL_DIGEST_MAX_BYTES = Math.floor(MAX_SUMMARY_BYTES * 0.2);
+var FRONTIER_REQUEST_BYTES = 4096;
+var MIN_SHARED_BLOCK_BYTES = 512;
+var ACTIVE_REQUEST_SHARE = 0.4;
+var UPGRADE_CANDIDATES = 256;
 var BLOCK_SEPARATOR = "\n\n";
 var WITHHELD_EXPAND_LABEL = "; expand: ";
 var withheldHeadline = (count) => `\u2026 withheld ${count} frontier node${count === 1 ? "" : "s"} that did not fit`;
@@ -1603,17 +1690,19 @@ ${NODE_ADDRESS_LABEL}${lcmSummaryAddress(node.nodeId)}`;
   const parts = [...requestBlock ? [requestBlock] : [], head, ...notice ? [notice] : []];
   return `${parts.join(BLOCK_SEPARATOR)}${footer}`;
 };
-var renderAddressedFrontier = (frontier, requestLines = []) => {
+var renderAddressedFrontier = (frontier, requestLines = [], surround = {}) => {
   const blocks = frontier.filter((node) => Boolean(node.text)).map((node) => ({ node, head: `${node.text ?? ""}
 ${NODE_ADDRESS_LABEL}${lcmSummaryAddress(node.nodeId)}` }));
   if (blocks.length === 0) return "";
-  const requestBlock = requestLines.length > 0 ? `[Compaction Request]
-${requestLines.join("\n")}` : "";
+  const leads = [requestLines.length > 0 ? `[Compaction Request]
+${requestLines.join("\n")}` : "", surround.lead ?? ""].filter((block) => block.length > 0);
+  const trail = clipUtf8(surround.trail ?? "", TAIL_DIGEST_MAX_BYTES);
+  const requestBlock = leads.join(BLOCK_SEPARATOR);
   const footer = `
 
 ${LCM_RECOVERY_POINTER}`;
   const separator = utf8Bytes(BLOCK_SEPARATOR);
-  const footerBytes = utf8Bytes(footer);
+  const footerBytes = utf8Bytes(footer) + (trail ? utf8Bytes(trail) + separator : 0);
   const requestBytes = requestBlock ? utf8Bytes(requestBlock) + separator : 0;
   const headBytes = blocks.map((block) => utf8Bytes(block.head));
   const floorFor = (kept2) => kept2 === blocks.length ? 0 : separator + utf8Bytes(withheldHeadline(blocks.length - kept2));
@@ -1629,7 +1718,38 @@ ${LCM_RECOVERY_POINTER}`;
     kept.push(index);
     body = grown;
   }
-  if (kept.length === 0) return clipOversized(blocks, headBytes, footer, separator, requestBlock);
+  if (withheld.length > 0) {
+    const addressLines = blocks.map(({ node }) => `
+${NODE_ADDRESS_LABEL}${lcmSummaryAddress(node.nodeId)}`);
+    let room2 = MAX_SUMMARY_BYTES - requestBytes - footerBytes - separator * (blocks.length - 1) - addressLines.reduce((total, line) => total + utf8Bytes(line), 0);
+    const textBytes = blocks.map(({ node }) => utf8Bytes(node.text ?? ""));
+    const budget = new Array(blocks.length).fill(0);
+    let open = blocks.map((_unused, index) => index);
+    while (open.length > 0 && room2 > 0) {
+      const share = Math.floor(room2 / open.length);
+      if (share < 1) break;
+      const fitting = open.filter((index) => textBytes[index] <= share);
+      if (fitting.length === 0) {
+        for (const index of open) budget[index] = share;
+        room2 -= share * open.length;
+        break;
+      }
+      for (const index of fitting) {
+        budget[index] = textBytes[index];
+        room2 -= textBytes[index];
+      }
+      open = open.filter((index) => !fitting.includes(index));
+    }
+    if (budget.every((value, index) => value >= Math.min(textBytes[index], MIN_SHARED_BLOCK_BYTES))) {
+      const shared = blocks.map(({ node }, index) => {
+        const text = clipUtf8(node.text ?? "", budget[index]);
+        return text ? `${text}${addressLines[index]}` : addressLines[index].slice(1);
+      });
+      const parts2 = [...requestBlock ? [requestBlock] : [], ...shared, ...trail ? [trail] : []];
+      return `${parts2.join(BLOCK_SEPARATOR)}${footer}`;
+    }
+  }
+  if (kept.length === 0) return clipOversized(blocks, headBytes, `${trail ? `${BLOCK_SEPARATOR}${trail}` : ""}${footer}`, separator, requestBlock);
   const room = MAX_SUMMARY_BYTES - body - footerBytes - (withheld.length === 0 ? 0 : separator);
   const notice = withheld.length === 0 ? "" : withheldNotice(withheld.map((index) => blocks[index].node.nodeId), Math.max(utf8Bytes(withheldHeadline(withheld.length)), Math.floor(room / 2)));
   const perNode = Math.max(0, Math.floor((room - utf8Bytes(notice)) / kept.length) - 1);
@@ -1639,7 +1759,7 @@ ${LCM_RECOVERY_POINTER}`;
     return addresses && utf8Bytes(addresses) <= perNode ? `${head}
 ${addresses}` : head;
   });
-  const parts = [...requestBlock ? [requestBlock] : [], ...rendered, ...notice ? [notice] : []];
+  const parts = [...requestBlock ? [requestBlock] : [], ...rendered, ...notice ? [notice] : [], ...trail ? [trail] : []];
   return `${parts.join(BLOCK_SEPARATOR)}${footer}`;
 };
 var LcmRuntime = class {
@@ -1650,6 +1770,8 @@ var LcmRuntime = class {
   abort = new AbortController();
   writePending = Promise.resolve();
   maintenancePending = Promise.resolve();
+  maintenanceRunning = false;
+  maintenanceQueued = false;
   closed = false;
   dirty = false;
   degradedError;
@@ -1788,7 +1910,7 @@ var LcmRuntime = class {
       const pending = [];
       for (const entry of entries) {
         const payloadJson = canonicalLcmPayload(entry);
-        const contentHash = hash(payloadJson);
+        const contentHash = hash(canonicalLcmEntry(entry));
         const known = this.persisted.get(entry);
         if (known?.contentHash === contentHash) active.add(known.key);
         else pending.push({ entry, payloadJson, contentHash });
@@ -1922,7 +2044,21 @@ var LcmRuntime = class {
   }
   scheduleMaintenance() {
     if (this.closed) return;
-    const run = this.maintenancePending.then(() => this.runMaintenance());
+    if (this.maintenanceRunning) {
+      this.maintenanceQueued = true;
+      return;
+    }
+    this.maintenanceRunning = true;
+    const run = this.maintenancePending.then(async () => {
+      await this.runMaintenance();
+      while (this.maintenanceQueued && !this.closed) {
+        this.maintenanceQueued = false;
+        await this.runMaintenance();
+      }
+    }).finally(() => {
+      this.maintenanceRunning = false;
+      this.maintenanceQueued = false;
+    });
     this.maintenancePending = run.catch((error) => {
       this.degradedError = error;
     });
@@ -2007,12 +2143,31 @@ var LcmRuntime = class {
       await Promise.all(Array.from({ length: Math.min(this.maintenance.concurrencyLimit, items.length) }, (_unused, slot) => worker(slot)));
     };
     this.reclaimExpiredLeases();
+    const inputBound = this.options.lcmMaxInputChars ?? DEFAULT_LCM_MAX_INPUT_CHARS;
+    const fitsBound = (node) => {
+      if (node.sources.length > (this.options.maxLeafEntries ?? DEFAULT_LEAF_ENTRIES) * fanIn) return false;
+      try {
+        return utf8Bytes(inputFor(node)) <= inputBound;
+      } catch {
+        return false;
+      }
+    };
     for (let pass = 0; pass < passes && !this.closed && Date.now() < runDeadline; pass += 1) {
-      const leafCandidate = this.maintenance.createLeaf(this.maintenance.selectLeaf(raw, this.activeSources));
-      const leaf = leafCandidate ? this.maintenance.getNode(leafCandidate.nodeId) : void 0;
+      const leaves = [];
+      const seen = /* @__PURE__ */ new Set();
+      while (leaves.length < this.maintenance.concurrencyLimit) {
+        const rows = this.maintenance.selectLeaf(raw, this.activeSources);
+        if (rows.length === 0) break;
+        const created = this.maintenance.createLeaf(rows);
+        const node = created ? this.maintenance.getNode(created.nodeId) : void 0;
+        if (!node || seen.has(node.nodeId)) break;
+        seen.add(node.nodeId);
+        leaves.push(node);
+      }
       const batch = [];
       const queued = /* @__PURE__ */ new Set();
-      if (leaf?.state === "pending") {
+      for (const leaf of leaves) {
+        if (leaf.state !== "pending") continue;
         const job = this.maintenance.jobForNode(leaf.nodeId);
         if (job && this.maintenance.isClaimable(job)) {
           batch.push({ job, node: leaf });
@@ -2033,9 +2188,8 @@ var LcmRuntime = class {
           if (job && this.maintenance.isClaimable(job)) await runJob(job, node);
         }
       }
-      if (!leaf && pending.length === 0 && children.length < fanIn) {
-        const upgrades = this.maintenance.selectUpgrades(sessionId, this.activeSources, 1);
-        const upgrade = upgrades[0];
+      if (leaves.length === 0 && pending.length === 0 && children.length < fanIn) {
+        const upgrade = this.maintenance.selectUpgrades(sessionId, this.activeSources, UPGRADE_CANDIDATES).find(fitsBound);
         if (!upgrade) break;
         const job = this.maintenance.reopen(upgrade.nodeId);
         await runJob(job, upgrade);
@@ -2066,71 +2220,105 @@ var LcmRuntime = class {
           payloadJson,
           parentEntryId: entry.parentId ?? null
         });
-        persistedEntries.set(`${entry.id}:${stored.payloadHash}`, stored);
+        persistedEntries.set(entry.id, stored);
       }
     });
     this.invalidateFrontier();
     const firstKeptIndex = input.firstKeptEntryId ? input.branchEntries.findIndex((entry) => entry.id === input.firstKeptEntryId) : input.branchEntries.length;
     const sourceEntries = input.branchEntries.slice(0, firstKeptIndex < 0 ? input.branchEntries.length : firstKeptIndex);
     const selectedStored = sourceEntries.map((entry) => {
-      const payloadHash = hashLcmPayload(JSON.parse(canonicalLcmPayload(entry)));
-      const stored = persistedEntries.get(`${entry.id}:${payloadHash}`);
+      const stored = persistedEntries.get(entry.id);
       if (!stored) throw new Error("compaction source was not persisted");
       return stored;
     });
     const activeSources = new Set(selectedStored.map((entry) => this.sourceKey(entry)));
     const frontier = this.maintenance.getFrontier(input.sessionId, activeSources);
     const coveredSources = new Set(frontier.flatMap((node) => node.sources.map((source) => this.sourceKey(source))));
-    const summary = renderAddressedFrontier(frontier, requestLines);
+    const keptEntry = firstKeptIndex >= 0 ? input.branchEntries[firstKeptIndex] : void 0;
+    const keptRole = keptEntry?.type === "message" ? keptEntry.message.role : void 0;
+    const splitTurn = input.isSplitTurn ?? keptRole !== "user";
+    const requestFor = (maxBytes) => splitTurn ? activeRequestBlock(sourceEntries, selectedStored, maxBytes) : "";
     const instructionDetails = instructions.ok && (instructions.requestLines.length > 0 || instructions.policy.preserveCount > 0) ? { instructionPolicy: instructions.policy } : void 0;
-    if (summary && selectedStored.every((entry) => coveredSources.has(this.sourceKey(entry)))) {
-      return {
-        summary,
-        firstKeptEntryId: input.firstKeptEntryId,
-        tokensBefore: input.tokensBefore,
-        source: "ready-frontier",
-        ...instructionDetails ? { details: instructionDetails } : {}
-      };
+    const uncovered = selectedStored.flatMap((stored, index) => coveredSources.has(this.sourceKey(stored)) ? [] : [index]);
+    if (uncovered.length === 0) {
+      const summary = renderAddressedFrontier(frontier, requestLines, { lead: requestFor(FRONTIER_REQUEST_BYTES) });
+      if (summary) {
+        return {
+          summary,
+          firstKeptEntryId: input.firstKeptEntryId,
+          tokensBefore: input.tokensBefore,
+          source: "ready-frontier",
+          ...instructionDetails ? { details: instructionDetails } : {}
+        };
+      }
     }
     if (selectedStored.length === 0) throw new Error("LCM emergency fallback has no persisted sources");
-    const payloads = sourceEntries.map((entry) => canonicalLcmPayload(entry)).join("\n");
-    const sources = selectedStored.map((stored) => ({ sessionId: stored.sessionId, entryId: stored.entryId, revision: stored.revision, payloadHash: stored.payloadHash }));
-    const fallback = emergencyReduce(payloads, this.options.lcmMaxOutputChars ?? 4096, sources, requestLines);
-    const leaf = this.maintenance.createLeaf(selectedStored);
-    if (!leaf) throw new Error("LCM emergency fallback node was not created");
-    const persisted = this.maintenance.getNode(leaf.nodeId);
-    if (persisted?.state === "ready") {
-      if (JSON.stringify(persisted.sources) !== JSON.stringify(sources)) throw new Error("LCM emergency fallback provenance mismatch");
-      if (!persisted.text) throw new Error("LCM emergency fallback text is missing");
-      return {
-        summary: persisted.text,
-        firstKeptEntryId: input.firstKeptEntryId,
-        tokensBefore: input.tokensBefore,
-        source: "emergency",
-        ...instructionDetails ? { details: instructionDetails } : {}
-      };
+    const tailEntries = uncovered.length > 0 ? uncovered.map((index) => sourceEntries[index]) : sourceEntries;
+    const tailStored = uncovered.length > 0 ? uncovered.map((index) => selectedStored[index]) : selectedStored;
+    const outputBound = this.options.lcmMaxOutputChars ?? 4096;
+    const nodeTextFor = (entries, stored) => {
+      const digest = tailDigest(entries, stored, Math.min(TAIL_DIGEST_MAX_BYTES, outputBound));
+      if (digest) return digest;
+      const payloads = entries.map((entry) => canonicalLcmPayload(entry)).join("\n");
+      return emergencyReduce(payloads, outputBound, stored.map((entry) => ({ sessionId: entry.sessionId, entryId: entry.entryId, revision: entry.revision, payloadHash: entry.payloadHash })), requestLines);
+    };
+    const fallback = nodeTextFor(tailEntries, tailStored);
+    const compose = (nodeText) => {
+      const partial = frontier.length > 0 ? renderAddressedFrontier(frontier, requestLines, { lead: requestFor(FRONTIER_REQUEST_BYTES), trail: nodeText }) : "";
+      if (partial) return partial;
+      const pointer = nodeText.includes(LCM_RECOVERY_POINTER) ? "" : LCM_RECOVERY_POINTER;
+      const separator = utf8Bytes(BLOCK_SEPARATOR);
+      const room = Math.max(0, outputBound - (pointer ? utf8Bytes(pointer) + separator : 0));
+      const request = requestLines.length > 0 ? `[Compaction Request]
+${requestLines.join("\n")}` : "";
+      const head = [request, requestFor(Math.floor(room * ACTIVE_REQUEST_SHARE))].filter((block) => block.length > 0);
+      const headBytes = head.length > 0 ? utf8Bytes(head.join(BLOCK_SEPARATOR)) + separator : 0;
+      const tailRoom = Math.max(0, room - headBytes);
+      const tail = tailDigest(tailEntries, tailStored, Math.min(TAIL_DIGEST_MAX_BYTES, tailRoom)) || clipUtf8(nodeText, tailRoom);
+      const body = clipUtf8([...head, tail].join(BLOCK_SEPARATOR), room);
+      return pointer ? `${body}${BLOCK_SEPARATOR}${pointer}` : body;
+    };
+    const leafCap = Math.max(1, this.options.maxLeafEntries ?? DEFAULT_LEAF_ENTRIES);
+    const inputCap = this.options.lcmMaxInputChars ?? DEFAULT_LCM_MAX_INPUT_CHARS;
+    const spans = [];
+    let span = [];
+    let spanChars = 0;
+    for (let index = 0; index < tailStored.length; index += 1) {
+      const size = tailStored[index].payloadJson.length;
+      if (span.length > 0 && (span.length >= leafCap || spanChars + size > inputCap)) {
+        spans.push(span);
+        span = [];
+        spanChars = 0;
+      }
+      span.push(index);
+      spanChars += size;
     }
-    const job = this.maintenance.jobForNode(leaf.nodeId);
-    if (!job) throw new Error("LCM emergency fallback job was not created");
-    try {
-      const completed = this.maintenance.completeEmergency(this.maintenance.claimEmergency(job.jobId), fallback);
-      return {
-        summary: completed.text ?? fallback,
-        firstKeptEntryId: input.firstKeptEntryId,
-        tokensBefore: input.tokensBefore,
-        source: "emergency",
-        ...instructionDetails ? { details: instructionDetails } : {}
-      };
-    } catch (error) {
-      if (!isLcmRejection(error)) throw error;
-      return {
-        summary: fallback,
-        firstKeptEntryId: input.firstKeptEntryId,
-        tokensBefore: input.tokensBefore,
-        source: "emergency",
-        ...instructionDetails ? { details: instructionDetails } : {}
-      };
+    if (span.length > 0) spans.push(span);
+    for (const indices of spans) {
+      const stored = indices.map((index) => tailStored[index]);
+      const entries = indices.map((index) => tailEntries[index]);
+      const leaf = this.maintenance.createLeaf(stored);
+      if (!leaf) throw new Error("LCM emergency fallback node was not created");
+      const persisted = this.maintenance.getNode(leaf.nodeId);
+      if (persisted?.state === "ready") {
+        if (!persisted.text) throw new Error("LCM emergency fallback text is missing");
+        continue;
+      }
+      const job = this.maintenance.jobForNode(leaf.nodeId);
+      if (!job) throw new Error("LCM emergency fallback job was not created");
+      try {
+        this.maintenance.completeEmergency(this.maintenance.claimEmergency(job.jobId), nodeTextFor(entries, stored));
+      } catch (error) {
+        if (!isLcmRejection(error)) throw error;
+      }
     }
+    return {
+      summary: compose(fallback),
+      firstKeptEntryId: input.firstKeptEntryId,
+      tokensBefore: input.tokensBefore,
+      source: "emergency",
+      ...instructionDetails ? { details: instructionDetails } : {}
+    };
   }
   report() {
     const day = new Date(Date.now()).toISOString().slice(0, 10);