stream-monaco 0.0.21 → 0.0.36

package/dist/{preloadMonacoWorkers.shared-DAHEwJHs.cjs → preloadMonacoWorkers.shared-kHKw8Ju_.cjs}

@@ -147,9 +147,14 @@ function processedLanguage(language) {
 //#endregion
 //#region src/monaco-shim.ts
 var monaco_shim_exports = {};
-__export(monaco_shim_exports, { default: () => monaco });
+__export(monaco_shim_exports, {
+	ScrollType: () => ScrollType,
+	default: () => monaco
+});
 __reExport(monaco_shim_exports, require("monaco-editor/esm/vs/editor/editor.api"));
+var _editor;
 const monaco = monaco_editor_esm_vs_editor_editor_api;
+const ScrollType = Reflect.get(monaco_editor_esm_vs_editor_editor_api, "ScrollType") ?? ((_editor = monaco_editor_esm_vs_editor_editor_api.editor) === null || _editor === void 0 ? void 0 : _editor.ScrollType);
 
 //#endregion
 //#region src/constant.ts
@@ -472,6 +477,809 @@ function createScrollWatcherForEditor(ed, opts) {
 	return api;
 }
 
+//#endregion
+//#region src/core/diffAppearance.ts
+function parseCssColorRgb(color) {
+	const normalized = color.trim().toLowerCase();
+	const rgbMatch = normalized.match(/^rgba?\(\s*([+\-.\d]+)\s*,\s*([+\-.\d]+)\s*,\s*([+\-.\d]+)/);
+	if (rgbMatch) return [
+		Number.parseFloat(rgbMatch[1]),
+		Number.parseFloat(rgbMatch[2]),
+		Number.parseFloat(rgbMatch[3])
+	];
+	const hexMatch = normalized.match(/^#([\da-f]{3,8})$/i);
+	if (!hexMatch) return null;
+	const hex = hexMatch[1];
+	if (hex.length === 3 || hex.length === 4) return [
+		Number.parseInt(`${hex[0]}${hex[0]}`, 16),
+		Number.parseInt(`${hex[1]}${hex[1]}`, 16),
+		Number.parseInt(`${hex[2]}${hex[2]}`, 16)
+	];
+	if (hex.length === 6 || hex.length === 8) return [
+		Number.parseInt(hex.slice(0, 2), 16),
+		Number.parseInt(hex.slice(2, 4), 16),
+		Number.parseInt(hex.slice(4, 6), 16)
+	];
+	return null;
+}
+function resolveCssColorLuminance(color) {
+	const rgb = parseCssColorRgb(color);
+	if (!rgb) return null;
+	const channel = (value) => {
+		const normalized = Math.max(0, Math.min(255, value)) / 255;
+		return normalized <= .03928 ? normalized / 12.92 : ((normalized + .055) / 1.055) ** 2.4;
+	};
+	const [r, g, b] = rgb;
+	return .2126 * channel(r) + .7152 * channel(g) + .0722 * channel(b);
+}
+function looksLikeDarkThemeName(themeName) {
+	if (!themeName) return false;
+	const normalized = themeName.toLowerCase();
+	return [
+		"dark",
+		"night",
+		"moon",
+		"black",
+		"dracula",
+		"mocha",
+		"frappe",
+		"macchiato",
+		"palenight",
+		"ocean",
+		"poimandres",
+		"monokai",
+		"laserwave",
+		"tokyo",
+		"slack-dark",
+		"rose-pine",
+		"github-dark",
+		"material-theme",
+		"one-dark",
+		"catppuccin-mocha",
+		"catppuccin-frappe",
+		"catppuccin-macchiato"
+	].some((token) => normalized.includes(token)) && !normalized.includes("light") && !normalized.includes("latte") && !normalized.includes("dawn") && !normalized.includes("lotus");
+}
+function looksLikeLightThemeName(themeName) {
+	if (!themeName) return false;
+	const normalized = themeName.toLowerCase();
+	return [
+		"light",
+		"day",
+		"dawn",
+		"latte",
+		"solarized-light",
+		"github-light",
+		"rose-pine-dawn",
+		"catppuccin-latte",
+		"one-light",
+		"vitesse-light",
+		"snazzy-light",
+		"material-lighter",
+		"material-theme-lighter",
+		"lotus"
+	].some((token) => normalized.includes(token));
+}
+function resolveDiffAppearance({ container, diffAppearance, diffEditorView, themeName }) {
+	var _diffEditorView$getMo, _diffEditorView$getMo2, _diffEditorView$getOr, _diffEditorView$getOr2;
+	if (diffAppearance === "light") return "light";
+	if (diffAppearance === "dark") return "dark";
+	if (looksLikeDarkThemeName(themeName)) return "dark";
+	if (looksLikeLightThemeName(themeName)) return "light";
+	const appearanceProbeNodes = [
+		diffEditorView === null || diffEditorView === void 0 || (_diffEditorView$getMo2 = (_diffEditorView$getMo = diffEditorView.getModifiedEditor()).getContainerDomNode) === null || _diffEditorView$getMo2 === void 0 ? void 0 : _diffEditorView$getMo2.call(_diffEditorView$getMo),
+		diffEditorView === null || diffEditorView === void 0 || (_diffEditorView$getOr2 = (_diffEditorView$getOr = diffEditorView.getOriginalEditor()).getContainerDomNode) === null || _diffEditorView$getOr2 === void 0 ? void 0 : _diffEditorView$getOr2.call(_diffEditorView$getOr),
+		container
+	];
+	for (const node of appearanceProbeNodes) {
+		if (!(node instanceof HTMLElement)) continue;
+		const style = globalThis.getComputedStyle(node);
+		const editorSurface = node.querySelector(".monaco-editor .monaco-editor-background, .monaco-editor .margin, .monaco-editor .lines-content");
+		const candidates = [
+			style.getPropertyValue("--stream-monaco-editor-bg"),
+			style.getPropertyValue("--vscode-editor-background"),
+			editorSurface ? globalThis.getComputedStyle(editorSurface).backgroundColor : "",
+			style.backgroundColor
+		];
+		for (const color of candidates) {
+			const luminance = resolveCssColorLuminance(color);
+			if (luminance == null) continue;
+			return luminance <= .42 ? "dark" : "light";
+		}
+	}
+	return looksLikeDarkThemeName(themeName) ? "dark" : "light";
+}
+function syncDiffRootThemeVariables(container, diffEditorView, appearance) {
+	var _diffEditorView$getMo3, _diffEditorView$getMo4, _diffEditorView$getOr3, _diffEditorView$getOr4;
+	const probeNodes = [
+		diffEditorView === null || diffEditorView === void 0 || (_diffEditorView$getMo4 = (_diffEditorView$getMo3 = diffEditorView.getModifiedEditor()).getContainerDomNode) === null || _diffEditorView$getMo4 === void 0 ? void 0 : _diffEditorView$getMo4.call(_diffEditorView$getMo3),
+		diffEditorView === null || diffEditorView === void 0 || (_diffEditorView$getOr4 = (_diffEditorView$getOr3 = diffEditorView.getOriginalEditor()).getContainerDomNode) === null || _diffEditorView$getOr4 === void 0 ? void 0 : _diffEditorView$getOr4.call(_diffEditorView$getOr3),
+		container
+	];
+	const containerStyle = globalThis.getComputedStyle(container);
+	const fixedBackgroundColor = containerStyle.getPropertyValue("--stream-monaco-fixed-editor-bg").trim() || null;
+	let backgroundColor = null;
+	let foregroundColor = null;
+	for (const node of probeNodes) {
+		if (!(node instanceof HTMLElement)) continue;
+		const backgroundProbe = node.querySelector(".monaco-editor-background, .margin, .lines-content") ?? node;
+		const foregroundProbe = node.querySelector(".view-lines, .monaco-editor, .view-overlays") ?? node;
+		const nextBackground = globalThis.getComputedStyle(backgroundProbe).backgroundColor;
+		if (!backgroundColor && resolveCssColorLuminance(nextBackground) != null) backgroundColor = nextBackground;
+		const nextForeground = globalThis.getComputedStyle(foregroundProbe).color;
+		if (!foregroundColor && resolveCssColorLuminance(nextForeground) != null) foregroundColor = nextForeground;
+		if (backgroundColor && foregroundColor) break;
+	}
+	const resolvedBackgroundColor = fixedBackgroundColor || backgroundColor || (appearance === "dark" ? "rgb(10 10 11)" : "rgb(255 255 255)");
+	if (resolvedBackgroundColor) container.style.setProperty("--stream-monaco-editor-bg", resolvedBackgroundColor);
+	else container.style.removeProperty("--stream-monaco-editor-bg");
+	if (foregroundColor) container.style.setProperty("--stream-monaco-editor-fg", foregroundColor);
+	else container.style.removeProperty("--stream-monaco-editor-fg");
+}
+function resolveDiffUnchangedLineInfoRailMetrics(node) {
+	const editorRoot = node.closest(".monaco-editor");
+	if (!editorRoot) return {
+		leftInset: 0,
+		width: null
+	};
+	const editorRect = editorRoot.getBoundingClientRect();
+	const lineNumberNode = Array.from(editorRoot.querySelectorAll(".line-numbers")).find((candidate) => {
+		const rect = candidate.getBoundingClientRect();
+		return rect.width > 0 && rect.height > 0;
+	});
+	if (!lineNumberNode) return {
+		leftInset: 0,
+		width: null
+	};
+	const lineNumberRect = lineNumberNode.getBoundingClientRect();
+	return {
+		leftInset: Math.max(0, lineNumberRect.left - editorRect.left),
+		width: Math.max(0, lineNumberRect.width) || null
+	};
+}
+function applyDiffRootAppearanceClass({ appearanceClasses, container, currentSignature, diffAppearance, diffEditorView, isInlineMode, layoutModeClasses, lineStyle, lineStyleClasses, themeName, unchangedRegionStyle, unchangedRegionStyleClasses }) {
+	if (!container) return currentSignature;
+	const resolvedAppearance = resolveDiffAppearance({
+		container,
+		diffAppearance,
+		diffEditorView,
+		themeName
+	});
+	syncDiffRootThemeVariables(container, diffEditorView, resolvedAppearance);
+	const containerClassList = container.classList;
+	const activeLineStyleClass = `stream-monaco-diff-style-${lineStyle}`;
+	const activeUnchangedRegionStyleClass = `stream-monaco-diff-unchanged-style-${unchangedRegionStyle}`;
+	const activeLayoutModeClass = isInlineMode ? "stream-monaco-diff-inline" : "stream-monaco-diff-side-by-side";
+	const activeAppearanceClass = `stream-monaco-diff-appearance-${resolvedAppearance}`;
+	const nextSignature = [
+		activeLineStyleClass,
+		activeUnchangedRegionStyleClass,
+		activeLayoutModeClass,
+		activeAppearanceClass
+	].join("|");
+	if (currentSignature === nextSignature && containerClassList.contains("stream-monaco-diff-root")) return currentSignature;
+	containerClassList.add("stream-monaco-diff-root");
+	for (const className of lineStyleClasses) containerClassList.toggle(className, className === activeLineStyleClass);
+	for (const className of unchangedRegionStyleClasses) containerClassList.toggle(className, className === activeUnchangedRegionStyleClass);
+	for (const className of layoutModeClasses) containerClassList.toggle(className, className === activeLayoutModeClass);
+	for (const className of appearanceClasses) containerClassList.toggle(className, className === activeAppearanceClass);
+	return nextSignature;
+}
+
+//#endregion
+//#region src/core/diffHunk.ts
+function createDiffHunkActionNode(side, onAction) {
+	const node = document.createElement("div");
+	node.className = "stream-monaco-diff-hunk-actions";
+	node.dataset.side = side;
+	const createButton = (action, label) => {
+		const button = document.createElement("button");
+		button.type = "button";
+		button.textContent = label;
+		button.dataset.action = action;
+		button.addEventListener("click", (event) => {
+			event.preventDefault();
+			event.stopPropagation();
+			onAction(side, action);
+		});
+		return button;
+	};
+	node.append(createButton("revert", "Revert"), createButton("stage", "Stage"));
+	return node;
+}
+function hasOriginalLines(change) {
+	return change.originalStartLineNumber > 0 && change.originalEndLineNumber >= change.originalStartLineNumber;
+}
+function hasModifiedLines(change) {
+	return change.modifiedStartLineNumber > 0 && change.modifiedEndLineNumber >= change.modifiedStartLineNumber;
+}
+function inferInlineDiffHunkHoverSide(change, hoverLine, targetElement) {
+	if (targetElement === null || targetElement === void 0 ? void 0 : targetElement.closest(".line-delete, .char-delete, .inline-deleted-text, .inline-deleted-margin-view-zone")) return "upper";
+	if (targetElement === null || targetElement === void 0 ? void 0 : targetElement.closest(".line-insert, .char-insert, .gutter-insert, .view-line")) return "lower";
+	if (!hasModifiedLines(change)) return "upper";
+	if (!hasOriginalLines(change)) return "lower";
+	const modifiedAnchor = Math.max(1, change.modifiedStartLineNumber || change.modifiedEndLineNumber || 1);
+	return hoverLine < modifiedAnchor ? "upper" : "lower";
+}
+function distanceToLineChange(side, change, line) {
+	const hasRange = side === "original" ? hasOriginalLines(change) : hasModifiedLines(change);
+	const start = side === "original" ? change.originalStartLineNumber : change.modifiedStartLineNumber;
+	const end = side === "original" ? change.originalEndLineNumber : change.modifiedEndLineNumber;
+	if (hasRange) {
+		if (line < start) return start - line;
+		if (line > end) return line - end;
+		return 0;
+	}
+	const fallbackAnchor = Math.max(1, start || end || 1);
+	return Math.abs(line - fallbackAnchor);
+}
+function findLineChangeByHoverLine(lineChanges, side, line) {
+	if (lineChanges.length === 0) return null;
+	let best = null;
+	let bestDistance = Number.POSITIVE_INFINITY;
+	for (const change of lineChanges) {
+		const distance = distanceToLineChange(side, change, line);
+		if (distance < bestDistance) {
+			bestDistance = distance;
+			best = change;
+			if (distance === 0) break;
+		}
+	}
+	if (bestDistance > 2) return null;
+	return best;
+}
+function getFullLineRange(model, startLine, endLine) {
+	if (endLine < startLine) return null;
+	const lineCount = model.getLineCount();
+	if (lineCount < 1) return null;
+	const start = Math.max(1, Math.min(startLine, lineCount));
+	const end = Math.max(start, Math.min(endLine, lineCount));
+	if (end < lineCount) return new monaco_shim_exports.Range(start, 1, end + 1, 1);
+	return new monaco_shim_exports.Range(start, 1, end, model.getLineMaxColumn(end));
+}
+function getLinesText(model, startLine, endLine) {
+	const range = getFullLineRange(model, startLine, endLine);
+	if (!range) return "";
+	return model.getValueInRange(range);
+}
+function getInsertRangeBeforeLine(model, lineNumber) {
+	const lineCount = model.getLineCount();
+	if (lineNumber <= 1) return new monaco_shim_exports.Range(1, 1, 1, 1);
+	if (lineNumber <= lineCount) return new monaco_shim_exports.Range(lineNumber, 1, lineNumber, 1);
+	const lastLine = lineCount;
+	const lastColumn = model.getLineMaxColumn(lastLine);
+	return new monaco_shim_exports.Range(lastLine, lastColumn, lastLine, lastColumn);
+}
+function getInsertRangeAfterLine(model, lineNumber) {
+	const lineCount = model.getLineCount();
+	if (lineNumber < 1) return new monaco_shim_exports.Range(1, 1, 1, 1);
+	if (lineNumber < lineCount) return new monaco_shim_exports.Range(lineNumber + 1, 1, lineNumber + 1, 1);
+	const lastLine = lineCount;
+	const lastColumn = model.getLineMaxColumn(lastLine);
+	return new monaco_shim_exports.Range(lastLine, lastColumn, lastLine, lastColumn);
+}
+function applyDefaultDiffHunkAction(context) {
+	const { action, side, lineChange, originalModel, modifiedModel } = context;
+	const hasOriginal = hasOriginalLines(lineChange);
+	const hasModified = hasModifiedLines(lineChange);
+	if (action === "revert" && side === "upper") {
+		if (!hasOriginal) return;
+		const text = getLinesText(originalModel, lineChange.originalStartLineNumber, lineChange.originalEndLineNumber);
+		if (!text) return;
+		const range = hasModified ? getInsertRangeBeforeLine(modifiedModel, lineChange.modifiedStartLineNumber) : getInsertRangeAfterLine(modifiedModel, Math.max(0, lineChange.modifiedStartLineNumber || lineChange.modifiedEndLineNumber));
+		modifiedModel.applyEdits([{
+			range,
+			text,
+			forceMoveMarkers: true
+		}]);
+		return;
+	}
+	if (action === "revert" && side === "lower") {
+		if (!hasModified) return;
+		const range = getFullLineRange(modifiedModel, lineChange.modifiedStartLineNumber, lineChange.modifiedEndLineNumber);
+		if (!range) return;
+		modifiedModel.applyEdits([{
+			range,
+			text: "",
+			forceMoveMarkers: true
+		}]);
+		return;
+	}
+	if (action === "stage" && side === "upper") {
+		if (!hasOriginal) return;
+		const range = getFullLineRange(originalModel, lineChange.originalStartLineNumber, lineChange.originalEndLineNumber);
+		if (!range) return;
+		originalModel.applyEdits([{
+			range,
+			text: "",
+			forceMoveMarkers: true
+		}]);
+		return;
+	}
+	if (action === "stage" && side === "lower") {
+		if (!hasModified) return;
+		const text = getLinesText(modifiedModel, lineChange.modifiedStartLineNumber, lineChange.modifiedEndLineNumber);
+		if (!text) return;
+		const anchor = hasOriginal ? lineChange.originalEndLineNumber : Math.max(0, lineChange.originalStartLineNumber);
+		const range = getInsertRangeAfterLine(originalModel, anchor);
+		originalModel.applyEdits([{
+			range,
+			text,
+			forceMoveMarkers: true
+		}]);
+	}
+}
+function setDiffHunkNodeEnabled(node, enabled) {
+	if (!node) return;
+	const buttons = node.querySelectorAll("button");
+	buttons.forEach((button) => {
+		button.disabled = !enabled;
+	});
+}
+function positionDiffHunkNode(node, editor, anchorLine, extraOffsetY = 0) {
+	var _editor$getScrollTop;
+	const host = editor.getContainerDomNode();
+	const line = Math.max(1, anchorLine);
+	const rawTop = editor.getTopForLineNumber(line) - (((_editor$getScrollTop = editor.getScrollTop) === null || _editor$getScrollTop === void 0 ? void 0 : _editor$getScrollTop.call(editor)) ?? 0);
+	const lineHeight = editor.getOption(monaco_shim_exports.editor.EditorOption.lineHeight);
+	const nodeWidth = node.offsetWidth || 130;
+	const nodeHeight = node.offsetHeight || 30;
+	const left = host.offsetLeft + Math.max(6, host.clientWidth - nodeWidth - 10);
+	const hostTop = host.offsetTop;
+	const minTop = hostTop + 4;
+	const maxTop = hostTop + Math.max(4, host.clientHeight - nodeHeight - 4);
+	const top = Math.min(maxTop, Math.max(minTop, hostTop + rawTop + Math.round(lineHeight * .2) + extraOffsetY));
+	node.style.transform = `translate(${Math.round(left)}px, ${Math.round(top)}px)`;
+	node.style.display = "flex";
+}
+
+//#endregion
+//#region src/core/diffUnchanged.ts
+function formatDiffUnchangedCountLabel(text) {
+	const match = text.match(/\d+/);
+	const count = match ? Number.parseInt(match[0], 10) : NaN;
+	if (Number.isFinite(count)) return `${count} unmodified ${count === 1 ? "line" : "lines"}`;
+	return text.replace(/hidden/gi, "unmodified");
+}
+function countDiffLines(startLineNumber, endLineNumber) {
+	return endLineNumber >= startLineNumber ? endLineNumber - startLineNumber + 1 : 0;
+}
+function measureDiffUnchangedSurroundingLines(primaryNode) {
+	const editorRoot = primaryNode.closest(".editor.modified") ?? primaryNode.closest(".monaco-editor");
+	if (!editorRoot) return {
+		previousVisibleLine: null,
+		nextVisibleLine: null
+	};
+	const widgetRect = primaryNode.getBoundingClientRect();
+	let previousVisibleLine = null;
+	let nextVisibleLine = null;
+	const lineNumberNodes = editorRoot.querySelectorAll(".line-numbers");
+	lineNumberNodes.forEach((node) => {
+		var _node$textContent;
+		const lineNumber = Number.parseInt(((_node$textContent = node.textContent) === null || _node$textContent === void 0 ? void 0 : _node$textContent.trim()) || "", 10);
+		if (!Number.isFinite(lineNumber)) return;
+		const top = node.getBoundingClientRect().top;
+		if (top < widgetRect.top - 1) previousVisibleLine = previousVisibleLine == null ? lineNumber : Math.max(previousVisibleLine, lineNumber);
+		else if (top > widgetRect.bottom + 1) nextVisibleLine = nextVisibleLine == null ? lineNumber : Math.min(nextVisibleLine, lineNumber);
+	});
+	return {
+		previousVisibleLine,
+		nextVisibleLine
+	};
+}
+function formatDiffMetadataRange(startLineNumber, lineCount) {
+	return `${startLineNumber},${Math.max(0, lineCount)}`;
+}
+function buildDiffHunkMetadataLabel(change, options) {
+	const { contextLineCount, modifiedTotalLines, originalTotalLines } = options;
+	const originalChangedCount = countDiffLines(change.originalStartLineNumber, change.originalEndLineNumber);
+	const modifiedChangedCount = countDiffLines(change.modifiedStartLineNumber, change.modifiedEndLineNumber);
+	const originalAnchor = Math.min(Math.max(change.originalStartLineNumber, 1), Math.max(1, originalTotalLines + 1));
+	const modifiedAnchor = Math.min(Math.max(change.modifiedStartLineNumber, 1), Math.max(1, modifiedTotalLines + 1));
+	const originalStart = Math.max(1, originalAnchor - contextLineCount);
+	const modifiedStart = Math.max(1, modifiedAnchor - contextLineCount);
+	const originalEnd = originalChangedCount > 0 ? Math.min(originalTotalLines, change.originalEndLineNumber + contextLineCount) : Math.min(originalTotalLines, originalAnchor + contextLineCount - 1);
+	const modifiedEnd = modifiedChangedCount > 0 ? Math.min(modifiedTotalLines, change.modifiedEndLineNumber + contextLineCount) : Math.min(modifiedTotalLines, modifiedAnchor + contextLineCount - 1);
+	const originalDisplayCount = originalEnd >= originalStart ? originalEnd - originalStart + 1 : 0;
+	const modifiedDisplayCount = modifiedEnd >= modifiedStart ? modifiedEnd - modifiedStart + 1 : 0;
+	return {
+		modifiedStart,
+		originalStart,
+		label: `@@ -${formatDiffMetadataRange(originalStart, originalDisplayCount)} +${formatDiffMetadataRange(modifiedStart, modifiedDisplayCount)} @@`
+	};
+}
+function resolveDiffMetadataLabel(options) {
+	var _metadataEntries$Math;
+	const { contextLineCount, lineChanges, modifiedTotalLines, originalTotalLines, pairIndex, primaryNode } = options;
+	if (lineChanges.length === 0) return null;
+	const metadataEntries = lineChanges.map((change) => buildDiffHunkMetadataLabel(change, {
+		contextLineCount,
+		modifiedTotalLines,
+		originalTotalLines
+	}));
+	const { nextVisibleLine } = measureDiffUnchangedSurroundingLines(primaryNode);
+	if (nextVisibleLine != null) {
+		const candidateStarts = [nextVisibleLine, nextVisibleLine - 1].filter((value) => value >= 1);
+		for (const candidateStart of candidateStarts) {
+			const matching = metadataEntries.find((entry) => entry.modifiedStart === candidateStart);
+			if (matching) return matching.label;
+		}
+	}
+	return ((_metadataEntries$Math = metadataEntries[Math.min(pairIndex, metadataEntries.length - 1)]) === null || _metadataEntries$Math === void 0 ? void 0 : _metadataEntries$Math.label) ?? null;
+}
+function resolveDiffUnchangedSummaryLabel(options) {
+	const { countText, unchangedRegionStyle,...metadataOptions } = options;
+	if (unchangedRegionStyle !== "metadata") return countText;
+	return resolveDiffMetadataLabel(metadataOptions) ?? countText;
+}
+function resolveDiffUnchangedRevealLayout(options) {
+	const { countText, modelLineCount, pairCount, pairIndex, primaryNode } = options;
+	let showTopHandle = pairCount === 1 || pairIndex > 0;
+	let showBottomHandle = pairCount === 1 || pairIndex < pairCount - 1;
+	const countMatch = countText.match(/\d+/);
+	const hiddenCount = countMatch ? Number.parseInt(countMatch[0], 10) : NaN;
+	if (!Number.isFinite(hiddenCount)) return {
+		showTopHandle,
+		showBottomHandle
+	};
+	const { previousVisibleLine, nextVisibleLine } = measureDiffUnchangedSurroundingLines(primaryNode);
+	if (previousVisibleLine == null && nextVisibleLine != null) {
+		showTopHandle = false;
+		showBottomHandle = true;
+		return {
+			showTopHandle,
+			showBottomHandle
+		};
+	}
+	if (nextVisibleLine == null && previousVisibleLine != null) {
+		showTopHandle = true;
+		showBottomHandle = false;
+		return {
+			showTopHandle,
+			showBottomHandle
+		};
+	}
+	if (nextVisibleLine != null && nextVisibleLine - hiddenCount === 1) {
+		showTopHandle = false;
+		showBottomHandle = true;
+	}
+	if (previousVisibleLine != null && modelLineCount != null && previousVisibleLine + hiddenCount === modelLineCount) {
+		showTopHandle = true;
+		showBottomHandle = false;
+	}
+	return {
+		showTopHandle,
+		showBottomHandle
+	};
+}
+function resolveDiffUnchangedMergeRole(options) {
+	const { diffRoot, modifiedHost, node, originalHost } = options;
+	if (typeof HTMLElement === "undefined") return "none";
+	if (!(diffRoot instanceof HTMLElement)) return "none";
+	const nodeRect = node.getBoundingClientRect();
+	const nodeCenter = nodeRect.left + nodeRect.width / 2;
+	if (originalHost instanceof HTMLElement && modifiedHost instanceof HTMLElement) {
+		const originalRect = originalHost.getBoundingClientRect();
+		const modifiedRect = modifiedHost.getBoundingClientRect();
+		const originalCenter = originalRect.left + originalRect.width / 2;
+		const modifiedCenter = modifiedRect.left + modifiedRect.width / 2;
+		return Math.abs(nodeCenter - originalCenter) <= Math.abs(nodeCenter - modifiedCenter) ? "secondary" : "primary";
+	}
+	const diffRect = diffRoot.getBoundingClientRect();
+	return nodeCenter < diffRect.left + diffRect.width / 2 ? "secondary" : "primary";
+}
+
+//#endregion
+//#region src/core/diffUnchangedDom.ts
+const diffUnchangedSummaryStyleClasses = [
+	"stream-monaco-unchanged-summary-line-info",
+	"stream-monaco-unchanged-summary-line-info-basic",
+	"stream-monaco-unchanged-summary-metadata",
+	"stream-monaco-unchanged-summary-simple"
+];
+function createDiffUnchangedBridgeScaffold() {
+	const bridge = document.createElement("div");
+	bridge.className = "stream-monaco-diff-unchanged-bridge";
+	bridge.setAttribute("role", "group");
+	syncDiffUnchangedBridgeVisibility(bridge, false);
+	const summary = document.createElement("button");
+	summary.type = "button";
+	summary.className = "stream-monaco-unchanged-summary";
+	const visualMeta = document.createElement("div");
+	visualMeta.className = "stream-monaco-unchanged-meta";
+	summary.append(visualMeta);
+	const divider = document.createElement("span");
+	divider.className = "stream-monaco-unchanged-pane-divider";
+	divider.setAttribute("aria-hidden", "true");
+	bridge.append(summary, divider);
+	return {
+		bridge,
+		summary,
+		visualMeta,
+		divider
+	};
+}
+function createDiffUnchangedBridgeOverlay() {
+	const overlay = document.createElement("div");
+	overlay.className = "stream-monaco-diff-unchanged-overlay";
+	return overlay;
+}
+function syncDiffUnchangedBridgeVisibility(bridge, visible) {
+	bridge.hidden = !visible;
+	bridge.toggleAttribute("aria-hidden", !visible);
+}
+function clearDiffUnchangedBridgeSourceClasses(container) {
+	const bridgedCenters = container.querySelectorAll(".stream-monaco-unchanged-bridge-source");
+	bridgedCenters.forEach((node) => node.classList.remove("stream-monaco-unchanged-bridge-source"));
+}
+function resetDiffUnchangedOverlayTransform(overlay) {
+	if (!overlay) return;
+	overlay.style.transform = "translate3d(0px, 0px, 0px)";
+}
+function resolveDiffUnchangedViewZoneHeight(unchangedRegionStyle) {
+	return unchangedRegionStyle === "simple" ? 28 : 32;
+}
+function collectDiffUnchangedViewZoneIds(editorRoot, scrollTop) {
+	const widgetTopValues = Array.from(editorRoot.querySelectorAll(".diff-hidden-lines-widget")).map((node) => Number.parseFloat(node.style.top || "NaN")).filter((value) => Number.isFinite(value) && value > -1e5);
+	if (widgetTopValues.length === 0) return [];
+	return Array.from(editorRoot.querySelectorAll(".view-zones > div[monaco-view-zone][monaco-visible-view-zone=\"true\"]")).filter((node) => {
+		const zoneTop = Number.parseFloat(node.style.top || "NaN");
+		const currentHeight = Number.parseFloat(node.style.height || "0");
+		return Number.isFinite(zoneTop) && Number.isFinite(currentHeight) && currentHeight > 0 && widgetTopValues.some((widgetTop) => Math.abs(zoneTop - scrollTop - widgetTop) < .5);
+	}).map((node) => node.getAttribute("monaco-view-zone")).filter((value) => Boolean(value));
+}
+function findDiffUnchangedActivationAction(...roots) {
+	for (const root of roots) {
+		const action = (root === null || root === void 0 ? void 0 : root.querySelector("a, button")) ?? null;
+		if (action) return action;
+	}
+	return null;
+}
+function findDiffUnchangedExpandAction(root) {
+	return (root === null || root === void 0 ? void 0 : root.querySelector("a")) ?? null;
+}
+function shouldIgnoreDiffUnchangedCenterClickTarget(target) {
+	return target instanceof HTMLElement && Boolean(target.closest("a, .breadcrumb-item"));
+}
+function shouldHandleDiffUnchangedCenterClick(event) {
+	return event.button === 0 && !shouldIgnoreDiffUnchangedCenterClickTarget(event.target);
+}
+function activateDiffUnchangedExpandAction(root, onBeforeActivate) {
+	const action = findDiffUnchangedExpandAction(root);
+	if (!action) return false;
+	onBeforeActivate === null || onBeforeActivate === void 0 || onBeforeActivate(action);
+	action.click();
+	return true;
+}
+function syncDiffUnchangedCenterNode(node, mergeRole) {
+	node.classList.add("stream-monaco-clickable");
+	node.title = "Click to expand all unmodified lines";
+	node.classList.toggle("stream-monaco-unchanged-merged-secondary", mergeRole === "secondary");
+	node.classList.toggle("stream-monaco-unchanged-merged-primary", mergeRole === "primary");
+}
+function syncDiffUnchangedMetaNode(metaNode, unchangedRegionStyle, summaryLabel) {
+	const lastStyle = metaNode.dataset.style;
+	const lastLabel = metaNode.dataset.label;
+	if (lastStyle === unchangedRegionStyle && lastLabel === summaryLabel) return;
+	metaNode.dataset.style = unchangedRegionStyle;
+	metaNode.dataset.label = summaryLabel;
+	metaNode.replaceChildren();
+	metaNode.classList.toggle("stream-monaco-unchanged-meta-simple", unchangedRegionStyle === "simple");
+	if (unchangedRegionStyle === "simple") {
+		const simpleBar = document.createElement("span");
+		simpleBar.className = "stream-monaco-unchanged-simple-bar";
+		simpleBar.setAttribute("aria-hidden", "true");
+		metaNode.append(simpleBar);
+		return;
+	}
+	const label = document.createElement("span");
+	label.className = unchangedRegionStyle === "metadata" ? "stream-monaco-unchanged-metadata-label" : "stream-monaco-unchanged-count";
+	label.textContent = summaryLabel;
+	metaNode.append(label);
+}
+function syncDiffUnchangedSummaryButton(summary, unchangedRegionStyle, summaryLabel) {
+	summary.classList.remove(...diffUnchangedSummaryStyleClasses);
+	summary.classList.add(`stream-monaco-unchanged-summary-${unchangedRegionStyle}`);
+	const summaryInteractive = unchangedRegionStyle === "line-info" || unchangedRegionStyle === "line-info-basic";
+	summary.disabled = !summaryInteractive;
+	summary.tabIndex = summaryInteractive ? 0 : -1;
+	if (summaryInteractive) {
+		summary.removeAttribute("aria-hidden");
+		summary.setAttribute("aria-label", `${summaryLabel}. Expand all unmodified lines`);
+		summary.title = "Expand all unmodified lines";
+		return;
+	}
+	if (unchangedRegionStyle === "simple") {
+		summary.setAttribute("aria-hidden", "true");
+		summary.removeAttribute("aria-label");
+		summary.title = "";
+		return;
+	}
+	summary.removeAttribute("aria-hidden");
+	summary.removeAttribute("aria-label");
+	summary.title = "";
+}
+function syncDiffUnchangedExpandAction(action, hidden) {
+	action.classList.add("stream-monaco-unchanged-expand");
+	action.dataset.streamMonacoLabel = "Expand all";
+	action.title = "Expand all unmodified lines";
+	action.setAttribute("aria-label", "Expand all unmodified lines");
+	action.toggleAttribute("aria-hidden", hidden);
+	action.tabIndex = hidden ? -1 : 0;
+}
+function createDiffUnchangedRevealButton(direction) {
+	const button = document.createElement("button");
+	button.type = "button";
+	button.className = "stream-monaco-unchanged-reveal";
+	button.innerHTML = `<span class="codicon codicon-chevron-${direction}"></span>`;
+	button.dataset.direction = direction;
+	return button;
+}
+function syncDiffUnchangedRevealButtonNode(button, handle, label) {
+	button.hidden = !handle;
+	button.disabled = !handle;
+	button.toggleAttribute("aria-hidden", !handle);
+	button.title = handle ? label : "";
+	button.setAttribute("aria-label", handle ? label : "");
+}
+function bindDiffUnchangedRevealButtonAction(button, handle, onActivate) {
+	button.onclick = handle ? (event) => {
+		event.preventDefault();
+		event.stopPropagation();
+		onActivate(handle);
+	} : null;
+}
+function shouldHandleDiffUnchangedWheel(event) {
+	return Math.abs(event.deltaY) >= .5 || Math.abs(event.deltaX) >= .5;
+}
+function resolveDiffUnchangedWheelScrollTarget(scrollTop, scrollLeft, event) {
+	return {
+		targetScrollTop: scrollTop + event.deltaY,
+		targetScrollLeft: scrollLeft + event.deltaX,
+		syncHorizontal: Math.abs(event.deltaX) >= .5
+	};
+}
+function syncDiffUnchangedBridgeNode(options) {
+	const { bridge, bridgeLeftInset, bridgeRailWidth, containerRect, containerScrollLeft, containerScrollTop, editorBackgroundColor, primaryAnchorRect, primaryStyle, secondaryAnchorRect, unchangedRegionStyle } = options;
+	bridge.className = "stream-monaco-diff-unchanged-bridge";
+	bridge.classList.add(`stream-monaco-diff-unchanged-bridge-${unchangedRegionStyle}`);
+	bridge.style.left = `${secondaryAnchorRect.left - containerRect.left + containerScrollLeft + bridgeLeftInset}px`;
+	bridge.style.top = `${primaryAnchorRect.top - containerRect.top + containerScrollTop}px`;
+	bridge.style.width = `${Math.max(0, primaryAnchorRect.right - secondaryAnchorRect.left - bridgeLeftInset)}px`;
+	bridge.style.height = `${Math.max(secondaryAnchorRect.height, primaryAnchorRect.height)}px`;
+	bridge.style.color = primaryStyle.color;
+	bridge.style.fontFamily = primaryStyle.fontFamily;
+	bridge.style.fontSize = primaryStyle.fontSize;
+	bridge.style.lineHeight = primaryStyle.lineHeight;
+	bridge.style.setProperty("--stream-monaco-unchanged-fg", primaryStyle.color);
+	bridge.style.setProperty("--stream-monaco-editor-bg", editorBackgroundColor);
+	bridge.style.setProperty("--stream-monaco-unchanged-split-offset", `${Math.max(0, secondaryAnchorRect.width - bridgeLeftInset)}px`);
+	if (bridgeRailWidth) {
+		bridge.style.setProperty("--stream-monaco-unchanged-rail-width", `${bridgeRailWidth}px`);
+		return;
+	}
+	bridge.style.removeProperty("--stream-monaco-unchanged-rail-width");
+}
+function syncDiffUnchangedRailNode(rail, showTopHandle, showBottomHandle) {
+	const shouldRenderRail = showTopHandle || showBottomHandle;
+	rail.hidden = !shouldRenderRail;
+	rail.toggleAttribute("aria-hidden", !shouldRenderRail);
+	rail.classList.toggle("stream-monaco-unchanged-rail-top-only", showTopHandle && !showBottomHandle);
+	rail.classList.toggle("stream-monaco-unchanged-rail-bottom-only", !showTopHandle && showBottomHandle);
+	rail.classList.toggle("stream-monaco-unchanged-rail-both", showTopHandle && showBottomHandle);
+}
+function dispatchSyntheticPrimaryMouseDown(node) {
+	const view = node.ownerDocument.defaultView;
+	if (!view) return;
+	const rect = node.getBoundingClientRect();
+	node.dispatchEvent(new view.MouseEvent("mousedown", {
+		bubbles: true,
+		cancelable: true,
+		button: 0,
+		clientX: rect.left + rect.width / 2,
+		clientY: rect.top + rect.height / 2
+	}));
+}
+function dispatchSyntheticPrimaryMouseTap(node) {
+	const view = node.ownerDocument.defaultView;
+	if (!view) return;
+	const rect = node.getBoundingClientRect();
+	const clientX = rect.left + rect.width / 2;
+	const clientY = rect.top + rect.height / 2;
+	node.dispatchEvent(new view.MouseEvent("mousedown", {
+		bubbles: true,
+		cancelable: true,
+		button: 0,
+		clientX,
+		clientY
+	}));
+	node.dispatchEvent(new view.MouseEvent("mouseup", {
+		bubbles: true,
+		cancelable: true,
+		button: 0,
+		clientX,
+		clientY
+	}));
+}
+
+//#endregion
+//#region src/core/diffViewport.ts
+function computeDiffRawHeight({ diffEditorView, maxHeightValue }) {
+	var _originalEditor$getMo, _modifiedEditor$getMo, _originalEditor$getSc, _modifiedEditor$getSc;
+	if (!diffEditorView) return Math.min(18 + padding, maxHeightValue);
+	const modifiedEditor = diffEditorView.getModifiedEditor();
+	const originalEditor = diffEditorView.getOriginalEditor();
+	const lineHeight = modifiedEditor.getOption(monaco_shim_exports.editor.EditorOption.lineHeight);
+	const originalLineCount = ((_originalEditor$getMo = originalEditor.getModel()) === null || _originalEditor$getMo === void 0 ? void 0 : _originalEditor$getMo.getLineCount()) ?? 1;
+	const modifiedLineCount = ((_modifiedEditor$getMo = modifiedEditor.getModel()) === null || _modifiedEditor$getMo === void 0 ? void 0 : _modifiedEditor$getMo.getLineCount()) ?? 1;
+	const lineCount = Math.max(originalLineCount, modifiedLineCount);
+	const fromLines = lineCount * lineHeight + padding;
+	const scrollHeight = Math.max(((_originalEditor$getSc = originalEditor.getScrollHeight) === null || _originalEditor$getSc === void 0 ? void 0 : _originalEditor$getSc.call(originalEditor)) ?? 0, ((_modifiedEditor$getSc = modifiedEditor.getScrollHeight) === null || _modifiedEditor$getSc === void 0 ? void 0 : _modifiedEditor$getSc.call(modifiedEditor)) ?? 0);
+	return Math.min(Math.max(fromLines, scrollHeight), maxHeightValue);
+}
+function computeDiffHeight({ inlineDiffStreamingHeightFloor, inlineDiffStreamingPresentationActive, isInlineMode, rawHeight }) {
+	if (!isInlineMode || !inlineDiffStreamingPresentationActive && inlineDiffStreamingHeightFloor <= 0) return {
+		height: rawHeight,
+		nextInlineDiffStreamingHeightFloor: inlineDiffStreamingHeightFloor
+	};
+	const nextInlineDiffStreamingHeightFloor = Math.max(rawHeight, inlineDiffStreamingHeightFloor);
+	return {
+		height: nextInlineDiffStreamingHeightFloor,
+		nextInlineDiffStreamingHeightFloor
+	};
+}
+function readContainerLayoutSize(container) {
+	var _container$getBoundin;
+	const rect = (_container$getBoundin = container.getBoundingClientRect) === null || _container$getBoundin === void 0 ? void 0 : _container$getBoundin.call(container);
+	return {
+		width: container.clientWidth || (rect === null || rect === void 0 ? void 0 : rect.width) || 0,
+		height: container.clientHeight || (rect === null || rect === void 0 ? void 0 : rect.height) || 0
+	};
+}
+function hasVerticalScrollbar(measurement) {
+	const epsilon = Math.max(2, Math.round(measurement.lineHeight / 8));
+	return measurement.scrollHeight > measurement.computedHeight + Math.max(padding / 2, epsilon);
+}
+function isUserNearBottom(measurement, options) {
+	const lineThreshold = options.autoScrollThresholdLines * measurement.lineHeight;
+	const threshold = Math.max(lineThreshold || 0, options.autoScrollThresholdPx);
+	const distance = measurement.scrollHeight - (measurement.scrollTop + measurement.viewportHeight);
+	return distance <= threshold;
+}
+function revealEditorLine(editor, line, strategy, scrollType) {
+	if (strategy === "bottom") {
+		if (typeof scrollType !== "undefined") editor.revealLine(line, scrollType);
+		else editor.revealLine(line);
+		return;
+	}
+	if (strategy === "center") {
+		if (typeof scrollType !== "undefined") editor.revealLineInCenter(line, scrollType);
+		else editor.revealLineInCenter(line);
+		return;
+	}
+	if (typeof scrollType !== "undefined") editor.revealLineInCenterIfOutsideViewport(line, scrollType);
+	else editor.revealLineInCenterIfOutsideViewport(line);
+}
+function waitForElementHeightApplied(element, target, timeoutMs = 500) {
+	return new Promise((resolve) => {
+		const start = typeof performance !== "undefined" && performance.now ? performance.now() : Date.now();
+		const check = () => {
+			const applied = element ? Number.parseFloat((element.style.height || "").replace("px", "")) || 0 : -1;
+			if (applied >= target - 1) {
+				resolve();
+				return;
+			}
+			const now = typeof performance !== "undefined" && performance.now ? performance.now() : Date.now();
+			if (now - start > timeoutMs) {
+				resolve();
+				return;
+			}
+			requestAnimationFrame(check);
+		};
+		check();
+	});
+}
+
 //#endregion
 //#region src/core/DiffEditorManager.ts
 var DiffEditorManager = class DiffEditorManager {
@@ -495,6 +1303,8 @@ var DiffEditorManager = class DiffEditorManager {
 	lastKnownModifiedCode = null;
 	lastKnownModifiedLineCount = null;
 	pendingDiffUpdate = null;
+	minimalEditMaxCharsValue = minimalEditMaxChars;
+	minimalEditMaxChangeRatioValue = minimalEditMaxChangeRatio;
 	shouldAutoScrollDiff = true;
 	diffScrollWatcher = null;
 	lastScrollTopDiff = 0;
@@ -503,6 +1313,7 @@ var DiffEditorManager = class DiffEditorManager {
 	cachedLineHeightDiff = null;
 	cachedComputedHeightDiff = null;
 	lastKnownModifiedDirty = false;
+	programmaticModifiedContentChangeDepth = 0;
 	measureViewportDiff() {
 		var _me$getLayoutInfo, _me$getScrollTop, _me$getScrollHeight;
 		if (!this.diffEditorView) return null;
@@ -555,8 +1366,14 @@ var DiffEditorManager = class DiffEditorManager {
 	diffComputedVersions = null;
 	preserveNativeDiffDecorationsOnStaleAppend = false;
 	diffPresentationDisposables = [];
+	diffPresentationObserver = null;
 	fallbackOriginalDecorationIds = [];
 	fallbackModifiedDecorationIds = [];
+	fallbackInlineDeletedZoneIds = [];
+	fallbackInlineDeletedZoneSignature = null;
+	inlineDiffStreamingPresentationActive = false;
+	inlineDiffStreamingPresentationIdleTimer = null;
+	inlineDiffStreamingHeightFloor = 0;
 	diffHunkHideTimer = null;
 	diffUnchangedRegionDisposables = [];
 	diffUnchangedRegionObserver = null;
@@ -569,9 +1386,11 @@ var DiffEditorManager = class DiffEditorManager {
 	diffUnchangedOverlayScrollLeft = 0;
 	diffRootAppearanceSignature = null;
 	diffPersistedUnchangedModelState = null;
+	diffPreviousUnchangedModelState = null;
 	pendingPreparedDiffViewModel = null;
 	cancelRafs() {
 		this.rafScheduler.cancel("sync-diff-presentation");
+		this.rafScheduler.cancel("sync-diff-layout");
 		this.rafScheduler.cancel("capture-diff-unchanged-state");
 		this.rafScheduler.cancel("restore-diff-unchanged-state");
 		this.rafScheduler.cancel("patch-diff-unchanged-regions");
@@ -634,6 +1453,8 @@ var DiffEditorManager = class DiffEditorManager {
 		this.diffAutoScroll = diffAutoScroll;
 		this.revealDebounceMsOption = revealDebounceMsOption;
 		this.diffUpdateThrottleMsOption = diffUpdateThrottleMsOption;
+		this.minimalEditMaxCharsValue = this.options.minimalEditMaxChars ?? minimalEditMaxChars;
+		this.minimalEditMaxChangeRatioValue = this.options.minimalEditMaxChangeRatio ?? minimalEditMaxChangeRatio;
 	}
 	resolveDiffHideUnchangedRegionsOption() {
 		const normalize = (value) => {
@@ -658,6 +1479,9 @@ var DiffEditorManager = class DiffEditorManager {
 			revealLineCount: 5
 		};
 	}
+	resolveDiffGlyphMarginOption(hideUnchangedRegions = this.resolveDiffHideUnchangedRegionsOption()) {
+		return (hideUnchangedRegions === null || hideUnchangedRegions === void 0 ? void 0 : hideUnchangedRegions.enabled) ? true : this.options.glyphMargin;
+	}
 	resolveDiffLineStyleOption() {
 		return this.options.diffLineStyle === "bar" ? "bar" : "background";
 	}
@@ -671,188 +1495,21 @@ var DiffEditorManager = class DiffEditorManager {
 		if (typeof explicitThrottle === "number") return explicitThrottle;
 		return 50;
 	}
-	parseCssColorRgb(color) {
-		const normalized = color.trim().toLowerCase();
-		const rgbMatch = normalized.match(/^rgba?\(\s*([+\-.\d]+)\s*,\s*([+\-.\d]+)\s*,\s*([+\-.\d]+)/);
-		if (rgbMatch) return [
-			Number.parseFloat(rgbMatch[1]),
-			Number.parseFloat(rgbMatch[2]),
-			Number.parseFloat(rgbMatch[3])
-		];
-		const hexMatch = normalized.match(/^#([\da-f]{3,8})$/i);
-		if (!hexMatch) return null;
-		const hex = hexMatch[1];
-		if (hex.length === 3 || hex.length === 4) return [
-			Number.parseInt(`${hex[0]}${hex[0]}`, 16),
-			Number.parseInt(`${hex[1]}${hex[1]}`, 16),
-			Number.parseInt(`${hex[2]}${hex[2]}`, 16)
-		];
-		if (hex.length === 6 || hex.length === 8) return [
-			Number.parseInt(hex.slice(0, 2), 16),
-			Number.parseInt(hex.slice(2, 4), 16),
-			Number.parseInt(hex.slice(4, 6), 16)
-		];
-		return null;
-	}
-	resolveCssColorLuminance(color) {
-		const rgb = this.parseCssColorRgb(color);
-		if (!rgb) return null;
-		const channel = (value) => {
-			const normalized = Math.max(0, Math.min(255, value)) / 255;
-			return normalized <= .03928 ? normalized / 12.92 : ((normalized + .055) / 1.055) ** 2.4;
-		};
-		const [r, g, b] = rgb;
-		return .2126 * channel(r) + .7152 * channel(g) + .0722 * channel(b);
-	}
-	resolveDiffUnchangedLineInfoRailMetrics(node) {
-		const editorRoot = node.closest(".monaco-editor");
-		if (!editorRoot) return {
-			leftInset: 0,
-			width: null
-		};
-		const editorRect = editorRoot.getBoundingClientRect();
-		const lineNumberNode = Array.from(editorRoot.querySelectorAll(".line-numbers")).find((candidate) => {
-			const rect = candidate.getBoundingClientRect();
-			return rect.width > 0 && rect.height > 0;
-		});
-		if (!lineNumberNode) return {
-			leftInset: 0,
-			width: null
-		};
-		const lineNumberRect = lineNumberNode.getBoundingClientRect();
-		return {
-			leftInset: Math.max(0, lineNumberRect.left - editorRect.left),
-			width: Math.max(0, lineNumberRect.width) || null
-		};
-	}
-	looksLikeDarkThemeName(themeName) {
-		if (!themeName) return false;
-		const normalized = themeName.toLowerCase();
-		return [
-			"dark",
-			"night",
-			"moon",
-			"black",
-			"dracula",
-			"mocha",
-			"frappe",
-			"macchiato",
-			"palenight",
-			"ocean",
-			"poimandres",
-			"monokai",
-			"laserwave",
-			"tokyo",
-			"slack-dark",
-			"rose-pine",
-			"github-dark",
-			"material-theme",
-			"one-dark",
-			"catppuccin-mocha",
-			"catppuccin-frappe",
-			"catppuccin-macchiato"
-		].some((token) => normalized.includes(token)) && !normalized.includes("light") && !normalized.includes("latte") && !normalized.includes("dawn") && !normalized.includes("lotus");
-	}
-	looksLikeLightThemeName(themeName) {
-		if (!themeName) return false;
-		const normalized = themeName.toLowerCase();
-		return [
-			"light",
-			"day",
-			"dawn",
-			"latte",
-			"solarized-light",
-			"github-light",
-			"rose-pine-dawn",
-			"catppuccin-latte",
-			"one-light",
-			"vitesse-light",
-			"snazzy-light",
-			"material-lighter",
-			"material-theme-lighter",
-			"lotus"
-		].some((token) => normalized.includes(token));
-	}
-	resolveDiffAppearanceOption() {
-		var _this$diffEditorView, _this$diffEditorView$, _this$diffEditorView$2, _this$diffEditorView2, _this$diffEditorView3, _this$diffEditorView4;
-		if (this.options.diffAppearance === "light") return "light";
-		if (this.options.diffAppearance === "dark") return "dark";
-		if (this.looksLikeDarkThemeName(this.options.theme)) return "dark";
-		if (this.looksLikeLightThemeName(this.options.theme)) return "light";
-		const appearanceProbeNodes = [
-			(_this$diffEditorView = this.diffEditorView) === null || _this$diffEditorView === void 0 || (_this$diffEditorView$2 = (_this$diffEditorView$ = _this$diffEditorView.getModifiedEditor()).getContainerDomNode) === null || _this$diffEditorView$2 === void 0 ? void 0 : _this$diffEditorView$2.call(_this$diffEditorView$),
-			(_this$diffEditorView2 = this.diffEditorView) === null || _this$diffEditorView2 === void 0 || (_this$diffEditorView4 = (_this$diffEditorView3 = _this$diffEditorView2.getOriginalEditor()).getContainerDomNode) === null || _this$diffEditorView4 === void 0 ? void 0 : _this$diffEditorView4.call(_this$diffEditorView3),
-			this.lastContainer
-		];
-		for (const node of appearanceProbeNodes) {
-			if (!(node instanceof HTMLElement)) continue;
-			const style = globalThis.getComputedStyle(node);
-			const editorSurface = node.querySelector(".monaco-editor .monaco-editor-background, .monaco-editor .margin, .monaco-editor .lines-content");
-			const candidates = [
-				style.getPropertyValue("--stream-monaco-editor-bg"),
-				style.getPropertyValue("--vscode-editor-background"),
-				editorSurface ? globalThis.getComputedStyle(editorSurface).backgroundColor : "",
-				style.backgroundColor
-			];
-			for (const color of candidates) {
-				const luminance = this.resolveCssColorLuminance(color);
-				if (luminance == null) continue;
-				return luminance <= .42 ? "dark" : "light";
-			}
-		}
-		return this.looksLikeDarkThemeName(this.options.theme) ? "dark" : "light";
-	}
-	syncDiffRootThemeVariables(appearance) {
-		var _this$diffEditorView5, _this$diffEditorView6, _this$diffEditorView7, _this$diffEditorView8, _this$diffEditorView9, _this$diffEditorView10;
-		if (!(this.lastContainer instanceof HTMLElement)) return;
-		const probeNodes = [
-			(_this$diffEditorView5 = this.diffEditorView) === null || _this$diffEditorView5 === void 0 || (_this$diffEditorView7 = (_this$diffEditorView6 = _this$diffEditorView5.getModifiedEditor()).getContainerDomNode) === null || _this$diffEditorView7 === void 0 ? void 0 : _this$diffEditorView7.call(_this$diffEditorView6),
-			(_this$diffEditorView8 = this.diffEditorView) === null || _this$diffEditorView8 === void 0 || (_this$diffEditorView10 = (_this$diffEditorView9 = _this$diffEditorView8.getOriginalEditor()).getContainerDomNode) === null || _this$diffEditorView10 === void 0 ? void 0 : _this$diffEditorView10.call(_this$diffEditorView9),
-			this.lastContainer
-		];
-		const containerStyle = globalThis.getComputedStyle(this.lastContainer);
-		const fixedBackgroundColor = containerStyle.getPropertyValue("--stream-monaco-fixed-editor-bg").trim() || null;
-		let backgroundColor = null;
-		let foregroundColor = null;
-		for (const node of probeNodes) {
-			if (!(node instanceof HTMLElement)) continue;
-			const backgroundProbe = node.querySelector(".monaco-editor-background, .margin, .lines-content") ?? node;
-			const foregroundProbe = node.querySelector(".view-lines, .monaco-editor, .view-overlays") ?? node;
-			const nextBackground = globalThis.getComputedStyle(backgroundProbe).backgroundColor;
-			if (!backgroundColor && this.resolveCssColorLuminance(nextBackground) != null) backgroundColor = nextBackground;
-			const nextForeground = globalThis.getComputedStyle(foregroundProbe).color;
-			if (!foregroundColor && this.resolveCssColorLuminance(nextForeground) != null) foregroundColor = nextForeground;
-			if (backgroundColor && foregroundColor) break;
-		}
-		const resolvedBackgroundColor = fixedBackgroundColor || backgroundColor || (appearance === "dark" ? "rgb(10 10 11)" : "rgb(255 255 255)");
-		if (resolvedBackgroundColor) this.lastContainer.style.setProperty("--stream-monaco-editor-bg", resolvedBackgroundColor);
-		else this.lastContainer.style.removeProperty("--stream-monaco-editor-bg");
-		if (foregroundColor) this.lastContainer.style.setProperty("--stream-monaco-editor-fg", foregroundColor);
-		else this.lastContainer.style.removeProperty("--stream-monaco-editor-fg");
-	}
 	applyDiffRootAppearanceClass() {
-		if (!this.lastContainer) return;
-		const resolvedAppearance = this.resolveDiffAppearanceOption();
-		this.syncDiffRootThemeVariables(resolvedAppearance);
-		const containerClassList = this.lastContainer.classList;
-		const activeLineStyleClass = `stream-monaco-diff-style-${this.resolveDiffLineStyleOption()}`;
-		const activeUnchangedRegionStyleClass = `stream-monaco-diff-unchanged-style-${this.resolveDiffUnchangedRegionStyleOption()}`;
-		const sideBySide = !this.isDiffInlineMode();
-		const activeLayoutModeClass = sideBySide ? "stream-monaco-diff-side-by-side" : "stream-monaco-diff-inline";
-		const activeAppearanceClass = `stream-monaco-diff-appearance-${resolvedAppearance}`;
-		const nextSignature = [
-			activeLineStyleClass,
-			activeUnchangedRegionStyleClass,
-			activeLayoutModeClass,
-			activeAppearanceClass
-		].join("|");
-		if (this.diffRootAppearanceSignature === nextSignature && containerClassList.contains("stream-monaco-diff-root")) return;
-		containerClassList.add("stream-monaco-diff-root");
-		for (const className of DiffEditorManager.diffLineStyleClasses) containerClassList.toggle(className, className === activeLineStyleClass);
-		for (const className of DiffEditorManager.diffUnchangedRegionStyleClasses) containerClassList.toggle(className, className === activeUnchangedRegionStyleClass);
-		for (const className of DiffEditorManager.diffLayoutModeClasses) containerClassList.toggle(className, className === activeLayoutModeClass);
-		for (const className of DiffEditorManager.diffAppearanceClasses) containerClassList.toggle(className, className === activeAppearanceClass);
-		this.diffRootAppearanceSignature = nextSignature;
+		this.diffRootAppearanceSignature = applyDiffRootAppearanceClass({
+			container: this.lastContainer,
+			diffEditorView: this.diffEditorView,
+			diffAppearance: this.options.diffAppearance,
+			themeName: this.options.theme ?? null,
+			currentSignature: this.diffRootAppearanceSignature,
+			lineStyle: this.resolveDiffLineStyleOption(),
+			unchangedRegionStyle: this.resolveDiffUnchangedRegionStyleOption(),
+			isInlineMode: this.isDiffInlineMode(),
+			lineStyleClasses: DiffEditorManager.diffLineStyleClasses,
+			unchangedRegionStyleClasses: DiffEditorManager.diffUnchangedRegionStyleClasses,
+			layoutModeClasses: DiffEditorManager.diffLayoutModeClasses,
+			appearanceClasses: DiffEditorManager.diffAppearanceClasses
+		});
 	}
 	disposeDiffHunkInteractions() {
 		if (this.diffHunkHideTimer != null) {
@@ -980,13 +1637,226 @@ var DiffEditorManager = class DiffEditorManager {
 		});
 	}
 	clearFallbackDiffDecorations() {
-		var _this$diffEditorView11, _this$diffEditorView12;
-		const originalEditor = (_this$diffEditorView11 = this.diffEditorView) === null || _this$diffEditorView11 === void 0 ? void 0 : _this$diffEditorView11.getOriginalEditor();
-		const modifiedEditor = (_this$diffEditorView12 = this.diffEditorView) === null || _this$diffEditorView12 === void 0 ? void 0 : _this$diffEditorView12.getModifiedEditor();
+		var _this$diffEditorView, _this$diffEditorView2;
+		const originalEditor = (_this$diffEditorView = this.diffEditorView) === null || _this$diffEditorView === void 0 ? void 0 : _this$diffEditorView.getOriginalEditor();
+		const modifiedEditor = (_this$diffEditorView2 = this.diffEditorView) === null || _this$diffEditorView2 === void 0 ? void 0 : _this$diffEditorView2.getModifiedEditor();
 		if (originalEditor && this.fallbackOriginalDecorationIds.length > 0) this.fallbackOriginalDecorationIds = originalEditor.deltaDecorations(this.fallbackOriginalDecorationIds, []);
 		else this.fallbackOriginalDecorationIds = [];
 		if (modifiedEditor && this.fallbackModifiedDecorationIds.length > 0) this.fallbackModifiedDecorationIds = modifiedEditor.deltaDecorations(this.fallbackModifiedDecorationIds, []);
 		else this.fallbackModifiedDecorationIds = [];
+		this.clearFallbackInlineDeletedZones();
+	}
+	clearFallbackInlineDeletedZones() {
+		var _this$diffEditorView3;
+		const modifiedEditor = (_this$diffEditorView3 = this.diffEditorView) === null || _this$diffEditorView3 === void 0 ? void 0 : _this$diffEditorView3.getModifiedEditor();
+		if (modifiedEditor && this.fallbackInlineDeletedZoneIds.length > 0) try {
+			var _modifiedEditor$chang;
+			(_modifiedEditor$chang = modifiedEditor.changeViewZones) === null || _modifiedEditor$chang === void 0 || _modifiedEditor$chang.call(modifiedEditor, (accessor) => {
+				for (const id of this.fallbackInlineDeletedZoneIds) accessor.removeZone(id);
+			});
+		} catch {}
+		this.fallbackInlineDeletedZoneIds = [];
+		this.clearFallbackInlineDeletedZoneWrapperContent();
+		this.fallbackInlineDeletedZoneSignature = null;
+	}
+	clearFallbackInlineDeletedZoneWrapperContent() {
+		var _this$lastContainer, _this$lastContainer2, _node$parentElement;
+		const querySelectorAll = typeof ((_this$lastContainer = this.lastContainer) === null || _this$lastContainer === void 0 ? void 0 : _this$lastContainer.querySelectorAll) === "function" ? (_this$lastContainer2 = this.lastContainer) === null || _this$lastContainer2 === void 0 ? void 0 : _this$lastContainer2.querySelectorAll.bind(this.lastContainer) : null;
+		if (!querySelectorAll) return;
+		const nodes = Array.from(querySelectorAll(".stream-monaco-fallback-inline-delete-zone[data-stream-monaco-native-wrapper=\"true\"], .stream-monaco-fallback-inline-delete-margin[data-stream-monaco-native-wrapper=\"true\"]") ?? []);
+		for (const node of nodes) (_node$parentElement = node.parentElement) === null || _node$parentElement === void 0 || _node$parentElement.removeChild(node);
+	}
+	clearInlineDiffStreamingPresentationIdleTimer() {
+		if (this.inlineDiffStreamingPresentationIdleTimer != null) {
+			clearTimeout(this.inlineDiffStreamingPresentationIdleTimer);
+			this.inlineDiffStreamingPresentationIdleTimer = null;
+		}
+	}
+	resetInlineDiffStreamingHeightFloor() {
+		this.inlineDiffStreamingHeightFloor = 0;
+	}
+	syncDiffEditorLayoutToContainer() {
+		if (!this.diffEditorView || !this.lastContainer) return;
+		const { width, height } = readContainerLayoutSize(this.lastContainer);
+		if (!(width > 0) || !(height > 0)) return;
+		try {
+			var _layout, _ref;
+			(_layout = (_ref = this.diffEditorView).layout) === null || _layout === void 0 || _layout.call(_ref, {
+				width: Math.round(width),
+				height: Math.round(height)
+			});
+		} catch {
+			try {
+				var _layout2, _ref2;
+				(_layout2 = (_ref2 = this.diffEditorView).layout) === null || _layout2 === void 0 || _layout2.call(_ref2);
+			} catch {}
+		}
+	}
+	scheduleSyncDiffEditorLayoutToContainer() {
+		this.rafScheduler.schedule("sync-diff-layout", () => {
+			this.syncDiffEditorLayoutToContainer();
+		});
+	}
+	readModelLineContent(model, lineNumber) {
+		const direct = model.getLineContent;
+		if (typeof direct === "function") return direct.call(model, lineNumber);
+		return model.getValue().split(/\r?\n/)[lineNumber - 1] ?? "";
+	}
+	hasVisibleNativeInlineDeleteNodes() {
+		if (!this.lastContainer) return false;
+		const querySelectorAll = typeof this.lastContainer.querySelectorAll === "function" ? this.lastContainer.querySelectorAll.bind(this.lastContainer) : null;
+		if (!querySelectorAll) return false;
+		const nodes = Array.from(querySelectorAll(".editor.modified .view-zones .line-delete, .editor.modified .inline-deleted-text, .editor.modified .inline-deleted-margin-view-zone") ?? []);
+		return nodes.some((node) => {
+			var _node$getBoundingClie, _globalThis$getComput, _globalThis;
+			if (!(node instanceof HTMLElement)) return false;
+			const rect = (_node$getBoundingClie = node.getBoundingClientRect) === null || _node$getBoundingClie === void 0 ? void 0 : _node$getBoundingClie.call(node);
+			const style = (_globalThis$getComput = (_globalThis = globalThis).getComputedStyle) === null || _globalThis$getComput === void 0 ? void 0 : _globalThis$getComput.call(_globalThis, node);
+			return ((rect === null || rect === void 0 ? void 0 : rect.width) ?? 0) > 0 && ((rect === null || rect === void 0 ? void 0 : rect.height) ?? 0) > 0 && (style === null || style === void 0 ? void 0 : style.display) !== "none" && (style === null || style === void 0 ? void 0 : style.visibility) !== "hidden" && Number.parseFloat((style === null || style === void 0 ? void 0 : style.opacity) || "1") > .01;
+		});
+	}
+	countNativeInlineDeleteZoneNodes() {
+		if (!this.lastContainer) return 0;
+		const querySelectorAll = typeof this.lastContainer.querySelectorAll === "function" ? this.lastContainer.querySelectorAll.bind(this.lastContainer) : null;
+		if (!querySelectorAll) return 0;
+		const nodes = Array.from(querySelectorAll(".editor.modified .view-zones [monaco-view-zone], .editor.modified .margin-view-zones [monaco-view-zone]") ?? []);
+		return nodes.filter((node) => {
+			if (!(node instanceof HTMLElement)) return false;
+			return node.matches(".view-lines.line-delete") || !!node.querySelector(".view-lines.line-delete") || node.matches(".inline-deleted-margin-view-zone") || !!node.querySelector(".inline-deleted-margin-view-zone");
+		}).length;
+	}
+	syncFallbackInlineDeletedZones(lineChanges) {
+		var _modifiedEditor$getMo, _EditorOption, _modifiedEditor$getOp, _this$lastContainer3, _this$lastContainer3$, _this$lastContainer4, _this$lastContainer4$;
+		if (typeof document === "undefined" || !this.diffEditorView || !this.originalModel || !this.isDiffInlineMode()) {
+			this.clearFallbackInlineDeletedZones();
+			return;
+		}
+		const modifiedEditor = this.diffEditorView.getModifiedEditor();
+		const modifiedModel = modifiedEditor === null || modifiedEditor === void 0 || (_modifiedEditor$getMo = modifiedEditor.getModel) === null || _modifiedEditor$getMo === void 0 ? void 0 : _modifiedEditor$getMo.call(modifiedEditor);
+		const originalModel = this.originalModel;
+		if (!modifiedEditor || !modifiedModel || !originalModel) {
+			this.fallbackInlineDeletedZoneIds = [];
+			return;
+		}
+		const lineHeightOption = (_EditorOption = monaco_shim_exports.editor.EditorOption) === null || _EditorOption === void 0 ? void 0 : _EditorOption.lineHeight;
+		const lineHeight = ((_modifiedEditor$getOp = modifiedEditor.getOption) === null || _modifiedEditor$getOp === void 0 ? void 0 : _modifiedEditor$getOp.call(modifiedEditor, lineHeightOption)) ?? 20;
+		const relevantChanges = lineChanges.filter((change) => hasOriginalLines(change));
+		const nativeViewWrappers = Array.from(((_this$lastContainer3 = this.lastContainer) === null || _this$lastContainer3 === void 0 || (_this$lastContainer3$ = _this$lastContainer3.querySelectorAll) === null || _this$lastContainer3$ === void 0 ? void 0 : _this$lastContainer3$.call(_this$lastContainer3, ".editor.modified .view-zones [monaco-view-zone]")) ?? []).filter((node) => {
+			return node instanceof HTMLElement && !!node.querySelector(".view-lines.line-delete");
+		});
+		const nativeMarginWrappers = Array.from(((_this$lastContainer4 = this.lastContainer) === null || _this$lastContainer4 === void 0 || (_this$lastContainer4$ = _this$lastContainer4.querySelectorAll) === null || _this$lastContainer4$ === void 0 ? void 0 : _this$lastContainer4$.call(_this$lastContainer4, ".editor.modified .margin-view-zones [monaco-view-zone]")) ?? []).filter((node) => {
+			return node instanceof HTMLElement && !!node.querySelector(".inline-deleted-margin-view-zone");
+		});
+		const nativePairs = nativeViewWrappers.map((viewWrapper) => {
+			const id = viewWrapper.getAttribute("monaco-view-zone");
+			if (!id) return null;
+			const marginWrapper = nativeMarginWrappers.find((candidate) => candidate.getAttribute("monaco-view-zone") === id);
+			return {
+				id,
+				top: Number.parseFloat(viewWrapper.style.top || "NaN"),
+				viewWrapper,
+				marginWrapper: marginWrapper ?? null
+			};
+		}).filter((entry) => !!entry && Number.isFinite(entry.top)).sort((left, right) => left.top - right.top);
+		if (nativePairs.length >= relevantChanges.length && relevantChanges.length > 0) {
+			const nextSignature$1 = nativePairs.slice(0, relevantChanges.length).map((pair, index) => {
+				const change = relevantChanges[index];
+				const text = Array.from({ length: change.originalEndLineNumber - change.originalStartLineNumber + 1 }, (_, offset) => this.readModelLineContent(originalModel, change.originalStartLineNumber + offset)).join("\n");
+				return `${pair.id}:${text}`;
+			}).join("|");
+			if (nextSignature$1 && this.fallbackInlineDeletedZoneSignature === nextSignature$1 && this.fallbackInlineDeletedZoneIds.length === 0) return;
+			if (this.fallbackInlineDeletedZoneIds.length > 0) {
+				try {
+					var _modifiedEditor$chang2;
+					(_modifiedEditor$chang2 = modifiedEditor.changeViewZones) === null || _modifiedEditor$chang2 === void 0 || _modifiedEditor$chang2.call(modifiedEditor, (accessor) => {
+						for (const id of this.fallbackInlineDeletedZoneIds) accessor.removeZone(id);
+					});
+				} catch {}
+				this.fallbackInlineDeletedZoneIds = [];
+			}
+			this.clearFallbackInlineDeletedZoneWrapperContent();
+			relevantChanges.forEach((change, index) => {
+				var _modifiedEditor$apply;
+				const pair = nativePairs[index];
+				const domNode = document.createElement("div");
+				domNode.className = "stream-monaco-fallback-inline-delete-zone";
+				domNode.setAttribute("aria-hidden", "true");
+				domNode.setAttribute("data-stream-monaco-native-wrapper", "true");
+				(_modifiedEditor$apply = modifiedEditor.applyFontInfo) === null || _modifiedEditor$apply === void 0 || _modifiedEditor$apply.call(modifiedEditor, domNode);
+				for (let line = change.originalStartLineNumber; line <= change.originalEndLineNumber; line++) {
+					const lineNode = document.createElement("div");
+					lineNode.className = "stream-monaco-fallback-inline-delete-line";
+					lineNode.textContent = this.readModelLineContent(originalModel, line);
+					lineNode.style.height = `${lineHeight}px`;
+					lineNode.style.lineHeight = `${lineHeight}px`;
+					domNode.append(lineNode);
+				}
+				pair.viewWrapper.append(domNode);
+				if (pair.marginWrapper) {
+					var _modifiedEditor$apply2;
+					const marginDomNode = document.createElement("div");
+					marginDomNode.className = "stream-monaco-fallback-inline-delete-margin";
+					marginDomNode.setAttribute("aria-hidden", "true");
+					marginDomNode.setAttribute("data-stream-monaco-native-wrapper", "true");
+					marginDomNode.style.height = "100%";
+					(_modifiedEditor$apply2 = modifiedEditor.applyFontInfo) === null || _modifiedEditor$apply2 === void 0 || _modifiedEditor$apply2.call(modifiedEditor, marginDomNode);
+					pair.marginWrapper.append(marginDomNode);
+				}
+			});
+			this.fallbackInlineDeletedZoneSignature = nextSignature$1 || null;
+			return;
+		}
+		this.clearFallbackInlineDeletedZoneWrapperContent();
+		const nextZones = relevantChanges.map((change) => {
+			var _modifiedEditor$apply3, _modifiedEditor$apply4;
+			const lineCount = change.originalEndLineNumber - change.originalStartLineNumber + 1;
+			if (lineCount < 1) return null;
+			const domNode = document.createElement("div");
+			domNode.className = "stream-monaco-fallback-inline-delete-zone";
+			domNode.setAttribute("aria-hidden", "true");
+			(_modifiedEditor$apply3 = modifiedEditor.applyFontInfo) === null || _modifiedEditor$apply3 === void 0 || _modifiedEditor$apply3.call(modifiedEditor, domNode);
+			for (let line = change.originalStartLineNumber; line <= change.originalEndLineNumber; line++) {
+				const lineNode = document.createElement("div");
+				lineNode.className = "stream-monaco-fallback-inline-delete-line";
+				lineNode.textContent = this.readModelLineContent(originalModel, line);
+				lineNode.style.height = `${lineHeight}px`;
+				lineNode.style.lineHeight = `${lineHeight}px`;
+				domNode.append(lineNode);
+			}
+			const marginDomNode = document.createElement("div");
+			marginDomNode.className = "stream-monaco-fallback-inline-delete-margin";
+			marginDomNode.setAttribute("aria-hidden", "true");
+			(_modifiedEditor$apply4 = modifiedEditor.applyFontInfo) === null || _modifiedEditor$apply4 === void 0 || _modifiedEditor$apply4.call(modifiedEditor, marginDomNode);
+			const anchorLine = Math.max(0, Math.min(modifiedModel.getLineCount(), (change.modifiedStartLineNumber || 1) - 1));
+			return {
+				afterLineNumber: anchorLine,
+				heightInLines: lineCount,
+				domNode,
+				marginDomNode
+			};
+		}).filter(Boolean);
+		const nextSignature = nextZones.map((zone) => {
+			var _zone$domNode;
+			const text = typeof ((_zone$domNode = zone.domNode) === null || _zone$domNode === void 0 ? void 0 : _zone$domNode.textContent) === "string" ? zone.domNode.textContent : "";
+			return `${zone.afterLineNumber}:${zone.heightInLines}:${text}`;
+		}).join("|");
+		if (nextSignature && this.fallbackInlineDeletedZoneSignature === nextSignature && this.fallbackInlineDeletedZoneIds.length === nextZones.length) return;
+		try {
+			var _modifiedEditor$chang3;
+			(_modifiedEditor$chang3 = modifiedEditor.changeViewZones) === null || _modifiedEditor$chang3 === void 0 || _modifiedEditor$chang3.call(modifiedEditor, (accessor) => {
+				for (const id of this.fallbackInlineDeletedZoneIds) accessor.removeZone(id);
+				this.fallbackInlineDeletedZoneIds = nextZones.map((zone) => accessor.addZone(zone));
+			});
+			this.fallbackInlineDeletedZoneSignature = nextSignature || null;
+		} catch {
+			this.fallbackInlineDeletedZoneIds = [];
+			this.fallbackInlineDeletedZoneSignature = null;
+		}
+		try {
+			var _modifiedEditor$layou, _render;
+			(_modifiedEditor$layou = modifiedEditor.layout) === null || _modifiedEditor$layou === void 0 || _modifiedEditor$layou.call(modifiedEditor);
+			(_render = modifiedEditor.render) === null || _render === void 0 || _render.call(modifiedEditor, true);
+		} catch {}
 	}
 	toWholeLineDecoration(side, startLineNumber, endLineNumber) {
 		if (endLineNumber < startLineNumber || startLineNumber < 1) return null;
@@ -1004,26 +1874,45 @@ var DiffEditorManager = class DiffEditorManager {
 		};
 	}
 	syncDiffPresentationDecorations() {
-		var _this$diffEditorView$3, _this$lastContainer$q, _this$lastContainer;
+		var _this$diffEditorView$, _this$lastContainer$q, _this$lastContainer5;
 		if (!this.diffEditorView || !this.lastContainer) return;
 		const nativeFresh = this.hasFreshNativeDiffResult();
-		const keepNativeDecorationsWhileStale = !nativeFresh && this.preserveNativeDiffDecorationsOnStaleAppend && ((((_this$diffEditorView$3 = this.diffEditorView.getLineChanges()) === null || _this$diffEditorView$3 === void 0 ? void 0 : _this$diffEditorView$3.length) ?? 0) > 0 || !!((_this$lastContainer$q = (_this$lastContainer = this.lastContainer).querySelector) === null || _this$lastContainer$q === void 0 ? void 0 : _this$lastContainer$q.call(_this$lastContainer, ".line-insert, .line-delete, .gutter-insert, .gutter-delete")));
+		const useInlineMode = this.isDiffInlineMode();
+		const lineChanges = this.getEffectiveLineChanges();
+		const nativeInlineDeleteZoneCount = useInlineMode ? this.countNativeInlineDeleteZoneNodes() : 0;
+		const hasNativeInlineDeleteZoneNodes = nativeInlineDeleteZoneCount > 0;
+		const hasNativeInlineDeleteNodes = useInlineMode && this.hasVisibleNativeInlineDeleteNodes();
+		const shouldKeepInlineFallback = useInlineMode && lineChanges.some((change) => hasOriginalLines(change)) && !hasNativeInlineDeleteZoneNodes;
+		const useInlineStaleFallback = shouldKeepInlineFallback;
+		this.lastContainer.classList.toggle("stream-monaco-diff-inline-native-ready", useInlineMode && !shouldKeepInlineFallback && (nativeFresh || hasNativeInlineDeleteNodes || hasNativeInlineDeleteZoneNodes));
+		const keepNativeDecorationsWhileStale = !useInlineStaleFallback && !nativeFresh && this.preserveNativeDiffDecorationsOnStaleAppend && ((((_this$diffEditorView$ = this.diffEditorView.getLineChanges()) === null || _this$diffEditorView$ === void 0 ? void 0 : _this$diffEditorView$.length) ?? 0) > 0 || !!((_this$lastContainer$q = (_this$lastContainer5 = this.lastContainer).querySelector) === null || _this$lastContainer$q === void 0 ? void 0 : _this$lastContainer$q.call(_this$lastContainer5, ".line-insert, .line-delete, .gutter-insert, .gutter-delete")));
 		this.lastContainer.classList.toggle("stream-monaco-diff-native-stale", !nativeFresh && !keepNativeDecorationsWhileStale);
-		if (nativeFresh) {
+		if (nativeFresh && !shouldKeepInlineFallback) {
 			this.clearFallbackDiffDecorations();
 			return;
 		}
 		const originalEditor = this.diffEditorView.getOriginalEditor();
 		const modifiedEditor = this.diffEditorView.getModifiedEditor();
-		const lineChanges = this.getEffectiveLineChanges();
 		const originalDecorations = lineChanges.map((change) => this.toWholeLineDecoration("original", change.originalStartLineNumber, change.originalEndLineNumber)).filter(Boolean);
 		const modifiedDecorations = lineChanges.map((change) => this.toWholeLineDecoration("modified", change.modifiedStartLineNumber, change.modifiedEndLineNumber)).filter(Boolean);
 		this.fallbackOriginalDecorationIds = originalEditor.deltaDecorations(this.fallbackOriginalDecorationIds, originalDecorations);
 		this.fallbackModifiedDecorationIds = modifiedEditor.deltaDecorations(this.fallbackModifiedDecorationIds, modifiedDecorations);
+		if (useInlineStaleFallback) this.syncFallbackInlineDeletedZones(lineChanges);
+		else this.clearFallbackInlineDeletedZones();
 	}
 	disposeDiffPresentationTracking() {
 		this.clearFallbackDiffDecorations();
-		if (this.lastContainer) this.lastContainer.classList.remove("stream-monaco-diff-native-stale");
+		if (this.diffPresentationObserver) {
+			this.diffPresentationObserver.disconnect();
+			this.diffPresentationObserver = null;
+		}
+		this.clearInlineDiffStreamingPresentationIdleTimer();
+		this.inlineDiffStreamingPresentationActive = false;
+		this.resetInlineDiffStreamingHeightFloor();
+		if (this.lastContainer) {
+			this.lastContainer.classList.remove("stream-monaco-diff-native-stale");
+			this.lastContainer.classList.remove("stream-monaco-diff-inline-native-ready");
+		}
 		this.diffComputedVersions = null;
 		this.diffPresentationDisposables.forEach((disposable) => disposable.dispose());
 		this.diffPresentationDisposables = [];
@@ -1374,6 +2263,31 @@ var DiffEditorManager = class DiffEditorManager {
   border: 0 !important;
   box-shadow: var(--stream-monaco-removed-line-shadow);
 }
+.stream-monaco-diff-root .monaco-editor .stream-monaco-fallback-inline-delete-zone {
+  box-sizing: border-box;
+  width: 100%;
+  pointer-events: none;
+}
+.stream-monaco-diff-root .monaco-editor .stream-monaco-fallback-inline-delete-line {
+  box-sizing: border-box;
+  width: 100%;
+  overflow: hidden;
+  white-space: pre;
+  color: inherit;
+  background: var(--stream-monaco-removed-line-fill);
+  box-shadow: var(--stream-monaco-removed-line-shadow);
+}
+.stream-monaco-diff-root .monaco-editor .stream-monaco-fallback-inline-delete-margin {
+  box-sizing: border-box;
+  width: 100%;
+  background: var(--stream-monaco-removed-gutter);
+  pointer-events: none;
+}
+.stream-monaco-diff-root.stream-monaco-diff-inline-native-ready .stream-monaco-fallback-inline-delete-zone,
+.stream-monaco-diff-root.stream-monaco-diff-inline-native-ready .stream-monaco-fallback-inline-delete-line,
+.stream-monaco-diff-root.stream-monaco-diff-inline-native-ready .stream-monaco-fallback-inline-delete-margin {
+  display: none !important;
+}
 .stream-monaco-diff-root .monaco-editor .stream-monaco-fallback-gutter-insert,
 .stream-monaco-diff-root .monaco-diff-editor .stream-monaco-fallback-gutter-insert {
   background: var(--stream-monaco-added-gutter) !important;
@@ -1503,6 +2417,9 @@ var DiffEditorManager = class DiffEditorManager {
 }
 .stream-monaco-diff-root .monaco-diff-editor .editor.original .current-line {
   width: var(--stream-monaco-original-margin-width, auto) !important;
+  display: none !important;
+  opacity: 0 !important;
+  pointer-events: none !important;
 }
 .stream-monaco-diff-root .monaco-diff-editor .editor.original .monaco-scrollable-element.editor-scrollable {
   left: var(--stream-monaco-original-scrollable-left, auto) !important;
@@ -1515,6 +2432,9 @@ var DiffEditorManager = class DiffEditorManager {
 }
 .stream-monaco-diff-root .monaco-diff-editor .editor.modified .current-line {
   width: var(--stream-monaco-modified-margin-width) !important;
+  display: none !important;
+  opacity: 0 !important;
+  pointer-events: none !important;
 }
 .stream-monaco-diff-root .monaco-diff-editor .editor.modified .monaco-scrollable-element.editor-scrollable {
   left: var(--stream-monaco-modified-scrollable-left, var(--stream-monaco-modified-margin-width)) !important;
@@ -1545,15 +2465,39 @@ var DiffEditorManager = class DiffEditorManager {
   border: 0 !important;
   overflow: hidden !important;
 }
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .monaco-editor,
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .monaco-editor-background,
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .lines-content {
+  width: 0 !important;
+  min-width: 0 !important;
+  background: transparent !important;
+  opacity: 0 !important;
+  pointer-events: none !important;
+}
 .stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .monaco-scrollable-element.editor-scrollable {
   left: 0 !important;
   width: 0 !important;
 }
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .margin,
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .margin-view-overlays,
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .margin-view-zones,
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .overflow-guard {
+  display: none !important;
+  width: 0 !important;
+  min-width: 0 !important;
+}
 .stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.modified {
   left: 0 !important;
   width: 100% !important;
   border-left: 0 !important;
 }
+.stream-monaco-diff-root.stream-monaco-diff-inline.stream-monaco-diff-native-stale .monaco-diff-editor .editor.modified .view-lines.line-delete,
+.stream-monaco-diff-root.stream-monaco-diff-inline.stream-monaco-diff-native-stale .monaco-diff-editor .editor.modified .inline-deleted-margin-view-zone {
+  display: none !important;
+  height: 0 !important;
+  min-height: 0 !important;
+  overflow: hidden !important;
+}
 .stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .gutter-delete,
 .stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .gutter-insert,
 .stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .line-delete,
@@ -2143,6 +3087,9 @@ var DiffEditorManager = class DiffEditorManager {
   opacity: 0.92 !important;
   transition: background-color 0.14s ease, border-color 0.14s ease, transform 0.14s ease, opacity 0.14s ease, box-shadow 0.14s ease;
 }
+.stream-monaco-diff-root .monaco-editor .fold-unchanged.stream-monaco-fold-unchanged-hidden {
+  display: none !important;
+}
 .stream-monaco-diff-root .monaco-editor .fold-unchanged:hover,
 .stream-monaco-diff-root .monaco-editor .fold-unchanged.stream-monaco-focus-visible {
   opacity: 1 !important;
@@ -2213,33 +3160,14 @@ var DiffEditorManager = class DiffEditorManager {
 		el.addEventListener(eventName, listener);
 		bucket.push({ dispose: () => el.removeEventListener(eventName, listener) });
 	}
-	createDiffHunkActionNode(side) {
-		const node = document.createElement("div");
-		node.className = "stream-monaco-diff-hunk-actions";
-		node.dataset.side = side;
-		const createButton = (action, label) => {
-			const button = document.createElement("button");
-			button.type = "button";
-			button.textContent = label;
-			button.dataset.action = action;
-			button.addEventListener("click", (event) => {
-				event.preventDefault();
-				event.stopPropagation();
-				this.applyDiffHunkAction(side, action);
-			});
-			return button;
-		};
-		node.append(createButton("revert", "Revert"), createButton("stage", "Stage"));
-		this.createDomDisposable(this.diffHunkDisposables, node, "mouseenter", () => this.cancelScheduledHideDiffHunkActions());
-		this.createDomDisposable(this.diffHunkDisposables, node, "mouseleave", () => this.scheduleHideDiffHunkActions());
-		return node;
-	}
 	cloneSerializableValue(value) {
 		if (typeof structuredClone === "function") return structuredClone(value);
 		return JSON.parse(JSON.stringify(value));
 	}
 	capturePersistedDiffUnchangedState() {
 		if (!this.diffEditorView) return;
+		const hideUnchangedRegions = this.diffHideUnchangedRegionsResolved ?? this.resolveDiffHideUnchangedRegionsOption();
+		if (!(hideUnchangedRegions === null || hideUnchangedRegions === void 0 ? void 0 : hideUnchangedRegions.enabled) || this.diffHideUnchangedRegionsDeferred) return;
 		const state = this.diffEditorView.saveViewState();
 		if (!(state === null || state === void 0 ? void 0 : state.modelState)) {
 			this.diffPersistedUnchangedModelState = null;
@@ -2247,6 +3175,14 @@ var DiffEditorManager = class DiffEditorManager {
 		}
 		this.diffPersistedUnchangedModelState = this.cloneSerializableValue(state.modelState);
 	}
+	capturePreviousDiffUnchangedState() {
+		if (!this.diffEditorView) return;
+		const hideUnchangedRegions = this.diffHideUnchangedRegionsResolved ?? this.resolveDiffHideUnchangedRegionsOption();
+		if (!(hideUnchangedRegions === null || hideUnchangedRegions === void 0 ? void 0 : hideUnchangedRegions.enabled) || this.diffHideUnchangedRegionsDeferred) return;
+		const state = this.diffEditorView.saveViewState();
+		if (!(state === null || state === void 0 ? void 0 : state.modelState)) return;
+		this.diffPreviousUnchangedModelState = this.cloneSerializableValue(state.modelState);
+	}
 	scheduleCapturePersistedDiffUnchangedState(frames = 1) {
 		this.rafScheduler.schedule("capture-diff-unchanged-state", () => {
 			let remaining = Math.max(0, frames);
@@ -2272,6 +3208,20 @@ var DiffEditorManager = class DiffEditorManager {
 		});
 		this.applyPendingDiffScrollRestore();
 	}
+	restorePreviousDiffUnchangedState() {
+		if (!this.diffEditorView || !this.diffPreviousUnchangedModelState) return false;
+		const current = this.diffEditorView.saveViewState();
+		if (!current) return false;
+		const previous = this.cloneSerializableValue(this.diffPreviousUnchangedModelState);
+		this.diffEditorView.restoreViewState({
+			original: current.original,
+			modified: current.modified,
+			modelState: previous
+		});
+		this.diffPersistedUnchangedModelState = this.cloneSerializableValue(previous);
+		this.applyPendingDiffScrollRestore();
+		return true;
+	}
 	scheduleRestorePersistedDiffUnchangedState() {
 		if (this.diffHideUnchangedRegionsDeferred) return;
 		if (!this.diffPersistedUnchangedModelState) return;
@@ -2435,7 +3385,7 @@ var DiffEditorManager = class DiffEditorManager {
 			readOnly: this.options.readOnly ?? true,
 			lineDecorationsWidth: this.options.lineDecorationsWidth,
 			lineNumbersMinChars: this.options.lineNumbersMinChars,
-			glyphMargin: this.options.glyphMargin,
+			glyphMargin: this.resolveDiffGlyphMarginOption(hideUnchangedRegions),
 			fontFamily: this.options.fontFamily,
 			fontSize: this.options.fontSize,
 			lineHeight: this.options.lineHeight,
@@ -2455,9 +3405,10 @@ var DiffEditorManager = class DiffEditorManager {
 		};
 	}
 	refreshDiffPresentation() {
-		var _this$diffHeightManag;
+		var _this$diffHideUnchang, _this$diffHeightManag;
 		if (!this.diffEditorView) return;
 		const hideUnchangedRegions = this.resolveDiffHideUnchangedRegionsOption();
+		const shouldRecomputeDiffViewModelForUnchangedRegions = !this.diffHideUnchangedRegionsDeferred && (hideUnchangedRegions === null || hideUnchangedRegions === void 0 ? void 0 : hideUnchangedRegions.enabled) === true && ((_this$diffHideUnchang = this.diffHideUnchangedRegionsResolved) === null || _this$diffHideUnchang === void 0 ? void 0 : _this$diffHideUnchang.enabled) === false && !!this.originalModel && !!this.modifiedModel;
 		const presentationOptions = this.resolveDiffPresentationEditorOptions(hideUnchangedRegions);
 		this.diffHideUnchangedRegionsResolved = hideUnchangedRegions;
 		this.diffUpdateThrottleMs = this.resolveDiffStreamingThrottleMs();
@@ -2467,13 +3418,20 @@ var DiffEditorManager = class DiffEditorManager {
 			this.lastContainer.style.removeProperty("--stream-monaco-editor-fg");
 		}
 		this.withLockedDiffScrollPosition(() => {
-			var _this$diffEditorView13;
-			(_this$diffEditorView13 = this.diffEditorView) === null || _this$diffEditorView13 === void 0 || _this$diffEditorView13.updateOptions(presentationOptions);
+			var _this$diffEditorView4;
+			(_this$diffEditorView4 = this.diffEditorView) === null || _this$diffEditorView4 === void 0 || _this$diffEditorView4.updateOptions(presentationOptions);
 		});
 		(_this$diffHeightManag = this.diffHeightManager) === null || _this$diffHeightManag === void 0 || _this$diffHeightManag.update();
 		this.applyDiffRootAppearanceClass();
 		this.schedulePatchDiffUnchangedRegionsAfterInteraction(1);
 		this.repositionDiffHunkNodes();
+		if (shouldRecomputeDiffViewModelForUnchangedRegions) this.setDiffModels({
+			original: this.originalModel,
+			modified: this.modifiedModel
+		}, {
+			preserveViewState: true,
+			preserveModelState: false
+		});
 	}
 	restoreDeferredDiffUnchangedRegions() {
 		this.clearDeferredDiffUnchangedRegionsIdleTimer();
@@ -2483,8 +3441,8 @@ var DiffEditorManager = class DiffEditorManager {
 		if (!this.diffHideUnchangedRegionsDeferred) return;
 		this.diffHideUnchangedRegionsDeferred = false;
 		this.withLockedDiffScrollPosition(() => {
-			var _this$diffEditorView14;
-			(_this$diffEditorView14 = this.diffEditorView) === null || _this$diffEditorView14 === void 0 || _this$diffEditorView14.updateOptions({ hideUnchangedRegions });
+			var _this$diffEditorView5;
+			(_this$diffEditorView5 = this.diffEditorView) === null || _this$diffEditorView5 === void 0 || _this$diffEditorView5.updateOptions({ hideUnchangedRegions });
 		});
 		this.schedulePatchDiffUnchangedRegionsAfterInteraction(1);
 		if (this.shouldAutoScrollDiff) {
@@ -2493,6 +3451,22 @@ var DiffEditorManager = class DiffEditorManager {
 		}
 	}
 	markDiffStreamingActivity() {
+		var _this$lastContainer6;
+		(_this$lastContainer6 = this.lastContainer) === null || _this$lastContainer6 === void 0 || (_this$lastContainer6 = _this$lastContainer6.classList) === null || _this$lastContainer6 === void 0 || _this$lastContainer6.remove("stream-monaco-diff-inline-native-ready");
+		if (this.isDiffInlineMode()) {
+			var _this$diffHeightManag2, _this$lastContainer7, _this$lastContainer7$;
+			this.inlineDiffStreamingPresentationActive = true;
+			this.inlineDiffStreamingHeightFloor = Math.max(this.inlineDiffStreamingHeightFloor, ((_this$diffHeightManag2 = this.diffHeightManager) === null || _this$diffHeightManag2 === void 0 ? void 0 : _this$diffHeightManag2.getLastApplied()) ?? 0, ((_this$lastContainer7 = this.lastContainer) === null || _this$lastContainer7 === void 0 || (_this$lastContainer7$ = _this$lastContainer7.getBoundingClientRect) === null || _this$lastContainer7$ === void 0 ? void 0 : _this$lastContainer7$.call(_this$lastContainer7).height) ?? 0);
+			this.clearInlineDiffStreamingPresentationIdleTimer();
+			this.inlineDiffStreamingPresentationIdleTimer = setTimeout(() => {
+				var _this$diffHeightManag3;
+				this.inlineDiffStreamingPresentationIdleTimer = null;
+				this.inlineDiffStreamingPresentationActive = false;
+				this.resetInlineDiffStreamingHeightFloor();
+				this.scheduleSyncDiffPresentationDecorations();
+				(_this$diffHeightManag3 = this.diffHeightManager) === null || _this$diffHeightManag3 === void 0 || _this$diffHeightManag3.update();
+			}, 3e3);
+		}
 		const hideUnchangedRegions = this.diffHideUnchangedRegionsResolved;
 		if (!this.diffEditorView || !(hideUnchangedRegions === null || hideUnchangedRegions === void 0 ? void 0 : hideUnchangedRegions.enabled)) return;
 		this.clearDeferredDiffUnchangedRegionsIdleTimer();
@@ -2504,8 +3478,8 @@ var DiffEditorManager = class DiffEditorManager {
 		this.diffHideUnchangedRegionsDeferred = true;
 		this.hideAllDiffUnchangedBridgeEntries();
 		this.withLockedDiffScrollPosition(() => {
-			var _this$diffEditorView15;
-			(_this$diffEditorView15 = this.diffEditorView) === null || _this$diffEditorView15 === void 0 || _this$diffEditorView15.updateOptions({ hideUnchangedRegions: {
+			var _this$diffEditorView6;
+			(_this$diffEditorView6 = this.diffEditorView) === null || _this$diffEditorView6 === void 0 || _this$diffEditorView6.updateOptions({ hideUnchangedRegions: {
 				...hideUnchangedRegions,
 				enabled: false
 			} });
@@ -2579,7 +3553,7 @@ var DiffEditorManager = class DiffEditorManager {
 		var _this$diffUnchangedBr;
 		this.clearDiffUnchangedBridgeSources();
 		if (this.diffUnchangedBridgeOverlay) this.diffUnchangedBridgeOverlay.replaceChildren();
-		if (this.diffUnchangedBridgeOverlay) this.diffUnchangedBridgeOverlay.style.transform = "translate3d(0px, 0px, 0px)";
+		resetDiffUnchangedOverlayTransform(this.diffUnchangedBridgeOverlay);
 		this.diffUnchangedBridgeEntries.clear();
 		this.diffUnchangedBridgePool.length = 0;
 		this.diffUnchangedOverlayScrollTop = 0;
@@ -2589,30 +3563,27 @@ var DiffEditorManager = class DiffEditorManager {
 	}
 	clearDiffUnchangedBridgeSources() {
 		if (!this.lastContainer) return;
-		const bridgedCenters = this.lastContainer.querySelectorAll(".stream-monaco-unchanged-bridge-source");
-		bridgedCenters.forEach((node) => node.classList.remove("stream-monaco-unchanged-bridge-source"));
+		clearDiffUnchangedBridgeSourceClasses(this.lastContainer);
 	}
 	ensureDiffUnchangedBridgeOverlay() {
 		if (!this.lastContainer) return null;
 		if (!this.diffUnchangedBridgeOverlay) {
-			const overlay = document.createElement("div");
-			overlay.className = "stream-monaco-diff-unchanged-overlay";
+			const overlay = createDiffUnchangedBridgeOverlay();
 			this.lastContainer.append(overlay);
 			this.diffUnchangedBridgeOverlay = overlay;
 		}
 		return this.diffUnchangedBridgeOverlay;
 	}
 	readDiffUnchangedOverlayScrollState() {
-		var _this$diffEditorView16, _modifiedEditor$getSc6, _modifiedEditor$getSc7;
-		const modifiedEditor = (_this$diffEditorView16 = this.diffEditorView) === null || _this$diffEditorView16 === void 0 ? void 0 : _this$diffEditorView16.getModifiedEditor();
+		var _this$diffEditorView7, _modifiedEditor$getSc6, _modifiedEditor$getSc7;
+		const modifiedEditor = (_this$diffEditorView7 = this.diffEditorView) === null || _this$diffEditorView7 === void 0 ? void 0 : _this$diffEditorView7.getModifiedEditor();
 		return {
 			top: (modifiedEditor === null || modifiedEditor === void 0 || (_modifiedEditor$getSc6 = modifiedEditor.getScrollTop) === null || _modifiedEditor$getSc6 === void 0 ? void 0 : _modifiedEditor$getSc6.call(modifiedEditor)) ?? 0,
 			left: (modifiedEditor === null || modifiedEditor === void 0 || (_modifiedEditor$getSc7 = modifiedEditor.getScrollLeft) === null || _modifiedEditor$getSc7 === void 0 ? void 0 : _modifiedEditor$getSc7.call(modifiedEditor)) ?? 0
 		};
 	}
 	syncDiffUnchangedOverlayScrollBaseline() {
-		const overlay = this.diffUnchangedBridgeOverlay;
-		if (overlay) overlay.style.transform = "translate3d(0px, 0px, 0px)";
+		resetDiffUnchangedOverlayTransform(this.diffUnchangedBridgeOverlay);
 		const { top, left } = this.readDiffUnchangedOverlayScrollState();
 		this.diffUnchangedOverlayScrollTop = top;
 		this.diffUnchangedOverlayScrollLeft = left;
@@ -2626,28 +3597,10 @@ var DiffEditorManager = class DiffEditorManager {
 		if (Math.abs(deltaY) < .5 && Math.abs(deltaX) < .5) return;
 		overlay.style.transform = `translate3d(${deltaX}px, ${deltaY}px, 0px)`;
 	}
-	resolveDiffUnchangedViewZoneHeight() {
-		switch (this.resolveDiffUnchangedRegionStyleOption()) {
-			case "line-info":
-			case "line-info-basic":
-			case "metadata": return 32;
-			case "simple": return 28;
-			default: return 32;
-		}
-	}
-	collectDiffUnchangedViewZoneIds(editorRoot, scrollTop) {
-		const widgetTopValues = Array.from(editorRoot.querySelectorAll(".diff-hidden-lines-widget")).map((node) => Number.parseFloat(node.style.top || "NaN")).filter((value) => Number.isFinite(value) && value > -1e5);
-		if (widgetTopValues.length === 0) return [];
-		return Array.from(editorRoot.querySelectorAll(".view-zones > div[monaco-view-zone][monaco-visible-view-zone=\"true\"]")).filter((node) => {
-			const zoneTop = Number.parseFloat(node.style.top || "NaN");
-			const currentHeight = Number.parseFloat(node.style.height || "0");
-			return Number.isFinite(zoneTop) && Number.isFinite(currentHeight) && currentHeight > 0 && widgetTopValues.some((widgetTop) => Math.abs(zoneTop - scrollTop - widgetTop) < .5);
-		}).map((node) => node.getAttribute("monaco-view-zone")).filter((value) => Boolean(value));
-	}
 	syncDiffUnchangedViewZoneHeightsForEditor(editor, editorRoot, targetHeight) {
 		var _editor$getScrollTop, _editorInternal$_mode;
 		if (!editor || !(editorRoot instanceof HTMLElement)) return false;
-		const zoneIds = this.collectDiffUnchangedViewZoneIds(editorRoot, ((_editor$getScrollTop = editor.getScrollTop) === null || _editor$getScrollTop === void 0 ? void 0 : _editor$getScrollTop.call(editor)) ?? 0);
+		const zoneIds = collectDiffUnchangedViewZoneIds(editorRoot, ((_editor$getScrollTop = editor.getScrollTop) === null || _editor$getScrollTop === void 0 ? void 0 : _editor$getScrollTop.call(editor)) ?? 0);
 		if (zoneIds.length === 0) return false;
 		const editorInternal = editor;
 		const zones = (_editorInternal$_mode = editorInternal._modelData) === null || _editorInternal$_mode === void 0 || (_editorInternal$_mode = _editorInternal$_mode.view) === null || _editorInternal$_mode === void 0 || (_editorInternal$_mode = _editorInternal$_mode._viewZones) === null || _editorInternal$_mode === void 0 ? void 0 : _editorInternal$_mode._zones;
@@ -2672,7 +3625,7 @@ var DiffEditorManager = class DiffEditorManager {
 	syncDiffUnchangedViewZoneHeights() {
 		var _originalEditor$getCo, _modifiedEditor$getCo3;
 		if (!this.diffEditorView) return false;
-		const targetHeight = this.resolveDiffUnchangedViewZoneHeight();
+		const targetHeight = resolveDiffUnchangedViewZoneHeight(this.resolveDiffUnchangedRegionStyleOption());
 		const originalEditor = this.diffEditorView.getOriginalEditor();
 		const modifiedEditor = this.diffEditorView.getModifiedEditor();
 		const originalChanged = this.syncDiffUnchangedViewZoneHeightsForEditor(originalEditor, (_originalEditor$getCo = originalEditor.getContainerDomNode) === null || _originalEditor$getCo === void 0 ? void 0 : _originalEditor$getCo.call(originalEditor), targetHeight);
@@ -2690,19 +3643,7 @@ var DiffEditorManager = class DiffEditorManager {
 		return `${this.getDiffUnchangedNodeId(secondaryNode)}:${this.getDiffUnchangedNodeId(primaryNode)}`;
 	}
 	createDiffUnchangedBridgeEntry(key) {
-		const bridge = document.createElement("div");
-		bridge.className = "stream-monaco-diff-unchanged-bridge";
-		bridge.setAttribute("role", "group");
-		bridge.hidden = true;
-		const summary = document.createElement("button");
-		summary.type = "button";
-		summary.className = "stream-monaco-unchanged-summary";
-		const visualMeta = document.createElement("div");
-		visualMeta.className = "stream-monaco-unchanged-meta";
-		summary.append(visualMeta);
-		const divider = document.createElement("span");
-		divider.className = "stream-monaco-unchanged-pane-divider";
-		divider.setAttribute("aria-hidden", "true");
+		const { bridge, summary, visualMeta, divider } = createDiffUnchangedBridgeScaffold();
 		const entry = {
 			key,
 			bridge,
@@ -2721,16 +3662,15 @@ var DiffEditorManager = class DiffEditorManager {
 		const onWheel = (event) => {
 			var _modifiedEditor$getSc8, _modifiedEditor$getSc9, _originalEditor$setSc6, _modifiedEditor$setSc6;
 			if (!this.diffEditorView) return;
-			if (Math.abs(event.deltaY) < .5 && Math.abs(event.deltaX) < .5) return;
+			if (!shouldHandleDiffUnchangedWheel(event)) return;
 			event.preventDefault();
 			event.stopPropagation();
 			const originalEditor = this.diffEditorView.getOriginalEditor();
 			const modifiedEditor = this.diffEditorView.getModifiedEditor();
-			const targetScrollTop = (((_modifiedEditor$getSc8 = modifiedEditor.getScrollTop) === null || _modifiedEditor$getSc8 === void 0 ? void 0 : _modifiedEditor$getSc8.call(modifiedEditor)) ?? 0) + event.deltaY;
-			const targetScrollLeft = (((_modifiedEditor$getSc9 = modifiedEditor.getScrollLeft) === null || _modifiedEditor$getSc9 === void 0 ? void 0 : _modifiedEditor$getSc9.call(modifiedEditor)) ?? 0) + event.deltaX;
+			const { syncHorizontal, targetScrollLeft, targetScrollTop } = resolveDiffUnchangedWheelScrollTarget(((_modifiedEditor$getSc8 = modifiedEditor.getScrollTop) === null || _modifiedEditor$getSc8 === void 0 ? void 0 : _modifiedEditor$getSc8.call(modifiedEditor)) ?? 0, ((_modifiedEditor$getSc9 = modifiedEditor.getScrollLeft) === null || _modifiedEditor$getSc9 === void 0 ? void 0 : _modifiedEditor$getSc9.call(modifiedEditor)) ?? 0, event);
 			(_originalEditor$setSc6 = originalEditor.setScrollTop) === null || _originalEditor$setSc6 === void 0 || _originalEditor$setSc6.call(originalEditor, targetScrollTop);
 			(_modifiedEditor$setSc6 = modifiedEditor.setScrollTop) === null || _modifiedEditor$setSc6 === void 0 || _modifiedEditor$setSc6.call(modifiedEditor, targetScrollTop);
-			if (Math.abs(event.deltaX) >= .5) {
+			if (syncHorizontal) {
 				var _originalEditor$setSc7, _modifiedEditor$setSc7;
 				(_originalEditor$setSc7 = originalEditor.setScrollLeft) === null || _originalEditor$setSc7 === void 0 || _originalEditor$setSc7.call(originalEditor, targetScrollLeft);
 				(_modifiedEditor$setSc7 = modifiedEditor.setScrollLeft) === null || _modifiedEditor$setSc7 === void 0 || _modifiedEditor$setSc7.call(modifiedEditor, targetScrollLeft);
@@ -2739,7 +3679,6 @@ var DiffEditorManager = class DiffEditorManager {
 		};
 		bridge.addEventListener("wheel", onWheel, { passive: false });
 		this.diffUnchangedRegionDisposables.push({ dispose: () => bridge.removeEventListener("wheel", onWheel) });
-		bridge.append(summary, divider);
 		return entry;
 	}
 	acquireDiffUnchangedBridgeEntry(key) {
@@ -2747,16 +3686,14 @@ var DiffEditorManager = class DiffEditorManager {
 		if (existing) return existing;
 		const entry = this.diffUnchangedBridgePool.pop() ?? this.createDiffUnchangedBridgeEntry(key);
 		entry.key = key;
-		entry.bridge.hidden = false;
-		entry.bridge.removeAttribute("aria-hidden");
+		syncDiffUnchangedBridgeVisibility(entry.bridge, true);
 		this.diffUnchangedBridgeEntries.set(key, entry);
 		return entry;
 	}
 	releaseDiffUnchangedBridgeEntry(entry) {
 		if (entry.key) this.diffUnchangedBridgeEntries.delete(entry.key);
 		entry.key = null;
-		entry.bridge.hidden = true;
-		entry.bridge.setAttribute("aria-hidden", "true");
+		syncDiffUnchangedBridgeVisibility(entry.bridge, false);
 		this.diffUnchangedBridgePool.push(entry);
 	}
 	hideAllDiffUnchangedBridgeEntries() {
@@ -2782,51 +3719,15 @@ var DiffEditorManager = class DiffEditorManager {
 		entry.activate();
 		this.schedulePatchDiffUnchangedRegionsAfterInteraction();
 	}
-	updateDiffUnchangedBridgeMeta(entry, unchangedRegionStyle, summaryLabel) {
-		this.updateDiffUnchangedMetaNode(entry.visualMeta, unchangedRegionStyle, summaryLabel);
-	}
-	updateDiffUnchangedMetaNode(metaNode, unchangedRegionStyle, summaryLabel) {
-		const lastStyle = metaNode.dataset.style;
-		const lastLabel = metaNode.dataset.label;
-		if (lastStyle === unchangedRegionStyle && lastLabel === summaryLabel) return;
-		metaNode.dataset.style = unchangedRegionStyle;
-		metaNode.dataset.label = summaryLabel;
-		metaNode.replaceChildren();
-		metaNode.classList.toggle("stream-monaco-unchanged-meta-simple", unchangedRegionStyle === "simple");
-		if (unchangedRegionStyle === "simple") {
-			const simpleBar = document.createElement("span");
-			simpleBar.className = "stream-monaco-unchanged-simple-bar";
-			simpleBar.setAttribute("aria-hidden", "true");
-			metaNode.append(simpleBar);
-			return;
-		}
-		const label = document.createElement("span");
-		if (unchangedRegionStyle === "metadata") label.className = "stream-monaco-unchanged-metadata-label";
-		else label.className = "stream-monaco-unchanged-count";
-		label.textContent = summaryLabel;
-		metaNode.append(label);
-	}
 	syncDiffUnchangedRevealButton(entry, slot, handle, direction, label) {
 		const existingButton = entry[slot];
-		const button = existingButton ?? document.createElement("button");
-		if (!existingButton) {
-			button.type = "button";
-			button.className = "stream-monaco-unchanged-reveal";
-			button.innerHTML = `<span class="codicon codicon-chevron-${direction}"></span>`;
-		}
-		button.dataset.direction = direction;
-		button.hidden = !handle;
-		button.disabled = !handle;
-		button.toggleAttribute("aria-hidden", !handle);
-		button.title = handle ? label : "";
-		button.setAttribute("aria-label", handle ? label : "");
-		button.onclick = handle ? (event) => {
-			event.preventDefault();
-			event.stopPropagation();
+		const button = existingButton ?? createDiffUnchangedRevealButton(direction);
+		syncDiffUnchangedRevealButtonNode(button, handle, label);
+		bindDiffUnchangedRevealButtonAction(button, handle, (nextHandle) => {
 			this.hideAllDiffUnchangedBridgeEntries();
-			this.activateDiffUnchangedHandle(handle);
+			this.activateDiffUnchangedHandle(nextHandle);
 			this.schedulePatchDiffUnchangedRegionsAfterInteraction();
-		} : null;
+		});
 		entry[slot] = button;
 	}
 	syncDiffUnchangedBridgeRail(entry, showTopHandle, topHandle, showBottomHandle, bottomHandle) {
@@ -2834,14 +3735,9 @@ var DiffEditorManager = class DiffEditorManager {
 			entry.rail = document.createElement("div");
 			entry.rail.className = "stream-monaco-unchanged-rail";
 		}
-		const shouldRenderRail = showTopHandle || showBottomHandle;
 		this.syncDiffUnchangedRevealButton(entry, "topButton", showTopHandle ? topHandle : null, "down", "Reveal more unmodified lines below");
 		this.syncDiffUnchangedRevealButton(entry, "bottomButton", showBottomHandle ? bottomHandle : null, "up", "Reveal more unmodified lines above");
-		entry.rail.hidden = !shouldRenderRail;
-		entry.rail.toggleAttribute("aria-hidden", !shouldRenderRail);
-		entry.rail.classList.toggle("stream-monaco-unchanged-rail-top-only", showTopHandle && !showBottomHandle);
-		entry.rail.classList.toggle("stream-monaco-unchanged-rail-bottom-only", !showTopHandle && showBottomHandle);
-		entry.rail.classList.toggle("stream-monaco-unchanged-rail-both", showTopHandle && showBottomHandle);
+		syncDiffUnchangedRailNode(entry.rail, showTopHandle, showBottomHandle);
 		if (entry.topButton && entry.topButton.parentElement !== entry.rail) entry.rail.append(entry.topButton);
 		if (entry.bottomButton && entry.bottomButton.parentElement !== entry.rail) entry.rail.append(entry.bottomButton);
 	}
@@ -2851,203 +3747,53 @@ var DiffEditorManager = class DiffEditorManager {
 			this.releaseDiffUnchangedBridgeEntry(entry);
 		}
 	}
-	dispatchSyntheticMouseDown(node) {
-		const view = node.ownerDocument.defaultView;
-		if (!view) return;
-		const rect = node.getBoundingClientRect();
-		node.dispatchEvent(new view.MouseEvent("mousedown", {
-			bubbles: true,
-			cancelable: true,
-			button: 0,
-			clientX: rect.left + rect.width / 2,
-			clientY: rect.top + rect.height / 2
-		}));
-	}
-	dispatchSyntheticMouseTap(node) {
-		const view = node.ownerDocument.defaultView;
-		if (!view) return;
-		const rect = node.getBoundingClientRect();
-		const clientX = rect.left + rect.width / 2;
-		const clientY = rect.top + rect.height / 2;
-		node.dispatchEvent(new view.MouseEvent("mousedown", {
-			bubbles: true,
-			cancelable: true,
-			button: 0,
-			clientX,
-			clientY
-		}));
-		node.dispatchEvent(new view.MouseEvent("mouseup", {
-			bubbles: true,
-			cancelable: true,
-			button: 0,
-			clientX,
-			clientY
-		}));
-	}
-	formatDiffUnchangedCountLabel(text) {
-		const match = text.match(/\d+/);
-		const count = match ? Number.parseInt(match[0], 10) : NaN;
-		if (Number.isFinite(count)) return `${count} unmodified ${count === 1 ? "line" : "lines"}`;
-		return text.replace(/hidden/gi, "unmodified");
-	}
-	countDiffLines(startLineNumber, endLineNumber) {
-		return endLineNumber >= startLineNumber ? endLineNumber - startLineNumber + 1 : 0;
-	}
-	measureDiffUnchangedSurroundingLines(primaryNode) {
-		const editorRoot = primaryNode.closest(".editor.modified") ?? primaryNode.closest(".monaco-editor");
-		if (!editorRoot) return {
-			previousVisibleLine: null,
-			nextVisibleLine: null
-		};
-		const widgetRect = primaryNode.getBoundingClientRect();
-		let previousVisibleLine = null;
-		let nextVisibleLine = null;
-		const lineNumberNodes = editorRoot.querySelectorAll(".line-numbers");
-		lineNumberNodes.forEach((node) => {
-			var _node$textContent3;
-			const lineNumber = Number.parseInt(((_node$textContent3 = node.textContent) === null || _node$textContent3 === void 0 ? void 0 : _node$textContent3.trim()) || "", 10);
-			if (!Number.isFinite(lineNumber)) return;
-			const top = node.getBoundingClientRect().top;
-			if (top < widgetRect.top - 1) previousVisibleLine = previousVisibleLine == null ? lineNumber : Math.max(previousVisibleLine, lineNumber);
-			else if (top > widgetRect.bottom + 1) nextVisibleLine = nextVisibleLine == null ? lineNumber : Math.min(nextVisibleLine, lineNumber);
-		});
-		return {
-			previousVisibleLine,
-			nextVisibleLine
-		};
-	}
-	formatDiffMetadataRange(startLineNumber, lineCount) {
-		return `${startLineNumber},${Math.max(0, lineCount)}`;
-	}
-	buildDiffHunkMetadataLabel(change) {
-		var _this$originalModel, _this$modifiedModel2;
-		const contextLineCount = this.resolveDiffHideUnchangedRegionsOption().contextLineCount ?? 3;
-		const originalTotalLines = ((_this$originalModel = this.originalModel) === null || _this$originalModel === void 0 ? void 0 : _this$originalModel.getLineCount()) ?? 0;
-		const modifiedTotalLines = ((_this$modifiedModel2 = this.modifiedModel) === null || _this$modifiedModel2 === void 0 ? void 0 : _this$modifiedModel2.getLineCount()) ?? 0;
-		const originalChangedCount = this.countDiffLines(change.originalStartLineNumber, change.originalEndLineNumber);
-		const modifiedChangedCount = this.countDiffLines(change.modifiedStartLineNumber, change.modifiedEndLineNumber);
-		const originalAnchor = Math.min(Math.max(change.originalStartLineNumber, 1), Math.max(1, originalTotalLines + 1));
-		const modifiedAnchor = Math.min(Math.max(change.modifiedStartLineNumber, 1), Math.max(1, modifiedTotalLines + 1));
-		const originalStart = Math.max(1, originalAnchor - contextLineCount);
-		const modifiedStart = Math.max(1, modifiedAnchor - contextLineCount);
-		const originalEnd = originalChangedCount > 0 ? Math.min(originalTotalLines, change.originalEndLineNumber + contextLineCount) : Math.min(originalTotalLines, originalAnchor + contextLineCount - 1);
-		const modifiedEnd = modifiedChangedCount > 0 ? Math.min(modifiedTotalLines, change.modifiedEndLineNumber + contextLineCount) : Math.min(modifiedTotalLines, modifiedAnchor + contextLineCount - 1);
-		const originalDisplayCount = originalEnd >= originalStart ? originalEnd - originalStart + 1 : 0;
-		const modifiedDisplayCount = modifiedEnd >= modifiedStart ? modifiedEnd - modifiedStart + 1 : 0;
-		return {
-			modifiedStart,
-			originalStart,
-			label: `@@ -${this.formatDiffMetadataRange(originalStart, originalDisplayCount)} +${this.formatDiffMetadataRange(modifiedStart, modifiedDisplayCount)} @@`
-		};
-	}
-	resolveDiffMetadataLabel(primaryNode, pairIndex) {
-		var _metadataEntries$Math;
-		const lineChanges = this.getEffectiveLineChanges();
-		if (lineChanges.length === 0) return null;
-		const metadataEntries = lineChanges.map((change) => this.buildDiffHunkMetadataLabel(change));
-		const { nextVisibleLine } = this.measureDiffUnchangedSurroundingLines(primaryNode);
-		if (nextVisibleLine != null) {
-			const candidateStarts = [nextVisibleLine, nextVisibleLine - 1].filter((value) => value >= 1);
-			for (const candidateStart of candidateStarts) {
-				const matching = metadataEntries.find((entry) => entry.modifiedStart === candidateStart);
-				if (matching) return matching.label;
-			}
-		}
-		return ((_metadataEntries$Math = metadataEntries[Math.min(pairIndex, metadataEntries.length - 1)]) === null || _metadataEntries$Math === void 0 ? void 0 : _metadataEntries$Math.label) ?? null;
-	}
 	activateDiffUnchangedHandle(node) {
 		if (!(node instanceof HTMLElement)) return;
-		this.dispatchSyntheticMouseTap(node);
+		dispatchSyntheticPrimaryMouseTap(node);
 		this.scheduleCapturePersistedDiffUnchangedState(1);
 	}
-	resolveDiffUnchangedRevealLayout(primaryNode, countText, pairIndex, pairCount) {
-		var _this$diffEditorView17, _this$diffEditorView18;
-		let showTopHandle = pairCount === 1 || pairIndex > 0;
-		let showBottomHandle = pairCount === 1 || pairIndex < pairCount - 1;
-		const countMatch = countText.match(/\d+/);
-		const hiddenCount = countMatch ? Number.parseInt(countMatch[0], 10) : NaN;
-		if (!Number.isFinite(hiddenCount)) return {
-			showTopHandle,
-			showBottomHandle
-		};
-		const { previousVisibleLine, nextVisibleLine } = this.measureDiffUnchangedSurroundingLines(primaryNode);
-		if (previousVisibleLine == null && nextVisibleLine != null) {
-			showTopHandle = false;
-			showBottomHandle = true;
-			return {
-				showTopHandle,
-				showBottomHandle
-			};
-		}
-		if (nextVisibleLine == null && previousVisibleLine != null) {
-			showTopHandle = true;
-			showBottomHandle = false;
-			return {
-				showTopHandle,
-				showBottomHandle
-			};
-		}
-		if (nextVisibleLine != null && nextVisibleLine - hiddenCount === 1) {
-			showTopHandle = false;
-			showBottomHandle = true;
-		}
-		const modelLineCount = ((_this$diffEditorView17 = this.diffEditorView) === null || _this$diffEditorView17 === void 0 || (_this$diffEditorView17 = _this$diffEditorView17.getModifiedEditor().getModel()) === null || _this$diffEditorView17 === void 0 || (_this$diffEditorView18 = _this$diffEditorView17.getLineCount) === null || _this$diffEditorView18 === void 0 ? void 0 : _this$diffEditorView18.call(_this$diffEditorView17)) ?? null;
-		if (previousVisibleLine != null && modelLineCount != null && previousVisibleLine + hiddenCount === modelLineCount) {
-			showTopHandle = true;
-			showBottomHandle = false;
-		}
-		return {
-			showTopHandle,
-			showBottomHandle
-		};
-	}
-	resolveDiffUnchangedMergeRole(node) {
-		var _this$diffEditorView19, _this$diffEditorView20, _this$diffEditorView21, _this$diffEditorView22, _this$diffEditorView23, _this$diffEditorView24;
-		const diffRoot = node.closest(".monaco-diff-editor.side-by-side");
-		if (!(diffRoot instanceof HTMLElement)) return "none";
-		const nodeRect = node.getBoundingClientRect();
-		const nodeCenter = nodeRect.left + nodeRect.width / 2;
-		const originalHost = (_this$diffEditorView19 = this.diffEditorView) === null || _this$diffEditorView19 === void 0 || (_this$diffEditorView21 = (_this$diffEditorView20 = _this$diffEditorView19.getOriginalEditor()).getContainerDomNode) === null || _this$diffEditorView21 === void 0 ? void 0 : _this$diffEditorView21.call(_this$diffEditorView20);
-		const modifiedHost = (_this$diffEditorView22 = this.diffEditorView) === null || _this$diffEditorView22 === void 0 || (_this$diffEditorView24 = (_this$diffEditorView23 = _this$diffEditorView22.getModifiedEditor()).getContainerDomNode) === null || _this$diffEditorView24 === void 0 ? void 0 : _this$diffEditorView24.call(_this$diffEditorView23);
-		if (originalHost instanceof HTMLElement && modifiedHost instanceof HTMLElement) {
-			const originalRect = originalHost.getBoundingClientRect();
-			const modifiedRect = modifiedHost.getBoundingClientRect();
-			const originalCenter = originalRect.left + originalRect.width / 2;
-			const modifiedCenter = modifiedRect.left + modifiedRect.width / 2;
-			return Math.abs(nodeCenter - originalCenter) <= Math.abs(nodeCenter - modifiedCenter) ? "secondary" : "primary";
-		}
-		const diffRect = diffRoot.getBoundingClientRect();
-		return nodeCenter < diffRect.left + diffRect.width / 2 ? "secondary" : "primary";
-	}
 	patchDiffUnchangedCenter(node, pairIndex = 0) {
-		node.classList.add("stream-monaco-clickable");
-		node.title = "Click to expand all unmodified lines";
-		const mergeRole = this.resolveDiffUnchangedMergeRole(node);
+		var _this$diffEditorView8, _this$diffEditorView9, _this$diffEditorView10, _this$diffEditorView11, _this$diffEditorView12, _this$diffEditorView13;
+		const mergeRole = resolveDiffUnchangedMergeRole({
+			node,
+			diffRoot: node.closest(".monaco-diff-editor.side-by-side"),
+			originalHost: (_this$diffEditorView8 = this.diffEditorView) === null || _this$diffEditorView8 === void 0 || (_this$diffEditorView10 = (_this$diffEditorView9 = _this$diffEditorView8.getOriginalEditor()).getContainerDomNode) === null || _this$diffEditorView10 === void 0 ? void 0 : _this$diffEditorView10.call(_this$diffEditorView9),
+			modifiedHost: (_this$diffEditorView11 = this.diffEditorView) === null || _this$diffEditorView11 === void 0 || (_this$diffEditorView13 = (_this$diffEditorView12 = _this$diffEditorView11.getModifiedEditor()).getContainerDomNode) === null || _this$diffEditorView13 === void 0 ? void 0 : _this$diffEditorView13.call(_this$diffEditorView12)
+		});
 		const shouldUseMergedSecondary = mergeRole === "secondary";
 		const unchangedRegionStyle = this.resolveDiffUnchangedRegionStyleOption();
-		node.classList.toggle("stream-monaco-unchanged-merged-secondary", shouldUseMergedSecondary);
-		node.classList.toggle("stream-monaco-unchanged-merged-primary", mergeRole === "primary");
+		syncDiffUnchangedCenterNode(node, mergeRole);
 		const primary = node.children.item(0);
 		const meta = node.children.item(1);
 		if (primary instanceof HTMLElement) primary.classList.add("stream-monaco-unchanged-primary");
 		if (meta instanceof HTMLElement) {
-			var _countSource$textCont;
+			var _countSource$textCont, _this$originalModel, _this$modifiedModel2;
 			meta.classList.add("stream-monaco-unchanged-meta");
 			const countSource = meta.querySelector(".count") ?? meta.firstElementChild;
-			const countText = this.formatDiffUnchangedCountLabel((countSource === null || countSource === void 0 || (_countSource$textCont = countSource.textContent) === null || _countSource$textCont === void 0 ? void 0 : _countSource$textCont.trim()) || "Unmodified lines");
-			const summaryLabel = unchangedRegionStyle === "metadata" ? this.resolveDiffMetadataLabel(node, pairIndex) ?? countText : countText;
-			this.updateDiffUnchangedMetaNode(meta, unchangedRegionStyle, summaryLabel);
+			const countText = formatDiffUnchangedCountLabel((countSource === null || countSource === void 0 || (_countSource$textCont = countSource.textContent) === null || _countSource$textCont === void 0 ? void 0 : _countSource$textCont.trim()) || "Unmodified lines");
+			const contextLineCount = this.resolveDiffHideUnchangedRegionsOption().contextLineCount ?? 3;
+			const summaryLabel = resolveDiffUnchangedSummaryLabel({
+				countText,
+				unchangedRegionStyle,
+				lineChanges: this.getEffectiveLineChanges(),
+				pairIndex,
+				primaryNode: node,
+				contextLineCount,
+				originalTotalLines: ((_this$originalModel = this.originalModel) === null || _this$originalModel === void 0 ? void 0 : _this$originalModel.getLineCount()) ?? 0,
+				modifiedTotalLines: ((_this$modifiedModel2 = this.modifiedModel) === null || _this$modifiedModel2 === void 0 ? void 0 : _this$modifiedModel2.getLineCount()) ?? 0
+			});
+			syncDiffUnchangedMetaNode(meta, unchangedRegionStyle, summaryLabel);
 		}
-		const action = node.querySelector("a");
+		const action = findDiffUnchangedExpandAction(node);
 		if (action instanceof HTMLElement) {
-			action.classList.add("stream-monaco-unchanged-expand");
-			action.dataset.streamMonacoLabel = "Expand all";
-			action.title = "Expand all unmodified lines";
-			action.setAttribute("aria-label", "Expand all unmodified lines");
-			action.toggleAttribute("aria-hidden", shouldUseMergedSecondary);
-			action.tabIndex = shouldUseMergedSecondary ? -1 : 0;
+			syncDiffUnchangedExpandAction(action, shouldUseMergedSecondary);
 			if (action.dataset.streamMonacoExpandPatched !== "true") {
 				action.dataset.streamMonacoExpandPatched = "true";
+				const handleCaptureExpand = () => {
+					this.capturePreviousDiffUnchangedState();
+				};
+				action.addEventListener("click", handleCaptureExpand, { capture: true });
+				this.diffUnchangedRegionDisposables.push({ dispose: () => action.removeEventListener("click", handleCaptureExpand, true) });
 				this.createDomDisposable(this.diffUnchangedRegionDisposables, action, "click", () => {
 					this.hideAllDiffUnchangedBridgeEntries();
 					this.scheduleCapturePersistedDiffUnchangedState(1);
@@ -3058,25 +3804,21 @@ var DiffEditorManager = class DiffEditorManager {
 		if (node.dataset.streamMonacoCenterPatched !== "true") {
 			node.dataset.streamMonacoCenterPatched = "true";
 			this.bindFocusWithinClass(this.diffUnchangedRegionDisposables, node, "stream-monaco-focus-within");
-			const activate = () => {
-				const action$1 = node.querySelector("a");
-				if (action$1 instanceof HTMLElement) action$1.click();
-			};
 			this.createDomDisposable(this.diffUnchangedRegionDisposables, node, "click", (event) => {
 				const mouseEvent = event;
-				if (mouseEvent.button !== 0) return;
-				const target = event.target instanceof HTMLElement ? event.target : null;
-				if (target === null || target === void 0 ? void 0 : target.closest("a, .breadcrumb-item")) return;
+				if (!shouldHandleDiffUnchangedCenterClick(mouseEvent)) return;
 				event.preventDefault();
 				this.hideAllDiffUnchangedBridgeEntries();
-				activate();
+				if (!activateDiffUnchangedExpandAction(node, () => {
+					this.capturePreviousDiffUnchangedState();
+				})) return;
 				this.scheduleCapturePersistedDiffUnchangedState(1);
 				this.schedulePatchDiffUnchangedRegionsAfterInteraction();
 			});
 		}
 	}
 	renderMergedDiffUnchangedBridge(secondaryNode, primaryNode, pairIndex, pairCount) {
-		var _countSource$textCont2, _secondaryNode$closes;
+		var _countSource$textCont2, _this$originalModel2, _this$modifiedModel3, _this$diffEditorView14, _this$diffEditorView15, _secondaryNode$closes;
 		if (!this.lastContainer) return null;
 		const overlay = this.ensureDiffUnchangedBridgeOverlay();
 		if (!overlay) return null;
@@ -3085,9 +3827,19 @@ var DiffEditorManager = class DiffEditorManager {
 		const primaryRect = primaryNode.getBoundingClientRect();
 		const primaryStyle = globalThis.getComputedStyle(primaryNode);
 		const countSource = primaryNode.querySelector(".stream-monaco-unchanged-count") ?? secondaryNode.querySelector(".stream-monaco-unchanged-count");
-		const countText = this.formatDiffUnchangedCountLabel((countSource === null || countSource === void 0 || (_countSource$textCont2 = countSource.textContent) === null || _countSource$textCont2 === void 0 ? void 0 : _countSource$textCont2.trim()) || "Unmodified lines");
+		const countText = formatDiffUnchangedCountLabel((countSource === null || countSource === void 0 || (_countSource$textCont2 = countSource.textContent) === null || _countSource$textCont2 === void 0 ? void 0 : _countSource$textCont2.trim()) || "Unmodified lines");
 		const unchangedRegionStyle = this.resolveDiffUnchangedRegionStyleOption();
-		const metadataLabel = unchangedRegionStyle === "metadata" ? this.resolveDiffMetadataLabel(primaryNode, pairIndex) : null;
+		const contextLineCount = this.resolveDiffHideUnchangedRegionsOption().contextLineCount ?? 3;
+		const summaryLabel = resolveDiffUnchangedSummaryLabel({
+			countText,
+			unchangedRegionStyle,
+			lineChanges: this.getEffectiveLineChanges(),
+			pairIndex,
+			primaryNode,
+			contextLineCount,
+			originalTotalLines: ((_this$originalModel2 = this.originalModel) === null || _this$originalModel2 === void 0 ? void 0 : _this$originalModel2.getLineCount()) ?? 0,
+			modifiedTotalLines: ((_this$modifiedModel3 = this.modifiedModel) === null || _this$modifiedModel3 === void 0 ? void 0 : _this$modifiedModel3.getLineCount()) ?? 0
+		});
 		const editorSurface = primaryNode.closest(".monaco-editor") ?? primaryNode;
 		const editorSurfaceStyle = globalThis.getComputedStyle(editorSurface);
 		const primaryHidden = primaryNode.parentElement;
@@ -3096,7 +3848,13 @@ var DiffEditorManager = class DiffEditorManager {
 		const secondaryWidget = secondaryHidden === null || secondaryHidden === void 0 ? void 0 : secondaryHidden.parentElement;
 		const topHandle = (primaryHidden === null || primaryHidden === void 0 ? void 0 : primaryHidden.querySelector(".top")) ?? (secondaryHidden === null || secondaryHidden === void 0 ? void 0 : secondaryHidden.querySelector(".top"));
 		const bottomHandle = (primaryHidden === null || primaryHidden === void 0 ? void 0 : primaryHidden.querySelector(".bottom")) ?? (secondaryHidden === null || secondaryHidden === void 0 ? void 0 : secondaryHidden.querySelector(".bottom"));
-		const { showTopHandle, showBottomHandle } = this.resolveDiffUnchangedRevealLayout(primaryNode, countText, pairIndex, pairCount);
+		const { showTopHandle, showBottomHandle } = resolveDiffUnchangedRevealLayout({
+			primaryNode,
+			countText,
+			pairIndex,
+			pairCount,
+			modelLineCount: ((_this$diffEditorView14 = this.diffEditorView) === null || _this$diffEditorView14 === void 0 || (_this$diffEditorView14 = _this$diffEditorView14.getModifiedEditor().getModel()) === null || _this$diffEditorView14 === void 0 || (_this$diffEditorView15 = _this$diffEditorView14.getLineCount) === null || _this$diffEditorView15 === void 0 ? void 0 : _this$diffEditorView15.call(_this$diffEditorView14)) ?? null
+		});
 		const key = this.getDiffUnchangedBridgeKey(secondaryNode, primaryNode);
 		secondaryNode.classList.add("stream-monaco-unchanged-bridge-source");
 		primaryNode.classList.add("stream-monaco-unchanged-bridge-source");
@@ -3108,42 +3866,24 @@ var DiffEditorManager = class DiffEditorManager {
 		const primaryAnchorRect = (primaryWidget === null || primaryWidget === void 0 ? void 0 : primaryWidget.getBoundingClientRect()) ?? primaryRect;
 		const secondaryMargin = (_secondaryNode$closes = secondaryNode.closest(".monaco-editor")) === null || _secondaryNode$closes === void 0 ? void 0 : _secondaryNode$closes.querySelector(".margin");
 		const secondaryMarginRect = secondaryMargin === null || secondaryMargin === void 0 ? void 0 : secondaryMargin.getBoundingClientRect();
-		const lineInfoRailMetrics = unchangedRegionStyle === "line-info" ? this.resolveDiffUnchangedLineInfoRailMetrics(secondaryNode) : null;
+		const lineInfoRailMetrics = unchangedRegionStyle === "line-info" ? resolveDiffUnchangedLineInfoRailMetrics(secondaryNode) : null;
 		const bridgeLeftInset = (lineInfoRailMetrics === null || lineInfoRailMetrics === void 0 ? void 0 : lineInfoRailMetrics.leftInset) ?? 0;
 		const bridgeRailWidth = (lineInfoRailMetrics === null || lineInfoRailMetrics === void 0 ? void 0 : lineInfoRailMetrics.width) ?? (secondaryMarginRect === null || secondaryMarginRect === void 0 ? void 0 : secondaryMarginRect.width) ?? null;
-		bridge.style.left = `${secondaryAnchorRect.left - containerRect.left + this.lastContainer.scrollLeft + bridgeLeftInset}px`;
-		bridge.style.top = `${primaryAnchorRect.top - containerRect.top + this.lastContainer.scrollTop}px`;
-		bridge.style.width = `${Math.max(0, primaryAnchorRect.right - secondaryAnchorRect.left - bridgeLeftInset)}px`;
-		bridge.style.height = `${Math.max(secondaryAnchorRect.height, primaryAnchorRect.height)}px`;
-		bridge.style.color = primaryStyle.color;
-		bridge.style.fontFamily = primaryStyle.fontFamily;
-		bridge.style.fontSize = primaryStyle.fontSize;
-		bridge.style.lineHeight = primaryStyle.lineHeight;
-		bridge.style.setProperty("--stream-monaco-unchanged-fg", primaryStyle.color);
-		bridge.style.setProperty("--stream-monaco-editor-bg", editorSurfaceStyle.backgroundColor);
-		bridge.style.setProperty("--stream-monaco-unchanged-split-offset", `${Math.max(0, secondaryAnchorRect.width - bridgeLeftInset)}px`);
-		if (bridgeRailWidth) bridge.style.setProperty("--stream-monaco-unchanged-rail-width", `${bridgeRailWidth}px`);
-		else bridge.style.removeProperty("--stream-monaco-unchanged-rail-width");
-		summary.classList.remove("stream-monaco-unchanged-summary-line-info", "stream-monaco-unchanged-summary-line-info-basic", "stream-monaco-unchanged-summary-metadata", "stream-monaco-unchanged-summary-simple");
-		summary.classList.add(`stream-monaco-unchanged-summary-${unchangedRegionStyle}`);
-		const summaryLabel = metadataLabel || countText;
-		const summaryInteractive = unchangedRegionStyle === "line-info" || unchangedRegionStyle === "line-info-basic";
-		summary.disabled = !summaryInteractive;
-		summary.tabIndex = summaryInteractive ? 0 : -1;
-		if (summaryInteractive) {
-			summary.removeAttribute("aria-hidden");
-			summary.setAttribute("aria-label", `${summaryLabel}. Expand all unmodified lines`);
-			summary.title = "Expand all unmodified lines";
-		} else if (unchangedRegionStyle === "simple") {
-			summary.setAttribute("aria-hidden", "true");
-			summary.removeAttribute("aria-label");
-			summary.title = "";
-		} else {
-			summary.removeAttribute("aria-hidden");
-			summary.removeAttribute("aria-label");
-			summary.title = "";
-		}
-		this.updateDiffUnchangedBridgeMeta(entry, unchangedRegionStyle, summaryLabel);
+		syncDiffUnchangedBridgeNode({
+			bridge,
+			unchangedRegionStyle,
+			containerRect,
+			containerScrollLeft: this.lastContainer.scrollLeft,
+			containerScrollTop: this.lastContainer.scrollTop,
+			secondaryAnchorRect,
+			primaryAnchorRect,
+			bridgeLeftInset,
+			bridgeRailWidth,
+			primaryStyle,
+			editorBackgroundColor: editorSurfaceStyle.backgroundColor
+		});
+		syncDiffUnchangedSummaryButton(summary, unchangedRegionStyle, summaryLabel);
+		syncDiffUnchangedMetaNode(entry.visualMeta, unchangedRegionStyle, summaryLabel);
 		if (unchangedRegionStyle === "line-info" || unchangedRegionStyle === "line-info-basic") {
 			this.syncDiffUnchangedBridgeRail(entry, showTopHandle, topHandle ?? null, showBottomHandle, bottomHandle ?? null);
 			if (entry.rail && entry.rail.parentElement !== bridge) bridge.prepend(entry.rail);
@@ -3152,8 +3892,9 @@ var DiffEditorManager = class DiffEditorManager {
 			entry.rail.setAttribute("aria-hidden", "true");
 		}
 		entry.activate = () => {
-			const action = primaryNode.querySelector("a, button") ?? secondaryNode.querySelector("a, button");
+			const action = findDiffUnchangedActivationAction(primaryNode, secondaryNode);
 			if (action instanceof HTMLElement) {
+				this.capturePreviousDiffUnchangedState();
 				action.click();
 				this.scheduleCapturePersistedDiffUnchangedState(1);
 			}
@@ -3172,11 +3913,23 @@ var DiffEditorManager = class DiffEditorManager {
 		node.title = node.title || "Collapse unchanged lines";
 		this.bindFocusVisibleClass(this.diffUnchangedRegionDisposables, node);
 		this.bindPersistOnMouseRelease(this.diffUnchangedRegionDisposables, node);
+		this.createDomDisposable(this.diffUnchangedRegionDisposables, node, "mouseup", (event) => {
+			const mouseEvent = event;
+			if (mouseEvent.button !== 0) return;
+			if (!this.restorePreviousDiffUnchangedState()) return;
+			event.preventDefault();
+			event.stopPropagation();
+			this.schedulePatchDiffUnchangedRegionsAfterInteraction();
+		});
 		this.createDomDisposable(this.diffUnchangedRegionDisposables, node, "keydown", (event) => {
 			const keyboardEvent = event;
 			if (keyboardEvent.key !== "Enter" && keyboardEvent.key !== " ") return;
 			keyboardEvent.preventDefault();
-			this.dispatchSyntheticMouseDown(node);
+			if (this.restorePreviousDiffUnchangedState()) {
+				this.schedulePatchDiffUnchangedRegionsAfterInteraction();
+				return;
+			}
+			dispatchSyntheticPrimaryMouseDown(node);
 			this.scheduleCapturePersistedDiffUnchangedState(1);
 		});
 	}
@@ -3185,6 +3938,11 @@ var DiffEditorManager = class DiffEditorManager {
 		this.applyDiffRootAppearanceClass();
 		const viewZoneHeightsChanged = this.syncDiffUnchangedViewZoneHeights();
 		const centers = this.lastContainer.querySelectorAll(".diff-hidden-lines .center");
+		const modifiedHiddenSummaryMidpoints = Array.from(this.lastContainer.querySelectorAll(".editor.modified .diff-hidden-lines .center")).map((node) => {
+			const rect = node.getBoundingClientRect();
+			if (rect.width <= 0 || rect.height <= 0) return null;
+			return rect.top + rect.height / 2;
+		}).filter((value) => value !== null);
 		Array.from(centers).sort((a, b) => a.getBoundingClientRect().top - b.getBoundingClientRect().top).forEach((node, index) => this.patchDiffUnchangedCenter(node, index));
 		const partialRevealHandles = this.lastContainer.querySelectorAll(".diff-hidden-lines .top, .diff-hidden-lines .bottom");
 		partialRevealHandles.forEach((node) => {
@@ -3209,7 +3967,13 @@ var DiffEditorManager = class DiffEditorManager {
 		this.pruneDiffUnchangedBridgeEntries(visibleKeys);
 		this.syncDiffUnchangedOverlayScrollBaseline();
 		const foldGlyphs = this.lastContainer.querySelectorAll(".fold-unchanged");
-		foldGlyphs.forEach((node) => this.patchDiffUnchangedFoldGlyph(node));
+		foldGlyphs.forEach((node) => {
+			const rect = node.getBoundingClientRect();
+			const midpoint = rect.top + rect.height / 2;
+			const overlapsHiddenSummary = modifiedHiddenSummaryMidpoints.some((summaryMidpoint) => Math.abs(summaryMidpoint - midpoint) <= 8);
+			node.classList.toggle("stream-monaco-fold-unchanged-hidden", overlapsHiddenSummary);
+			this.patchDiffUnchangedFoldGlyph(node);
+		});
 		if (viewZoneHeightsChanged) this.schedulePatchDiffUnchangedRegions();
 	}
 	schedulePatchDiffUnchangedRegions() {
@@ -3222,12 +3986,12 @@ var DiffEditorManager = class DiffEditorManager {
 		this.schedulePatchDiffUnchangedRegions();
 	}
 	setupDiffUnchangedRegionEnhancements() {
-		var _globalThis$getComput, _globalThis;
+		var _globalThis$getComput2, _globalThis2;
 		this.disposeDiffUnchangedRegionEnhancements();
 		if (!this.diffEditorView || !this.lastContainer) return;
 		if (typeof document === "undefined") return;
 		this.ensureDiffUiStyle();
-		const containerStyle = (_globalThis$getComput = (_globalThis = globalThis).getComputedStyle) === null || _globalThis$getComput === void 0 ? void 0 : _globalThis$getComput.call(_globalThis, this.lastContainer);
+		const containerStyle = (_globalThis$getComput2 = (_globalThis2 = globalThis).getComputedStyle) === null || _globalThis$getComput2 === void 0 ? void 0 : _globalThis$getComput2.call(_globalThis2, this.lastContainer);
 		if (!containerStyle || containerStyle.position === "static") this.lastContainer.style.position = "relative";
 		this.applyDiffRootAppearanceClass();
 		this.schedulePatchDiffUnchangedRegions();
@@ -3255,6 +4019,20 @@ var DiffEditorManager = class DiffEditorManager {
 			this.applyDiffRootAppearanceClass();
 			this.schedulePatchDiffUnchangedRegions();
 		};
+		const handleFoldMouseUp = (event) => {
+			var _event$event, _event$target, _event$event2, _event$event2$prevent, _event$event3, _event$event3$stopPro;
+			if (event === null || event === void 0 || (_event$event = event.event) === null || _event$event === void 0 ? void 0 : _event$event.rightButton) return;
+			const targetElement = event === null || event === void 0 || (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.element;
+			const className = typeof (targetElement === null || targetElement === void 0 ? void 0 : targetElement.className) === "string" ? targetElement.className : "";
+			if (!className.includes("fold-unchanged")) return;
+			if (!this.diffPreviousUnchangedModelState) return;
+			event === null || event === void 0 || (_event$event2 = event.event) === null || _event$event2 === void 0 || (_event$event2$prevent = _event$event2.preventDefault) === null || _event$event2$prevent === void 0 || _event$event2$prevent.call(_event$event2);
+			event === null || event === void 0 || (_event$event3 = event.event) === null || _event$event3 === void 0 || (_event$event3$stopPro = _event$event3.stopPropagation) === null || _event$event3$stopPro === void 0 || _event$event3$stopPro.call(_event$event3);
+			requestAnimationFrame(() => {
+				if (!this.restorePreviousDiffUnchangedState()) return;
+				this.schedulePatchDiffUnchangedRegionsAfterInteraction();
+			});
+		};
 		this.diffUnchangedRegionDisposables.push(this.diffEditorView.onDidUpdateDiff(() => {
 			repatch();
 			this.scheduleRestorePersistedDiffUnchangedState();
@@ -3263,23 +4041,29 @@ var DiffEditorManager = class DiffEditorManager {
 		this.diffUnchangedRegionDisposables.push(modifiedEditor.onDidLayoutChange(repatch));
 		this.diffUnchangedRegionDisposables.push(originalEditor.onDidScrollChange(() => this.schedulePatchDiffUnchangedRegionsAfterScroll()));
 		this.diffUnchangedRegionDisposables.push(modifiedEditor.onDidScrollChange(() => this.schedulePatchDiffUnchangedRegionsAfterScroll()));
+		this.diffUnchangedRegionDisposables.push(originalEditor.onMouseUp(handleFoldMouseUp));
+		this.diffUnchangedRegionDisposables.push(modifiedEditor.onMouseUp(handleFoldMouseUp));
 		this.createDomDisposable(this.diffUnchangedRegionDisposables, this.lastContainer, "scroll", () => this.schedulePatchDiffUnchangedRegionsAfterScroll());
 	}
 	setupDiffHunkInteractions() {
-		var _globalThis$getComput2, _globalThis2;
+		var _globalThis$getComput3, _globalThis3;
 		this.disposeDiffHunkInteractions();
 		if (!this.diffEditorView || !this.lastContainer) return;
 		if (this.options.diffHunkActionsOnHover !== true) return;
 		if (typeof document === "undefined") return;
 		this.ensureDiffUiStyle();
-		const containerStyle = (_globalThis$getComput2 = (_globalThis2 = globalThis).getComputedStyle) === null || _globalThis$getComput2 === void 0 ? void 0 : _globalThis$getComput2.call(_globalThis2, this.lastContainer);
+		const containerStyle = (_globalThis$getComput3 = (_globalThis3 = globalThis).getComputedStyle) === null || _globalThis$getComput3 === void 0 ? void 0 : _globalThis$getComput3.call(_globalThis3, this.lastContainer);
 		if (!containerStyle || containerStyle.position === "static") this.lastContainer.style.position = "relative";
 		const overlay = document.createElement("div");
 		overlay.className = "stream-monaco-diff-hunk-overlay";
 		this.diffHunkOverlay = overlay;
 		this.lastContainer.append(overlay);
-		this.diffHunkUpperNode = this.createDiffHunkActionNode("upper");
-		this.diffHunkLowerNode = this.createDiffHunkActionNode("lower");
+		this.diffHunkUpperNode = createDiffHunkActionNode("upper", (side, action) => this.applyDiffHunkAction(side, action));
+		this.diffHunkLowerNode = createDiffHunkActionNode("lower", (side, action) => this.applyDiffHunkAction(side, action));
+		this.createDomDisposable(this.diffHunkDisposables, this.diffHunkUpperNode, "mouseenter", () => this.cancelScheduledHideDiffHunkActions());
+		this.createDomDisposable(this.diffHunkDisposables, this.diffHunkUpperNode, "mouseleave", () => this.scheduleHideDiffHunkActions());
+		this.createDomDisposable(this.diffHunkDisposables, this.diffHunkLowerNode, "mouseenter", () => this.cancelScheduledHideDiffHunkActions());
+		this.createDomDisposable(this.diffHunkDisposables, this.diffHunkLowerNode, "mouseleave", () => this.scheduleHideDiffHunkActions());
 		overlay.append(this.diffHunkUpperNode, this.diffHunkLowerNode);
 		const originalEditor = this.diffEditorView.getOriginalEditor();
 		const modifiedEditor = this.diffEditorView.getModifiedEditor();
@@ -3322,113 +4106,35 @@ var DiffEditorManager = class DiffEditorManager {
 		if (this.diffHunkUpperNode) this.diffHunkUpperNode.style.display = "none";
 		if (this.diffHunkLowerNode) this.diffHunkLowerNode.style.display = "none";
 	}
-	inferInlineDiffHunkHoverSide(change, event) {
-		var _event$target$positio;
-		const targetElement = event.target.element instanceof HTMLElement ? event.target.element : null;
-		if (targetElement === null || targetElement === void 0 ? void 0 : targetElement.closest(".line-delete, .char-delete, .inline-deleted-text, .inline-deleted-margin-view-zone")) return "upper";
-		if (targetElement === null || targetElement === void 0 ? void 0 : targetElement.closest(".line-insert, .char-insert, .gutter-insert, .view-line")) return "lower";
-		if (!this.hasModifiedLines(change)) return "upper";
-		if (!this.hasOriginalLines(change)) return "lower";
-		const hoverLine = ((_event$target$positio = event.target.position) === null || _event$target$positio === void 0 ? void 0 : _event$target$positio.lineNumber) ?? 0;
-		const modifiedAnchor = Math.max(1, change.modifiedStartLineNumber || change.modifiedEndLineNumber || 1);
-		return hoverLine < modifiedAnchor ? "upper" : "lower";
-	}
-	hasOriginalLines(change) {
-		return change.originalStartLineNumber > 0 && change.originalEndLineNumber >= change.originalStartLineNumber;
-	}
-	hasModifiedLines(change) {
-		return change.modifiedStartLineNumber > 0 && change.modifiedEndLineNumber >= change.modifiedStartLineNumber;
-	}
-	distanceToLineChange(side, change, line) {
-		const hasRange = side === "original" ? this.hasOriginalLines(change) : this.hasModifiedLines(change);
-		const start = side === "original" ? change.originalStartLineNumber : change.modifiedStartLineNumber;
-		const end = side === "original" ? change.originalEndLineNumber : change.modifiedEndLineNumber;
-		if (hasRange) {
-			if (line < start) return start - line;
-			if (line > end) return line - end;
-			return 0;
-		}
-		const fallbackAnchor = Math.max(1, start || end || 1);
-		return Math.abs(line - fallbackAnchor);
-	}
-	findLineChangeByHoverLine(side, line) {
-		if (this.diffHunkLineChanges.length === 0) return null;
-		let best = null;
-		let bestDistance = Number.POSITIVE_INFINITY;
-		for (const change of this.diffHunkLineChanges) {
-			const distance = this.distanceToLineChange(side, change, line);
-			if (distance < bestDistance) {
-				bestDistance = distance;
-				best = change;
-				if (distance === 0) break;
-			}
-		}
-		if (bestDistance > 2) return null;
-		return best;
-	}
 	handleDiffHunkMouseMove(side, event) {
-		var _event$target$positio2;
-		const line = (_event$target$positio2 = event.target.position) === null || _event$target$positio2 === void 0 ? void 0 : _event$target$positio2.lineNumber;
+		var _event$target$positio, _event$target$positio2;
+		const line = (_event$target$positio = event.target.position) === null || _event$target$positio === void 0 ? void 0 : _event$target$positio.lineNumber;
 		if (!line) {
 			this.scheduleHideDiffHunkActions(120);
 			return;
 		}
-		const change = this.findLineChangeByHoverLine(side, line);
+		const change = findLineChangeByHoverLine(this.diffHunkLineChanges, side, line);
 		if (!change) {
 			this.scheduleHideDiffHunkActions(120);
 			return;
 		}
 		this.cancelScheduledHideDiffHunkActions();
 		this.diffHunkActiveChange = change;
-		this.diffHunkActiveHoverSide = this.isDiffInlineMode() ? this.inferInlineDiffHunkHoverSide(change, event) : null;
+		this.diffHunkActiveHoverSide = this.isDiffInlineMode() ? inferInlineDiffHunkHoverSide(change, ((_event$target$positio2 = event.target.position) === null || _event$target$positio2 === void 0 ? void 0 : _event$target$positio2.lineNumber) ?? 0, event.target.element instanceof HTMLElement ? event.target.element : null) : null;
 		this.repositionDiffHunkNodes();
 	}
 	isOriginalEditorCollapsed() {
-		var _this$diffEditorView$4, _this$diffEditorView$5;
+		var _this$diffEditorView$2, _this$diffEditorView$3;
 		if (!this.diffEditorView) return true;
-		const info = (_this$diffEditorView$4 = (_this$diffEditorView$5 = this.diffEditorView.getOriginalEditor()).getLayoutInfo) === null || _this$diffEditorView$4 === void 0 ? void 0 : _this$diffEditorView$4.call(_this$diffEditorView$5);
+		const info = (_this$diffEditorView$2 = (_this$diffEditorView$3 = this.diffEditorView.getOriginalEditor()).getLayoutInfo) === null || _this$diffEditorView$2 === void 0 ? void 0 : _this$diffEditorView$2.call(_this$diffEditorView$3);
 		return !info || info.width < 24;
 	}
 	isDiffInlineMode() {
-		var _this$lastContainer2;
-		const diffRoot = (_this$lastContainer2 = this.lastContainer) === null || _this$lastContainer2 === void 0 ? void 0 : _this$lastContainer2.querySelector(".monaco-diff-editor");
-		if (diffRoot instanceof HTMLElement) return !diffRoot.classList.contains("side-by-side");
+		var _this$lastContainer8, _this$lastContainer9;
+		const diffRoot = typeof ((_this$lastContainer8 = this.lastContainer) === null || _this$lastContainer8 === void 0 ? void 0 : _this$lastContainer8.querySelector) === "function" ? (_this$lastContainer9 = this.lastContainer) === null || _this$lastContainer9 === void 0 ? void 0 : _this$lastContainer9.querySelector(".monaco-diff-editor") : null;
+		if (typeof HTMLElement !== "undefined" && diffRoot instanceof HTMLElement) return !diffRoot.classList.contains("side-by-side");
 		return this.isOriginalEditorCollapsed();
 	}
-	getEditorBySide(side) {
-		if (!this.diffEditorView) return null;
-		return side === "original" ? this.diffEditorView.getOriginalEditor() : this.diffEditorView.getModifiedEditor();
-	}
-	getFullLineRange(model, startLine, endLine) {
-		if (endLine < startLine) return null;
-		const lineCount = model.getLineCount();
-		if (lineCount < 1) return null;
-		const start = Math.max(1, Math.min(startLine, lineCount));
-		const end = Math.max(start, Math.min(endLine, lineCount));
-		if (end < lineCount) return new monaco_shim_exports.Range(start, 1, end + 1, 1);
-		return new monaco_shim_exports.Range(start, 1, end, model.getLineMaxColumn(end));
-	}
-	getLinesText(model, startLine, endLine) {
-		const range = this.getFullLineRange(model, startLine, endLine);
-		if (!range) return "";
-		return model.getValueInRange(range);
-	}
-	getInsertRangeBeforeLine(model, lineNumber) {
-		const lineCount = model.getLineCount();
-		if (lineNumber <= 1) return new monaco_shim_exports.Range(1, 1, 1, 1);
-		if (lineNumber <= lineCount) return new monaco_shim_exports.Range(lineNumber, 1, lineNumber, 1);
-		const lastLine = lineCount;
-		const lastColumn = model.getLineMaxColumn(lastLine);
-		return new monaco_shim_exports.Range(lastLine, lastColumn, lastLine, lastColumn);
-	}
-	getInsertRangeAfterLine(model, lineNumber) {
-		const lineCount = model.getLineCount();
-		if (lineNumber < 1) return new monaco_shim_exports.Range(1, 1, 1, 1);
-		if (lineNumber < lineCount) return new monaco_shim_exports.Range(lineNumber + 1, 1, lineNumber + 1, 1);
-		const lastLine = lineCount;
-		const lastColumn = model.getLineMaxColumn(lastLine);
-		return new monaco_shim_exports.Range(lastLine, lastColumn, lastLine, lastColumn);
-	}
 	applyDiffModelLanguage(models, codeLanguage) {
 		if (!codeLanguage) return;
 		const lang = processedLanguage(codeLanguage);
@@ -3440,8 +4146,8 @@ var DiffEditorManager = class DiffEditorManager {
 		if (!this.diffEditorView || !viewState) return;
 		const restore = () => {
 			try {
-				var _this$diffEditorView25;
-				(_this$diffEditorView25 = this.diffEditorView) === null || _this$diffEditorView25 === void 0 || _this$diffEditorView25.restoreViewState(viewState);
+				var _this$diffEditorView16;
+				(_this$diffEditorView16 = this.diffEditorView) === null || _this$diffEditorView16 === void 0 || _this$diffEditorView16.restoreViewState(viewState);
 			} catch {}
 		};
 		restore();
@@ -3459,7 +4165,7 @@ var DiffEditorManager = class DiffEditorManager {
 		this.pendingPreparedDiffViewModel = null;
 	}
 	syncDiffKnownValues() {
-		var _this$diffEditorView26, _this$diffEditorView27, _this$diffEditorView28, _this$diffHeightManag2;
+		var _this$diffEditorView17, _this$diffEditorView18, _this$diffEditorView19, _this$diffHeightManag4;
 		if (this.originalModel) this.lastKnownOriginalCode = this.originalModel.getValue();
 		if (this.modifiedModel) {
 			this.lastKnownModifiedCode = this.modifiedModel.getValue();
@@ -3468,67 +4174,15 @@ var DiffEditorManager = class DiffEditorManager {
 		this.lastKnownModifiedDirty = false;
 		this._hasScrollBar = false;
 		this.cachedComputedHeightDiff = this.computedHeight();
-		this.cachedScrollHeightDiff = ((_this$diffEditorView26 = this.diffEditorView) === null || _this$diffEditorView26 === void 0 || (_this$diffEditorView28 = (_this$diffEditorView27 = _this$diffEditorView26.getModifiedEditor()).getScrollHeight) === null || _this$diffEditorView28 === void 0 ? void 0 : _this$diffEditorView28.call(_this$diffEditorView27)) ?? this.cachedScrollHeightDiff;
-		(_this$diffHeightManag2 = this.diffHeightManager) === null || _this$diffHeightManag2 === void 0 || _this$diffHeightManag2.update();
-	}
-	applyDefaultDiffHunkAction(context) {
-		const { action, side, lineChange } = context;
-		if (!this.originalModel || !this.modifiedModel) return;
-		const hasOriginal = this.hasOriginalLines(lineChange);
-		const hasModified = this.hasModifiedLines(lineChange);
-		if (action === "revert" && side === "upper") {
-			if (!hasOriginal) return;
-			const text = this.getLinesText(this.originalModel, lineChange.originalStartLineNumber, lineChange.originalEndLineNumber);
-			if (!text) return;
-			const range = hasModified ? this.getInsertRangeBeforeLine(this.modifiedModel, lineChange.modifiedStartLineNumber) : this.getInsertRangeAfterLine(this.modifiedModel, Math.max(0, lineChange.modifiedStartLineNumber || lineChange.modifiedEndLineNumber));
-			this.modifiedModel.applyEdits([{
-				range,
-				text,
-				forceMoveMarkers: true
-			}]);
-			return;
-		}
-		if (action === "revert" && side === "lower") {
-			if (!hasModified) return;
-			const range = this.getFullLineRange(this.modifiedModel, lineChange.modifiedStartLineNumber, lineChange.modifiedEndLineNumber);
-			if (!range) return;
-			this.modifiedModel.applyEdits([{
-				range,
-				text: "",
-				forceMoveMarkers: true
-			}]);
-			return;
-		}
-		if (action === "stage" && side === "upper") {
-			if (!hasOriginal) return;
-			const range = this.getFullLineRange(this.originalModel, lineChange.originalStartLineNumber, lineChange.originalEndLineNumber);
-			if (!range) return;
-			this.originalModel.applyEdits([{
-				range,
-				text: "",
-				forceMoveMarkers: true
-			}]);
-			return;
-		}
-		if (action === "stage" && side === "lower") {
-			if (!hasModified) return;
-			const text = this.getLinesText(this.modifiedModel, lineChange.modifiedStartLineNumber, lineChange.modifiedEndLineNumber);
-			if (!text) return;
-			const anchor = hasOriginal ? lineChange.originalEndLineNumber : Math.max(0, lineChange.originalStartLineNumber);
-			const range = this.getInsertRangeAfterLine(this.originalModel, anchor);
-			this.originalModel.applyEdits([{
-				range,
-				text,
-				forceMoveMarkers: true
-			}]);
-		}
+		this.cachedScrollHeightDiff = ((_this$diffEditorView17 = this.diffEditorView) === null || _this$diffEditorView17 === void 0 || (_this$diffEditorView19 = (_this$diffEditorView18 = _this$diffEditorView17.getModifiedEditor()).getScrollHeight) === null || _this$diffEditorView19 === void 0 ? void 0 : _this$diffEditorView19.call(_this$diffEditorView18)) ?? this.cachedScrollHeightDiff;
+		(_this$diffHeightManag4 = this.diffHeightManager) === null || _this$diffHeightManag4 === void 0 || _this$diffHeightManag4.update();
 	}
 	async applyDiffHunkAction(side, action) {
 		if (!this.diffHunkActiveChange || !this.originalModel || !this.modifiedModel) return;
 		if (this.diffHunkActionInFlight) return;
 		this.diffHunkActionInFlight = true;
-		this.setDiffHunkNodeEnabled(this.diffHunkUpperNode, false);
-		this.setDiffHunkNodeEnabled(this.diffHunkLowerNode, false);
+		setDiffHunkNodeEnabled(this.diffHunkUpperNode, false);
+		setDiffHunkNodeEnabled(this.diffHunkLowerNode, false);
 		try {
 			this.flushOriginalAppendBufferSync();
 			this.flushModifiedAppendBufferSync();
@@ -3545,39 +4199,13 @@ var DiffEditorManager = class DiffEditorManager {
 			} catch (error$1) {
 				console.warn("onDiffHunkAction callback threw an error:", error$1);
 			}
-			if (allowDefault) this.applyDefaultDiffHunkAction(context);
+			if (allowDefault) applyDefaultDiffHunkAction(context);
 			this.syncDiffKnownValues();
 			this.hideDiffHunkActions();
 		} finally {
 			this.diffHunkActionInFlight = false;
 		}
 	}
-	setDiffHunkNodeEnabled(node, enabled) {
-		if (!node) return;
-		const buttons = node.querySelectorAll("button");
-		buttons.forEach((button) => {
-			button.disabled = !enabled;
-		});
-	}
-	positionDiffHunkNode(node, side, anchorLine, extraOffsetY = 0) {
-		var _editor$getScrollTop2;
-		if (!this.diffHunkOverlay) return;
-		const editor = this.getEditorBySide(side);
-		if (!editor) return;
-		const host = editor.getContainerDomNode();
-		const line = Math.max(1, anchorLine);
-		const rawTop = editor.getTopForLineNumber(line) - (((_editor$getScrollTop2 = editor.getScrollTop) === null || _editor$getScrollTop2 === void 0 ? void 0 : _editor$getScrollTop2.call(editor)) ?? 0);
-		const lineHeight = editor.getOption(monaco_shim_exports.editor.EditorOption.lineHeight);
-		const nodeWidth = node.offsetWidth || 130;
-		const nodeHeight = node.offsetHeight || 30;
-		const left = host.offsetLeft + Math.max(6, host.clientWidth - nodeWidth - 10);
-		const hostTop = host.offsetTop;
-		const minTop = hostTop + 4;
-		const maxTop = hostTop + Math.max(4, host.clientHeight - nodeHeight - 4);
-		const top = Math.min(maxTop, Math.max(minTop, hostTop + rawTop + Math.round(lineHeight * .2) + extraOffsetY));
-		node.style.transform = `translate(${Math.round(left)}px, ${Math.round(top)}px)`;
-		node.style.display = "flex";
-	}
 	repositionDiffHunkNodes() {
 		if (!this.diffHunkActiveChange) {
 			this.hideDiffHunkActions();
@@ -3586,22 +4214,22 @@ var DiffEditorManager = class DiffEditorManager {
 		if (!this.diffHunkUpperNode || !this.diffHunkLowerNode) return;
 		if (!this.diffEditorView) return;
 		const change = this.diffHunkActiveChange;
-		const hasOriginal = this.hasOriginalLines(change);
-		const hasModified = this.hasModifiedLines(change);
-		this.setDiffHunkNodeEnabled(this.diffHunkUpperNode, hasOriginal);
-		this.setDiffHunkNodeEnabled(this.diffHunkLowerNode, hasModified);
+		const hasOriginal = hasOriginalLines(change);
+		const hasModified = hasModifiedLines(change);
+		setDiffHunkNodeEnabled(this.diffHunkUpperNode, hasOriginal);
+		setDiffHunkNodeEnabled(this.diffHunkLowerNode, hasModified);
 		const inlineMode = this.isDiffInlineMode();
 		if (inlineMode) {
 			const inlineHoverSide = this.diffHunkActiveHoverSide ?? (hasOriginal && !hasModified ? "upper" : "lower");
 			if (inlineHoverSide === "upper" && hasOriginal) {
 				const upperAnchor = Math.max(1, change.modifiedStartLineNumber - 1 || change.modifiedEndLineNumber || 1);
-				this.positionDiffHunkNode(this.diffHunkUpperNode, "modified", upperAnchor);
+				positionDiffHunkNode(this.diffHunkUpperNode, this.diffEditorView.getModifiedEditor(), upperAnchor);
 				this.diffHunkLowerNode.style.display = "none";
 				return;
 			}
 			if (hasModified) {
 				const lowerAnchor = Math.max(1, change.modifiedStartLineNumber || change.modifiedEndLineNumber || 1);
-				this.positionDiffHunkNode(this.diffHunkLowerNode, "modified", lowerAnchor);
+				positionDiffHunkNode(this.diffHunkLowerNode, this.diffEditorView.getModifiedEditor(), lowerAnchor);
 				this.diffHunkUpperNode.style.display = "none";
 				return;
 			}
@@ -3609,13 +4237,12 @@ var DiffEditorManager = class DiffEditorManager {
 			return;
 		}
 		if (hasOriginal) {
-			const upperSide = "original";
 			const upperAnchor = change.originalStartLineNumber;
-			this.positionDiffHunkNode(this.diffHunkUpperNode, upperSide, upperAnchor);
+			positionDiffHunkNode(this.diffHunkUpperNode, this.diffEditorView.getOriginalEditor(), upperAnchor);
 		} else this.diffHunkUpperNode.style.display = "none";
 		if (hasModified) {
 			const lowerAnchor = change.modifiedStartLineNumber;
-			this.positionDiffHunkNode(this.diffHunkLowerNode, "modified", lowerAnchor);
+			positionDiffHunkNode(this.diffHunkLowerNode, this.diffEditorView.getModifiedEditor(), lowerAnchor);
 		} else this.diffHunkLowerNode.style.display = "none";
 	}
 	scheduleFlushAppendBufferDiff() {
@@ -3653,24 +4280,43 @@ var DiffEditorManager = class DiffEditorManager {
 		this.preserveNativeDiffDecorationsOnStaleAppend = true;
 		this.appendToModel(this.originalModel, text);
 	}
+	computeRawHeight() {
+		return computeDiffRawHeight({
+			diffEditorView: this.diffEditorView,
+			maxHeightValue: this.maxHeightValue
+		});
+	}
 	computedHeight() {
-		var _originalEditor$getMo, _modifiedEditor$getMo, _originalEditor$getSc5, _modifiedEditor$getSc10;
-		if (!this.diffEditorView) return Math.min(1 * 18 + padding, this.maxHeightValue);
-		const modifiedEditor = this.diffEditorView.getModifiedEditor();
-		const originalEditor = this.diffEditorView.getOriginalEditor();
-		const lineHeight = modifiedEditor.getOption(monaco_shim_exports.editor.EditorOption.lineHeight);
-		const oCount = ((_originalEditor$getMo = originalEditor.getModel()) === null || _originalEditor$getMo === void 0 ? void 0 : _originalEditor$getMo.getLineCount()) ?? 1;
-		const mCount = ((_modifiedEditor$getMo = modifiedEditor.getModel()) === null || _modifiedEditor$getMo === void 0 ? void 0 : _modifiedEditor$getMo.getLineCount()) ?? 1;
-		const lineCount = Math.max(oCount, mCount);
-		const fromLines = lineCount * lineHeight + padding;
-		const scrollH = Math.max(((_originalEditor$getSc5 = originalEditor.getScrollHeight) === null || _originalEditor$getSc5 === void 0 ? void 0 : _originalEditor$getSc5.call(originalEditor)) ?? 0, ((_modifiedEditor$getSc10 = modifiedEditor.getScrollHeight) === null || _modifiedEditor$getSc10 === void 0 ? void 0 : _modifiedEditor$getSc10.call(modifiedEditor)) ?? 0);
-		const desired = Math.max(fromLines, scrollH);
-		return Math.min(desired, this.maxHeightValue);
+		const { height, nextInlineDiffStreamingHeightFloor } = computeDiffHeight({
+			rawHeight: this.computeRawHeight(),
+			isInlineMode: this.isDiffInlineMode(),
+			inlineDiffStreamingPresentationActive: this.inlineDiffStreamingPresentationActive,
+			inlineDiffStreamingHeightFloor: this.inlineDiffStreamingHeightFloor
+		});
+		this.inlineDiffStreamingHeightFloor = nextInlineDiffStreamingHeightFloor;
+		return height;
+	}
+	eagerlyGrowDiffContainerHeight() {
+		var _this$lastContainer$g, _this$lastContainer10;
+		if (!this.lastContainer) return;
+		const next = this.computedHeight();
+		if (!Number.isFinite(next) || next <= 0) return;
+		const applied = Number.parseFloat(this.lastContainer.style.height || "0") || 0;
+		const measured = ((_this$lastContainer$g = (_this$lastContainer10 = this.lastContainer).getBoundingClientRect) === null || _this$lastContainer$g === void 0 ? void 0 : _this$lastContainer$g.call(_this$lastContainer10).height) ?? this.lastContainer.clientHeight ?? 0;
+		const baseline = Math.max(applied, measured);
+		if (next <= baseline + 1) return;
+		this.lastContainer.style.height = `${next}px`;
+		this.cachedComputedHeightDiff = next;
+		this.scheduleSyncDiffEditorLayoutToContainer();
 	}
 	isOverflowAutoDiff() {
 		if (!this.lastContainer) return false;
 		return this.computedHeight() >= this.maxHeightValue - 1;
 	}
+	shouldAvoidOptimisticMaxHeightWriteDiff() {
+		const hideUnchangedRegions = this.diffHideUnchangedRegionsResolved;
+		return this.isDiffInlineMode() && (hideUnchangedRegions === null || hideUnchangedRegions === void 0 ? void 0 : hideUnchangedRegions.enabled) === true && !this.diffHideUnchangedRegionsDeferred;
+	}
 	shouldPerformImmediateRevealDiff() {
 		return this.autoScrollOnUpdate && this.shouldAutoScrollDiff && !this.diffHideUnchangedRegionsDeferred && this.hasVerticalScrollbarModified() && this.isOverflowAutoDiff();
 	}
@@ -3693,17 +4339,22 @@ var DiffEditorManager = class DiffEditorManager {
 		if (this._hasScrollBar) return true;
 		const m = this.measureViewportDiff();
 		if (!m) return false;
-		const epsilon = Math.max(2, Math.round(m.lineHeight / 8));
-		return this._hasScrollBar = m.scrollHeight > m.computedHeight + Math.max(padding / 2, epsilon);
+		return this._hasScrollBar = hasVerticalScrollbar(m);
 	}
 	userIsNearBottomDiff() {
 		if (!this.diffEditorView) return true;
 		const m = this.measureViewportDiff();
 		if (!m || !m.li) return true;
-		const lineThreshold = (this.autoScrollThresholdLines ?? 0) * m.lineHeight;
-		const threshold = Math.max(lineThreshold || 0, this.autoScrollThresholdPx || 0);
-		const distance = m.scrollHeight - (m.scrollTop + m.li.height);
-		return distance <= threshold;
+		return isUserNearBottom({
+			computedHeight: m.computedHeight,
+			lineHeight: m.lineHeight,
+			scrollHeight: m.scrollHeight,
+			scrollTop: m.scrollTop,
+			viewportHeight: m.li.height
+		}, {
+			autoScrollThresholdLines: this.autoScrollThresholdLines ?? 0,
+			autoScrollThresholdPx: this.autoScrollThresholdPx || 0
+		});
 	}
 	maybeScrollDiffToBottom(targetLine, prevLineOverride) {
 		this.rafScheduler.schedule("maybe-scroll-diff", () => {
@@ -3779,7 +4430,7 @@ var DiffEditorManager = class DiffEditorManager {
 	}
 	performRevealDiffTicketed(line, ticket) {
 		this.rafScheduler.schedule("revealDiff", () => {
-			var _editor;
+			var _editor$1;
 			if (this.diffScrollWatcher) {
 				log("diff", "performRevealDiffTicketed - suppressing watcher", {
 					ticket,
@@ -3794,16 +4445,11 @@ var DiffEditorManager = class DiffEditorManager {
 				line
 			});
 			const strategy = this.diffHideUnchangedRegionsDeferred ? "bottom" : this.revealStrategyOption ?? this.options.revealStrategy ?? "centerIfOutside";
-			const ScrollType = monaco_shim_exports.ScrollType || ((_editor = monaco_shim_exports.editor) === null || _editor === void 0 ? void 0 : _editor.ScrollType);
-			const smooth = !this.diffHideUnchangedRegionsDeferred && ScrollType && typeof ScrollType.Smooth !== "undefined" ? ScrollType.Smooth : void 0;
+			const ScrollType$1 = ScrollType || ((_editor$1 = monaco_shim_exports.editor) === null || _editor$1 === void 0 ? void 0 : _editor$1.ScrollType);
+			const smooth = !this.diffHideUnchangedRegionsDeferred && ScrollType$1 && typeof ScrollType$1.Smooth !== "undefined" ? ScrollType$1.Smooth : void 0;
 			try {
 				const me = this.diffEditorView.getModifiedEditor();
-				if (strategy === "bottom") if (typeof smooth !== "undefined") me.revealLine(line, smooth);
-				else me.revealLine(line);
-				else if (strategy === "center") if (typeof smooth !== "undefined") me.revealLineInCenter(line, smooth);
-				else me.revealLineInCenter(line);
-				else if (typeof smooth !== "undefined") me.revealLineInCenterIfOutsideViewport(line, smooth);
-				else me.revealLineInCenterIfOutsideViewport(line);
+				revealEditorLine(me, line, strategy, smooth);
 			} catch {
 				try {
 					this.diffEditorView.getModifiedEditor().revealLine(line);
@@ -3815,8 +4461,8 @@ var DiffEditorManager = class DiffEditorManager {
 				lastRevealLineDiff: this.lastRevealLineDiff
 			});
 			try {
-				var _this$diffEditorView29, _this$diffEditorView30, _this$diffEditorView31;
-				this.lastScrollTopDiff = ((_this$diffEditorView29 = this.diffEditorView) === null || _this$diffEditorView29 === void 0 || (_this$diffEditorView31 = (_this$diffEditorView30 = _this$diffEditorView29.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView31 === void 0 ? void 0 : _this$diffEditorView31.call(_this$diffEditorView30)) ?? this.lastScrollTopDiff;
+				var _this$diffEditorView20, _this$diffEditorView21, _this$diffEditorView22;
+				this.lastScrollTopDiff = ((_this$diffEditorView20 = this.diffEditorView) === null || _this$diffEditorView20 === void 0 || (_this$diffEditorView22 = (_this$diffEditorView21 = _this$diffEditorView20.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView22 === void 0 ? void 0 : _this$diffEditorView22.call(_this$diffEditorView21)) ?? this.lastScrollTopDiff;
 			} catch {}
 		});
 	}
@@ -3824,11 +4470,10 @@ var DiffEditorManager = class DiffEditorManager {
 		var _editor2;
 		if (!this.diffEditorView) return;
 		if (ticket !== this.revealTicketDiff) return;
-		const ScrollType = monaco_shim_exports.ScrollType || ((_editor2 = monaco_shim_exports.editor) === null || _editor2 === void 0 ? void 0 : _editor2.ScrollType);
-		const immediate = ScrollType && typeof ScrollType.Immediate !== "undefined" ? ScrollType.Immediate : void 0;
+		const ScrollType$1 = ScrollType || ((_editor2 = monaco_shim_exports.editor) === null || _editor2 === void 0 ? void 0 : _editor2.ScrollType);
+		const immediate = ScrollType$1 && typeof ScrollType$1.Immediate !== "undefined" ? ScrollType$1.Immediate : void 0;
 		const me = this.diffEditorView.getModifiedEditor();
-		if (typeof immediate !== "undefined") me.revealLine(line, immediate);
-		else me.revealLine(line);
+		revealEditorLine(me, line, "bottom", immediate);
 		this.measureViewportDiff();
 		log("diff", "performImmediateRevealDiff", {
 			line,
@@ -3842,34 +4487,28 @@ var DiffEditorManager = class DiffEditorManager {
 			if (target !== -1 && this.diffHeightManager) {
 				if (this.lastContainer) this.lastContainer.style.height = `${target}px`;
 				await this.waitForHeightAppliedDiff(target);
+				this.syncDiffEditorLayoutToContainer();
 			}
 			this.performImmediateRevealDiff(line, ticket);
 		});
 	}
 	waitForHeightAppliedDiff(target, timeoutMs = 500) {
-		return new Promise((resolve) => {
-			const start = typeof performance !== "undefined" && performance.now ? performance.now() : Date.now();
-			const check = () => {
-				const applied = this.lastContainer ? Number.parseFloat((this.lastContainer.style.height || "").replace("px", "")) || 0 : -1;
-				if (applied >= target - 1) {
-					resolve();
-					return;
-				}
-				if ((typeof performance !== "undefined" && performance.now ? performance.now() : Date.now()) - start > timeoutMs) {
-					resolve();
-					return;
-				}
-				requestAnimationFrame(check);
-			};
-			check();
-		});
+		return waitForElementHeightApplied(this.lastContainer, target, timeoutMs);
 	}
 	async createDiffEditor(container, originalCode, modifiedCode, language, currentTheme) {
-		var _me$getScrollHeight2, _me$getOption, _oEditor$onDidContent, _mEditor$onDidContent;
+		var _me$getScrollHeight2, _me$getOption, _oEditor$onDidLayoutC, _mEditor$onDidLayoutC, _oEditor$onDidContent, _mEditor$onDidContent;
 		this.cleanup();
 		this.lastContainer = container;
 		container.style.overflow = "hidden";
 		container.style.maxHeight = this.maxHeightCSS;
+		container.innerHTML = "";
+		const editorMount = typeof document !== "undefined" ? document.createElement("div") : container;
+		if (editorMount !== container) {
+			editorMount.style.width = "100%";
+			editorMount.style.height = "100%";
+			editorMount.style.overflow = "hidden";
+			container.append(editorMount);
+		}
 		const lang = processedLanguage(language) || language;
 		this.originalModel = monaco_shim_exports.editor.createModel(originalCode, lang);
 		this.modifiedModel = monaco_shim_exports.editor.createModel(modifiedCode, lang);
@@ -3878,7 +4517,7 @@ var DiffEditorManager = class DiffEditorManager {
 		const hideUnchangedRegions = this.resolveDiffHideUnchangedRegionsOption();
 		this.diffHideUnchangedRegionsResolved = hideUnchangedRegions;
 		this.diffHideUnchangedRegionsDeferred = false;
-		this.diffEditorView = monaco_shim_exports.editor.createDiffEditor(container, {
+		this.diffEditorView = monaco_shim_exports.editor.createDiffEditor(editorMount, {
 			automaticLayout: true,
 			scrollBeyondLastLine: false,
 			renderSideBySide: true,
@@ -3892,6 +4531,7 @@ var DiffEditorManager = class DiffEditorManager {
 				...this.options.scrollbar || {}
 			},
 			...this.options,
+			glyphMargin: this.resolveDiffGlyphMarginOption(hideUnchangedRegions),
 			hideUnchangedRegions
 		});
 		monaco_shim_exports.editor.setTheme(currentTheme);
@@ -3928,8 +4568,10 @@ var DiffEditorManager = class DiffEditorManager {
 			autoScrollInitial: this.autoScrollInitial,
 			diffAutoScroll: this.diffAutoScroll
 		});
-		const MIN_VISIBLE_HEIGHT = Math.min(120, this.maxHeightValue);
-		container.style.minHeight = `${MIN_VISIBLE_HEIGHT}px`;
+		const minVisibleHeight = this.shouldDeferTailAppendForInlineStreaming() ? 0 : Math.min(120, this.maxHeightValue);
+		if (minVisibleHeight > 0) container.style.minHeight = `${minVisibleHeight}px`;
+		else if (typeof container.style.removeProperty === "function") container.style.removeProperty("min-height");
+		else delete container.style.minHeight;
 		if (this.diffHeightManager) {
 			this.diffHeightManager.dispose();
 			this.diffHeightManager = null;
@@ -3948,6 +4590,7 @@ var DiffEditorManager = class DiffEditorManager {
 		this.diffComputedVersions = null;
 		this.diffPresentationDisposables.push(this.diffEditorView.onDidUpdateDiff(() => {
 			this.diffComputedVersions = this.captureCurrentDiffVersions();
+			this.syncDiffEditorLayoutToContainer();
 			this.scheduleSyncDiffPresentationDecorations();
 		}));
 		this.diffPresentationDisposables.push(oEditor.onDidChangeModelContent(() => {
@@ -3956,21 +4599,51 @@ var DiffEditorManager = class DiffEditorManager {
 		this.diffPresentationDisposables.push(mEditor.onDidChangeModelContent(() => {
 			this.scheduleSyncDiffPresentationDecorations();
 		}));
+		const originalLayoutDisposable = (_oEditor$onDidLayoutC = oEditor.onDidLayoutChange) === null || _oEditor$onDidLayoutC === void 0 ? void 0 : _oEditor$onDidLayoutC.call(oEditor, () => {
+			this.scheduleSyncDiffPresentationDecorations();
+		});
+		if (originalLayoutDisposable) this.diffPresentationDisposables.push(originalLayoutDisposable);
+		const modifiedLayoutDisposable = (_mEditor$onDidLayoutC = mEditor.onDidLayoutChange) === null || _mEditor$onDidLayoutC === void 0 ? void 0 : _mEditor$onDidLayoutC.call(mEditor, () => {
+			this.scheduleSyncDiffPresentationDecorations();
+		});
+		if (modifiedLayoutDisposable) this.diffPresentationDisposables.push(modifiedLayoutDisposable);
+		if (typeof MutationObserver !== "undefined" && this.lastContainer) {
+			this.diffPresentationObserver = new MutationObserver((mutations) => {
+				const shouldSync = mutations.some((mutation) => {
+					if (mutation.type !== "childList") return false;
+					const nodes = Array.from(mutation.addedNodes).concat(Array.from(mutation.removedNodes));
+					return nodes.some((node) => {
+						if (!(node instanceof HTMLElement)) return false;
+						return node.matches(".line-delete, .inline-deleted-text, .inline-deleted-margin-view-zone") || !!node.querySelector(".line-delete, .inline-deleted-text, .inline-deleted-margin-view-zone") || !!node.closest(".editor.modified .view-zones, .editor.modified .margin-view-zones");
+					});
+				});
+				if (shouldSync) this.scheduleSyncDiffPresentationDecorations();
+			});
+			this.diffPresentationObserver.observe(this.lastContainer, {
+				childList: true,
+				subtree: true
+			});
+		}
 		(_oEditor$onDidContent = oEditor.onDidContentSizeChange) === null || _oEditor$onDidContent === void 0 || _oEditor$onDidContent.call(oEditor, () => {
 			this._hasScrollBar = false;
 			this.rafScheduler.schedule("content-size-change-diff", () => {
-				var _oEditor$getScrollHei, _oEditor$getOption, _this$diffHeightManag3, _this$diffHeightManag4;
+				var _oEditor$getScrollHei, _oEditor$getOption, _this$diffHeightManag5, _this$diffHeightManag6;
 				this.cachedScrollHeightDiff = ((_oEditor$getScrollHei = oEditor.getScrollHeight) === null || _oEditor$getScrollHei === void 0 ? void 0 : _oEditor$getScrollHei.call(oEditor)) ?? this.cachedScrollHeightDiff;
 				this.cachedLineHeightDiff = ((_oEditor$getOption = oEditor.getOption) === null || _oEditor$getOption === void 0 ? void 0 : _oEditor$getOption.call(oEditor, monaco_shim_exports.editor.EditorOption.lineHeight)) ?? this.cachedLineHeightDiff;
 				this.cachedComputedHeightDiff = this.computedHeight();
-				if ((_this$diffHeightManag3 = this.diffHeightManager) === null || _this$diffHeightManag3 === void 0 ? void 0 : _this$diffHeightManag3.isSuppressed()) return;
-				(_this$diffHeightManag4 = this.diffHeightManager) === null || _this$diffHeightManag4 === void 0 || _this$diffHeightManag4.update();
-				const computed$1 = this.computedHeight();
+				if (this.lastContainer) {
+					const applied = Number.parseFloat(this.lastContainer.style.height || "0") || 0;
+					if (this.cachedComputedHeightDiff > applied + 1 && (this.cachedComputedHeightDiff < this.maxHeightValue - 1 || !this.shouldAvoidOptimisticMaxHeightWriteDiff())) this.lastContainer.style.height = `${this.cachedComputedHeightDiff}px`;
+				}
+				if ((_this$diffHeightManag5 = this.diffHeightManager) === null || _this$diffHeightManag5 === void 0 ? void 0 : _this$diffHeightManag5.isSuppressed()) return;
+				(_this$diffHeightManag6 = this.diffHeightManager) === null || _this$diffHeightManag6 === void 0 || _this$diffHeightManag6.update();
+				this.scheduleSyncDiffEditorLayoutToContainer();
+				const computed$1 = this.cachedComputedHeightDiff;
 				if (this.lastContainer) {
 					this.lastContainer.style.overflow = "hidden";
 					if (computed$1 >= this.maxHeightValue - 1 && this.shouldAutoScrollDiff && !this.diffHideUnchangedRegionsDeferred) {
-						var _this$modifiedModel3;
-						this.maybeScrollDiffToBottom((_this$modifiedModel3 = this.modifiedModel) === null || _this$modifiedModel3 === void 0 ? void 0 : _this$modifiedModel3.getLineCount());
+						var _this$modifiedModel4;
+						this.maybeScrollDiffToBottom((_this$modifiedModel4 = this.modifiedModel) === null || _this$modifiedModel4 === void 0 ? void 0 : _this$modifiedModel4.getLineCount());
 					}
 				}
 			});
@@ -3978,23 +4651,29 @@ var DiffEditorManager = class DiffEditorManager {
 		(_mEditor$onDidContent = mEditor.onDidContentSizeChange) === null || _mEditor$onDidContent === void 0 || _mEditor$onDidContent.call(mEditor, () => {
 			this._hasScrollBar = false;
 			this.rafScheduler.schedule("content-size-change-diff", () => {
-				var _mEditor$getScrollHei, _mEditor$getOption, _this$diffHeightManag5, _this$diffHeightManag6;
+				var _mEditor$getScrollHei, _mEditor$getOption, _this$diffHeightManag7, _this$diffHeightManag8;
 				this.cachedScrollHeightDiff = ((_mEditor$getScrollHei = mEditor.getScrollHeight) === null || _mEditor$getScrollHei === void 0 ? void 0 : _mEditor$getScrollHei.call(mEditor)) ?? this.cachedScrollHeightDiff;
 				this.cachedLineHeightDiff = ((_mEditor$getOption = mEditor.getOption) === null || _mEditor$getOption === void 0 ? void 0 : _mEditor$getOption.call(mEditor, monaco_shim_exports.editor.EditorOption.lineHeight)) ?? this.cachedLineHeightDiff;
 				this.cachedComputedHeightDiff = this.computedHeight();
-				if ((_this$diffHeightManag5 = this.diffHeightManager) === null || _this$diffHeightManag5 === void 0 ? void 0 : _this$diffHeightManag5.isSuppressed()) return;
-				(_this$diffHeightManag6 = this.diffHeightManager) === null || _this$diffHeightManag6 === void 0 || _this$diffHeightManag6.update();
-				const computed$1 = this.computedHeight();
+				if (this.lastContainer) {
+					const applied = Number.parseFloat(this.lastContainer.style.height || "0") || 0;
+					if (this.cachedComputedHeightDiff > applied + 1 && (this.cachedComputedHeightDiff < this.maxHeightValue - 1 || !this.shouldAvoidOptimisticMaxHeightWriteDiff())) this.lastContainer.style.height = `${this.cachedComputedHeightDiff}px`;
+				}
+				if ((_this$diffHeightManag7 = this.diffHeightManager) === null || _this$diffHeightManag7 === void 0 ? void 0 : _this$diffHeightManag7.isSuppressed()) return;
+				(_this$diffHeightManag8 = this.diffHeightManager) === null || _this$diffHeightManag8 === void 0 || _this$diffHeightManag8.update();
+				this.scheduleSyncDiffEditorLayoutToContainer();
+				const computed$1 = this.cachedComputedHeightDiff;
 				if (this.lastContainer) {
 					this.lastContainer.style.overflow = "hidden";
 					if (computed$1 >= this.maxHeightValue - 1 && this.shouldAutoScrollDiff && !this.diffHideUnchangedRegionsDeferred) {
-						var _this$modifiedModel4;
-						this.maybeScrollDiffToBottom((_this$modifiedModel4 = this.modifiedModel) === null || _this$modifiedModel4 === void 0 ? void 0 : _this$modifiedModel4.getLineCount());
+						var _this$modifiedModel5;
+						this.maybeScrollDiffToBottom((_this$modifiedModel5 = this.modifiedModel) === null || _this$modifiedModel5 === void 0 ? void 0 : _this$modifiedModel5.getLineCount());
 					}
 				}
 			});
 		});
 		mEditor.onDidChangeModelContent(() => {
+			if (this.programmaticModifiedContentChangeDepth > 0) return;
 			this.lastKnownModifiedDirty = true;
 			this.rafScheduler.schedule("sync-last-known-modified", () => this.syncLastKnownModified());
 		});
@@ -4025,13 +4704,14 @@ var DiffEditorManager = class DiffEditorManager {
 		const modifiedTailAppend = modifiedCode !== prevM && modifiedCode.startsWith(prevM) && prevM.length < modifiedCode.length;
 		const hasContentChange = originalCode !== prevO || modifiedCode !== prevM;
 		if (originalCode !== prevO || modifiedCode !== prevM) this.markDiffStreamingActivity();
+		const deferTailAppendForInline = this.shouldDeferTailAppendForInlineStreaming();
 		let didImmediate = false;
-		if (originalTailAppend) {
+		if (originalTailAppend && !deferTailAppendForInline) {
 			this.appendOriginal(originalCode.slice(prevO.length));
 			this.lastKnownOriginalCode = originalCode;
 			didImmediate = true;
 		}
-		if (modifiedTailAppend) {
+		if (modifiedTailAppend && !deferTailAppendForInline) {
 			this.appendModified(modifiedCode.slice(prevM.length));
 			this.lastKnownModifiedCode = modifiedCode;
 			didImmediate = true;
@@ -4045,6 +4725,16 @@ var DiffEditorManager = class DiffEditorManager {
 			this.rafScheduler.schedule("diff", () => this.flushPendingDiffUpdate());
 		} else if (didImmediate) {}
 	}
+	shouldDeferTailAppendForInlineStreaming() {
+		var _this$lastContainer11, _this$lastContainer12, _this$lastContainer13;
+		const renderSideBySide = this.options.renderSideBySide ?? true;
+		if (renderSideBySide === false) return true;
+		const useInlineViewWhenSpaceIsLimited = this.options.useInlineViewWhenSpaceIsLimited ?? true;
+		if (!useInlineViewWhenSpaceIsLimited) return false;
+		const breakpoint = this.options.renderSideBySideInlineBreakpoint ?? 900;
+		const width = ((_this$lastContainer11 = this.lastContainer) === null || _this$lastContainer11 === void 0 || (_this$lastContainer12 = _this$lastContainer11.getBoundingClientRect) === null || _this$lastContainer12 === void 0 ? void 0 : _this$lastContainer12.call(_this$lastContainer11).width) ?? ((_this$lastContainer13 = this.lastContainer) === null || _this$lastContainer13 === void 0 ? void 0 : _this$lastContainer13.clientWidth) ?? 0;
+		return width > 0 && width <= breakpoint;
+	}
 	updateOriginal(newCode, codeLanguage) {
 		if (!this.diffEditorView || !this.originalModel) return;
 		if (codeLanguage) {
@@ -4082,10 +4772,11 @@ var DiffEditorManager = class DiffEditorManager {
 			this.applyMinimalEditToModel(this.modifiedModel, prevAfterFlush, newCode);
 			const newLine = this.modifiedModel.getLineCount();
 			if (newLine !== prevLine) {
+				this.eagerlyGrowDiffContainerHeight();
 				const shouldImmediate = this.shouldPerformImmediateRevealDiff();
 				if (shouldImmediate) this.suppressScrollWatcherDiff(this.scrollWatcherSuppressionMs + 800);
 				const computed$1 = this.computedHeight();
-				if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer) {
+				if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer && !this.shouldAvoidOptimisticMaxHeightWriteDiff()) {
 					this.lastContainer.style.height = `${this.maxHeightValue}px`;
 					this.lastContainer.style.overflow = "hidden";
 				}
@@ -4126,7 +4817,7 @@ var DiffEditorManager = class DiffEditorManager {
 		if (this.modifiedModel && this.modifiedModel.getLanguageId() !== language) monaco_shim_exports.editor.setModelLanguage(this.modifiedModel, language);
 	}
 	async setDiffModels(models, options = {}) {
-		var _this$originalModel2, _this$modifiedModel5, _this$diffEditorView$6, _this$diffEditorView$7, _this$diffEditorView$8, _this$diffEditorView$9;
+		var _this$originalModel3, _this$modifiedModel6, _this$diffEditorView$4, _this$diffEditorView$5, _this$diffEditorView$6, _this$diffEditorView$7;
 		if (!this.diffEditorView) return;
 		const transitionRequestId = ++this.diffModelTransitionRequestId;
 		this.preserveNativeDiffDecorationsOnStaleAppend = false;
@@ -4134,8 +4825,8 @@ var DiffEditorManager = class DiffEditorManager {
 		const nextOriginal = models.original;
 		const nextModified = models.modified;
 		this.applyDiffModelLanguage(models, options.codeLanguage);
-		const currentOriginalValue = this.lastKnownOriginalCode ?? ((_this$originalModel2 = this.originalModel) === null || _this$originalModel2 === void 0 ? void 0 : _this$originalModel2.getValue()) ?? null;
-		const currentModifiedValue = this.lastKnownModifiedCode ?? ((_this$modifiedModel5 = this.modifiedModel) === null || _this$modifiedModel5 === void 0 ? void 0 : _this$modifiedModel5.getValue()) ?? null;
+		const currentOriginalValue = this.lastKnownOriginalCode ?? ((_this$originalModel3 = this.originalModel) === null || _this$originalModel3 === void 0 ? void 0 : _this$originalModel3.getValue()) ?? null;
+		const currentModifiedValue = this.lastKnownModifiedCode ?? ((_this$modifiedModel6 = this.modifiedModel) === null || _this$modifiedModel6 === void 0 ? void 0 : _this$modifiedModel6.getValue()) ?? null;
 		const nextOriginalValue = nextOriginal.getValue();
 		const nextModifiedValue = nextModified.getValue();
 		const sameContent = currentOriginalValue === nextOriginalValue && currentModifiedValue === nextModifiedValue;
@@ -4184,14 +4875,15 @@ var DiffEditorManager = class DiffEditorManager {
 		const currentOriginal = this.originalModel;
 		const currentModified = this.modifiedModel;
 		const shouldRestorePersistedUnchangedState = preserveViewState && !sameContent;
+		const shouldRestoreSavedModelState = options.preserveModelState ?? true;
 		const preservedScrollPosition = preserveViewState ? this.captureDiffScrollPosition() : null;
 		const preservedViewportAnchor = preserveViewState && sameContent ? this.captureModifiedViewportAnchor() : null;
-		const viewState = preserveViewState ? this.diffEditorView.saveViewState() : null;
+		const viewState = preserveViewState && shouldRestoreSavedModelState ? this.diffEditorView.saveViewState() : null;
 		this.queuePendingDiffScrollRestore(preservedScrollPosition, shouldRestorePersistedUnchangedState ? 2 : 0);
 		if (shouldRestorePersistedUnchangedState) this.capturePersistedDiffUnchangedState();
 		const applyModelSwap = () => {
-			var _this$diffEditorView32;
-			(_this$diffEditorView32 = this.diffEditorView) === null || _this$diffEditorView32 === void 0 || _this$diffEditorView32.setModel(nextModelTarget);
+			var _this$diffEditorView23;
+			(_this$diffEditorView23 = this.diffEditorView) === null || _this$diffEditorView23 === void 0 || _this$diffEditorView23.setModel(nextModelTarget);
 		};
 		if (preserveViewState) this.withLockedDiffScrollPosition(applyModelSwap);
 		else applyModelSwap();
@@ -4206,8 +4898,8 @@ var DiffEditorManager = class DiffEditorManager {
 		this.lastKnownModifiedLineCount = nextModified.getLineCount();
 		this.lastKnownModifiedDirty = false;
 		this._hasScrollBar = false;
-		this.cachedScrollHeightDiff = ((_this$diffEditorView$6 = (_this$diffEditorView$7 = this.diffEditorView.getModifiedEditor()).getScrollHeight) === null || _this$diffEditorView$6 === void 0 ? void 0 : _this$diffEditorView$6.call(_this$diffEditorView$7)) ?? null;
-		this.cachedLineHeightDiff = ((_this$diffEditorView$8 = (_this$diffEditorView$9 = this.diffEditorView.getModifiedEditor()).getOption) === null || _this$diffEditorView$8 === void 0 ? void 0 : _this$diffEditorView$8.call(_this$diffEditorView$9, monaco_shim_exports.editor.EditorOption.lineHeight)) ?? null;
+		this.cachedScrollHeightDiff = ((_this$diffEditorView$4 = (_this$diffEditorView$5 = this.diffEditorView.getModifiedEditor()).getScrollHeight) === null || _this$diffEditorView$4 === void 0 ? void 0 : _this$diffEditorView$4.call(_this$diffEditorView$5)) ?? null;
+		this.cachedLineHeightDiff = ((_this$diffEditorView$6 = (_this$diffEditorView$7 = this.diffEditorView.getModifiedEditor()).getOption) === null || _this$diffEditorView$6 === void 0 ? void 0 : _this$diffEditorView$6.call(_this$diffEditorView$7, monaco_shim_exports.editor.EditorOption.lineHeight)) ?? null;
 		this.cachedComputedHeightDiff = this.computedHeight();
 		this.diffHunkLineChanges = this.getEffectiveLineChanges();
 		this.hideDiffHunkActions();
@@ -4270,6 +4962,7 @@ var DiffEditorManager = class DiffEditorManager {
 		this.revealTicketDiff = 0;
 		this.lastRevealLineDiff = null;
 		this.diffPersistedUnchangedModelState = null;
+		this.diffPreviousUnchangedModelState = null;
 		this.pendingDiffScrollRestorePosition = null;
 		this.pendingDiffScrollRestoreBudget = 0;
 		this.diffHideUnchangedRegionsResolved = null;
@@ -4297,7 +4990,11 @@ var DiffEditorManager = class DiffEditorManager {
 		this.revealTicketDiff = 0;
 		this.lastRevealLineDiff = null;
 		this.diffPersistedUnchangedModelState = null;
+		this.diffPreviousUnchangedModelState = null;
 		this.diffHideUnchangedRegionsDeferred = false;
+		this.clearInlineDiffStreamingPresentationIdleTimer();
+		this.inlineDiffStreamingPresentationActive = false;
+		this.resetInlineDiffStreamingHeightFloor();
 	}
 	syncLastKnownModified() {
 		if (!this.diffEditorView || !this.lastKnownModifiedDirty) return;
@@ -4353,10 +5050,11 @@ var DiffEditorManager = class DiffEditorManager {
 			this.lastKnownModifiedCode = modified;
 			const newMLineCount = m.getLineCount();
 			if (newMLineCount !== prevMLineCount) {
+				this.eagerlyGrowDiffContainerHeight();
 				const shouldImmediate = this.shouldPerformImmediateRevealDiff();
 				if (shouldImmediate) this.suppressScrollWatcherDiff(this.scrollWatcherSuppressionMs + 800);
 				const computed$1 = this.computedHeight();
-				if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer) {
+				if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer && !this.shouldAvoidOptimisticMaxHeightWriteDiff()) {
 					this.lastContainer.style.height = `${this.maxHeightValue}px`;
 					this.lastContainer.style.overflow = "hidden";
 				}
@@ -4437,15 +5135,18 @@ var DiffEditorManager = class DiffEditorManager {
 				const lastColumn$1 = model.getLineMaxColumn(prevLine);
 				const range$1 = new monaco_shim_exports.Range(prevLine, lastColumn$1, prevLine, lastColumn$1);
 				this.preserveNativeDiffDecorationsOnStaleAppend = true;
-				model.applyEdits([{
-					range: range$1,
-					text: part,
-					forceMoveMarkers: true
-				}]);
+				this.runAsProgrammaticModifiedContentChange(() => {
+					model.applyEdits([{
+						range: range$1,
+						text: part,
+						forceMoveMarkers: true
+					}]);
+				});
 				this.lastKnownModifiedCode = model.getValue();
 				const newLine$1 = model.getLineCount();
 				this.lastKnownModifiedLineCount = newLine$1;
 				await new Promise((resolve) => typeof requestAnimationFrame !== "undefined" ? requestAnimationFrame(resolve) : setTimeout(resolve, 0));
+				this.eagerlyGrowDiffContainerHeight();
 				const shouldImmediate$1 = this.shouldPerformImmediateRevealDiff();
 				log("diff", "flushAppendBufferDiff chunk metrics", {
 					idx,
@@ -4455,7 +5156,7 @@ var DiffEditorManager = class DiffEditorManager {
 				});
 				if (shouldImmediate$1) this.suppressScrollWatcherDiff(this.scrollWatcherSuppressionMs + 800);
 				const computed$2 = this.computedHeight();
-				if (computed$2 >= this.maxHeightValue - 1 && this.lastContainer) {
+				if (computed$2 >= this.maxHeightValue - 1 && this.lastContainer && !this.shouldAvoidOptimisticMaxHeightWriteDiff()) {
 					this.lastContainer.style.height = `${this.maxHeightValue}px`;
 					this.lastContainer.style.overflow = "hidden";
 				}
@@ -4476,33 +5177,38 @@ var DiffEditorManager = class DiffEditorManager {
 		const lastColumn = model.getLineMaxColumn(prevLine);
 		const range = new monaco_shim_exports.Range(prevLine, lastColumn, prevLine, lastColumn);
 		this.preserveNativeDiffDecorationsOnStaleAppend = true;
-		model.applyEdits([{
-			range,
-			text,
-			forceMoveMarkers: true
-		}]);
+		this.runAsProgrammaticModifiedContentChange(() => {
+			model.applyEdits([{
+				range,
+				text,
+				forceMoveMarkers: true
+			}]);
+		});
 		this.lastKnownModifiedCode = model.getValue();
 		const newLine = model.getLineCount();
 		this.lastKnownModifiedLineCount = newLine;
+		this.eagerlyGrowDiffContainerHeight();
 		const shouldImmediate = this.shouldPerformImmediateRevealDiff();
 		if (shouldImmediate) this.suppressScrollWatcherDiff(this.scrollWatcherSuppressionMs + 800);
 		const computed$1 = this.computedHeight();
-		if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer) this.lastContainer.style.height = `${this.maxHeightValue}px`;
+		if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer && !this.shouldAvoidOptimisticMaxHeightWriteDiff()) this.lastContainer.style.height = `${this.maxHeightValue}px`;
 		if (shouldImmediate) this.scheduleImmediateRevealAfterLayoutDiff(newLine);
 		else this.maybeScrollDiffToBottom(newLine, prevLine);
 		if (suppressedByFlush) watcherApi.setSuppressed(false);
 		try {
-			var _this$diffEditorView33, _this$diffEditorView34, _this$diffEditorView35;
-			this.lastScrollTopDiff = ((_this$diffEditorView33 = this.diffEditorView) === null || _this$diffEditorView33 === void 0 || (_this$diffEditorView35 = (_this$diffEditorView34 = _this$diffEditorView33.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView35 === void 0 ? void 0 : _this$diffEditorView35.call(_this$diffEditorView34)) ?? this.lastScrollTopDiff;
+			var _this$diffEditorView24, _this$diffEditorView25, _this$diffEditorView26;
+			this.lastScrollTopDiff = ((_this$diffEditorView24 = this.diffEditorView) === null || _this$diffEditorView24 === void 0 || (_this$diffEditorView26 = (_this$diffEditorView25 = _this$diffEditorView24.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView26 === void 0 ? void 0 : _this$diffEditorView26.call(_this$diffEditorView25)) ?? this.lastScrollTopDiff;
 		} catch {}
 	}
 	applyMinimalEditToModel(model, prev, next) {
-		const maxChars = minimalEditMaxChars;
-		const ratio = minimalEditMaxChangeRatio;
+		const maxChars = this.minimalEditMaxCharsValue;
+		const ratio = this.minimalEditMaxChangeRatioValue;
 		const maxLen = Math.max(prev.length, next.length);
 		const changeRatio = maxLen > 0 ? Math.abs(next.length - prev.length) / maxLen : 0;
 		if (prev.length + next.length > maxChars || changeRatio > ratio) {
-			model.setValue(next);
+			this.applyModelEdit(model, () => {
+				model.setValue(next);
+			});
 			if (model === this.modifiedModel) this.lastKnownModifiedLineCount = model.getLineCount();
 			return;
 		}
@@ -4512,11 +5218,13 @@ var DiffEditorManager = class DiffEditorManager {
 		const rangeStart = model.getPositionAt(start);
 		const rangeEnd = model.getPositionAt(endPrevIncl + 1);
 		const range = new monaco_shim_exports.Range(rangeStart.lineNumber, rangeStart.column, rangeEnd.lineNumber, rangeEnd.column);
-		model.applyEdits([{
-			range,
-			text: replaceText,
-			forceMoveMarkers: true
-		}]);
+		this.applyModelEdit(model, () => {
+			model.applyEdits([{
+				range,
+				text: replaceText,
+				forceMoveMarkers: true
+			}]);
+		});
 		if (model === this.modifiedModel) this.lastKnownModifiedLineCount = model.getLineCount();
 	}
 	appendToModel(model, appendText) {
@@ -4524,13 +5232,30 @@ var DiffEditorManager = class DiffEditorManager {
 		const lastLine = model.getLineCount();
 		const lastColumn = model.getLineMaxColumn(lastLine);
 		const range = new monaco_shim_exports.Range(lastLine, lastColumn, lastLine, lastColumn);
-		model.applyEdits([{
-			range,
-			text: appendText,
-			forceMoveMarkers: true
-		}]);
+		this.applyModelEdit(model, () => {
+			model.applyEdits([{
+				range,
+				text: appendText,
+				forceMoveMarkers: true
+			}]);
+		});
 		if (model === this.modifiedModel) this.lastKnownModifiedLineCount = model.getLineCount();
 	}
+	applyModelEdit(model, fn) {
+		if (model === this.modifiedModel) {
+			this.runAsProgrammaticModifiedContentChange(fn);
+			return;
+		}
+		fn();
+	}
+	runAsProgrammaticModifiedContentChange(fn) {
+		this.programmaticModifiedContentChangeDepth += 1;
+		try {
+			fn();
+		} finally {
+			this.programmaticModifiedContentChangeDepth -= 1;
+		}
+	}
 };
 
 //#endregion
@@ -4542,6 +5267,8 @@ var EditorManager = class {
 	pendingUpdate = null;
 	_hasScrollBar = false;
 	updateThrottleMs = 50;
+	minimalEditMaxCharsValue = minimalEditMaxChars;
+	minimalEditMaxChangeRatioValue = minimalEditMaxChangeRatio;
 	lastUpdateFlushTime = 0;
 	updateThrottleTimer = null;
 	shouldAutoScroll = true;
@@ -4597,6 +5324,8 @@ var EditorManager = class {
 		this.revealDebounceMsOption = revealDebounceMsOption;
 		this.updateThrottleMsOption = updateThrottleMsOption;
 		this.updateThrottleMs = this.updateThrottleMsOption ?? this.options.updateThrottleMs ?? 50;
+		this.minimalEditMaxCharsValue = this.options.minimalEditMaxChars ?? minimalEditMaxChars;
+		this.minimalEditMaxChangeRatioValue = this.options.minimalEditMaxChangeRatio ?? minimalEditMaxChangeRatio;
 	}
 	cancelRafs() {
 		this.rafScheduler.cancel("update");
@@ -4731,7 +5460,7 @@ var EditorManager = class {
 	}
 	performReveal(line, ticket) {
 		this.rafScheduler.schedule("reveal", () => {
-			var _editor;
+			var _editor$1;
 			if (ticket !== this.revealTicket) {
 				this.dlog("performReveal skipped, stale ticket", ticket, "current", this.revealTicket);
 				return;
@@ -4739,8 +5468,8 @@ var EditorManager = class {
 			this.dlog("performReveal executing, ticket=", ticket, "line=", line);
 			const strategy = this.revealStrategyOption ?? this.options.revealStrategy ?? "centerIfOutside";
 			this.dlog("performReveal strategy=", strategy);
-			const ScrollType = monaco_shim_exports.ScrollType || ((_editor = monaco_shim_exports.editor) === null || _editor === void 0 ? void 0 : _editor.ScrollType);
-			const smooth = ScrollType && typeof ScrollType.Smooth !== "undefined" ? ScrollType.Smooth : void 0;
+			const ScrollType$1 = ScrollType || ((_editor$1 = monaco_shim_exports.editor) === null || _editor$1 === void 0 ? void 0 : _editor$1.ScrollType);
+			const smooth = ScrollType$1 && typeof ScrollType$1.Smooth !== "undefined" ? ScrollType$1.Smooth : void 0;
 			try {
 				if (strategy === "bottom") if (typeof smooth !== "undefined") this.editorView.revealLine(line, smooth);
 				else this.editorView.revealLine(line);
@@ -4764,8 +5493,8 @@ var EditorManager = class {
 				this.dlog("performImmediateReveal skipped, stale ticket", ticket, "current", this.revealTicket);
 				return;
 			}
-			const ScrollType = monaco_shim_exports.ScrollType || ((_editor2 = monaco_shim_exports.editor) === null || _editor2 === void 0 ? void 0 : _editor2.ScrollType);
-			const immediate = ScrollType && typeof ScrollType.Immediate !== "undefined" ? ScrollType.Immediate : void 0;
+			const ScrollType$1 = ScrollType || ((_editor2 = monaco_shim_exports.editor) === null || _editor2 === void 0 ? void 0 : _editor2.ScrollType);
+			const immediate = ScrollType$1 && typeof ScrollType$1.Immediate !== "undefined" ? ScrollType$1.Immediate : void 0;
 			if (typeof immediate !== "undefined") this.editorView.revealLine(line, immediate);
 			else this.editorView.revealLine(line);
 		} catch {}
@@ -4777,8 +5506,8 @@ var EditorManager = class {
 		try {
 			var _editor3;
 			if (!this.editorView) return;
-			const ScrollType = monaco_shim_exports.ScrollType || ((_editor3 = monaco_shim_exports.editor) === null || _editor3 === void 0 ? void 0 : _editor3.ScrollType);
-			const immediate = ScrollType && typeof ScrollType.Immediate !== "undefined" ? ScrollType.Immediate : void 0;
+			const ScrollType$1 = ScrollType || ((_editor3 = monaco_shim_exports.editor) === null || _editor3 === void 0 ? void 0 : _editor3.ScrollType);
+			const immediate = ScrollType$1 && typeof ScrollType$1.Immediate !== "undefined" ? ScrollType$1.Immediate : void 0;
 			if (typeof immediate !== "undefined") this.editorView.revealLine(line, immediate);
 			else this.editorView.revealLine(line);
 		} catch {}
@@ -5046,7 +5775,6 @@ var EditorManager = class {
 		if (newCode.startsWith(prevCode) && prevCode.length < newCode.length) {
 			const suffix = newCode.slice(prevCode.length);
 			if (suffix) this.appendCode(suffix, codeLanguage);
-			this.lastKnownCode = newCode;
 			return;
 		}
 		const prevLineCount = model.getLineCount();
@@ -5079,8 +5807,8 @@ var EditorManager = class {
 		if (!this.editorView) return;
 		const model = this.editorView.getModel();
 		if (!model) return;
-		const maxChars = minimalEditMaxChars;
-		const ratio = minimalEditMaxChangeRatio;
+		const maxChars = this.minimalEditMaxCharsValue;
+		const ratio = this.minimalEditMaxChangeRatioValue;
 		const maxLen = Math.max(prev.length, next.length);
 		const changeRatio = maxLen > 0 ? Math.abs(next.length - prev.length) / maxLen : 0;
 		if (prev.length + next.length > maxChars || changeRatio > ratio) {
@@ -5164,6 +5892,10 @@ var EditorManager = class {
 	getEditorView() {
 		return this.editorView;
 	}
+	getCode() {
+		var _this$editorView9;
+		return ((_this$editorView9 = this.editorView) === null || _this$editorView9 === void 0 || (_this$editorView9 = _this$editorView9.getModel()) === null || _this$editorView9 === void 0 ? void 0 : _this$editorView9.getValue()) ?? null;
+	}
 	setUpdateThrottleMs(ms) {
 		this.updateThrottleMs = ms;
 		if (!this.updateThrottleMs && this.updateThrottleTimer != null) {
@@ -5346,6 +6078,14 @@ async function ensureMonacoHighlighter(themes, languages$1) {
 */
 function clearHighlighterCache() {
 	highlighterCache.clear();
+	monacoHighlighterPromise = null;
+	lastPatchedHighlighter = null;
+	lastPatchedLanguages = /* @__PURE__ */ new Set();
+	monacoThemeByKey.clear();
+	monacoLanguageSet.clear();
+	themeRegisterPromise = null;
+	languagesRegistered = false;
+	currentLanguages = [];
 }
 function serializeThemes(themes) {
 	return JSON.stringify(themes.map((t) => typeof t === "string" ? t : t.name ?? JSON.stringify(t)).sort());
@@ -5585,15 +6325,13 @@ let globalAppliedThemeName = null;
 function useMonaco(monacoOptions = {}) {
 	var _monacoOptions$themes;
 	const disposals = [];
-	if (monacoOptions.isCleanOnBeforeCreate ?? true) disposals.forEach((d) => d.dispose());
-	if (monacoOptions.isCleanOnBeforeCreate ?? true) disposals.length = 0;
+	const pendingCreateDisposables = /* @__PURE__ */ new Map();
 	let editorView = null;
 	let editorMgr = null;
 	let diffEditorView = null;
 	let diffMgr = null;
 	let originalModel = null;
 	let modifiedModel = null;
-	let _hasScrollBar = false;
 	const themes = monacoOptions.themes && ((_monacoOptions$themes = monacoOptions.themes) === null || _monacoOptions$themes === void 0 ? void 0 : _monacoOptions$themes.length) ? monacoOptions.themes : defaultThemes;
 	if (!Array.isArray(themes) || themes.length < 2) throw new Error("Monaco themes must be an array with at least two themes: [darkTheme, lightTheme]");
 	const languages$1 = monacoOptions.languages ?? defaultLanguages;
@@ -5614,22 +6352,12 @@ function useMonaco(monacoOptions = {}) {
 	};
 	const maxHeightValue = getMaxHeightValue();
 	const maxHeightCSS = getMaxHeightCSS();
-	let lastContainer = null;
-	let lastKnownCode = null;
-	const minimalEditMaxCharsLocal = monacoOptions.minimalEditMaxChars ?? minimalEditMaxChars;
-	const minimalEditMaxChangeRatioLocal = monacoOptions.minimalEditMaxChangeRatio ?? minimalEditMaxChangeRatio;
-	let updateThrottleMs = monacoOptions.updateThrottleMs ?? 50;
-	let lastFlushTime = 0;
-	let updateThrottleTimer = null;
-	let pendingUpdate = null;
-	let shouldAutoScroll = true;
-	const cachedComputedHeight = null;
-	const appendBuffer = [];
-	let appendBufferScheduled = false;
+	let createRequestSeq = 0;
+	let activeCreateRequestId = null;
+	let activeCreateKind = null;
+	let queuedEditorUpdateDuringCreate = null;
 	const currentTheme = computed(() => monacoOptions.theme ?? (typeof themes[0] === "string" ? themes[0] : themes[0].name));
 	let requestedThemeName = monacoOptions.theme ?? globalRequestedThemeName ?? currentTheme.value;
-	let themeWatcher = null;
-	const rafScheduler = createRafScheduler();
 	async function tryLoadAndSetShikiTheme(highlighter, themeName) {
 		if (!highlighter || typeof highlighter.setTheme !== "function") return;
 		try {
@@ -5700,326 +6428,206 @@ function useMonaco(monacoOptions = {}) {
 		const list = availableNames.includes(themeName) ? themes : themes.concat(themeName);
 		await registerMonacoThemes(list, languages$1);
 	}
-	function hasVerticalScrollbar() {
-		if (!editorView) return false;
-		if (_hasScrollBar) return true;
-		const ch = cachedComputedHeight ?? computedHeight(editorView);
-		return _hasScrollBar = editorView.getScrollHeight() > ch + padding / 2;
-	}
-	let revealDebounceId = null;
-	const revealDebounceMs = 75;
-	function maybeScrollToBottom(targetLine) {
-		if (autoScrollOnUpdate && shouldAutoScroll && hasVerticalScrollbar()) {
-			const model = editorView.getModel();
-			const line = targetLine ?? (model === null || model === void 0 ? void 0 : model.getLineCount()) ?? 1;
-			if (revealDebounceId != null) {
-				clearTimeout(revealDebounceId);
-				revealDebounceId = null;
-			}
-			revealDebounceId = setTimeout(() => {
-				revealDebounceId = null;
-				rafScheduler.schedule("reveal", () => {
-					try {
-						var _editor;
-						const ScrollType = monaco_shim_exports.ScrollType || ((_editor = monaco_shim_exports.editor) === null || _editor === void 0 ? void 0 : _editor.ScrollType);
-						if (ScrollType && typeof ScrollType.Smooth !== "undefined") editorView.revealLineInCenterIfOutsideViewport(line, ScrollType.Smooth);
-						else editorView.revealLineInCenterIfOutsideViewport(line);
-					} catch {}
-				});
-			}, revealDebounceMs);
-		}
+	function resolveRequestedThemeName() {
+		return requestedThemeName ?? globalRequestedThemeName ?? monacoOptions.theme ?? currentTheme.value;
 	}
-	async function createEditor(container, code, language) {
-		cleanupEditor();
-		lastContainer = container;
-		if (monacoOptions.isCleanOnBeforeCreate ?? true) {
-			disposals.forEach((d) => d.dispose());
-			disposals.length = 0;
-		}
-		if (monacoOptions.onBeforeCreate) {
-			const ds = monacoOptions.onBeforeCreate(monaco_shim_exports);
-			if (ds) disposals.push(...ds);
-		}
-		const initialThemeName = monacoOptions.theme ?? requestedThemeName ?? globalRequestedThemeName ?? currentTheme.value;
-		await ensureThemeRegistered(initialThemeName);
-		editorMgr = new EditorManager(monacoOptions, maxHeightValue, maxHeightCSS, autoScrollOnUpdate, autoScrollInitial, autoScrollThresholdPx, autoScrollThresholdLines, monacoOptions.revealDebounceMs, updateThrottleMs);
-		editorView = await editorMgr.createEditor(container, code, language, initialThemeName);
-		if (pendingUpdate && editorMgr) {
-			const { code: queuedCode, lang: queuedLang } = pendingUpdate;
-			pendingUpdate = null;
-			editorMgr.updateCode(queuedCode, queuedLang);
-		}
-		if (typeof monacoOptions.onThemeChange === "function") monacoOptions.onThemeChange(initialThemeName);
-		if (editorView) lastKnownCode = editorView.getValue();
-		return editorView;
-	}
-	function computedHeight(editorView$1) {
-		var _getModel;
-		const lineCount = ((_getModel = editorView$1.getModel()) === null || _getModel === void 0 ? void 0 : _getModel.getLineCount()) ?? 1;
-		const lineHeight = editorView$1.getOption(monaco_shim_exports.editor.EditorOption.lineHeight);
-		const height = Math.min(lineCount * lineHeight + padding, maxHeightValue);
-		return height;
+	function commitAppliedTheme(themeName) {
+		requestedThemeName = themeName;
+		globalRequestedThemeName = themeName;
+		globalAppliedThemeName = themeName;
+		monacoOptions.theme = themeName;
 	}
-	async function createDiffEditor(container, originalCode, modifiedCode, language) {
-		cleanupEditor();
-		lastContainer = container;
-		if (monacoOptions.isCleanOnBeforeCreate ?? true) {
-			disposals.forEach((d) => d.dispose());
-			disposals.length = 0;
-		}
-		if (monacoOptions.onBeforeCreate) {
-			const ds = monacoOptions.onBeforeCreate(monaco_shim_exports);
-			if (ds) disposals.push(...ds);
-		}
-		const initialThemeName = monacoOptions.theme ?? requestedThemeName ?? globalRequestedThemeName ?? currentTheme.value;
-		await ensureThemeRegistered(initialThemeName);
+	async function notifyThemeApplied(themeName) {
+		if (typeof monacoOptions.onThemeChange !== "function") return;
 		try {
-			monaco_shim_exports.editor.setTheme(initialThemeName);
+			await monacoOptions.onThemeChange(themeName);
+		} catch (err) {
+			console.warn("onThemeChange callback threw an error:", err);
+		}
+	}
+	function disposeDisposables(items) {
+		if (!(items === null || items === void 0 ? void 0 : items.length)) return;
+		for (const item of items) try {
+			item.dispose();
 		} catch {}
-		diffMgr = new DiffEditorManager(monacoOptions, maxHeightValue, maxHeightCSS, autoScrollOnUpdate, autoScrollInitial, autoScrollThresholdPx, autoScrollThresholdLines, diffAutoScroll, monacoOptions.revealDebounceMs, monacoOptions.diffUpdateThrottleMs);
-		diffEditorView = await diffMgr.createDiffEditor(container, originalCode, modifiedCode, language, initialThemeName);
-		if (typeof monacoOptions.onThemeChange === "function") monacoOptions.onThemeChange(initialThemeName);
-		const models = diffMgr.getDiffModels();
-		originalModel = models.original;
-		modifiedModel = models.modified;
-		return diffEditorView;
-	}
-	function clearFallbackAsyncWork() {
-		rafScheduler.cancel("update");
-		rafScheduler.cancel("append");
-		rafScheduler.cancel("reveal");
-		pendingUpdate = null;
-		appendBufferScheduled = false;
-		appendBuffer.length = 0;
-		if (revealDebounceId != null) {
-			clearTimeout(revealDebounceId);
-			revealDebounceId = null;
-		}
-		if (updateThrottleTimer != null) {
-			clearTimeout(updateThrottleTimer);
-			updateThrottleTimer = null;
-		}
-		lastFlushTime = 0;
 	}
-	function cleanupEditor() {
+	function takePendingCreateDisposables(requestId) {
+		const items = pendingCreateDisposables.get(requestId) ?? [];
+		pendingCreateDisposables.delete(requestId);
+		return items;
+	}
+	function disposeAllPendingCreateDisposables() {
+		for (const requestId of Array.from(pendingCreateDisposables.keys())) disposeDisposables(takePendingCreateDisposables(requestId));
+	}
+	function cleanupInstances() {
 		if (editorMgr) {
 			editorMgr.cleanup();
 			editorMgr = null;
-		}
+		} else if (editorView) try {
+			editorView.dispose();
+		} catch {}
 		if (diffMgr) {
 			diffMgr.cleanup();
 			diffMgr = null;
+		} else {
+			try {
+				diffEditorView === null || diffEditorView === void 0 || diffEditorView.dispose();
+			} catch {}
+			try {
+				originalModel === null || originalModel === void 0 || originalModel.dispose();
+			} catch {}
+			try {
+				modifiedModel === null || modifiedModel === void 0 || modifiedModel.dispose();
+			} catch {}
 		}
-		clearFallbackAsyncWork();
-		if (!editorMgr && editorView) {
-			editorView.dispose();
-			editorView = null;
-		}
-		lastKnownCode = null;
-		if (lastContainer) {
-			lastContainer.innerHTML = "";
-			lastContainer = null;
-		}
-		if (themeWatcher) {
-			themeWatcher();
-			themeWatcher = null;
-		}
+		editorView = null;
 		diffEditorView = null;
 		originalModel = null;
 		modifiedModel = null;
 	}
-	function appendCode(appendText, codeLanguage) {
-		if (editorMgr) editorMgr.appendCode(appendText, codeLanguage);
-		else {
-			if (!editorView) return;
-			const model = editorView.getModel();
-			if (!model) return;
-			const processedCodeLanguage = codeLanguage ? processedLanguage(codeLanguage) : model.getLanguageId();
-			if (processedCodeLanguage && model.getLanguageId() !== processedCodeLanguage) monaco_shim_exports.editor.setModelLanguage(model, processedCodeLanguage);
-			if (appendText && lastKnownCode != null) lastKnownCode = lastKnownCode + appendText;
-			if (appendText) {
-				appendBuffer.push(appendText);
-				if (!appendBufferScheduled) {
-					appendBufferScheduled = true;
-					rafScheduler.schedule("append", flushAppendBuffer);
-				}
-			}
+	function createSupersededError() {
+		const err = new Error("Editor creation was superseded");
+		err.name = "AbortError";
+		err.code = "STREAM_MONACO_CREATE_SUPERSEDED";
+		return err;
+	}
+	function isCreateActive(requestId, kind) {
+		return activeCreateRequestId === requestId && activeCreateKind === kind;
+	}
+	function assertCreateStillActive(requestId, kind) {
+		if (!isCreateActive(requestId, kind)) throw createSupersededError();
+	}
+	function cancelPendingCreates() {
+		activeCreateRequestId = null;
+		activeCreateKind = null;
+		queuedEditorUpdateDuringCreate = null;
+		disposeAllPendingCreateDisposables();
+	}
+	async function resolveCreateThemeName(requestId, kind) {
+		let themeName = resolveRequestedThemeName();
+		while (true) {
+			assertCreateStillActive(requestId, kind);
+			await ensureThemeRegistered(themeName);
+			assertCreateStillActive(requestId, kind);
+			const latestThemeName = resolveRequestedThemeName();
+			if (latestThemeName === themeName) return themeName;
+			themeName = latestThemeName;
 		}
 	}
-	function applyMinimalEdit(prev, next) {
-		if (!editorView) return;
-		const model = editorView.getModel();
-		if (!model) return;
+	async function createEditor(container, code, language) {
+		var _monacoOptions$onBefo;
+		cancelPendingCreates();
+		cleanupInstances();
+		const requestId = ++createRequestSeq;
+		activeCreateRequestId = requestId;
+		activeCreateKind = "editor";
+		if (monacoOptions.isCleanOnBeforeCreate ?? true) disposeDisposables(disposals.splice(0));
+		const requestDisposables = ((_monacoOptions$onBefo = monacoOptions.onBeforeCreate) === null || _monacoOptions$onBefo === void 0 ? void 0 : _monacoOptions$onBefo.call(monacoOptions, monaco_shim_exports)) ?? [];
+		if (requestDisposables.length) pendingCreateDisposables.set(requestId, requestDisposables);
+		let nextEditorMgr = null;
 		try {
-			const maxChars = minimalEditMaxCharsLocal;
-			const ratio = minimalEditMaxChangeRatioLocal;
-			const maxLen = Math.max(prev.length, next.length);
-			const changeRatio = maxLen > 0 ? Math.abs(next.length - prev.length) / maxLen : 0;
-			if (prev.length + next.length > maxChars || changeRatio > ratio) {
-				const prevLineCount = model.getLineCount();
-				model.setValue(next);
-				lastKnownCode = next;
-				const newLineCount = model.getLineCount();
-				if (newLineCount !== prevLineCount) maybeScrollToBottom(newLineCount);
-				return;
-			}
-		} catch {}
-		const res = computeMinimalEdit(prev, next);
-		if (!res) return;
-		const { start, endPrevIncl, replaceText } = res;
-		const rangeStart = model.getPositionAt(start);
-		const rangeEnd = model.getPositionAt(endPrevIncl + 1);
-		const range = new monaco_shim_exports.Range(rangeStart.lineNumber, rangeStart.column, rangeEnd.lineNumber, rangeEnd.column);
-		const isReadOnly = editorView.getOption(monaco_shim_exports.editor.EditorOption.readOnly);
-		const edit = [{
-			range,
-			text: replaceText,
-			forceMoveMarkers: true
-		}];
-		if (isReadOnly) model.applyEdits(edit);
-		else editorView.executeEdits("minimal-replace", edit);
-	}
-	function flushPendingUpdate() {
-		if (!pendingUpdate) return;
-		lastFlushTime = Date.now();
-		if (!editorView) return;
-		const model = editorView.getModel();
-		if (!model) return;
-		const { code: newCode, lang: codeLanguage } = pendingUpdate;
-		pendingUpdate = null;
-		const processedCodeLanguage = processedLanguage(codeLanguage);
-		let prevCode = null;
-		if (appendBuffer.length > 0) {
-			appendBuffer.length = 0;
-			appendBufferScheduled = false;
-			rafScheduler.cancel("append");
-			try {
-				prevCode = model.getValue();
-				lastKnownCode = prevCode;
-			} catch {
-				prevCode = lastKnownCode ?? "";
+			const initialThemeName = await resolveCreateThemeName(requestId, "editor");
+			nextEditorMgr = new EditorManager(monacoOptions, maxHeightValue, maxHeightCSS, autoScrollOnUpdate, autoScrollInitial, autoScrollThresholdPx, autoScrollThresholdLines, monacoOptions.revealDebounceMs, monacoOptions.updateThrottleMs);
+			const nextEditorView = await nextEditorMgr.createEditor(container, code, language, initialThemeName);
+			assertCreateStillActive(requestId, "editor");
+			editorMgr = nextEditorMgr;
+			editorView = nextEditorView;
+			diffMgr = null;
+			diffEditorView = null;
+			originalModel = null;
+			modifiedModel = null;
+			commitAppliedTheme(initialThemeName);
+			const committedDisposables = takePendingCreateDisposables(requestId);
+			if (committedDisposables.length) disposals.push(...committedDisposables);
+			activeCreateRequestId = null;
+			activeCreateKind = null;
+			const queuedUpdate = queuedEditorUpdateDuringCreate;
+			if ((queuedUpdate === null || queuedUpdate === void 0 ? void 0 : queuedUpdate.requestId) === requestId) {
+				queuedEditorUpdateDuringCreate = null;
+				editorMgr.updateCode(queuedUpdate.code, queuedUpdate.lang);
 			}
-		} else {
-			prevCode = lastKnownCode;
-			if (prevCode == null) try {
-				prevCode = model.getValue();
-				lastKnownCode = prevCode;
-			} catch {
-				prevCode = "";
+			await notifyThemeApplied(initialThemeName);
+			return nextEditorView;
+		} catch (error$1) {
+			if (nextEditorMgr) try {
+				nextEditorMgr.cleanup();
+			} catch {}
+			disposeDisposables(takePendingCreateDisposables(requestId));
+			if (activeCreateRequestId === requestId) {
+				activeCreateRequestId = null;
+				activeCreateKind = null;
+				queuedEditorUpdateDuringCreate = null;
 			}
+			throw error$1;
 		}
-		if (prevCode === newCode) return;
-		const languageId = model.getLanguageId();
-		if (languageId !== processedCodeLanguage) {
-			if (processedCodeLanguage) monaco_shim_exports.editor.setModelLanguage(model, processedCodeLanguage);
-			const prevLineCount = model.getLineCount();
-			model.setValue(newCode);
-			lastKnownCode = newCode;
-			const newLineCount = model.getLineCount();
-			if (newLineCount !== prevLineCount) maybeScrollToBottom(newLineCount);
-			return;
-		}
-		if (newCode.startsWith(prevCode) && prevCode.length < newCode.length) {
-			const suffix = newCode.slice(prevCode.length);
-			if (suffix) appendCode(suffix, codeLanguage);
-			lastKnownCode = newCode;
-			return;
-		}
-		try {
-			const maxChars = minimalEditMaxCharsLocal;
-			const ratio = minimalEditMaxChangeRatioLocal;
-			const maxLen = Math.max(prevCode.length, newCode.length);
-			const changeRatio = maxLen > 0 ? Math.abs(newCode.length - prevCode.length) / maxLen : 0;
-			if (prevCode.length + newCode.length > maxChars || changeRatio > ratio) {
-				const prevLineCount = model.getLineCount();
-				model.setValue(newCode);
-				lastKnownCode = newCode;
-				const newLineCount = model.getLineCount();
-				if (newLineCount !== prevLineCount) maybeScrollToBottom(newLineCount);
-				return;
-			}
-		} catch {}
+	}
+	async function createDiffEditor(container, originalCode, modifiedCode, language) {
+		var _monacoOptions$onBefo2;
+		cancelPendingCreates();
+		cleanupInstances();
+		const requestId = ++createRequestSeq;
+		activeCreateRequestId = requestId;
+		activeCreateKind = "diff";
+		if (monacoOptions.isCleanOnBeforeCreate ?? true) disposeDisposables(disposals.splice(0));
+		const requestDisposables = ((_monacoOptions$onBefo2 = monacoOptions.onBeforeCreate) === null || _monacoOptions$onBefo2 === void 0 ? void 0 : _monacoOptions$onBefo2.call(monacoOptions, monaco_shim_exports)) ?? [];
+		if (requestDisposables.length) pendingCreateDisposables.set(requestId, requestDisposables);
+		let nextDiffMgr = null;
 		try {
-			applyMinimalEdit(prevCode, newCode);
-			lastKnownCode = newCode;
-			const newLineCount = model.getLineCount();
-			const prevLineCount = (prevCode ? prevCode.split("\n").length : 0) || model.getLineCount();
-			if (newLineCount !== prevLineCount) maybeScrollToBottom(newLineCount);
-		} catch {
-			try {
-				const prevLineCount = model.getLineCount();
-				model.setValue(newCode);
-				lastKnownCode = newCode;
-				const newLineCount = model.getLineCount();
-				if (newLineCount !== prevLineCount) maybeScrollToBottom(newLineCount);
+			const initialThemeName = await resolveCreateThemeName(requestId, "diff");
+			nextDiffMgr = new DiffEditorManager(monacoOptions, maxHeightValue, maxHeightCSS, autoScrollOnUpdate, autoScrollInitial, autoScrollThresholdPx, autoScrollThresholdLines, diffAutoScroll, monacoOptions.revealDebounceMs, monacoOptions.diffUpdateThrottleMs);
+			const nextDiffEditorView = await nextDiffMgr.createDiffEditor(container, originalCode, modifiedCode, language, initialThemeName);
+			assertCreateStillActive(requestId, "diff");
+			diffMgr = nextDiffMgr;
+			diffEditorView = nextDiffEditorView;
+			editorMgr = null;
+			editorView = null;
+			const models = diffMgr.getDiffModels();
+			originalModel = models.original;
+			modifiedModel = models.modified;
+			commitAppliedTheme(initialThemeName);
+			const committedDisposables = takePendingCreateDisposables(requestId);
+			if (committedDisposables.length) disposals.push(...committedDisposables);
+			activeCreateRequestId = null;
+			activeCreateKind = null;
+			await notifyThemeApplied(initialThemeName);
+			return nextDiffEditorView;
+		} catch (error$1) {
+			if (nextDiffMgr) try {
+				nextDiffMgr.cleanup();
 			} catch {}
+			disposeDisposables(takePendingCreateDisposables(requestId));
+			if (activeCreateRequestId === requestId) {
+				activeCreateRequestId = null;
+				activeCreateKind = null;
+			}
+			throw error$1;
 		}
 	}
-	function flushAppendBuffer() {
-		if (!editorView) return;
-		if (appendBuffer.length === 0) return;
-		appendBufferScheduled = false;
-		const model = editorView.getModel();
-		if (!model) {
-			appendBuffer.length = 0;
-			return;
-		}
-		const text = appendBuffer.join("");
-		appendBuffer.length = 0;
-		try {
-			const lastLine = model.getLineCount();
-			const lastColumn = model.getLineMaxColumn(lastLine);
-			const range = new monaco_shim_exports.Range(lastLine, lastColumn, lastLine, lastColumn);
-			const isReadOnly = editorView.getOption(monaco_shim_exports.editor.EditorOption.readOnly);
-			if (isReadOnly) model.applyEdits([{
-				range,
-				text,
-				forceMoveMarkers: true
-			}]);
-			else editorView.executeEdits("append", [{
-				range,
-				text,
-				forceMoveMarkers: true
-			}]);
-			if (lastKnownCode != null) lastKnownCode = lastKnownCode + text;
-			try {
-				if (lastLine !== model.getLineCount()) maybeScrollToBottom(model.getLineCount());
-			} catch {}
-		} catch {}
+	function cleanupEditor() {
+		cancelPendingCreates();
+		cleanupInstances();
+		disposeDisposables(disposals.splice(0));
+	}
+	function appendCode(appendText, codeLanguage) {
+		if (editorMgr) editorMgr.appendCode(appendText, codeLanguage);
 	}
 	function updateCode(newCode, codeLanguage) {
-		if (editorMgr) editorMgr.updateCode(newCode, codeLanguage);
-		else {
-			pendingUpdate = {
-				code: newCode,
-				lang: codeLanguage
-			};
-			rafScheduler.schedule("update", () => {
-				if (!updateThrottleMs) {
-					flushPendingUpdate();
-					return;
-				}
-				const now = Date.now();
-				const since = now - lastFlushTime;
-				if (since >= updateThrottleMs) {
-					flushPendingUpdate();
-					return;
-				}
-				if (updateThrottleTimer != null) return;
-				const wait = updateThrottleMs - since;
-				updateThrottleTimer = setTimeout(() => {
-					updateThrottleTimer = null;
-					rafScheduler.schedule("update", () => flushPendingUpdate());
-				}, wait);
-			});
+		if (editorMgr) {
+			editorMgr.updateCode(newCode, codeLanguage);
+			return;
 		}
+		if (activeCreateRequestId != null && activeCreateKind === "editor") queuedEditorUpdateDuringCreate = {
+			requestId: activeCreateRequestId,
+			code: newCode,
+			lang: codeLanguage
+		};
 	}
 	function setUpdateThrottleMs(ms) {
-		updateThrottleMs = ms;
+		monacoOptions.updateThrottleMs = ms;
 		editorMgr === null || editorMgr === void 0 || editorMgr.setUpdateThrottleMs(ms);
 	}
 	function getUpdateThrottleMs() {
-		return (editorMgr === null || editorMgr === void 0 ? void 0 : editorMgr.getUpdateThrottleMs()) ?? updateThrottleMs;
+		return (editorMgr === null || editorMgr === void 0 ? void 0 : editorMgr.getUpdateThrottleMs()) ?? monacoOptions.updateThrottleMs ?? 50;
 	}
 	function updateDiff(originalCode, modifiedCode, codeLanguage) {
 		if (diffMgr) diffMgr.updateDiff(originalCode, modifiedCode, codeLanguage);
@@ -6051,15 +6659,12 @@ function useMonaco(monacoOptions = {}) {
 		createDiffEditor,
 		cleanupEditor,
 		safeClean() {
-			clearFallbackAsyncWork();
 			if (editorMgr) try {
 				editorMgr.safeClean();
 			} catch {}
 			if (diffMgr) try {
 				diffMgr.safeClean();
 			} catch {}
-			_hasScrollBar = false;
-			shouldAutoScroll = !!autoScrollInitial;
 		},
 		updateCode,
 		appendCode,
@@ -6096,10 +6701,10 @@ function useMonaco(monacoOptions = {}) {
 			return monaco_shim_exports.editor;
 		},
 		getEditorView() {
-			return editorView;
+			return (editorMgr === null || editorMgr === void 0 ? void 0 : editorMgr.getEditorView()) ?? editorView;
 		},
 		getDiffEditorView() {
-			return diffEditorView;
+			return (diffMgr === null || diffMgr === void 0 ? void 0 : diffMgr.getDiffEditorView()) ?? diffEditorView;
 		},
 		getDiffModels() {
 			if (diffMgr) return diffMgr.getDiffModels();
@@ -6114,18 +6719,22 @@ function useMonaco(monacoOptions = {}) {
 		setUpdateThrottleMs,
 		getUpdateThrottleMs,
 		getCode() {
+			if (editorMgr) return editorMgr.getCode();
 			if (editorView) try {
 				var _editorView$getModel;
 				return ((_editorView$getModel = editorView.getModel()) === null || _editorView$getModel === void 0 ? void 0 : _editorView$getModel.getValue()) ?? null;
 			} catch {
 				return null;
 			}
-			if (diffEditorView || originalModel && modifiedModel) try {
-				const original = (originalModel === null || originalModel === void 0 ? void 0 : originalModel.getValue()) ?? "";
-				const modified = (modifiedModel === null || modifiedModel === void 0 ? void 0 : modifiedModel.getValue()) ?? "";
+			const diffModels = (diffMgr === null || diffMgr === void 0 ? void 0 : diffMgr.getDiffModels()) ?? {
+				original: originalModel,
+				modified: modifiedModel
+			};
+			if (diffEditorView || diffModels.original && diffModels.modified) try {
+				var _diffModels$original, _diffModels$modified;
 				return {
-					original,
-					modified
+					original: ((_diffModels$original = diffModels.original) === null || _diffModels$original === void 0 ? void 0 : _diffModels$original.getValue()) ?? "",
+					modified: ((_diffModels$modified = diffModels.modified) === null || _diffModels$modified === void 0 ? void 0 : _diffModels$modified.getValue()) ?? ""
 				};
 			} catch {
 				return null;