@openclaw/diffs 2026.9.6 → 2026.9.7

package/node_modules/@pierre/diffs/dist/editor/textMeasure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"textMeasure.d.ts","names":[],"sources":["../../src/editor/textMeasure.ts"],"mappings":";cAUa;;;EASX;;EAEA;;EAEA;;EAEA;;EAGA,KAAK,MAAM;;;;;;;;;;;;;;;;EA+DX;;EAeA,iBAAiB;;;;;EA0CjB,iBACE,kBACA,sBACA;;EAoBF,uBAAuB;;;;;;EAYvB,oBAAoB;;;;;;EAiDpB;;;iBAYc,wBAAwB;;iBAiBxB,gCACd,cACA;;iBA6Cc,6BACd;;;;;;iBA2Bc,4BACd,cACA"}
+{"version":3,"file":"textMeasure.d.ts","names":[],"sources":["../../src/editor/textMeasure.ts"],"mappings":";cAUa;;;EAUX;;EAEA;;EAEA;;EAEA;;EAGA,KAAK,MAAM;;;;;;;;;;;;;;;;EA+DX;;EAwCA,iBAAiB;;;;;EA0CjB,iBACE,kBACA,sBACA;;EAoBF,uBAAuB;;;;;;EAYvB,oBAAoB;;;;;;EAiDpB;;;iBAYc,wBAAwB;;iBAiBxB,gCACd,cACA;;iBA6Cc,6BACd;;;;;;iBA2Bc,4BACd,cACA"}

package/node_modules/@pierre/diffs/dist/editor/textMeasure.js

@@ -4,6 +4,7 @@ const TEXT_WIDTH_CACHE_LIMIT = 4096;
 const COMBINING_MARK_PATTERN = /\p{Mark}/u;
 var Metrics = class {
 	#root;
+	#canvas;
 	#canvasCtx;
 	#font;
 	#textWidthCache = /* @__PURE__ */ new Map();
@@ -19,7 +20,8 @@ var Metrics = class {
 	init(root) {
 		if (this.#root === root && this.#canvasCtx !== void 0 && this.ch !== -1) return;
 		this.#root = root;
-		this.#canvasCtx ??= document.createElement("canvas").getContext("2d") ?? void 0;
+		this.#canvas ??= h("canvas", { style: { display: "none" } });
+		this.#canvasCtx ??= this.#canvas.getContext("2d") ?? void 0;
 		if (this.#canvasCtx === void 0) throw new Error("Could not get canvas context");
 		const parent = root.parentElement;
 		if (parent !== null) {
@@ -32,7 +34,7 @@ var Metrics = class {
 		const font = fontSize + " " + fontFamily;
 		if (this.#font !== font || this.ch === -1) {
 			this.#font = font;
-			this.#canvasCtx.font = font;
+			this.#setCanvasFont(font);
 			this.ch = this.canvasMeasureTextWidth("0");
 			this.clearTextWidthCache();
 		}
@@ -56,13 +58,35 @@ var Metrics = class {
 	*/
 	remeasureCharacterWidth() {
 		if (this.#canvasCtx === void 0 || this.#font === void 0) return false;
-		this.#canvasCtx.font = this.#font;
+		this.#setCanvasFont(this.#font);
 		const ch = this.canvasMeasureTextWidth("0");
 		const characterWidthChanged = ch !== this.ch;
 		if (characterWidthChanged) this.ch = ch;
 		const textWidthCacheCleared = this.#clearTextWidthCache();
 		return characterWidthChanged || textWidthCacheCleared;
 	}
+	/**
+	* Set the canvas font while the canvas is connected to the document.
+	*
+	* WebKit resolves a canvas font from the canvas element's computed style at
+	* assignment. A detached canvas has none, so WebKit ignores user-installed
+	* fonts and measures the fallback family while the DOM renders the real font,
+	* shifting every caret and selection in hosts that allow user-installed fonts
+	* (WKWebView, Playwright WebKit). Connecting the canvas for the assignment
+	* makes it measure the same font the DOM renders.
+	*/
+	#setCanvasFont(font) {
+		const root = this.#root;
+		const canvas = this.#canvas;
+		const canvasCtx = this.#canvasCtx;
+		if (root == null || canvas == null || canvasCtx == null) throw new Error("Metrics not initialized");
+		root.append(canvas);
+		try {
+			canvasCtx.font = font;
+		} finally {
+			canvas.remove();
+		}
+	}
 	/** measure the width of the text */
 	measureTextWidth(text) {
 		if (!text.includes("	")) return this.#measureTextWidthWithoutTabs(text);

package/node_modules/@pierre/diffs/dist/editor/textMeasure.js.map

@@ -1 +1 @@
-{"version":3,"file":"textMeasure.js","names":[],"sources":["../../src/editor/textMeasure.ts"],"sourcesContent":["import { getGraphemeSegmenter, h, round } from './utils';\n\n// Upper bound on cached DOM text-width measurements. The cache only holds\n// non-ASCII runs (emoji, ZWJ sequences, variation selectors, combining marks),\n// so it stays small for ordinary code, but capping it prevents unbounded growth\n// on emoji-heavy documents. Past the cap the oldest entry is evicted.\nconst TEXT_WIDTH_CACHE_LIMIT = 4096;\n\nconst COMBINING_MARK_PATTERN = /\\p{Mark}/u;\n\nexport class Metrics {\n  #root?: HTMLElement;\n  #canvasCtx?: CanvasRenderingContext2D;\n  #font?: string;\n\n  // Memoizes domMeasureTextWidth() results\n  #textWidthCache = new Map<string, number>();\n\n  /** Width of the '0' character. */\n  ch: number = -1;\n  /** Size of a tab(\\t) character. */\n  tabSize: number = 2;\n  /** Height of the code line. */\n  lineHeight: number = 20;\n  /** Padding top of the root element. */\n  paddingTop: number = 0;\n\n  /** initialize the metrics */\n  init(root: HTMLElement): void {\n    if (\n      this.#root === root &&\n      this.#canvasCtx !== undefined &&\n      this.ch !== -1\n    ) {\n      // already initialized\n      return;\n    }\n\n    this.#root = root;\n    this.#canvasCtx ??=\n      document.createElement('canvas').getContext('2d') ?? undefined;\n    if (this.#canvasCtx === undefined) {\n      throw new Error('Could not get canvas context');\n    }\n\n    const parent = root.parentElement;\n    if (parent !== null) {\n      const { paddingTop } = getComputedStyle(parent);\n      if (paddingTop.endsWith('px')) {\n        this.paddingTop = parseFloat(paddingTop.slice(0, -2));\n      }\n    }\n\n    const { fontSize, fontFamily, tabSize, lineHeight } =\n      getComputedStyle(root);\n    if (lineHeight.endsWith('px')) {\n      this.lineHeight = parseFloat(lineHeight.slice(0, -2));\n    } else if (fontSize.endsWith('px')) {\n      this.lineHeight = round(\n        parseFloat(fontSize.slice(0, -2)) * parseFloat(lineHeight)\n      );\n    }\n    const font = fontSize + ' ' + fontFamily;\n    if (this.#font !== font || this.ch === -1) {\n      this.#font = font;\n      this.#canvasCtx.font = font;\n      this.ch = this.canvasMeasureTextWidth('0');\n      // Cached DOM widths were measured against the previous font.\n      this.clearTextWidthCache();\n    }\n    const nextTabSize = parseInt(tabSize, 10);\n    if (!Number.isNaN(nextTabSize)) {\n      this.tabSize = nextTabSize;\n    }\n  }\n\n  /**\n   * Re-measure the '0' character width against the font that is loaded right\n   * now, returning true when measurement-dependent UI should refresh.\n   *\n   * A custom web font can finish loading after the editor first renders.\n   * Until then canvas measureText reports the fallback font's width, and\n   * getComputedStyle returns the same font-family string before and after the\n   * file arrives, so init()'s font guard never re-measures on its own. Call\n   * this once fonts have settled (e.g. on document.fonts.ready) to replace a\n   * width measured against the fallback font with the real glyph width. Font\n   * completion can also change DOM-measured emoji/ZWJ widths while leaving the\n   * ASCII width unchanged, and the computed font string stays the same in both\n   * cases. The boolean return lets the caller skip re-rendering when there is no\n   * measured state to refresh.\n   */\n  remeasureCharacterWidth(): boolean {\n    if (this.#canvasCtx === undefined || this.#font === undefined) {\n      return false;\n    }\n    this.#canvasCtx.font = this.#font;\n    const ch = this.canvasMeasureTextWidth('0');\n    const characterWidthChanged = ch !== this.ch;\n    if (characterWidthChanged) {\n      this.ch = ch;\n    }\n    const textWidthCacheCleared = this.#clearTextWidthCache();\n    return characterWidthChanged || textWidthCacheCleared;\n  }\n\n  /** measure the width of the text */\n  measureTextWidth(text: string): number {\n    if (!text.includes('\\t')) {\n      return this.#measureTextWidthWithoutTabs(text);\n    }\n    if (this.#canvasCtx === undefined) {\n      throw new Error('Metrics not initialized');\n    }\n    const asciiColumns = getExpandedAsciiTextColumns(text, this.tabSize);\n    if (asciiColumns !== -1) {\n      return asciiColumns * this.ch;\n    }\n\n    let width = 0;\n    let runStart = 0;\n    const tabStopWidth = this.tabSize * this.ch;\n    for (let i = 0; i < text.length; i++) {\n      if (text.charCodeAt(i) !== /* '\\t' */ 9) {\n        continue;\n      }\n\n      if (i > runStart) {\n        width += this.#measureTextWidthWithoutTabs(text.slice(runStart, i));\n      }\n      // CSS tab stops are pixel positions, so wide glyphs before a tab must\n      // contribute their measured width rather than one logical column.\n      if (tabStopWidth > 0) {\n        const remainder = width % tabStopWidth;\n        width += remainder === 0 ? tabStopWidth : tabStopWidth - remainder;\n      }\n      runStart = i + 1;\n    }\n\n    if (runStart < text.length) {\n      width += this.#measureTextWidthWithoutTabs(text.slice(runStart));\n    }\n    return round(width);\n  }\n\n  /**\n   * Pixel width from a wrapped segment's start up to a character. Tabs advance\n   * from the segment start so their stops line up with the rendered text.\n   */\n  segmentTextWidth(\n    lineText: string,\n    segmentStart: number,\n    character: number\n  ): number {\n    if (character <= segmentStart) {\n      return 0;\n    }\n    const segmentText = lineText.slice(segmentStart, character);\n    const asciiColumns = getExpandedAsciiTextColumns(segmentText, this.tabSize);\n    return asciiColumns !== -1\n      ? asciiColumns * this.ch\n      : this.measureTextWidth(segmentText);\n  }\n\n  #measureTextWidthWithoutTabs(text: string): number {\n    if (needsDomTextMeasurement(text)) {\n      return this.domMeasureTextWidth(text);\n    }\n    return this.canvasMeasureTextWidth(text);\n  }\n\n  /** measure the width of the text using the canvas measureText API */\n  canvasMeasureTextWidth(text: string): number {\n    if (this.#canvasCtx === undefined) {\n      throw new Error('Metrics not initialized');\n    }\n    return round(this.#canvasCtx.measureText(text).width);\n  }\n\n  /**\n   * measure the width of the text using the DOM\n   * this is slow because it cause a reflow, use it for non-ascii text;\n   * results are memoized per text so repeated measurements skip the reflow\n   */\n  domMeasureTextWidth(text: string): number {\n    if (this.#root === undefined) {\n      throw new Error('Metrics not initialized');\n    }\n    const cacheKey = text + '|' + this.#font;\n    const cached = this.#textWidthCache.get(cacheKey);\n    if (cached !== undefined) {\n      return cached;\n    }\n    const measureEl = h(\n      'span',\n      {\n        style: {\n          position: 'absolute',\n          top: '0',\n          left: '0',\n          visibility: 'hidden',\n          pointerEvents: 'none',\n          whiteSpace: 'pre',\n          font: 'inherit',\n        },\n        textContent: text,\n      },\n      this.#root\n    );\n    let width: number;\n    try {\n      // round() to match canvasMeasureTextWidth and ch; otherwise the DOM path\n      // returns raw sub-pixel widths and caret/selection offsets drift between\n      // ASCII and non-ASCII runs on the same line.\n      width = round(measureEl.getBoundingClientRect().width);\n    } finally {\n      measureEl.remove();\n    }\n    if (this.#textWidthCache.size >= TEXT_WIDTH_CACHE_LIMIT) {\n      const oldestKey = this.#textWidthCache.keys().next().value;\n      if (oldestKey !== undefined) {\n        this.#textWidthCache.delete(oldestKey);\n      }\n    }\n    this.#textWidthCache.set(cacheKey, width);\n    return width;\n  }\n\n  /**\n   * discard memoized DOM text widths\n   * call this when the inherited font may have changed without re-running\n   * init(), e.g. on a layout reflow, so stale widths are not reused\n   */\n  clearTextWidthCache(): void {\n    this.#clearTextWidthCache();\n  }\n\n  #clearTextWidthCache(): boolean {\n    const hadCachedTextWidths = this.#textWidthCache.size > 0;\n    this.#textWidthCache.clear();\n    return hadCachedTextWidths;\n  }\n}\n\n/** Check if the text needs DOM text measurement. */\nexport function needsDomTextMeasurement(text: string): boolean {\n  for (let i = 0; i < text.length; i++) {\n    const code = text.charCodeAt(i);\n    if (\n      (code >= 0xd800 && code <= 0xdfff) ||\n      code === 0x200d ||\n      code === 0xfe0e ||\n      code === 0xfe0f ||\n      (code > 0x7f && COMBINING_MARK_PATTERN.test(text.charAt(i)))\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n\n/** snap the text offset to the Unicode boundary */\nexport function snapTextOffsetToUnicodeBoundary(\n  text: string,\n  offset: number\n): number {\n  const boundedOffset = Math.max(0, Math.min(offset, text.length));\n  if (\n    boundedOffset === 0 ||\n    boundedOffset === text.length ||\n    !needsDomTextMeasurement(text)\n  ) {\n    return boundedOffset;\n  }\n  // Avoid measuring a caret position inside one visual emoji/grapheme.\n  // Browser caret movement can report offsets around UTF-16 surrogate\n  // pairs and emoji joiners; measuring a partial sequence gives a\n  // replacement-glyph width.\n  const segmenter = getGraphemeSegmenter();\n  if (segmenter !== undefined) {\n    for (const segment of segmenter.segment(text)) {\n      const segmentStart = segment.index;\n      const segmentEnd = segmentStart + segment.segment.length;\n      if (boundedOffset > segmentStart && boundedOffset < segmentEnd) {\n        return segmentEnd;\n      }\n      if (boundedOffset <= segmentStart) {\n        break;\n      }\n    }\n    return boundedOffset;\n  }\n  // Degraded path for engines lacking Intl.Segmenter: snap out of a\n  // surrogate pair by stepping over code points.\n  let segmentStart = 0;\n  for (const codePoint of text) {\n    const segmentEnd = segmentStart + codePoint.length;\n    if (boundedOffset > segmentStart && boundedOffset < segmentEnd) {\n      return segmentEnd;\n    }\n    if (boundedOffset <= segmentStart) {\n      break;\n    }\n    segmentStart = segmentEnd;\n  }\n  return boundedOffset;\n}\n\n/** get the offsets of the Unicode grapheme clusters in the text */\nexport function getUnicodeMeasurementOffsets(\n  text: string\n): number[] | undefined {\n  if (!needsDomTextMeasurement(text)) {\n    return undefined;\n  }\n  const offsets = [0];\n  const segmenter = getGraphemeSegmenter();\n  if (segmenter !== undefined) {\n    for (const segment of segmenter.segment(text)) {\n      offsets.push(segment.index + segment.segment.length);\n    }\n    return offsets;\n  }\n  // Degraded path for engines lacking Intl.Segmenter: step by code point.\n  let offset = 0;\n  for (const codePoint of text) {\n    offset += codePoint.length;\n    offsets.push(offset);\n  }\n  return offsets;\n}\n\n/**\n * Count the rendered columns of ASCII text, advancing each tab to the next\n * fixed tab stop (a multiple of tabSize) to match CSS `tab-size`. Returns -1\n * for non-ASCII text, which must be measured glyph-by-glyph instead.\n */\nexport function getExpandedAsciiTextColumns(\n  text: string,\n  tabSize: number\n): number {\n  let columns = 0;\n  for (let i = 0; i < text.length; i++) {\n    const code = text.charCodeAt(i);\n    if (code > 127) {\n      return -1;\n    }\n    columns += code === /* '\\t' */ 9 ? tabSize - (columns % tabSize) : 1;\n  }\n  return columns;\n}\n"],"mappings":"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"}
+{"version":3,"file":"textMeasure.js","names":[],"sources":["../../src/editor/textMeasure.ts"],"sourcesContent":["import { getGraphemeSegmenter, h, round } from './utils';\n\n// Upper bound on cached DOM text-width measurements. The cache only holds\n// non-ASCII runs (emoji, ZWJ sequences, variation selectors, combining marks),\n// so it stays small for ordinary code, but capping it prevents unbounded growth\n// on emoji-heavy documents. Past the cap the oldest entry is evicted.\nconst TEXT_WIDTH_CACHE_LIMIT = 4096;\n\nconst COMBINING_MARK_PATTERN = /\\p{Mark}/u;\n\nexport class Metrics {\n  #root?: HTMLElement;\n  #canvas?: HTMLCanvasElement;\n  #canvasCtx?: CanvasRenderingContext2D;\n  #font?: string;\n\n  // Memoizes domMeasureTextWidth() results\n  #textWidthCache = new Map<string, number>();\n\n  /** Width of the '0' character. */\n  ch: number = -1;\n  /** Size of a tab(\\t) character. */\n  tabSize: number = 2;\n  /** Height of the code line. */\n  lineHeight: number = 20;\n  /** Padding top of the root element. */\n  paddingTop: number = 0;\n\n  /** initialize the metrics */\n  init(root: HTMLElement): void {\n    if (\n      this.#root === root &&\n      this.#canvasCtx !== undefined &&\n      this.ch !== -1\n    ) {\n      // already initialized\n      return;\n    }\n\n    this.#root = root;\n    this.#canvas ??= h('canvas', { style: { display: 'none' } });\n    this.#canvasCtx ??= this.#canvas.getContext('2d') ?? undefined;\n    if (this.#canvasCtx === undefined) {\n      throw new Error('Could not get canvas context');\n    }\n\n    const parent = root.parentElement;\n    if (parent !== null) {\n      const { paddingTop } = getComputedStyle(parent);\n      if (paddingTop.endsWith('px')) {\n        this.paddingTop = parseFloat(paddingTop.slice(0, -2));\n      }\n    }\n\n    const { fontSize, fontFamily, tabSize, lineHeight } =\n      getComputedStyle(root);\n    if (lineHeight.endsWith('px')) {\n      this.lineHeight = parseFloat(lineHeight.slice(0, -2));\n    } else if (fontSize.endsWith('px')) {\n      this.lineHeight = round(\n        parseFloat(fontSize.slice(0, -2)) * parseFloat(lineHeight)\n      );\n    }\n    const font = fontSize + ' ' + fontFamily;\n    if (this.#font !== font || this.ch === -1) {\n      this.#font = font;\n      this.#setCanvasFont(font);\n      this.ch = this.canvasMeasureTextWidth('0');\n      // Cached DOM widths were measured against the previous font.\n      this.clearTextWidthCache();\n    }\n    const nextTabSize = parseInt(tabSize, 10);\n    if (!Number.isNaN(nextTabSize)) {\n      this.tabSize = nextTabSize;\n    }\n  }\n\n  /**\n   * Re-measure the '0' character width against the font that is loaded right\n   * now, returning true when measurement-dependent UI should refresh.\n   *\n   * A custom web font can finish loading after the editor first renders.\n   * Until then canvas measureText reports the fallback font's width, and\n   * getComputedStyle returns the same font-family string before and after the\n   * file arrives, so init()'s font guard never re-measures on its own. Call\n   * this once fonts have settled (e.g. on document.fonts.ready) to replace a\n   * width measured against the fallback font with the real glyph width. Font\n   * completion can also change DOM-measured emoji/ZWJ widths while leaving the\n   * ASCII width unchanged, and the computed font string stays the same in both\n   * cases. The boolean return lets the caller skip re-rendering when there is no\n   * measured state to refresh.\n   */\n  remeasureCharacterWidth(): boolean {\n    if (this.#canvasCtx === undefined || this.#font === undefined) {\n      return false;\n    }\n    this.#setCanvasFont(this.#font);\n    const ch = this.canvasMeasureTextWidth('0');\n    const characterWidthChanged = ch !== this.ch;\n    if (characterWidthChanged) {\n      this.ch = ch;\n    }\n    const textWidthCacheCleared = this.#clearTextWidthCache();\n    return characterWidthChanged || textWidthCacheCleared;\n  }\n\n  /**\n   * Set the canvas font while the canvas is connected to the document.\n   *\n   * WebKit resolves a canvas font from the canvas element's computed style at\n   * assignment. A detached canvas has none, so WebKit ignores user-installed\n   * fonts and measures the fallback family while the DOM renders the real font,\n   * shifting every caret and selection in hosts that allow user-installed fonts\n   * (WKWebView, Playwright WebKit). Connecting the canvas for the assignment\n   * makes it measure the same font the DOM renders.\n   */\n  #setCanvasFont(font: string): void {\n    const root = this.#root;\n    const canvas = this.#canvas;\n    const canvasCtx = this.#canvasCtx;\n    if (root == null || canvas == null || canvasCtx == null) {\n      throw new Error('Metrics not initialized');\n    }\n    root.append(canvas);\n    try {\n      canvasCtx.font = font;\n    } finally {\n      canvas.remove();\n    }\n  }\n\n  /** measure the width of the text */\n  measureTextWidth(text: string): number {\n    if (!text.includes('\\t')) {\n      return this.#measureTextWidthWithoutTabs(text);\n    }\n    if (this.#canvasCtx === undefined) {\n      throw new Error('Metrics not initialized');\n    }\n    const asciiColumns = getExpandedAsciiTextColumns(text, this.tabSize);\n    if (asciiColumns !== -1) {\n      return asciiColumns * this.ch;\n    }\n\n    let width = 0;\n    let runStart = 0;\n    const tabStopWidth = this.tabSize * this.ch;\n    for (let i = 0; i < text.length; i++) {\n      if (text.charCodeAt(i) !== /* '\\t' */ 9) {\n        continue;\n      }\n\n      if (i > runStart) {\n        width += this.#measureTextWidthWithoutTabs(text.slice(runStart, i));\n      }\n      // CSS tab stops are pixel positions, so wide glyphs before a tab must\n      // contribute their measured width rather than one logical column.\n      if (tabStopWidth > 0) {\n        const remainder = width % tabStopWidth;\n        width += remainder === 0 ? tabStopWidth : tabStopWidth - remainder;\n      }\n      runStart = i + 1;\n    }\n\n    if (runStart < text.length) {\n      width += this.#measureTextWidthWithoutTabs(text.slice(runStart));\n    }\n    return round(width);\n  }\n\n  /**\n   * Pixel width from a wrapped segment's start up to a character. Tabs advance\n   * from the segment start so their stops line up with the rendered text.\n   */\n  segmentTextWidth(\n    lineText: string,\n    segmentStart: number,\n    character: number\n  ): number {\n    if (character <= segmentStart) {\n      return 0;\n    }\n    const segmentText = lineText.slice(segmentStart, character);\n    const asciiColumns = getExpandedAsciiTextColumns(segmentText, this.tabSize);\n    return asciiColumns !== -1\n      ? asciiColumns * this.ch\n      : this.measureTextWidth(segmentText);\n  }\n\n  #measureTextWidthWithoutTabs(text: string): number {\n    if (needsDomTextMeasurement(text)) {\n      return this.domMeasureTextWidth(text);\n    }\n    return this.canvasMeasureTextWidth(text);\n  }\n\n  /** measure the width of the text using the canvas measureText API */\n  canvasMeasureTextWidth(text: string): number {\n    if (this.#canvasCtx === undefined) {\n      throw new Error('Metrics not initialized');\n    }\n    return round(this.#canvasCtx.measureText(text).width);\n  }\n\n  /**\n   * measure the width of the text using the DOM\n   * this is slow because it cause a reflow, use it for non-ascii text;\n   * results are memoized per text so repeated measurements skip the reflow\n   */\n  domMeasureTextWidth(text: string): number {\n    if (this.#root === undefined) {\n      throw new Error('Metrics not initialized');\n    }\n    const cacheKey = text + '|' + this.#font;\n    const cached = this.#textWidthCache.get(cacheKey);\n    if (cached !== undefined) {\n      return cached;\n    }\n    const measureEl = h(\n      'span',\n      {\n        style: {\n          position: 'absolute',\n          top: '0',\n          left: '0',\n          visibility: 'hidden',\n          pointerEvents: 'none',\n          whiteSpace: 'pre',\n          font: 'inherit',\n        },\n        textContent: text,\n      },\n      this.#root\n    );\n    let width: number;\n    try {\n      // round() to match canvasMeasureTextWidth and ch; otherwise the DOM path\n      // returns raw sub-pixel widths and caret/selection offsets drift between\n      // ASCII and non-ASCII runs on the same line.\n      width = round(measureEl.getBoundingClientRect().width);\n    } finally {\n      measureEl.remove();\n    }\n    if (this.#textWidthCache.size >= TEXT_WIDTH_CACHE_LIMIT) {\n      const oldestKey = this.#textWidthCache.keys().next().value;\n      if (oldestKey !== undefined) {\n        this.#textWidthCache.delete(oldestKey);\n      }\n    }\n    this.#textWidthCache.set(cacheKey, width);\n    return width;\n  }\n\n  /**\n   * discard memoized DOM text widths\n   * call this when the inherited font may have changed without re-running\n   * init(), e.g. on a layout reflow, so stale widths are not reused\n   */\n  clearTextWidthCache(): void {\n    this.#clearTextWidthCache();\n  }\n\n  #clearTextWidthCache(): boolean {\n    const hadCachedTextWidths = this.#textWidthCache.size > 0;\n    this.#textWidthCache.clear();\n    return hadCachedTextWidths;\n  }\n}\n\n/** Check if the text needs DOM text measurement. */\nexport function needsDomTextMeasurement(text: string): boolean {\n  for (let i = 0; i < text.length; i++) {\n    const code = text.charCodeAt(i);\n    if (\n      (code >= 0xd800 && code <= 0xdfff) ||\n      code === 0x200d ||\n      code === 0xfe0e ||\n      code === 0xfe0f ||\n      (code > 0x7f && COMBINING_MARK_PATTERN.test(text.charAt(i)))\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n\n/** snap the text offset to the Unicode boundary */\nexport function snapTextOffsetToUnicodeBoundary(\n  text: string,\n  offset: number\n): number {\n  const boundedOffset = Math.max(0, Math.min(offset, text.length));\n  if (\n    boundedOffset === 0 ||\n    boundedOffset === text.length ||\n    !needsDomTextMeasurement(text)\n  ) {\n    return boundedOffset;\n  }\n  // Avoid measuring a caret position inside one visual emoji/grapheme.\n  // Browser caret movement can report offsets around UTF-16 surrogate\n  // pairs and emoji joiners; measuring a partial sequence gives a\n  // replacement-glyph width.\n  const segmenter = getGraphemeSegmenter();\n  if (segmenter !== undefined) {\n    for (const segment of segmenter.segment(text)) {\n      const segmentStart = segment.index;\n      const segmentEnd = segmentStart + segment.segment.length;\n      if (boundedOffset > segmentStart && boundedOffset < segmentEnd) {\n        return segmentEnd;\n      }\n      if (boundedOffset <= segmentStart) {\n        break;\n      }\n    }\n    return boundedOffset;\n  }\n  // Degraded path for engines lacking Intl.Segmenter: snap out of a\n  // surrogate pair by stepping over code points.\n  let segmentStart = 0;\n  for (const codePoint of text) {\n    const segmentEnd = segmentStart + codePoint.length;\n    if (boundedOffset > segmentStart && boundedOffset < segmentEnd) {\n      return segmentEnd;\n    }\n    if (boundedOffset <= segmentStart) {\n      break;\n    }\n    segmentStart = segmentEnd;\n  }\n  return boundedOffset;\n}\n\n/** get the offsets of the Unicode grapheme clusters in the text */\nexport function getUnicodeMeasurementOffsets(\n  text: string\n): number[] | undefined {\n  if (!needsDomTextMeasurement(text)) {\n    return undefined;\n  }\n  const offsets = [0];\n  const segmenter = getGraphemeSegmenter();\n  if (segmenter !== undefined) {\n    for (const segment of segmenter.segment(text)) {\n      offsets.push(segment.index + segment.segment.length);\n    }\n    return offsets;\n  }\n  // Degraded path for engines lacking Intl.Segmenter: step by code point.\n  let offset = 0;\n  for (const codePoint of text) {\n    offset += codePoint.length;\n    offsets.push(offset);\n  }\n  return offsets;\n}\n\n/**\n * Count the rendered columns of ASCII text, advancing each tab to the next\n * fixed tab stop (a multiple of tabSize) to match CSS `tab-size`. Returns -1\n * for non-ASCII text, which must be measured glyph-by-glyph instead.\n */\nexport function getExpandedAsciiTextColumns(\n  text: string,\n  tabSize: number\n): number {\n  let columns = 0;\n  for (let i = 0; i < text.length; i++) {\n    const code = text.charCodeAt(i);\n    if (code > 127) {\n      return -1;\n    }\n    columns += code === /* '\\t' */ 9 ? tabSize - (columns % tabSize) : 1;\n  }\n  return columns;\n}\n"],"mappings":"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"}

package/node_modules/@pierre/diffs/dist/highlighter/languages/attachResolvedLanguages.js

@@ -9,8 +9,15 @@ function attachResolvedLanguages(resolvedLanguages, highlighter) {
 			lang = resolvedLang;
 			ResolvedLanguages.set(resolvedLang.name, lang);
 		}
-		AttachedLanguages.add(lang.name);
+		const grammar = lang.data.find((grammar) => grammar.name === lang.name || grammar.aliases?.includes(lang.name) === true);
+		if (grammar == null) throw new Error(`attachResolvedLanguages: No returned grammar declares "${lang.name}" as its name or an alias.`);
 		highlighter.loadLanguageSync(lang.data);
+		try {
+			highlighter.getLanguage(lang.name);
+		} catch {
+			throw new Error(`attachResolvedLanguages: "${grammar.name}" is already loaded without alias "${lang.name}". Load the alias first or give the grammar a unique name.`);
+		}
+		AttachedLanguages.add(lang.name);
 	}
 }
 //#endregion

package/node_modules/@pierre/diffs/dist/highlighter/languages/attachResolvedLanguages.js.map

@@ -1 +1 @@
-{"version":3,"file":"attachResolvedLanguages.js","names":[],"sources":["../../../src/highlighter/languages/attachResolvedLanguages.ts"],"sourcesContent":["import type { DiffsHighlighter } from '../../types';\nimport type { ResolvedLanguage } from '../../worker';\nimport { AttachedLanguages, ResolvedLanguages } from './constants';\n\nexport function attachResolvedLanguages(\n  resolvedLanguages: ResolvedLanguage | ResolvedLanguage[],\n  highlighter: DiffsHighlighter\n): void {\n  resolvedLanguages = Array.isArray(resolvedLanguages)\n    ? resolvedLanguages\n    : [resolvedLanguages];\n\n  for (const resolvedLang of resolvedLanguages) {\n    if (AttachedLanguages.has(resolvedLang.name)) continue;\n    let lang = ResolvedLanguages.get(resolvedLang.name);\n    if (lang == null) {\n      lang = resolvedLang;\n      ResolvedLanguages.set(resolvedLang.name, lang);\n    }\n    AttachedLanguages.add(lang.name);\n    highlighter.loadLanguageSync(lang.data);\n  }\n}\n"],"mappings":";;AAIA,SAAgB,wBACd,mBACA,aACM;CACN,oBAAoB,MAAM,QAAQ,iBAAiB,IAC/C,oBACA,CAAC,iBAAiB;CAEtB,KAAK,MAAM,gBAAgB,mBAAmB;EAC5C,IAAI,kBAAkB,IAAI,aAAa,IAAI,GAAG;EAC9C,IAAI,OAAO,kBAAkB,IAAI,aAAa,IAAI;EAClD,IAAI,QAAQ,MAAM;GAChB,OAAO;GACP,kBAAkB,IAAI,aAAa,MAAM,IAAI;EAC/C;EACA,kBAAkB,IAAI,KAAK,IAAI;EAC/B,YAAY,iBAAiB,KAAK,IAAI;CACxC;AACF"}
+{"version":3,"file":"attachResolvedLanguages.js","names":[],"sources":["../../../src/highlighter/languages/attachResolvedLanguages.ts"],"sourcesContent":["import type { DiffsHighlighter } from '../../types';\nimport type { ResolvedLanguage } from '../../worker';\nimport { AttachedLanguages, ResolvedLanguages } from './constants';\n\nexport function attachResolvedLanguages(\n  resolvedLanguages: ResolvedLanguage | ResolvedLanguage[],\n  highlighter: DiffsHighlighter\n): void {\n  resolvedLanguages = Array.isArray(resolvedLanguages)\n    ? resolvedLanguages\n    : [resolvedLanguages];\n\n  for (const resolvedLang of resolvedLanguages) {\n    if (AttachedLanguages.has(resolvedLang.name)) continue;\n    let lang = ResolvedLanguages.get(resolvedLang.name);\n    if (lang == null) {\n      lang = resolvedLang;\n      ResolvedLanguages.set(resolvedLang.name, lang);\n    }\n    const grammar = lang.data.find(\n      (grammar) =>\n        grammar.name === lang.name ||\n        grammar.aliases?.includes(lang.name) === true\n    );\n    if (grammar == null) {\n      throw new Error(\n        `attachResolvedLanguages: No returned grammar declares \"${lang.name}\" as its name or an alias.`\n      );\n    }\n    highlighter.loadLanguageSync(lang.data);\n    // Shiki can skip an already-loaded grammar, including any newly added aliases.\n    try {\n      highlighter.getLanguage(lang.name);\n    } catch {\n      throw new Error(\n        `attachResolvedLanguages: \"${grammar.name}\" is already loaded without alias \"${lang.name}\". Load the alias first or give the grammar a unique name.`\n      );\n    }\n    AttachedLanguages.add(lang.name);\n  }\n}\n"],"mappings":";;AAIA,SAAgB,wBACd,mBACA,aACM;CACN,oBAAoB,MAAM,QAAQ,iBAAiB,IAC/C,oBACA,CAAC,iBAAiB;CAEtB,KAAK,MAAM,gBAAgB,mBAAmB;EAC5C,IAAI,kBAAkB,IAAI,aAAa,IAAI,GAAG;EAC9C,IAAI,OAAO,kBAAkB,IAAI,aAAa,IAAI;EAClD,IAAI,QAAQ,MAAM;GAChB,OAAO;GACP,kBAAkB,IAAI,aAAa,MAAM,IAAI;EAC/C;EACA,MAAM,UAAU,KAAK,KAAK,MACvB,YACC,QAAQ,SAAS,KAAK,QACtB,QAAQ,SAAS,SAAS,KAAK,IAAI,MAAM,IAC7C;EACA,IAAI,WAAW,MACb,MAAM,IAAI,MACR,0DAA0D,KAAK,KAAK,2BACtE;EAEF,YAAY,iBAAiB,KAAK,IAAI;EAEtC,IAAI;GACF,YAAY,YAAY,KAAK,IAAI;EACnC,QAAQ;GACN,MAAM,IAAI,MACR,6BAA6B,QAAQ,KAAK,qCAAqC,KAAK,KAAK,2DAC3F;EACF;EACA,kBAAkB,IAAI,KAAK,IAAI;CACjC;AACF"}

package/node_modules/@pierre/diffs/dist/highlighter/languages/registerCustomLanguage.d.ts

@@ -2,7 +2,9 @@ import { DynamicImportLanguageRegistration } from "shiki";
 //#region src/highlighter/languages/registerCustomLanguage.d.ts
 /**
  * Register a custom language loader and optionally map it to
- * file names or extensions.
+ * file names or extensions. The registered name must match a returned
+ * grammar's name or aliases; registering a loader does not automatically add a
+ * grammar alias.
  */
 declare function registerCustomLanguage(lang: string, loader: DynamicImportLanguageRegistration,
 /**

package/node_modules/@pierre/diffs/dist/highlighter/languages/registerCustomLanguage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerCustomLanguage.d.ts","names":[],"sources":["../../../src/highlighter/languages/registerCustomLanguage.ts"],"mappings":";;;;;;iBASgB,uBACd,cACA,QAAQ,mCAOR;;;;;;;AAAA"}
+{"version":3,"file":"registerCustomLanguage.d.ts","names":[],"sources":["../../../src/highlighter/languages/registerCustomLanguage.ts"],"mappings":";;;;;;;;iBAWgB,uBACd,cACA,QAAQ,mCAOR;;;;;;;AAAA"}

package/node_modules/@pierre/diffs/dist/highlighter/languages/registerCustomLanguage.js

@@ -3,7 +3,9 @@ import { setCustomExtension } from "../../utils/getFiletypeFromFileName.js";
 //#region src/highlighter/languages/registerCustomLanguage.ts
 /**
 * Register a custom language loader and optionally map it to
-* file names or extensions.
+* file names or extensions. The registered name must match a returned
+* grammar's name or aliases; registering a loader does not automatically add a
+* grammar alias.
 */
 function registerCustomLanguage(lang, loader, extensionsOrFilenames = []) {
 	if (lang === "text" || lang === "ansi") throw new Error("registerCustomLanguage: 'text' and 'ansi' are reserved language names");

package/node_modules/@pierre/diffs/dist/highlighter/languages/registerCustomLanguage.js.map

@@ -1 +1 @@
-{"version":3,"file":"registerCustomLanguage.js","names":[],"sources":["../../../src/highlighter/languages/registerCustomLanguage.ts"],"sourcesContent":["import type { DynamicImportLanguageRegistration } from 'shiki';\n\nimport { setCustomExtension } from '../../utils/getFiletypeFromFileName';\nimport { RegisteredCustomLanguages } from './constants';\n\n/**\n * Register a custom language loader and optionally map it to\n * file names or extensions.\n */\nexport function registerCustomLanguage(\n  lang: string,\n  loader: DynamicImportLanguageRegistration,\n  /**\n   * File names or extensions to map to this language. Use exact filenames\n   * (e.g., \"Dockerfile\", \"CMakeLists.txt\") or extension tokens without a dot\n   * (e.g., \"proto\", \"foo\"). Compound extensions are supported\n   * (e.g., \"blade.php\").\n   */\n  extensionsOrFilenames: string[] = []\n): void {\n  if (lang === 'text' || lang === 'ansi') {\n    throw new Error(\n      \"registerCustomLanguage: 'text' and 'ansi' are reserved language names\"\n    );\n  }\n  if (RegisteredCustomLanguages.has(lang)) {\n    console.error(\n      `registerCustomLanguage: lang: ${lang} is already registered`\n    );\n    return;\n  }\n  RegisteredCustomLanguages.set(lang, loader);\n  for (const extension of extensionsOrFilenames) {\n    setCustomExtension(extension, lang);\n  }\n}\n"],"mappings":";;;;;;;AASA,SAAgB,uBACd,MACA,QAOA,wBAAkC,CAAC,GAC7B;CACN,IAAI,SAAS,UAAU,SAAS,QAC9B,MAAM,IAAI,MACR,uEACF;CAEF,IAAI,0BAA0B,IAAI,IAAI,GAAG;EACvC,QAAQ,MACN,iCAAiC,KAAK,uBACxC;EACA;CACF;CACA,0BAA0B,IAAI,MAAM,MAAM;CAC1C,KAAK,MAAM,aAAa,uBACtB,mBAAmB,WAAW,IAAI;AAEtC"}
+{"version":3,"file":"registerCustomLanguage.js","names":[],"sources":["../../../src/highlighter/languages/registerCustomLanguage.ts"],"sourcesContent":["import type { DynamicImportLanguageRegistration } from 'shiki';\n\nimport { setCustomExtension } from '../../utils/getFiletypeFromFileName';\nimport { RegisteredCustomLanguages } from './constants';\n\n/**\n * Register a custom language loader and optionally map it to\n * file names or extensions. The registered name must match a returned\n * grammar's name or aliases; registering a loader does not automatically add a\n * grammar alias.\n */\nexport function registerCustomLanguage(\n  lang: string,\n  loader: DynamicImportLanguageRegistration,\n  /**\n   * File names or extensions to map to this language. Use exact filenames\n   * (e.g., \"Dockerfile\", \"CMakeLists.txt\") or extension tokens without a dot\n   * (e.g., \"proto\", \"foo\"). Compound extensions are supported\n   * (e.g., \"blade.php\").\n   */\n  extensionsOrFilenames: string[] = []\n): void {\n  if (lang === 'text' || lang === 'ansi') {\n    throw new Error(\n      \"registerCustomLanguage: 'text' and 'ansi' are reserved language names\"\n    );\n  }\n  if (RegisteredCustomLanguages.has(lang)) {\n    console.error(\n      `registerCustomLanguage: lang: ${lang} is already registered`\n    );\n    return;\n  }\n  RegisteredCustomLanguages.set(lang, loader);\n  for (const extension of extensionsOrFilenames) {\n    setCustomExtension(extension, lang);\n  }\n}\n"],"mappings":";;;;;;;;;AAWA,SAAgB,uBACd,MACA,QAOA,wBAAkC,CAAC,GAC7B;CACN,IAAI,SAAS,UAAU,SAAS,QAC9B,MAAM,IAAI,MACR,uEACF;CAEF,IAAI,0BAA0B,IAAI,IAAI,GAAG;EACvC,QAAQ,MACN,iCAAiC,KAAK,uBACxC;EACA;CACF;CACA,0BAA0B,IAAI,MAAM,MAAM;CAC1C,KAAK,MAAM,aAAa,uBACtB,mBAAmB,WAAW,IAAI;AAEtC"}

package/node_modules/@pierre/diffs/dist/worker/WorkerPoolManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerPoolManager.d.ts","names":[],"sources":["../../src/worker/WorkerPoolManager.ts"],"mappings":";;;;UA+EU;EACR,WAAW,eAAe;EAC1B,WAAW,eAAe;;UAYlB;EACR;;KAKG,qBAAqB,uBAAuB;cAEpC;UAkCD;UAjCF;mBACS;UACT;UACA;UACA;UACA;UACA;UAEA;UACA;UAIA;UAGA;UACA;UAKA;UACA;UACA;UACA;UACA;UACA;UACA;UAEA;EAER,YACU,SAAS,qBAEf,OACA,OACA,qBACA,cACA,mBACA,uBACA,wBACC;EAeE;EAIA,mBAAmB,MAAM,eAAe;EAMxC,mBACL,MAAM,mBACL;EAMI,iBAAiB;EAKjB,mBAAmB;EAQnB,mBAAmB;EAQpB,mBACJ,OACA,qBACA,cACA,mBACA,yBACC,QAAQ,0BAA0B;EA4E9B,2BAA2B;EAI3B,wBAAwB;EAMxB,wBAAwB;UAIjB;EA6CP,wBAAwB,UAAU;EASlC,0BAA0B,UAAU;EAKpC,uBACL,WAAW,OAAO;UASZ;UAKA;EAWD,aAAa,UAAU;EAkBvB;EAIM,WAAW,YAAW,uBAA4B;UAiFjD;UAsFN;UAiBA;EA2BD,iBACL,UAAU,sBACV,MAAM;EAqBD,wBAAwB,MAAM,eAAe;UAe5C;EAgCD,gBACL,MAAM,cACN,sBACA,oBACA,mBACC;EAaI,iBACL,UAAU,sBACV,MAAM;EAqBD,wBAAwB,MAAM,mBAAmB;UAehD;EAgCD,gBACL,MAAM,kBACN,sBACA,oBACA,gBAAgB,YAAY,6BAC5B,qCACC;EAYI;UAqBC;UAIA;UAMA;UAWA;EAOD,YAAY;UAwBX;UA+DA;UA0CA;UAcM;UAyDN;UAgGA;UACA;UAMA;UAYA;UAqBA;UAsCA;UAeA;UAUA;UA8BA;UAOA;UAOA;UAWA;UASA;UAgBA;UAeA;UAWA;UAUA;UAOA;UAMA;UAOA;UAOA;UAkBA;UAQA;UASA;UAMA;UAQA;UAYA;UAYA;UAQA;UAiBA;UAiBA;UAKA;UAIC;UAWD"}
+{"version":3,"file":"WorkerPoolManager.d.ts","names":[],"sources":["../../src/worker/WorkerPoolManager.ts"],"mappings":";;;;UA+EU;EACR,WAAW,eAAe;EAC1B,WAAW,eAAe;;UAYlB;EACR;;KAKG,qBAAqB,uBAAuB;cAEpC;UAkCD;UAjCF;mBACS;UACT;UACA;UACA;UACA;UACA;UAEA;UACA;UAIA;UAGA;UACA;UAKA;UACA;UACA;UACA;UACA;UACA;UACA;UAEA;EAER,YACU,SAAS,qBAEf,OACA,OACA,qBACA,cACA,mBACA,uBACA,wBACC;EAeE;EAIA,mBAAmB,MAAM,eAAe;EAMxC,mBACL,MAAM,mBACL;EAMI,iBAAiB;EAKjB,mBAAmB;EAQnB,mBAAmB;EAQpB,mBACJ,OACA,qBACA,cACA,mBACA,yBACC,QAAQ,0BAA0B;EA4E9B,2BAA2B;EAI3B,wBAAwB;EAMxB,wBAAwB;UAIjB;EA6CP,wBAAwB,UAAU;EASlC,0BAA0B,UAAU;EAKpC,uBACL,WAAW,OAAO;UASZ;UAKA;EAWD,aAAa,UAAU;EAkBvB;EAIM,WAAW,YAAW,uBAA4B;UAiFjD;UAsFN;UAiBA;EA2BD,iBACL,UAAU,sBACV,MAAM;EAqBD,wBAAwB,MAAM,eAAe;UAe5C;EAgCD,gBACL,MAAM,cACN,sBACA,oBACA,mBACC;EAaI,iBACL,UAAU,sBACV,MAAM;EAqBD,wBAAwB,MAAM,mBAAmB;UAehD;EAgCD,gBACL,MAAM,kBACN,sBACA,oBACA,gBAAgB,YAAY,6BAC5B,qCACC;EAYI;UAqBC;UAIA;UAMA;UAWA;EAOD,YAAY;UAwBX;UA+DA;UA0CA;UAcM;UAyDN;UAuGA;UACA;UAMA;UAYA;UAqBA;UAmCA;UAeA;UAUA;UA8BA;UAOA;UAOA;UAWA;UASA;UAgBA;UAeA;UAWA;UAUA;UAOA;UAMA;UAOA;UAOA;UAkBA;UAQA;UASA;UAMA;UAQA;UAYA;UAYA;UAQA;UAiBA;UAiBA;UAKA;UAIC;UAWD"}

package/node_modules/@pierre/diffs/dist/worker/WorkerPoolManager.js

@@ -657,43 +657,46 @@ var WorkerPoolManager = class {
 					this.rejectRenderTaskCallbacks(task, error);
 				} else throw new Error("handleWorkerMessage: unknown task type");
 				throw error;
-			} else switch (response.requestType) {
-				case "initialize":
-					if (task.type !== "initialize") throw new Error("handleWorkerMessage: task/response dont match");
-					this.syncCustomExtensionVersion(managedWorker, task.request);
-					task.resolve();
-					break;
-				case "set-render-options":
-					if (task.type !== "set-render-options") throw new Error("handleWorkerMessage: task/response dont match");
-					task.resolve();
-					break;
-				case "file": {
-					if (task.type !== "file") throw new Error("handleWorkerMessage: task/response dont match");
-					const { result, options } = response;
-					if (!this.isCurrentRenderTask(task) || !areFileRenderOptionsEqual(options, this.getFileRenderOptions())) throw IGNORE_RESPONSE;
-					const { request } = task;
-					this.syncCustomExtensionVersion(managedWorker, request);
-					if (task.cacheKeyAtDispatch != null) this.fileCache.set(task.cacheKeyAtDispatch, {
-						result,
-						options
-					});
-					this.resolveRenderTaskCallbacks(task);
-					this.notifyFileInstances(task, result, options);
-					break;
-				}
-				case "diff": {
-					if (task.type !== "diff") throw new Error("handleWorkerMessage: task/response dont match");
-					const { result, options } = response;
-					if (!this.isCurrentRenderTask(task) || !areDiffRenderOptionsEqual(options, this.getDiffRenderOptions())) throw IGNORE_RESPONSE;
-					const { request } = task;
-					this.syncCustomExtensionVersion(managedWorker, request);
-					if (task.cacheKeyAtDispatch != null) this.diffCache.set(task.cacheKeyAtDispatch, {
-						result,
-						options
-					});
-					this.resolveRenderTaskCallbacks(task);
-					this.notifyDiffInstances(task, result, options);
-					break;
+			} else {
+				if (isRenderTask(task)) for (const { name } of task.request.resolvedLanguages ?? []) managedWorker.langs.add(name);
+				switch (response.requestType) {
+					case "initialize":
+						if (task.type !== "initialize") throw new Error("handleWorkerMessage: task/response dont match");
+						this.syncCustomExtensionVersion(managedWorker, task.request);
+						task.resolve();
+						break;
+					case "set-render-options":
+						if (task.type !== "set-render-options") throw new Error("handleWorkerMessage: task/response dont match");
+						task.resolve();
+						break;
+					case "file": {
+						if (task.type !== "file") throw new Error("handleWorkerMessage: task/response dont match");
+						const { result, options } = response;
+						if (!this.isCurrentRenderTask(task) || !areFileRenderOptionsEqual(options, this.getFileRenderOptions())) throw IGNORE_RESPONSE;
+						const { request } = task;
+						this.syncCustomExtensionVersion(managedWorker, request);
+						if (task.cacheKeyAtDispatch != null) this.fileCache.set(task.cacheKeyAtDispatch, {
+							result,
+							options
+						});
+						this.resolveRenderTaskCallbacks(task);
+						this.notifyFileInstances(task, result, options);
+						break;
+					}
+					case "diff": {
+						if (task.type !== "diff") throw new Error("handleWorkerMessage: task/response dont match");
+						const { result, options } = response;
+						if (!this.isCurrentRenderTask(task) || !areDiffRenderOptionsEqual(options, this.getDiffRenderOptions())) throw IGNORE_RESPONSE;
+						const { request } = task;
+						this.syncCustomExtensionVersion(managedWorker, request);
+						if (task.cacheKeyAtDispatch != null) this.diffCache.set(task.cacheKeyAtDispatch, {
+							result,
+							options
+						});
+						this.resolveRenderTaskCallbacks(task);
+						this.notifyDiffInstances(task, result, options);
+						break;
+					}
 				}
 			}
 		} catch (error) {
@@ -732,7 +735,6 @@ var WorkerPoolManager = class {
 	executeTask(managedWorker, task) {
 		if (shouldSyncCustomExtensions(task.request)) this.maybeAttachCustomExtensions(managedWorker, task.request);
 		if (!this.activeTaskById.has(task.id)) this.assignWorkerToTask(task, managedWorker);
-		for (const lang of getLangsFromTask(task)) managedWorker.langs.add(lang);
 		try {
 			if (task.type === "file") task.cacheKeyAtDispatch = task.request.file.cacheKey;
 			else if (task.type === "diff") task.cacheKeyAtDispatch = task.request.diff.cacheKey;