restty 0.1.12 → 0.1.13

package/README.md

@@ -9,6 +9,15 @@ Powered by:
 - `WebGPU` (with WebGL2 fallback)
 - `text-shaper` (shaping + raster)
 
+## Release Status
+
+`restty` is in an early release stage.
+
+- Known issue: kitty image protocol handling can still fail in some edge cases.
+- API note: high-level APIs are usable now, but some APIs may still change to improve DX.
+
+If you hit an issue, please open one on GitHub with repro steps.
+
 ## Install
 
 ```bash

package/dist/app/index.js

@@ -8672,7 +8672,6 @@ var COLOR_EMOJI_FONT_HINTS = [
   /apple color emoji/i,
   /noto color emoji/i,
   /segoe ui emoji/i,
-  /openmoji/i,
   /twemoji/i
 ];
 var WIDE_FONT_HINTS = [
@@ -25641,9 +25640,17 @@ var DEFAULT_FONT_SOURCES = [
     type: "url",
     url: "https://cdn.jsdelivr.net/gh/notofonts/noto-fonts@main/unhinted/ttf/NotoSansSymbols2/NotoSansSymbols2-Regular.ttf"
   },
+  {
+    type: "url",
+    url: "https://cdn.jsdelivr.net/gh/googlefonts/noto-emoji@main/fonts/NotoColorEmoji.ttf"
+  },
   {
     type: "url",
     url: "https://cdn.jsdelivr.net/gh/hfg-gmuend/openmoji@master/font/OpenMoji-black-glyf/OpenMoji-black-glyf.ttf"
+  },
+  {
+    type: "url",
+    url: "https://cdn.jsdelivr.net/gh/notofonts/noto-cjk@main/Sans/OTF/SimplifiedChinese/NotoSansCJKsc-Regular.otf"
   }
 ];
 function validateFontSource(source, index) {
@@ -53192,6 +53199,46 @@ function createResttyApp(options) {
     const firstCp = text.codePointAt(0) ?? 0;
     const nerdSymbol = isNerdSymbolCodepoint(firstCp);
     const preferSymbol = nerdSymbol || isSymbolCp(firstCp);
+    const preferEmoji = text.includes("‍") || chars.some((ch) => {
+      const cp = ch.codePointAt(0) ?? 0;
+      if (cp >= 127462 && cp <= 127487)
+        return true;
+      if (cp >= 127744 && cp <= 129791)
+        return true;
+      return false;
+    });
+    if (preferEmoji) {
+      let bestEmojiIndex = -1;
+      let bestEmojiScore = Number.POSITIVE_INFINITY;
+      for (let i3 = 0;i3 < fontState.fonts.length; i3 += 1) {
+        const entry = fontState.fonts[i3];
+        if (!entry?.font || !isColorEmojiFont(entry))
+          continue;
+        let ok = true;
+        for (const ch of chars) {
+          if (!fontHasGlyph2(entry.font, ch)) {
+            ok = false;
+            break;
+          }
+        }
+        if (!ok)
+          continue;
+        const shaped = shapeClusterWithFont(entry, text);
+        let score = shaped.glyphs.length;
+        if (/noto color emoji/i.test(entry.label))
+          score -= 0.25;
+        if (score < bestEmojiScore) {
+          bestEmojiScore = score;
+          bestEmojiIndex = i3;
+          if (score <= 0.75)
+            break;
+        }
+      }
+      if (bestEmojiIndex >= 0) {
+        setBoundedMap(fontState.fontPickCache, cacheKey, bestEmojiIndex, FONT_PICK_CACHE_LIMIT);
+        return bestEmojiIndex;
+      }
+    }
     if (nerdSymbol) {
       const symbolIndex = fontState.fonts.findIndex((entry) => isSymbolFont(entry));
       if (symbolIndex >= 0) {
@@ -53639,6 +53686,29 @@ function createResttyApp(options) {
     } = render;
     if (!codepoints || !fgBytes)
       return;
+    const mergedEmojiSkip = new Uint8Array(codepoints.length);
+    const isRegionalIndicator = (value) => value >= 127462 && value <= 127487;
+    const readCellCluster = (cellIndex) => {
+      const flag = wide ? wide[cellIndex] ?? 0 : 0;
+      if (flag === 2 || flag === 3)
+        return null;
+      const cp = codepoints[cellIndex] ?? 0;
+      if (!cp)
+        return null;
+      let text = String.fromCodePoint(cp);
+      const extra = graphemeLen && graphemeOffset && graphemeBuffer ? graphemeLen[cellIndex] ?? 0 : 0;
+      if (extra > 0 && graphemeOffset && graphemeBuffer) {
+        const start = graphemeOffset[cellIndex] ?? 0;
+        const cps = [cp];
+        for (let j = 0;j < extra; j += 1) {
+          const extraCp = graphemeBuffer[start + j];
+          if (extraCp)
+            cps.push(extraCp);
+        }
+        text = String.fromCodePoint(...cps);
+      }
+      return { cp, text, span: flag === 1 ? 2 : 1 };
+    };
     const { useLinearBlending, useLinearCorrection } = resolveBlendFlags("webgpu", state);
     const clearColor = useLinearBlending ? srgbToLinearColor(defaultBg) : defaultBg;
     reportTermSize(cols, rows);
@@ -53874,28 +53944,43 @@ function createResttyApp(options) {
         }
         if (bgOnly || textHidden)
           continue;
-        const wideFlag = wide ? wide[idx] : 0;
-        if (wideFlag === 2 || wideFlag === 3)
+        if (mergedEmojiSkip[idx])
           continue;
-        const cp = codepoints[idx];
-        if (!cp)
+        const cluster = readCellCluster(idx);
+        if (!cluster)
           continue;
+        const cp = cluster.cp;
         if (cp === KITTY_PLACEHOLDER_CP)
           continue;
-        const extra = graphemeLen && graphemeOffset && graphemeBuffer ? graphemeLen[idx] ?? 0 : 0;
-        if (extra === 0 && isSpaceCp(cp))
-          continue;
-        let text = String.fromCodePoint(cp);
-        if (extra > 0 && graphemeOffset && graphemeBuffer) {
-          const start = graphemeOffset[idx] ?? 0;
-          const cps = [cp];
-          for (let j = 0;j < extra; j += 1) {
-            const extraCp = graphemeBuffer[start + j];
-            if (extraCp)
-              cps.push(extraCp);
+        let text = cluster.text;
+        let baseSpan = cluster.span;
+        const rowEnd = row * cols + cols;
+        if (isRegionalIndicator(cp)) {
+          const nextIdx = idx + baseSpan;
+          if (nextIdx < rowEnd && !mergedEmojiSkip[nextIdx]) {
+            const next = readCellCluster(nextIdx);
+            if (next && isRegionalIndicator(next.cp)) {
+              text += next.text;
+              baseSpan += next.span;
+              mergedEmojiSkip[nextIdx] = 1;
+            }
           }
-          text = String.fromCodePoint(...cps);
         }
+        let nextSeqIdx = idx + baseSpan;
+        let guard = 0;
+        while ((text.codePointAt(text.length - 1) ?? 0) === 8205 && nextSeqIdx < rowEnd && guard < 8) {
+          const next = readCellCluster(nextSeqIdx);
+          if (!next || !next.cp || isSpaceCp(next.cp))
+            break;
+          text += next.text;
+          baseSpan += next.span;
+          mergedEmojiSkip[nextSeqIdx] = 1;
+          nextSeqIdx += next.span;
+          guard += 1;
+        }
+        const extra = text.length > String.fromCodePoint(cp).length ? 1 : 0;
+        if (extra === 0 && isSpaceCp(cp))
+          continue;
         if (cursorBlock && cursorCell && row === cursorCell.row && col >= cursorCell.col && col < cursorCell.col + (cursorCell.wide ? 2 : 1)) {
           fg = [bgForText[0], bgForText[1], bgForText[2], 1];
         }
@@ -53917,7 +54002,6 @@ function createResttyApp(options) {
         }
         if (extra > 0 && text.trim() === "")
           continue;
-        const baseSpan = wideFlag === 1 ? 2 : 1;
         const fontIndex = pickFontIndexForText2(text, baseSpan);
         const fontEntry = fontState.fonts[fontIndex] ?? fontState.fonts[0];
         const shaped = shapeClusterWithFont(fontEntry, text);
@@ -54515,6 +54599,29 @@ function createResttyApp(options) {
       clearKittyOverlay();
       return;
     }
+    const mergedEmojiSkip = new Uint8Array(codepoints.length);
+    const isRegionalIndicator = (value) => value >= 127462 && value <= 127487;
+    const readCellCluster = (cellIndex) => {
+      const flag = wide ? wide[cellIndex] ?? 0 : 0;
+      if (flag === 2 || flag === 3)
+        return null;
+      const cp = codepoints[cellIndex] ?? 0;
+      if (!cp)
+        return null;
+      let text = String.fromCodePoint(cp);
+      const extra = graphemeLen && graphemeOffset && graphemeBuffer ? graphemeLen[cellIndex] ?? 0 : 0;
+      if (extra > 0 && graphemeOffset && graphemeBuffer) {
+        const start = graphemeOffset[cellIndex] ?? 0;
+        const cps = [cp];
+        for (let j = 0;j < extra; j += 1) {
+          const extraCp = graphemeBuffer[start + j];
+          if (extraCp)
+            cps.push(extraCp);
+        }
+        text = String.fromCodePoint(...cps);
+      }
+      return { cp, text, span: flag === 1 ? 2 : 1 };
+    };
     const { useLinearBlending, useLinearCorrection } = resolveBlendFlags("webgl2");
     reportTermSize(cols, rows);
     const cursorPos = cursor ? resolveCursorPosition(cursor) : null;
@@ -54735,28 +54842,43 @@ function createResttyApp(options) {
         }
         if (bgOnly || textHidden)
           continue;
-        const wideFlag = wide ? wide[idx] : 0;
-        if (wideFlag === 2 || wideFlag === 3)
+        if (mergedEmojiSkip[idx])
           continue;
-        const cp = codepoints[idx];
-        if (!cp)
+        const cluster = readCellCluster(idx);
+        if (!cluster)
           continue;
+        const cp = cluster.cp;
         if (cp === KITTY_PLACEHOLDER_CP)
           continue;
-        const extra = graphemeLen && graphemeOffset && graphemeBuffer ? graphemeLen[idx] ?? 0 : 0;
-        if (extra === 0 && isSpaceCp(cp))
-          continue;
-        let text = String.fromCodePoint(cp);
-        if (extra > 0 && graphemeOffset && graphemeBuffer) {
-          const start = graphemeOffset[idx] ?? 0;
-          const cps = [cp];
-          for (let j = 0;j < extra; j += 1) {
-            const extraCp = graphemeBuffer[start + j];
-            if (extraCp)
-              cps.push(extraCp);
+        let text = cluster.text;
+        let baseSpan = cluster.span;
+        const rowEnd = row * cols + cols;
+        if (isRegionalIndicator(cp)) {
+          const nextIdx = idx + baseSpan;
+          if (nextIdx < rowEnd && !mergedEmojiSkip[nextIdx]) {
+            const next = readCellCluster(nextIdx);
+            if (next && isRegionalIndicator(next.cp)) {
+              text += next.text;
+              baseSpan += next.span;
+              mergedEmojiSkip[nextIdx] = 1;
+            }
           }
-          text = String.fromCodePoint(...cps);
         }
+        let nextSeqIdx = idx + baseSpan;
+        let guard = 0;
+        while ((text.codePointAt(text.length - 1) ?? 0) === 8205 && nextSeqIdx < rowEnd && guard < 8) {
+          const next = readCellCluster(nextSeqIdx);
+          if (!next || !next.cp || isSpaceCp(next.cp))
+            break;
+          text += next.text;
+          baseSpan += next.span;
+          mergedEmojiSkip[nextSeqIdx] = 1;
+          nextSeqIdx += next.span;
+          guard += 1;
+        }
+        const extra = text.length > String.fromCodePoint(cp).length ? 1 : 0;
+        if (extra === 0 && isSpaceCp(cp))
+          continue;
         if (cursorBlock && cursorCell && row === cursorCell.row && col >= cursorCell.col && col < cursorCell.col + (cursorCell.wide ? 2 : 1)) {
           fg = [bgForText[0], bgForText[1], bgForText[2], 1];
         }
@@ -54778,7 +54900,6 @@ function createResttyApp(options) {
         }
         if (extra > 0 && text.trim() === "")
           continue;
-        const baseSpan = wideFlag === 1 ? 2 : 1;
         const fontIndex = pickFontIndexForText2(text, baseSpan);
         const fontEntry = fontState.fonts[fontIndex] ?? fontState.fonts[0];
         const shaped = shapeClusterWithFont(fontEntry, text);

package/dist/fonts/index.js

@@ -96,7 +96,6 @@ var COLOR_EMOJI_FONT_HINTS = [
   /apple color emoji/i,
   /noto color emoji/i,
   /segoe ui emoji/i,
-  /openmoji/i,
   /twemoji/i
 ];
 var WIDE_FONT_HINTS = [

package/dist/index.js

@@ -8672,7 +8672,6 @@ var COLOR_EMOJI_FONT_HINTS = [
   /apple color emoji/i,
   /noto color emoji/i,
   /segoe ui emoji/i,
-  /openmoji/i,
   /twemoji/i
 ];
 var WIDE_FONT_HINTS = [
@@ -25641,9 +25640,17 @@ var DEFAULT_FONT_SOURCES = [
     type: "url",
     url: "https://cdn.jsdelivr.net/gh/notofonts/noto-fonts@main/unhinted/ttf/NotoSansSymbols2/NotoSansSymbols2-Regular.ttf"
   },
+  {
+    type: "url",
+    url: "https://cdn.jsdelivr.net/gh/googlefonts/noto-emoji@main/fonts/NotoColorEmoji.ttf"
+  },
   {
     type: "url",
     url: "https://cdn.jsdelivr.net/gh/hfg-gmuend/openmoji@master/font/OpenMoji-black-glyf/OpenMoji-black-glyf.ttf"
+  },
+  {
+    type: "url",
+    url: "https://cdn.jsdelivr.net/gh/notofonts/noto-cjk@main/Sans/OTF/SimplifiedChinese/NotoSansCJKsc-Regular.otf"
   }
 ];
 function validateFontSource(source, index) {
@@ -53192,6 +53199,46 @@ function createResttyApp(options) {
     const firstCp = text.codePointAt(0) ?? 0;
     const nerdSymbol = isNerdSymbolCodepoint(firstCp);
     const preferSymbol = nerdSymbol || isSymbolCp(firstCp);
+    const preferEmoji = text.includes("‍") || chars.some((ch) => {
+      const cp = ch.codePointAt(0) ?? 0;
+      if (cp >= 127462 && cp <= 127487)
+        return true;
+      if (cp >= 127744 && cp <= 129791)
+        return true;
+      return false;
+    });
+    if (preferEmoji) {
+      let bestEmojiIndex = -1;
+      let bestEmojiScore = Number.POSITIVE_INFINITY;
+      for (let i3 = 0;i3 < fontState.fonts.length; i3 += 1) {
+        const entry = fontState.fonts[i3];
+        if (!entry?.font || !isColorEmojiFont(entry))
+          continue;
+        let ok = true;
+        for (const ch of chars) {
+          if (!fontHasGlyph2(entry.font, ch)) {
+            ok = false;
+            break;
+          }
+        }
+        if (!ok)
+          continue;
+        const shaped = shapeClusterWithFont(entry, text);
+        let score = shaped.glyphs.length;
+        if (/noto color emoji/i.test(entry.label))
+          score -= 0.25;
+        if (score < bestEmojiScore) {
+          bestEmojiScore = score;
+          bestEmojiIndex = i3;
+          if (score <= 0.75)
+            break;
+        }
+      }
+      if (bestEmojiIndex >= 0) {
+        setBoundedMap(fontState.fontPickCache, cacheKey, bestEmojiIndex, FONT_PICK_CACHE_LIMIT);
+        return bestEmojiIndex;
+      }
+    }
     if (nerdSymbol) {
       const symbolIndex = fontState.fonts.findIndex((entry) => isSymbolFont(entry));
       if (symbolIndex >= 0) {
@@ -53639,6 +53686,29 @@ function createResttyApp(options) {
     } = render;
     if (!codepoints || !fgBytes)
       return;
+    const mergedEmojiSkip = new Uint8Array(codepoints.length);
+    const isRegionalIndicator = (value) => value >= 127462 && value <= 127487;
+    const readCellCluster = (cellIndex) => {
+      const flag = wide ? wide[cellIndex] ?? 0 : 0;
+      if (flag === 2 || flag === 3)
+        return null;
+      const cp = codepoints[cellIndex] ?? 0;
+      if (!cp)
+        return null;
+      let text = String.fromCodePoint(cp);
+      const extra = graphemeLen && graphemeOffset && graphemeBuffer ? graphemeLen[cellIndex] ?? 0 : 0;
+      if (extra > 0 && graphemeOffset && graphemeBuffer) {
+        const start = graphemeOffset[cellIndex] ?? 0;
+        const cps = [cp];
+        for (let j = 0;j < extra; j += 1) {
+          const extraCp = graphemeBuffer[start + j];
+          if (extraCp)
+            cps.push(extraCp);
+        }
+        text = String.fromCodePoint(...cps);
+      }
+      return { cp, text, span: flag === 1 ? 2 : 1 };
+    };
     const { useLinearBlending, useLinearCorrection } = resolveBlendFlags("webgpu", state);
     const clearColor = useLinearBlending ? srgbToLinearColor(defaultBg) : defaultBg;
     reportTermSize(cols, rows);
@@ -53874,28 +53944,43 @@ function createResttyApp(options) {
         }
         if (bgOnly || textHidden)
           continue;
-        const wideFlag = wide ? wide[idx] : 0;
-        if (wideFlag === 2 || wideFlag === 3)
+        if (mergedEmojiSkip[idx])
           continue;
-        const cp = codepoints[idx];
-        if (!cp)
+        const cluster = readCellCluster(idx);
+        if (!cluster)
           continue;
+        const cp = cluster.cp;
         if (cp === KITTY_PLACEHOLDER_CP)
           continue;
-        const extra = graphemeLen && graphemeOffset && graphemeBuffer ? graphemeLen[idx] ?? 0 : 0;
-        if (extra === 0 && isSpaceCp(cp))
-          continue;
-        let text = String.fromCodePoint(cp);
-        if (extra > 0 && graphemeOffset && graphemeBuffer) {
-          const start = graphemeOffset[idx] ?? 0;
-          const cps = [cp];
-          for (let j = 0;j < extra; j += 1) {
-            const extraCp = graphemeBuffer[start + j];
-            if (extraCp)
-              cps.push(extraCp);
+        let text = cluster.text;
+        let baseSpan = cluster.span;
+        const rowEnd = row * cols + cols;
+        if (isRegionalIndicator(cp)) {
+          const nextIdx = idx + baseSpan;
+          if (nextIdx < rowEnd && !mergedEmojiSkip[nextIdx]) {
+            const next = readCellCluster(nextIdx);
+            if (next && isRegionalIndicator(next.cp)) {
+              text += next.text;
+              baseSpan += next.span;
+              mergedEmojiSkip[nextIdx] = 1;
+            }
           }
-          text = String.fromCodePoint(...cps);
         }
+        let nextSeqIdx = idx + baseSpan;
+        let guard = 0;
+        while ((text.codePointAt(text.length - 1) ?? 0) === 8205 && nextSeqIdx < rowEnd && guard < 8) {
+          const next = readCellCluster(nextSeqIdx);
+          if (!next || !next.cp || isSpaceCp(next.cp))
+            break;
+          text += next.text;
+          baseSpan += next.span;
+          mergedEmojiSkip[nextSeqIdx] = 1;
+          nextSeqIdx += next.span;
+          guard += 1;
+        }
+        const extra = text.length > String.fromCodePoint(cp).length ? 1 : 0;
+        if (extra === 0 && isSpaceCp(cp))
+          continue;
         if (cursorBlock && cursorCell && row === cursorCell.row && col >= cursorCell.col && col < cursorCell.col + (cursorCell.wide ? 2 : 1)) {
           fg = [bgForText[0], bgForText[1], bgForText[2], 1];
         }
@@ -53917,7 +54002,6 @@ function createResttyApp(options) {
         }
         if (extra > 0 && text.trim() === "")
           continue;
-        const baseSpan = wideFlag === 1 ? 2 : 1;
         const fontIndex = pickFontIndexForText2(text, baseSpan);
         const fontEntry = fontState.fonts[fontIndex] ?? fontState.fonts[0];
         const shaped = shapeClusterWithFont(fontEntry, text);
@@ -54515,6 +54599,29 @@ function createResttyApp(options) {
       clearKittyOverlay();
       return;
     }
+    const mergedEmojiSkip = new Uint8Array(codepoints.length);
+    const isRegionalIndicator = (value) => value >= 127462 && value <= 127487;
+    const readCellCluster = (cellIndex) => {
+      const flag = wide ? wide[cellIndex] ?? 0 : 0;
+      if (flag === 2 || flag === 3)
+        return null;
+      const cp = codepoints[cellIndex] ?? 0;
+      if (!cp)
+        return null;
+      let text = String.fromCodePoint(cp);
+      const extra = graphemeLen && graphemeOffset && graphemeBuffer ? graphemeLen[cellIndex] ?? 0 : 0;
+      if (extra > 0 && graphemeOffset && graphemeBuffer) {
+        const start = graphemeOffset[cellIndex] ?? 0;
+        const cps = [cp];
+        for (let j = 0;j < extra; j += 1) {
+          const extraCp = graphemeBuffer[start + j];
+          if (extraCp)
+            cps.push(extraCp);
+        }
+        text = String.fromCodePoint(...cps);
+      }
+      return { cp, text, span: flag === 1 ? 2 : 1 };
+    };
     const { useLinearBlending, useLinearCorrection } = resolveBlendFlags("webgl2");
     reportTermSize(cols, rows);
     const cursorPos = cursor ? resolveCursorPosition(cursor) : null;
@@ -54735,28 +54842,43 @@ function createResttyApp(options) {
         }
         if (bgOnly || textHidden)
           continue;
-        const wideFlag = wide ? wide[idx] : 0;
-        if (wideFlag === 2 || wideFlag === 3)
+        if (mergedEmojiSkip[idx])
           continue;
-        const cp = codepoints[idx];
-        if (!cp)
+        const cluster = readCellCluster(idx);
+        if (!cluster)
           continue;
+        const cp = cluster.cp;
         if (cp === KITTY_PLACEHOLDER_CP)
           continue;
-        const extra = graphemeLen && graphemeOffset && graphemeBuffer ? graphemeLen[idx] ?? 0 : 0;
-        if (extra === 0 && isSpaceCp(cp))
-          continue;
-        let text = String.fromCodePoint(cp);
-        if (extra > 0 && graphemeOffset && graphemeBuffer) {
-          const start = graphemeOffset[idx] ?? 0;
-          const cps = [cp];
-          for (let j = 0;j < extra; j += 1) {
-            const extraCp = graphemeBuffer[start + j];
-            if (extraCp)
-              cps.push(extraCp);
+        let text = cluster.text;
+        let baseSpan = cluster.span;
+        const rowEnd = row * cols + cols;
+        if (isRegionalIndicator(cp)) {
+          const nextIdx = idx + baseSpan;
+          if (nextIdx < rowEnd && !mergedEmojiSkip[nextIdx]) {
+            const next = readCellCluster(nextIdx);
+            if (next && isRegionalIndicator(next.cp)) {
+              text += next.text;
+              baseSpan += next.span;
+              mergedEmojiSkip[nextIdx] = 1;
+            }
           }
-          text = String.fromCodePoint(...cps);
         }
+        let nextSeqIdx = idx + baseSpan;
+        let guard = 0;
+        while ((text.codePointAt(text.length - 1) ?? 0) === 8205 && nextSeqIdx < rowEnd && guard < 8) {
+          const next = readCellCluster(nextSeqIdx);
+          if (!next || !next.cp || isSpaceCp(next.cp))
+            break;
+          text += next.text;
+          baseSpan += next.span;
+          mergedEmojiSkip[nextSeqIdx] = 1;
+          nextSeqIdx += next.span;
+          guard += 1;
+        }
+        const extra = text.length > String.fromCodePoint(cp).length ? 1 : 0;
+        if (extra === 0 && isSpaceCp(cp))
+          continue;
         if (cursorBlock && cursorCell && row === cursorCell.row && col >= cursorCell.col && col < cursorCell.col + (cursorCell.wide ? 2 : 1)) {
           fg = [bgForText[0], bgForText[1], bgForText[2], 1];
         }
@@ -54778,7 +54900,6 @@ function createResttyApp(options) {
         }
         if (extra > 0 && text.trim() === "")
           continue;
-        const baseSpan = wideFlag === 1 ? 2 : 1;
         const fontIndex = pickFontIndexForText2(text, baseSpan);
         const fontEntry = fontState.fonts[fontIndex] ?? fontState.fonts[0];
         const shaped = shapeClusterWithFont(fontEntry, text);

package/dist/internal.js

@@ -8672,7 +8672,6 @@ var COLOR_EMOJI_FONT_HINTS = [
   /apple color emoji/i,
   /noto color emoji/i,
   /segoe ui emoji/i,
-  /openmoji/i,
   /twemoji/i
 ];
 var WIDE_FONT_HINTS = [
@@ -25641,9 +25640,17 @@ var DEFAULT_FONT_SOURCES = [
     type: "url",
     url: "https://cdn.jsdelivr.net/gh/notofonts/noto-fonts@main/unhinted/ttf/NotoSansSymbols2/NotoSansSymbols2-Regular.ttf"
   },
+  {
+    type: "url",
+    url: "https://cdn.jsdelivr.net/gh/googlefonts/noto-emoji@main/fonts/NotoColorEmoji.ttf"
+  },
   {
     type: "url",
     url: "https://cdn.jsdelivr.net/gh/hfg-gmuend/openmoji@master/font/OpenMoji-black-glyf/OpenMoji-black-glyf.ttf"
+  },
+  {
+    type: "url",
+    url: "https://cdn.jsdelivr.net/gh/notofonts/noto-cjk@main/Sans/OTF/SimplifiedChinese/NotoSansCJKsc-Regular.otf"
   }
 ];
 function validateFontSource(source, index) {
@@ -53192,6 +53199,46 @@ function createResttyApp(options) {
     const firstCp = text.codePointAt(0) ?? 0;
     const nerdSymbol = isNerdSymbolCodepoint(firstCp);
     const preferSymbol = nerdSymbol || isSymbolCp(firstCp);
+    const preferEmoji = text.includes("‍") || chars.some((ch) => {
+      const cp = ch.codePointAt(0) ?? 0;
+      if (cp >= 127462 && cp <= 127487)
+        return true;
+      if (cp >= 127744 && cp <= 129791)
+        return true;
+      return false;
+    });
+    if (preferEmoji) {
+      let bestEmojiIndex = -1;
+      let bestEmojiScore = Number.POSITIVE_INFINITY;
+      for (let i3 = 0;i3 < fontState.fonts.length; i3 += 1) {
+        const entry = fontState.fonts[i3];
+        if (!entry?.font || !isColorEmojiFont(entry))
+          continue;
+        let ok = true;
+        for (const ch of chars) {
+          if (!fontHasGlyph2(entry.font, ch)) {
+            ok = false;
+            break;
+          }
+        }
+        if (!ok)
+          continue;
+        const shaped = shapeClusterWithFont(entry, text);
+        let score = shaped.glyphs.length;
+        if (/noto color emoji/i.test(entry.label))
+          score -= 0.25;
+        if (score < bestEmojiScore) {
+          bestEmojiScore = score;
+          bestEmojiIndex = i3;
+          if (score <= 0.75)
+            break;
+        }
+      }
+      if (bestEmojiIndex >= 0) {
+        setBoundedMap(fontState.fontPickCache, cacheKey, bestEmojiIndex, FONT_PICK_CACHE_LIMIT);
+        return bestEmojiIndex;
+      }
+    }
     if (nerdSymbol) {
       const symbolIndex = fontState.fonts.findIndex((entry) => isSymbolFont(entry));
       if (symbolIndex >= 0) {
@@ -53639,6 +53686,29 @@ function createResttyApp(options) {
     } = render;
     if (!codepoints || !fgBytes)
       return;
+    const mergedEmojiSkip = new Uint8Array(codepoints.length);
+    const isRegionalIndicator = (value) => value >= 127462 && value <= 127487;
+    const readCellCluster = (cellIndex) => {
+      const flag = wide ? wide[cellIndex] ?? 0 : 0;
+      if (flag === 2 || flag === 3)
+        return null;
+      const cp = codepoints[cellIndex] ?? 0;
+      if (!cp)
+        return null;
+      let text = String.fromCodePoint(cp);
+      const extra = graphemeLen && graphemeOffset && graphemeBuffer ? graphemeLen[cellIndex] ?? 0 : 0;
+      if (extra > 0 && graphemeOffset && graphemeBuffer) {
+        const start = graphemeOffset[cellIndex] ?? 0;
+        const cps = [cp];
+        for (let j = 0;j < extra; j += 1) {
+          const extraCp = graphemeBuffer[start + j];
+          if (extraCp)
+            cps.push(extraCp);
+        }
+        text = String.fromCodePoint(...cps);
+      }
+      return { cp, text, span: flag === 1 ? 2 : 1 };
+    };
     const { useLinearBlending, useLinearCorrection } = resolveBlendFlags("webgpu", state);
     const clearColor = useLinearBlending ? srgbToLinearColor(defaultBg) : defaultBg;
     reportTermSize(cols, rows);
@@ -53874,28 +53944,43 @@ function createResttyApp(options) {
         }
         if (bgOnly || textHidden)
           continue;
-        const wideFlag = wide ? wide[idx] : 0;
-        if (wideFlag === 2 || wideFlag === 3)
+        if (mergedEmojiSkip[idx])
           continue;
-        const cp = codepoints[idx];
-        if (!cp)
+        const cluster = readCellCluster(idx);
+        if (!cluster)
           continue;
+        const cp = cluster.cp;
         if (cp === KITTY_PLACEHOLDER_CP)
           continue;
-        const extra = graphemeLen && graphemeOffset && graphemeBuffer ? graphemeLen[idx] ?? 0 : 0;
-        if (extra === 0 && isSpaceCp(cp))
-          continue;
-        let text = String.fromCodePoint(cp);
-        if (extra > 0 && graphemeOffset && graphemeBuffer) {
-          const start = graphemeOffset[idx] ?? 0;
-          const cps = [cp];
-          for (let j = 0;j < extra; j += 1) {
-            const extraCp = graphemeBuffer[start + j];
-            if (extraCp)
-              cps.push(extraCp);
+        let text = cluster.text;
+        let baseSpan = cluster.span;
+        const rowEnd = row * cols + cols;
+        if (isRegionalIndicator(cp)) {
+          const nextIdx = idx + baseSpan;
+          if (nextIdx < rowEnd && !mergedEmojiSkip[nextIdx]) {
+            const next = readCellCluster(nextIdx);
+            if (next && isRegionalIndicator(next.cp)) {
+              text += next.text;
+              baseSpan += next.span;
+              mergedEmojiSkip[nextIdx] = 1;
+            }
           }
-          text = String.fromCodePoint(...cps);
         }
+        let nextSeqIdx = idx + baseSpan;
+        let guard = 0;
+        while ((text.codePointAt(text.length - 1) ?? 0) === 8205 && nextSeqIdx < rowEnd && guard < 8) {
+          const next = readCellCluster(nextSeqIdx);
+          if (!next || !next.cp || isSpaceCp(next.cp))
+            break;
+          text += next.text;
+          baseSpan += next.span;
+          mergedEmojiSkip[nextSeqIdx] = 1;
+          nextSeqIdx += next.span;
+          guard += 1;
+        }
+        const extra = text.length > String.fromCodePoint(cp).length ? 1 : 0;
+        if (extra === 0 && isSpaceCp(cp))
+          continue;
         if (cursorBlock && cursorCell && row === cursorCell.row && col >= cursorCell.col && col < cursorCell.col + (cursorCell.wide ? 2 : 1)) {
           fg = [bgForText[0], bgForText[1], bgForText[2], 1];
         }
@@ -53917,7 +54002,6 @@ function createResttyApp(options) {
         }
         if (extra > 0 && text.trim() === "")
           continue;
-        const baseSpan = wideFlag === 1 ? 2 : 1;
         const fontIndex = pickFontIndexForText2(text, baseSpan);
         const fontEntry = fontState.fonts[fontIndex] ?? fontState.fonts[0];
         const shaped = shapeClusterWithFont(fontEntry, text);
@@ -54515,6 +54599,29 @@ function createResttyApp(options) {
       clearKittyOverlay();
       return;
     }
+    const mergedEmojiSkip = new Uint8Array(codepoints.length);
+    const isRegionalIndicator = (value) => value >= 127462 && value <= 127487;
+    const readCellCluster = (cellIndex) => {
+      const flag = wide ? wide[cellIndex] ?? 0 : 0;
+      if (flag === 2 || flag === 3)
+        return null;
+      const cp = codepoints[cellIndex] ?? 0;
+      if (!cp)
+        return null;
+      let text = String.fromCodePoint(cp);
+      const extra = graphemeLen && graphemeOffset && graphemeBuffer ? graphemeLen[cellIndex] ?? 0 : 0;
+      if (extra > 0 && graphemeOffset && graphemeBuffer) {
+        const start = graphemeOffset[cellIndex] ?? 0;
+        const cps = [cp];
+        for (let j = 0;j < extra; j += 1) {
+          const extraCp = graphemeBuffer[start + j];
+          if (extraCp)
+            cps.push(extraCp);
+        }
+        text = String.fromCodePoint(...cps);
+      }
+      return { cp, text, span: flag === 1 ? 2 : 1 };
+    };
     const { useLinearBlending, useLinearCorrection } = resolveBlendFlags("webgl2");
     reportTermSize(cols, rows);
     const cursorPos = cursor ? resolveCursorPosition(cursor) : null;
@@ -54735,28 +54842,43 @@ function createResttyApp(options) {
         }
         if (bgOnly || textHidden)
           continue;
-        const wideFlag = wide ? wide[idx] : 0;
-        if (wideFlag === 2 || wideFlag === 3)
+        if (mergedEmojiSkip[idx])
           continue;
-        const cp = codepoints[idx];
-        if (!cp)
+        const cluster = readCellCluster(idx);
+        if (!cluster)
           continue;
+        const cp = cluster.cp;
         if (cp === KITTY_PLACEHOLDER_CP)
           continue;
-        const extra = graphemeLen && graphemeOffset && graphemeBuffer ? graphemeLen[idx] ?? 0 : 0;
-        if (extra === 0 && isSpaceCp(cp))
-          continue;
-        let text = String.fromCodePoint(cp);
-        if (extra > 0 && graphemeOffset && graphemeBuffer) {
-          const start = graphemeOffset[idx] ?? 0;
-          const cps = [cp];
-          for (let j = 0;j < extra; j += 1) {
-            const extraCp = graphemeBuffer[start + j];
-            if (extraCp)
-              cps.push(extraCp);
+        let text = cluster.text;
+        let baseSpan = cluster.span;
+        const rowEnd = row * cols + cols;
+        if (isRegionalIndicator(cp)) {
+          const nextIdx = idx + baseSpan;
+          if (nextIdx < rowEnd && !mergedEmojiSkip[nextIdx]) {
+            const next = readCellCluster(nextIdx);
+            if (next && isRegionalIndicator(next.cp)) {
+              text += next.text;
+              baseSpan += next.span;
+              mergedEmojiSkip[nextIdx] = 1;
+            }
           }
-          text = String.fromCodePoint(...cps);
         }
+        let nextSeqIdx = idx + baseSpan;
+        let guard = 0;
+        while ((text.codePointAt(text.length - 1) ?? 0) === 8205 && nextSeqIdx < rowEnd && guard < 8) {
+          const next = readCellCluster(nextSeqIdx);
+          if (!next || !next.cp || isSpaceCp(next.cp))
+            break;
+          text += next.text;
+          baseSpan += next.span;
+          mergedEmojiSkip[nextSeqIdx] = 1;
+          nextSeqIdx += next.span;
+          guard += 1;
+        }
+        const extra = text.length > String.fromCodePoint(cp).length ? 1 : 0;
+        if (extra === 0 && isSpaceCp(cp))
+          continue;
         if (cursorBlock && cursorCell && row === cursorCell.row && col >= cursorCell.col && col < cursorCell.col + (cursorCell.wide ? 2 : 1)) {
           fg = [bgForText[0], bgForText[1], bgForText[2], 1];
         }
@@ -54778,7 +54900,6 @@ function createResttyApp(options) {
         }
         if (extra > 0 && text.trim() === "")
           continue;
-        const baseSpan = wideFlag === 1 ? 2 : 1;
         const fontIndex = pickFontIndexForText2(text, baseSpan);
         const fontEntry = fontState.fonts[fontIndex] ?? fontState.fonts[0];
         const shaped = shapeClusterWithFont(fontEntry, text);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "restty",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "Browser terminal rendering library powered by WASM, WebGPU/WebGL2, and TypeScript text shaping.",
   "keywords": [
     "terminal",