@ai-matrx/content-ir 0.18.5 → 0.18.6

package/dist/source.cjs

@@ -1241,10 +1241,13 @@ var Tokenizer = class {
   /**
    * Streaming: an open block that may still turn back into prose — a `$$`
    * pair whose closer is on the open last line (prose after it makes it
-   * inline), or a JSON head whose braces have not balanced (it may never parse).
+   * inline), a JSON head whose braces have not balanced (it may never parse),
+   * or any opener that is itself still arriving on the open last line.
    */
   mayDissolve(block) {
-    return this.streaming && !block.complete && (block.type === "math_block" || block.type === "json");
+    if (!this.streaming || block.complete) return false;
+    if (block.type === "math_block" || block.type === "json") return true;
+    return this.isOpenTail(this.lineOf(block.start));
   }
   /** Streaming: paragraph ends where an undecided, dissolvable block cut them short. */
   undecidedBreaks = /* @__PURE__ */ new Set();
@@ -1265,6 +1268,12 @@ var Tokenizer = class {
     }
     return lo;
   }
+  /** How many whitespace characters open the text at `from` (up to `to`). */
+  leadingSpace(from, to) {
+    let k = from;
+    while (k < to && /\s/.test(this.text[k])) k++;
+    return k - from;
+  }
   isBlank(from, to) {
     return !NOT_WHITESPACE.test(this.text.slice(from, to));
   }
@@ -1289,6 +1298,10 @@ var Tokenizer = class {
         break;
       }
       const island = this.detectBlock(pos, li, true);
+      if (island && pos + this.leadingSpace(pos, this.contentEnds[li]) >= this.provisionalFrom) {
+        this.push({ kind: "prose", start: pos, end: this.n, island: null, inlines: [] });
+        break;
+      }
       if (island) {
         this.push({ kind: "island", start: island.start, end: island.end, island, inlines: [] });
         pos = island.end;
@@ -1349,36 +1362,55 @@ var Tokenizer = class {
    * region…) is never a tree line nor a root label, so it stops the walk.
    */
   treeRootHoldFrom() {
-    const claimable = (k2) => {
+    const claimFrom = (k2) => {
+      const lineStart = this.lineStarts[k2];
+      const lineEnd = this.contentEnds[k2];
+      let pos = lineStart;
       for (; ; ) {
-        const block = this.blockAt(this.lineStarts[k2]);
-        if (!block || block.kind !== "island" || block.island?.fromParagraph === true) return true;
-        const opened = this.lineOf(block.start);
-        if (this.lineStarts[opened] === block.start || opened === k2) return false;
-        k2 = opened;
+        const block = this.blockAt(pos);
+        if (!block || block.kind !== "island" || !block.island) return pos;
+        if (block.island.fromParagraph === true || this.mayDissolve(block.island)) return pos;
+        if (block.start < lineStart) {
+          const opened = this.lineOf(block.start);
+          if (this.lineStarts[opened] !== block.start && claimFrom(opened) !== -1) return pos;
+          if (block.end >= lineEnd) return -1;
+          pos = block.end;
+          continue;
+        }
+        if (block.end >= lineEnd) return -1;
+        pos = block.end;
       }
     };
     let k = this.lineCount - 1;
     let start = this.lineCount;
+    let startPos = this.n;
     if (k >= 0 && this.isOpenTail(k)) {
-      if (!claimable(k)) return this.n;
+      const at = claimFrom(k);
+      if (at === -1) return this.n;
       start = k;
+      startPos = at;
       k--;
     }
-    for (; k >= 0 && claimable(k); k--) {
+    for (; k >= 0; k--) {
       this.tick(1);
+      const at = claimFrom(k);
+      if (at === -1) break;
       if (this.lineIsBlank(k)) continue;
       if (!TREE_GLYPHS.test(this.lineText(k))) break;
       start = k;
+      startPos = at;
     }
-    let root = start;
-    for (let j = start - 1; j >= 0 && claimable(j); j--) {
+    let rootPos = startPos;
+    for (let j = start - 1; j >= 0; j--) {
+      const at = claimFrom(j);
+      if (at === -1) break;
       const trimmed = this.lineText(j).trim();
       this.tick(trimmed.length + 1);
       if (!trimmed || isSplitterTreeLine(trimmed) || /^#{1,6}\s/.test(trimmed)) break;
-      root = j;
+      rootPos = at;
+      if (at > this.lineStarts[j]) break;
     }
-    return root < this.lineCount ? this.lineStarts[root] : this.n;
+    return rootPos;
   }
   /** The block (so far) containing offset `pos`, or null. */
   blockAt(pos) {
@@ -2148,6 +2180,10 @@ var Tokenizer = class {
             const closer = `</${name}>`;
             const close = this.next(closer, tagEnd);
             const blockType = isAttr ? "xml_attr" : "xml_region";
+            if (close === -1 && isThinking && !this.streaming) {
+              i = tagEnd;
+              continue;
+            }
             if (close === -1) return stop(this.island(blockType, i, this.n, false, { tag: name }));
             const end = close + closer.length;
             if (end > pe) return stop(this.spill(blockType, i, end, pe, { tag: name }));