@ai-markdown/core 3.0.0 → 3.0.1

package/dist/index.js

@@ -341,19 +341,49 @@ function createBlockPlanner() {
     let h = 0;
     let reusedContext = false;
     if (previous && source.startsWith(previous.source) && options.phantomFootnoteLabels === previous.phantoms) {
+      const prevHast = previous.hast.children;
+      const prevPlan = previous.result.plan;
+      const isRetainedGap = (i) => {
+        const gap = hast.children[i];
+        return gap === prevHast[i] && gap.type === "text" && !/\S/.test(gap.value);
+      };
       while (m < mdast.children.length) {
         const node = mdast.children[m];
         const el = hast.children[h];
-        const item = previous.result.plan[h];
-        if (node !== previous.mdast.children[m] || el !== previous.hast.children[h] || !el || el.type !== "element" || !item || item.kind !== "block" || item.info.startOffset !== node.position?.start.offset || !isEligible(node))
+        const item = prevPlan[h];
+        if (node !== previous.mdast.children[m] || el !== prevHast[h] || !el || el.type !== "element" || !item || item.kind !== "block" || item.info.startOffset !== node.position?.start.offset || !isEligible(node))
           break;
+        const startOffset = item.info.startOffset;
+        let next = h + 1;
+        let complete = true;
+        for (; ; ) {
+          let probe = next;
+          while (probe < hast.children.length && isRetainedGap(probe)) probe++;
+          const sibling = prevPlan[probe];
+          if (!sibling || sibling.kind !== "block" || sibling.info.startOffset !== startOffset) break;
+          if (hast.children[probe] !== prevHast[probe]) {
+            complete = false;
+            break;
+          }
+          next = probe + 1;
+        }
+        if (!complete) break;
         reusedContext ||= item.info.hasReference;
         m++;
-        h++;
-        while (h < hast.children.length) {
-          const gap = hast.children[h];
-          if (gap !== previous.hast.children[h] || gap.type !== "text" || /\S/.test(gap.value)) break;
-          h++;
+        h = next;
+        while (h < hast.children.length && isRetainedGap(h)) h++;
+      }
+      if (m > 0) {
+        const prefixEnd = mdast.children[m - 1].position?.end.offset ?? 0;
+        for (let i = h; i < hast.children.length; i++) {
+          const child = hast.children[i];
+          const at = child.type === "element" ? child.position?.start.offset : void 0;
+          if (at !== void 0 && at < prefixEnd) {
+            m = 0;
+            h = 0;
+            reusedContext = false;
+            break;
+          }
         }
       }
     }
@@ -387,7 +417,7 @@ function createBlockPlanner() {
 }
 
 // src/contribution.ts
-import { extractContributions, extractDefBodiesFromHast } from "@ai-markdown/engine";
+import { extractContributions, extractDefBodiesFromHast, footnoteSafeId } from "@ai-markdown/engine";
 function createContributionSession() {
   let lastContribution = null;
   return {
@@ -400,7 +430,12 @@ function createContributionSession() {
         phantomFootnoteLabels: targetPhantoms.missingFootnotes
       })) {
         if (node.kind === "ref") {
-          refs.push({ label: node.label, kind: node.refKind, referenceType: node.referenceType });
+          refs.push({
+            label: node.label,
+            kind: node.refKind,
+            referenceType: node.referenceType,
+            ...node.nestedIn !== void 0 ? { nestedIn: node.nestedIn } : {}
+          });
         } else if (node.kind === "fnDef") {
           defMeta.set(node.label, {
             identifier: node.label,
@@ -434,14 +469,14 @@ function createContributionSession() {
       if (last?.registry === registry && last.symbol === sym && last.fp === fp && last.chain.length === chain.length && last.chain.every((dep, i) => dep === chain[i])) {
         return;
       }
-      const bodiesByLabel = extractDefBodiesFromHast(pipeline.hast, clobberPrefix);
+      const bodiesBySafeId = extractDefBodiesFromHast(pipeline.hast, clobberPrefix);
       const defs = /* @__PURE__ */ new Map();
       for (const [label, meta] of defMeta) {
         defs.set(label, {
           identifier: meta.identifier,
           sourceIdentifier: meta.sourceIdentifier,
           contentSource: meta.contentSource,
-          bodyHast: bodiesByLabel.get(label) ?? []
+          bodyHast: bodiesBySafeId.get(footnoteSafeId(meta.sourceIdentifier)) ?? []
         });
       }
       lastContribution = { registry, symbol: sym, fp, chain };
@@ -578,7 +613,7 @@ function deriveTailSignal(mdast, contentLength) {
 }
 
 // src/aggregateFootnotes.ts
-import { footnoteSafeId, lastMeaningfulIdx } from "@ai-markdown/engine";
+import { footnoteSafeId as footnoteSafeId2, lastMeaningfulIdx } from "@ai-markdown/engine";
 
 // src/cloneHastForRender.ts
 function cloneHastForRender(node) {
@@ -649,6 +684,7 @@ function buildAggregateTree(registry, clobberPrefix, preserveOrphanReferences =
       });
     }
   }
+  ordered.sort((a, b) => (a.n ?? 0) - (b.n ?? 0));
   if (preserveOrphanReferences) {
     for (const sym of registry.chunkOrder) {
       const data = registry.chunkData.get(sym);
@@ -669,7 +705,7 @@ function buildAggregateTree(registry, clobberPrefix, preserveOrphanReferences =
   }
   if (ordered.length === 0) return null;
   const liElements = ordered.map(({ normalizedLabel, sourceIdentifier, bodyHast, n, withBackref }) => {
-    const safeId = footnoteSafeId(sourceIdentifier);
+    const safeId = footnoteSafeId2(sourceIdentifier);
     const liChildren = bodyHast.map((c) => cloneHastForRender(c));
     if (withBackref) {
       const totalRefs = registry.getRefsForLabel(normalizedLabel);
@@ -735,6 +771,7 @@ function buildAggregateTree(registry, clobberPrefix, preserveOrphanReferences =
 
 // src/pipelineSession.ts
 import {
+  EngineRawHtmlDepthError,
   advanceIncrementalParse,
   buildPhantomSuffix,
   phantomSuffixCloser,
@@ -742,6 +779,30 @@ import {
   transformStage
 } from "@ai-markdown/engine";
 var unmeasured = (_stage, fn) => fn();
+function endPoint(text) {
+  let line = 1;
+  let lineStart = 0;
+  for (let i = 0; i < text.length; i++) {
+    const code = text.charCodeAt(i);
+    if (code === 10 || code === 13 && text.charCodeAt(i + 1) !== 10) {
+      line += 1;
+      lineStart = i + 1;
+    }
+  }
+  return { line, column: text.length - lineStart + 1, offset: text.length };
+}
+function plainTextTrees(content) {
+  const position = { start: { line: 1, column: 1, offset: 0 }, end: endPoint(content) };
+  const text = { type: "text", value: content, position };
+  return {
+    mdast: { type: "root", children: [{ type: "paragraph", children: [text], position }], position },
+    hast: {
+      type: "root",
+      children: [{ type: "element", tagName: "p", properties: {}, children: [text], position }],
+      position
+    }
+  };
+}
 function createPipelineSession() {
   let state = null;
   return {
@@ -783,19 +844,33 @@ function createPipelineSession() {
       } : {
         ...remarkRehypeOptions
       };
+      const fullPipeline = () => {
+        try {
+          const parsed = measureHere(
+            "parse",
+            () => parseStage({
+              children: augmented,
+              remarkPlugins,
+              rehypePlugins,
+              remarkRehypeOptions: mergedRemarkRehypeOptions
+            })
+          );
+          const hastRoot = measureHere("transform", () => transformStage(parsed));
+          return { mdast: parsed.mdast, hast: hastRoot };
+        } catch (error) {
+          if (!(error instanceof EngineRawHtmlDepthError)) throw error;
+          if (false) {
+            console.error(
+              "[ai-react-markdown] raw HTML nested past the engine depth bound \u2014 rendering this frame as plain text:",
+              error
+            );
+          }
+          return plainTextTrees(content ?? "");
+        }
+      };
       if (!incrementalParse) {
         state = null;
-        const parsed = measureHere(
-          "parse",
-          () => parseStage({
-            children: augmented,
-            remarkPlugins,
-            rehypePlugins,
-            remarkRehypeOptions: mergedRemarkRehypeOptions
-          })
-        );
-        const hastRoot = measureHere("transform", () => transformStage(parsed));
-        return { mdast: parsed.mdast, hast: hastRoot };
+        return fullPipeline();
       }
       try {
         const result = advanceIncrementalParse(state, content ?? "", {
@@ -818,7 +893,12 @@ function createPipelineSession() {
             // Explicit even though `rehypePlugins` already carries it: a
             // credential change must never reuse trees stamped under the
             // old one.
-            provenance
+            provenance,
+            // The boundary scanner's grammar profile. The scan checkpoint
+            // already refuses to resume under a different profile, but the
+            // retained TREES were still spliced against — a prefix frozen
+            // under one profile must not survive into frames under the other.
+            defListEnabled
           ],
           defListEnabled,
           phantomSuffix,
@@ -831,17 +911,7 @@ function createPipelineSession() {
         if (false) {
           console.error("[ai-react-markdown] incremental parse failed \u2014 full parse fallback for this frame:", error);
         }
-        const parsed = measureHere(
-          "parse",
-          () => parseStage({
-            children: augmented,
-            remarkPlugins,
-            rehypePlugins,
-            remarkRehypeOptions: mergedRemarkRehypeOptions
-          })
-        );
-        const hastRoot = measureHere("transform", () => transformStage(parsed));
-        return { mdast: parsed.mdast, hast: hastRoot };
+        return fullPipeline();
       }
     }
   };