stream-monaco 0.0.19 → 0.0.20

package/dist/{preloadMonacoWorkers.shared-DMvZ1HUs.cjs → preloadMonacoWorkers.shared-B2kXtXTi.cjs}

@@ -476,9 +476,20 @@ function createScrollWatcherForEditor(ed, opts) {
 //#region src/core/DiffEditorManager.ts
 var DiffEditorManager = class DiffEditorManager {
 	static diffUiStyleId = "stream-monaco-diff-ui-style";
+	static diffLineStyleClasses = ["stream-monaco-diff-style-background", "stream-monaco-diff-style-bar"];
+	static diffUnchangedRegionStyleClasses = [
+		"stream-monaco-diff-unchanged-style-line-info",
+		"stream-monaco-diff-unchanged-style-line-info-basic",
+		"stream-monaco-diff-unchanged-style-metadata",
+		"stream-monaco-diff-unchanged-style-simple"
+	];
+	static diffLayoutModeClasses = ["stream-monaco-diff-inline", "stream-monaco-diff-side-by-side"];
+	static diffAppearanceClasses = ["stream-monaco-diff-appearance-light", "stream-monaco-diff-appearance-dark"];
 	diffEditorView = null;
 	originalModel = null;
 	modifiedModel = null;
+	originalModelOwned = false;
+	modifiedModelOwned = false;
 	lastContainer = null;
 	lastKnownOriginalCode = null;
 	lastKnownModifiedCode = null;
@@ -536,15 +547,35 @@ var DiffEditorManager = class DiffEditorManager {
 	diffHunkUpperNode = null;
 	diffHunkLowerNode = null;
 	diffHunkActiveChange = null;
+	diffHunkActiveHoverSide = null;
 	diffHunkLineChanges = [];
 	diffHunkFallbackLineChanges = [];
 	diffHunkFallbackVersions = null;
+	diffHunkActionInFlight = false;
+	diffComputedVersions = null;
+	diffPresentationDisposables = [];
+	fallbackOriginalDecorationIds = [];
+	fallbackModifiedDecorationIds = [];
 	diffHunkHideTimer = null;
 	diffUnchangedRegionDisposables = [];
 	diffUnchangedRegionObserver = null;
 	diffUnchangedBridgeOverlay = null;
-	diffUnchangedBridgeDisposables = [];
+	diffUnchangedBridgeEntries = /* @__PURE__ */ new Map();
+	diffUnchangedBridgePool = [];
+	diffUnchangedNodeIds = /* @__PURE__ */ new WeakMap();
+	diffUnchangedNodeIdSequence = 0;
+	diffUnchangedOverlayScrollTop = 0;
+	diffUnchangedOverlayScrollLeft = 0;
+	diffRootAppearanceSignature = null;
 	diffPersistedUnchangedModelState = null;
+	pendingPreparedDiffViewModel = null;
+	diffModelTransitionRequestId = 0;
+	pendingDiffScrollRestorePosition = null;
+	pendingDiffScrollRestoreBudget = 0;
+	diffHideUnchangedRegionsResolved = null;
+	diffHideUnchangedRegionsDeferred = false;
+	diffHideUnchangedRegionsIdleTimer = null;
+	diffThemeSyncRafId = null;
 	constructor(options, maxHeightValue, maxHeightCSS, autoScrollOnUpdate, autoScrollInitial, autoScrollThresholdPx, autoScrollThresholdLines, diffAutoScroll, revealDebounceMsOption, diffUpdateThrottleMsOption) {
 		this.options = options;
 		this.maxHeightValue = maxHeightValue;
@@ -577,15 +608,212 @@ var DiffEditorManager = class DiffEditorManager {
 			enabled: true,
 			contextLineCount: 3,
 			minimumLineCount: 3,
-			revealLineCount: 3
+			revealLineCount: 5
 		};
 	}
+	resolveDiffLineStyleOption() {
+		return this.options.diffLineStyle === "bar" ? "bar" : "background";
+	}
+	resolveDiffUnchangedRegionStyleOption() {
+		if (this.options.diffUnchangedRegionStyle === "simple") return "simple";
+		if (this.options.diffUnchangedRegionStyle === "line-info-basic") return "line-info-basic";
+		return this.options.diffUnchangedRegionStyle === "metadata" ? "metadata" : "line-info";
+	}
+	resolveDiffStreamingThrottleMs() {
+		const explicitThrottle = this.diffUpdateThrottleMsOption ?? this.options.diffUpdateThrottleMs;
+		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;
+	}
 	disposeDiffHunkInteractions() {
 		if (this.diffHunkHideTimer != null) {
 			clearTimeout(this.diffHunkHideTimer);
 			this.diffHunkHideTimer = null;
 		}
 		this.diffHunkActiveChange = null;
+		this.diffHunkActiveHoverSide = null;
 		this.diffHunkLineChanges = [];
 		this.diffHunkFallbackLineChanges = [];
 		this.diffHunkFallbackVersions = null;
@@ -673,7 +901,7 @@ var DiffEditorManager = class DiffEditorManager {
 	getEffectiveLineChanges() {
 		if (!this.diffEditorView) return [];
 		const nativeLineChanges = this.diffEditorView.getLineChanges();
-		if (nativeLineChanges) {
+		if (nativeLineChanges && this.hasFreshNativeDiffResult()) {
 			this.diffHunkFallbackLineChanges = [];
 			this.diffHunkFallbackVersions = null;
 			return nativeLineChanges;
@@ -688,6 +916,71 @@ var DiffEditorManager = class DiffEditorManager {
 		this.diffHunkFallbackVersions = versions;
 		return this.diffHunkFallbackLineChanges;
 	}
+	captureCurrentDiffVersions() {
+		if (!this.originalModel || !this.modifiedModel) return null;
+		return {
+			original: this.originalModel.getAlternativeVersionId(),
+			modified: this.modifiedModel.getAlternativeVersionId()
+		};
+	}
+	hasFreshNativeDiffResult() {
+		const versions = this.captureCurrentDiffVersions();
+		return !!(versions && this.diffComputedVersions && versions.original === this.diffComputedVersions.original && versions.modified === this.diffComputedVersions.modified);
+	}
+	scheduleSyncDiffPresentationDecorations() {
+		this.rafScheduler.schedule("sync-diff-presentation", () => {
+			this.syncDiffPresentationDecorations();
+		});
+	}
+	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();
+		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 = [];
+	}
+	toWholeLineDecoration(side, startLineNumber, endLineNumber) {
+		if (endLineNumber < startLineNumber || startLineNumber < 1) return null;
+		const removed = side === "original";
+		return {
+			range: new monaco_shim_exports.Range(startLineNumber, 1, endLineNumber, 1),
+			options: {
+				isWholeLine: true,
+				className: removed ? "stream-monaco-fallback-line-delete" : "stream-monaco-fallback-line-insert",
+				marginClassName: removed ? "stream-monaco-fallback-gutter-delete" : "stream-monaco-fallback-gutter-insert",
+				linesDecorationsClassName: removed ? "stream-monaco-fallback-lines-delete" : "stream-monaco-fallback-lines-insert",
+				lineNumberClassName: removed ? "stream-monaco-fallback-line-number-delete" : "stream-monaco-fallback-line-number-insert",
+				description: removed ? "stream-monaco-fallback-line-delete" : "stream-monaco-fallback-line-insert",
+				zIndex: 5
+			}
+		};
+	}
+	syncDiffPresentationDecorations() {
+		if (!this.diffEditorView || !this.lastContainer) return;
+		const nativeFresh = this.hasFreshNativeDiffResult();
+		this.lastContainer.classList.toggle("stream-monaco-diff-native-stale", !nativeFresh);
+		if (nativeFresh) {
+			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);
+	}
+	disposeDiffPresentationTracking() {
+		this.clearFallbackDiffDecorations();
+		if (this.lastContainer) this.lastContainer.classList.remove("stream-monaco-diff-native-stale");
+		this.diffComputedVersions = null;
+		this.diffPresentationDisposables.forEach((disposable) => disposable.dispose());
+		this.diffPresentationDisposables = [];
+		this.rafScheduler.cancel("sync-diff-presentation");
+	}
 	ensureDiffUiStyle() {
 		if (typeof document === "undefined") return;
 		if (document.getElementById(DiffEditorManager.diffUiStyleId)) return;
@@ -695,30 +988,549 @@ var DiffEditorManager = class DiffEditorManager {
 		style.id = DiffEditorManager.diffUiStyleId;
 		style.textContent = `
 .stream-monaco-diff-root {
-  --stream-monaco-unchanged-fg: var(--vscode-diffEditor-unchangedRegionForeground, var(--vscode-editor-foreground, currentColor));
-  --stream-monaco-unchanged-bg: var(--vscode-diffEditor-unchangedRegionBackground, transparent);
+  --stream-monaco-editor-fg: var(--vscode-editor-foreground, #111827);
   --stream-monaco-editor-bg: var(--vscode-editor-background, #fff);
-  --stream-monaco-widget-shadow: var(--vscode-widget-shadow, rgb(0 0 0 / 30%));
-  --stream-monaco-focus: var(--vscode-focusBorder, var(--stream-monaco-unchanged-fg));
-  --stream-monaco-surface: color-mix(in srgb, var(--stream-monaco-unchanged-bg) 82%, var(--stream-monaco-editor-bg) 18%);
-  --stream-monaco-surface-hover: color-mix(in srgb, var(--stream-monaco-unchanged-bg) 72%, var(--stream-monaco-editor-bg) 28%);
+  --stream-monaco-unchanged-fg: var(--vscode-diffEditor-unchangedRegionForeground, var(--stream-monaco-editor-fg));
+  --stream-monaco-unchanged-bg: var(--vscode-diffEditor-unchangedRegionBackground, transparent);
+  --stream-monaco-gutter-marker-width: 4px;
+  --stream-monaco-gutter-gap: 16px;
+  --stream-monaco-widget-shadow: var(--vscode-widget-shadow, rgb(15 23 42 / 26%));
+  --stream-monaco-focus: var(--vscode-focusBorder, color-mix(in srgb, var(--stream-monaco-editor-fg) 56%, transparent));
+  --stream-monaco-frame-radius: 20px;
+  --stream-monaco-frame-border: color-mix(in srgb, var(--stream-monaco-editor-fg) 12%, transparent);
+  --stream-monaco-frame-shadow: 0 28px 60px -46px var(--stream-monaco-widget-shadow);
+  --stream-monaco-panel-border: color-mix(in srgb, var(--stream-monaco-editor-fg) 9%, transparent);
+  --stream-monaco-pane-divider: var(--stream-monaco-panel-border);
+  --stream-monaco-line-number: color-mix(in srgb, var(--stream-monaco-editor-fg) 34%, transparent);
+  --stream-monaco-line-number-active: color-mix(in srgb, var(--stream-monaco-editor-fg) 46%, transparent);
+  --stream-monaco-line-number-left: calc(
+    var(--stream-monaco-gutter-marker-width) + var(--stream-monaco-gutter-gap)
+  );
+  --stream-monaco-line-number-width: 36px;
+  --stream-monaco-line-number-align: center;
+  --stream-monaco-original-margin-width: calc(
+    var(--stream-monaco-line-number-left) +
+      var(--stream-monaco-line-number-width)
+  );
+  --stream-monaco-original-scrollable-left: var(
+    --stream-monaco-original-margin-width
+  );
+  --stream-monaco-original-scrollable-width: calc(
+    100% - var(--stream-monaco-original-margin-width)
+  );
+  --stream-monaco-modified-margin-width: calc(
+    var(--stream-monaco-line-number-left) +
+      var(--stream-monaco-line-number-width)
+  );
+  --stream-monaco-modified-scrollable-left: var(
+    --stream-monaco-modified-margin-width
+  );
+  --stream-monaco-modified-scrollable-width: calc(
+    100% - var(--stream-monaco-modified-margin-width)
+  );
+  --stream-monaco-panel-bg:
+    linear-gradient(
+      180deg,
+      color-mix(in srgb, var(--stream-monaco-editor-bg) 97%, white 3%) 0%,
+      color-mix(in srgb, var(--stream-monaco-editor-bg) 92%, var(--stream-monaco-editor-fg) 8%) 100%
+    );
+  --stream-monaco-panel-bg-soft: color-mix(in srgb, var(--stream-monaco-editor-bg) 94%, var(--stream-monaco-editor-fg) 6%);
+  --stream-monaco-panel-bg-strong: color-mix(in srgb, var(--stream-monaco-editor-bg) 88%, var(--stream-monaco-editor-fg) 12%);
+  --stream-monaco-gutter-bg:
+    linear-gradient(
+      180deg,
+      color-mix(in srgb, var(--stream-monaco-editor-bg) 92%, var(--stream-monaco-editor-fg) 8%) 0%,
+      color-mix(in srgb, var(--stream-monaco-editor-bg) 88%, var(--stream-monaco-editor-fg) 12%) 100%
+    );
+  --stream-monaco-gutter-guide: color-mix(in srgb, var(--stream-monaco-editor-fg) 14%, transparent);
+  --stream-monaco-surface: color-mix(in srgb, var(--stream-monaco-unchanged-bg) 76%, var(--stream-monaco-editor-bg) 24%);
+  --stream-monaco-surface-hover: color-mix(in srgb, var(--stream-monaco-unchanged-bg) 64%, var(--stream-monaco-editor-bg) 36%);
   --stream-monaco-surface-soft: color-mix(in srgb, var(--stream-monaco-unchanged-bg) 55%, transparent);
-  --stream-monaco-border: color-mix(in srgb, var(--stream-monaco-unchanged-fg) 20%, transparent);
-  --stream-monaco-border-strong: color-mix(in srgb, var(--stream-monaco-unchanged-fg) 34%, transparent);
-  --stream-monaco-muted: color-mix(in srgb, var(--stream-monaco-unchanged-fg) 72%, transparent);
-  --stream-monaco-accent-soft: color-mix(in srgb, var(--stream-monaco-focus) 18%, transparent);
+  --stream-monaco-border: color-mix(in srgb, var(--stream-monaco-unchanged-fg) 18%, transparent);
+  --stream-monaco-border-strong: color-mix(in srgb, var(--stream-monaco-unchanged-fg) 30%, transparent);
+  --stream-monaco-muted: color-mix(in srgb, var(--stream-monaco-unchanged-fg) 70%, transparent);
+  --stream-monaco-added-fg: color-mix(in srgb, var(--vscode-diffEditorGutter-insertedLineBackground, #14b8a6) 78%, #0f766e 22%);
+  --stream-monaco-added-line: color-mix(in srgb, var(--vscode-diffEditor-insertedLineBackground, #ddfbe8) 88%, var(--stream-monaco-editor-bg) 12%);
+  --stream-monaco-added-inline: color-mix(in srgb, var(--vscode-diffEditor-insertedTextBackground, #baf5d1) 92%, var(--stream-monaco-editor-bg) 8%);
+  --stream-monaco-added-border: color-mix(in srgb, var(--stream-monaco-added-fg) 24%, transparent);
+  --stream-monaco-added-outline: var(--stream-monaco-added-border);
+  --stream-monaco-added-inline-border: var(--stream-monaco-added-border);
+  --stream-monaco-added-line-shadow:
+    inset 4px 0 0 var(--stream-monaco-added-fg),
+    inset 0 0 0 1px var(--stream-monaco-added-outline);
+  --stream-monaco-added-line-fill:
+    linear-gradient(
+      90deg,
+      color-mix(in srgb, var(--stream-monaco-added-line) 94%, var(--stream-monaco-editor-bg) 6%) 0%,
+      color-mix(in srgb, var(--stream-monaco-added-line) 82%, transparent) 100%
+    );
+  --stream-monaco-added-gutter:
+    linear-gradient(
+      90deg,
+      var(--stream-monaco-added-fg) 0 4px,
+      color-mix(in srgb, var(--stream-monaco-added-line) 82%, transparent) 4px 100%
+    );
+  --stream-monaco-removed-fg: color-mix(in srgb, var(--vscode-diffEditorGutter-removedLineBackground, #f43f5e) 74%, #dc2626 26%);
+  --stream-monaco-removed-line: color-mix(in srgb, var(--vscode-diffEditor-removedLineBackground, #fde8ec) 88%, var(--stream-monaco-editor-bg) 12%);
+  --stream-monaco-removed-inline: color-mix(in srgb, var(--vscode-diffEditor-removedTextBackground, #fecdd6) 92%, var(--stream-monaco-editor-bg) 8%);
+  --stream-monaco-removed-border: color-mix(in srgb, var(--stream-monaco-removed-fg) 24%, transparent);
+  --stream-monaco-removed-outline: var(--stream-monaco-removed-border);
+  --stream-monaco-removed-inline-border: var(--stream-monaco-removed-border);
+  --stream-monaco-removed-line-shadow:
+    inset 4px 0 0 var(--stream-monaco-removed-fg),
+    inset 0 0 0 1px var(--stream-monaco-removed-outline);
+  --stream-monaco-removed-line-fill:
+    linear-gradient(
+      90deg,
+      color-mix(in srgb, var(--stream-monaco-removed-line) 94%, var(--stream-monaco-editor-bg) 6%) 0%,
+      color-mix(in srgb, var(--stream-monaco-removed-line) 82%, transparent) 100%
+    );
+  --stream-monaco-removed-gutter:
+    linear-gradient(
+      90deg,
+      var(--stream-monaco-removed-fg) 0 4px,
+      color-mix(in srgb, var(--stream-monaco-removed-line) 82%, transparent) 4px 100%
+    );
+  scrollbar-width: none;
+  color-scheme: light;
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark {
+  --stream-monaco-frame-border: color-mix(in srgb, var(--stream-monaco-editor-fg) 16%, transparent);
+  --stream-monaco-frame-shadow: 0 30px 60px -42px rgb(2 6 23 / 0.78);
+  --stream-monaco-panel-border: color-mix(in srgb, var(--stream-monaco-editor-fg) 15%, transparent);
+  --stream-monaco-pane-divider: color-mix(in srgb, var(--stream-monaco-editor-fg) 12%, transparent);
+  --stream-monaco-panel-bg:
+    linear-gradient(
+      180deg,
+      color-mix(in srgb, var(--stream-monaco-editor-bg) 94%, black 6%) 0%,
+      color-mix(in srgb, var(--stream-monaco-editor-bg) 82%, var(--stream-monaco-editor-fg) 18%) 100%
+    );
+  --stream-monaco-panel-bg-soft: color-mix(in srgb, var(--stream-monaco-editor-bg) 86%, var(--stream-monaco-editor-fg) 14%);
+  --stream-monaco-panel-bg-strong: color-mix(in srgb, var(--stream-monaco-editor-bg) 78%, var(--stream-monaco-editor-fg) 22%);
+  --stream-monaco-gutter-bg:
+    linear-gradient(
+      180deg,
+      color-mix(in srgb, var(--stream-monaco-editor-bg) 84%, black 16%) 0%,
+      color-mix(in srgb, var(--stream-monaco-editor-bg) 76%, var(--stream-monaco-editor-fg) 24%) 100%
+    );
+  --stream-monaco-gutter-guide: color-mix(in srgb, var(--stream-monaco-editor-fg) 12%, transparent);
+  --stream-monaco-surface: color-mix(in srgb, var(--stream-monaco-editor-bg) 91%, var(--stream-monaco-unchanged-fg) 9%);
+  --stream-monaco-surface-hover: color-mix(in srgb, var(--stream-monaco-editor-bg) 84%, var(--stream-monaco-unchanged-fg) 16%);
+  --stream-monaco-surface-soft: color-mix(in srgb, var(--stream-monaco-editor-bg) 78%, var(--stream-monaco-unchanged-fg) 22%);
+  --stream-monaco-border: color-mix(in srgb, var(--stream-monaco-editor-fg) 22%, transparent);
+  --stream-monaco-border-strong: color-mix(in srgb, var(--stream-monaco-editor-fg) 30%, transparent);
+  --stream-monaco-muted: color-mix(in srgb, var(--stream-monaco-editor-fg) 72%, transparent);
+  --stream-monaco-added-fg: color-mix(in srgb, var(--vscode-diffEditorGutter-insertedLineBackground, #2dd4bf) 88%, #99f6e4 12%);
+  --stream-monaco-added-line: color-mix(in srgb, var(--vscode-diffEditor-insertedLineBackground, rgb(16 185 129 / 0.24)) 54%, var(--stream-monaco-editor-bg) 46%);
+  --stream-monaco-added-inline: color-mix(in srgb, var(--vscode-diffEditor-insertedTextBackground, rgb(45 212 191 / 0.26)) 62%, var(--stream-monaco-editor-bg) 38%);
+  --stream-monaco-added-border: color-mix(in srgb, var(--stream-monaco-added-fg) 32%, transparent);
+  --stream-monaco-added-outline: color-mix(in srgb, var(--stream-monaco-added-fg) 20%, transparent);
+  --stream-monaco-added-inline-border: color-mix(in srgb, var(--stream-monaco-added-fg) 26%, transparent);
+  --stream-monaco-added-line-shadow:
+    inset 4px 0 0 var(--stream-monaco-added-fg),
+    inset 0 0 0 1px var(--stream-monaco-added-outline);
+  --stream-monaco-added-line-fill:
+    linear-gradient(
+      90deg,
+      color-mix(in srgb, var(--stream-monaco-added-line) 96%, var(--stream-monaco-editor-bg) 4%) 0%,
+      color-mix(in srgb, var(--stream-monaco-added-line) 74%, transparent) 100%
+    );
+  --stream-monaco-added-gutter:
+    linear-gradient(
+      90deg,
+      var(--stream-monaco-added-fg) 0 4px,
+      color-mix(in srgb, var(--stream-monaco-added-line) 74%, transparent) 4px 100%
+    );
+  --stream-monaco-removed-fg: color-mix(in srgb, var(--vscode-diffEditorGutter-removedLineBackground, #fb7185) 86%, #fecdd3 14%);
+  --stream-monaco-removed-line: color-mix(in srgb, var(--vscode-diffEditor-removedLineBackground, rgb(244 63 94 / 0.22)) 54%, var(--stream-monaco-editor-bg) 46%);
+  --stream-monaco-removed-inline: color-mix(in srgb, var(--vscode-diffEditor-removedTextBackground, rgb(251 113 133 / 0.24)) 62%, var(--stream-monaco-editor-bg) 38%);
+  --stream-monaco-removed-border: color-mix(in srgb, var(--stream-monaco-removed-fg) 32%, transparent);
+  --stream-monaco-removed-outline: color-mix(in srgb, var(--stream-monaco-removed-fg) 20%, transparent);
+  --stream-monaco-removed-inline-border: color-mix(in srgb, var(--stream-monaco-removed-fg) 26%, transparent);
+  --stream-monaco-removed-line-shadow:
+    inset 4px 0 0 var(--stream-monaco-removed-fg),
+    inset 0 0 0 1px var(--stream-monaco-removed-outline);
+  --stream-monaco-removed-line-fill:
+    linear-gradient(
+      90deg,
+      color-mix(in srgb, var(--stream-monaco-removed-line) 96%, var(--stream-monaco-editor-bg) 4%) 0%,
+      color-mix(in srgb, var(--stream-monaco-removed-line) 74%, transparent) 100%
+    );
+  --stream-monaco-removed-gutter:
+    linear-gradient(
+      90deg,
+      var(--stream-monaco-removed-fg) 0 4px,
+      color-mix(in srgb, var(--stream-monaco-removed-line) 74%, transparent) 4px 100%
+    );
+  color-scheme: dark;
+}
+.stream-monaco-diff-root::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+  display: none;
+}
+.stream-monaco-diff-root .monaco-diff-editor {
+  overflow: hidden;
+  background: var(--stream-monaco-panel-bg);
+  box-shadow: var(--stream-monaco-frame-shadow);
+}
+.stream-monaco-diff-root .monaco-diff-editor.side-by-side .editor.original .scrollbar.vertical,
+.stream-monaco-diff-root .monaco-diff-editor.side-by-side .editor.modified .scrollbar.vertical {
+  display: none !important;
+}
+.stream-monaco-diff-root .monaco-diff-editor.side-by-side {
+  background:
+    radial-gradient(circle at top center, color-mix(in srgb, var(--stream-monaco-editor-bg) 82%, white 18%) 0%, transparent 44%),
+    var(--stream-monaco-panel-bg);
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .monaco-diff-editor.side-by-side {
+  background:
+    radial-gradient(circle at top center, color-mix(in srgb, var(--stream-monaco-editor-bg) 88%, black 12%) 0%, transparent 48%),
+    var(--stream-monaco-panel-bg);
+}
+.stream-monaco-diff-root .monaco-diff-editor .editor.original,
+.stream-monaco-diff-root .monaco-diff-editor .editor.modified {
+  background:
+    linear-gradient(
+      180deg,
+      color-mix(in srgb, var(--stream-monaco-editor-bg) 98%, white 2%) 0%,
+      var(--stream-monaco-editor-bg) 100%
+    );
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .monaco-diff-editor .editor.original,
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .monaco-diff-editor .editor.modified {
+  background:
+    linear-gradient(
+      180deg,
+      color-mix(in srgb, var(--stream-monaco-editor-bg) 94%, black 6%) 0%,
+      var(--stream-monaco-editor-bg) 100%
+    );
+}
+.stream-monaco-diff-root .monaco-diff-editor .editor.original .monaco-editor-background,
+.stream-monaco-diff-root .monaco-diff-editor .editor.original .margin,
+.stream-monaco-diff-root .monaco-diff-editor .editor.original .margin-view-overlays,
+.stream-monaco-diff-root .monaco-diff-editor .editor.original .margin-view-zones,
+.stream-monaco-diff-root .monaco-diff-editor .editor.original .lines-content,
+.stream-monaco-diff-root .monaco-diff-editor .editor.modified .monaco-editor-background,
+.stream-monaco-diff-root .monaco-diff-editor .editor.modified .margin,
+.stream-monaco-diff-root .monaco-diff-editor .editor.modified .margin-view-overlays,
+.stream-monaco-diff-root .monaco-diff-editor .editor.modified .margin-view-zones,
+.stream-monaco-diff-root .monaco-diff-editor .editor.modified .lines-content {
+  background: var(--stream-monaco-editor-bg) !important;
+}
+.stream-monaco-diff-root .monaco-diff-editor.side-by-side .editor.modified {
+  box-shadow: none;
+  border-left: 1px solid var(--stream-monaco-pane-divider);
+}
+.stream-monaco-diff-root .monaco-diff-editor.side-by-side .editor.original {
+  box-shadow: none;
+  border-right: 1px solid var(--stream-monaco-pane-divider);
+}
+.stream-monaco-diff-root .monaco-diff-editor .gutter {
+  background: var(--stream-monaco-gutter-bg);
+  border-inline: 1px solid var(--stream-monaco-pane-divider);
+}
+.stream-monaco-diff-root .monaco-diff-editor .gutter .background {
+  left: 50%;
+  width: 1px;
+  border-left: 0 !important;
+  background: var(--stream-monaco-gutter-guide);
+}
+.stream-monaco-diff-root .monaco-diff-editor .gutter .buttons .monaco-toolbar .monaco-action-bar .actions-container {
+  border-radius: 999px;
+  border: 1px solid var(--stream-monaco-panel-border);
+  background: color-mix(in srgb, var(--stream-monaco-editor-bg) 84%, var(--stream-monaco-editor-fg) 16%);
+  box-shadow: 0 14px 24px -18px var(--stream-monaco-widget-shadow);
+}
+.stream-monaco-diff-root .monaco-diff-editor .gutter .buttons .monaco-toolbar .monaco-action-bar .actions-container .action-item {
+  border-radius: 999px;
+}
+.stream-monaco-diff-root .monaco-diff-editor .insert-sign,
+.stream-monaco-diff-root .monaco-diff-editor .delete-sign {
+  display: none !important;
+}
+.stream-monaco-diff-root .monaco-diff-editor .gutter-insert {
+  background: var(--stream-monaco-added-gutter) !important;
+}
+.stream-monaco-diff-root .monaco-diff-editor .gutter-delete,
+.stream-monaco-diff-root .monaco-editor .inline-deleted-margin-view-zone {
+  background: var(--stream-monaco-removed-gutter) !important;
+}
+.stream-monaco-diff-root .monaco-editor .line-insert,
+.stream-monaco-diff-root .monaco-diff-editor .line-insert {
+  background: var(--stream-monaco-added-line-fill) !important;
+  border: 0 !important;
+  box-shadow: var(--stream-monaco-added-line-shadow);
+}
+.stream-monaco-diff-root .monaco-editor .line-delete,
+.stream-monaco-diff-root .monaco-diff-editor .line-delete {
+  background: var(--stream-monaco-removed-line-fill) !important;
+  border: 0 !important;
+  box-shadow: var(--stream-monaco-removed-line-shadow);
+}
+.stream-monaco-diff-root .monaco-editor .char-insert,
+.stream-monaco-diff-root .monaco-diff-editor .char-insert {
+  background: var(--stream-monaco-added-inline) !important;
+  border: 1px solid var(--stream-monaco-added-inline-border) !important;
+  border-radius: 6px;
+  box-shadow: inset 0 -1px 0 color-mix(in srgb, var(--stream-monaco-added-fg) 18%, transparent);
+}
+.stream-monaco-diff-root .monaco-editor .char-delete,
+.stream-monaco-diff-root .monaco-diff-editor .char-delete,
+.stream-monaco-diff-root .monaco-editor .inline-deleted-text {
+  background: var(--stream-monaco-removed-inline) !important;
+  border: 1px solid var(--stream-monaco-removed-inline-border) !important;
+  border-radius: 6px;
+  box-shadow: inset 0 -1px 0 color-mix(in srgb, var(--stream-monaco-removed-fg) 18%, transparent);
+}
+.stream-monaco-diff-root .monaco-editor .inline-deleted-text {
+  text-decoration: none;
+}
+.stream-monaco-diff-root .monaco-editor .char-insert.diff-range-empty,
+.stream-monaco-diff-root .monaco-editor .char-delete.diff-range-empty {
+  min-width: 2px;
+  margin: 0 1px;
+  border-radius: 999px;
+}
+.stream-monaco-diff-root.stream-monaco-diff-native-stale .monaco-editor .line-insert,
+.stream-monaco-diff-root.stream-monaco-diff-native-stale .monaco-diff-editor .line-insert,
+.stream-monaco-diff-root.stream-monaco-diff-native-stale .monaco-editor .line-delete,
+.stream-monaco-diff-root.stream-monaco-diff-native-stale .monaco-diff-editor .line-delete,
+.stream-monaco-diff-root.stream-monaco-diff-native-stale .monaco-editor .char-insert,
+.stream-monaco-diff-root.stream-monaco-diff-native-stale .monaco-diff-editor .char-insert,
+.stream-monaco-diff-root.stream-monaco-diff-native-stale .monaco-editor .char-delete,
+.stream-monaco-diff-root.stream-monaco-diff-native-stale .monaco-diff-editor .char-delete,
+.stream-monaco-diff-root.stream-monaco-diff-native-stale .monaco-editor .inline-deleted-text,
+.stream-monaco-diff-root.stream-monaco-diff-native-stale .monaco-diff-editor .gutter-insert,
+.stream-monaco-diff-root.stream-monaco-diff-native-stale .monaco-diff-editor .gutter-delete,
+.stream-monaco-diff-root.stream-monaco-diff-native-stale .monaco-editor .inline-deleted-margin-view-zone {
+  background: transparent !important;
+  border-color: transparent !important;
+  box-shadow: none !important;
+}
+.stream-monaco-diff-root.stream-monaco-diff-native-stale .monaco-editor .line-delete.line-numbers,
+.stream-monaco-diff-root.stream-monaco-diff-native-stale .monaco-diff-editor .line-delete.line-numbers,
+.stream-monaco-diff-root.stream-monaco-diff-native-stale .monaco-editor .line-insert.line-numbers,
+.stream-monaco-diff-root.stream-monaco-diff-native-stale .monaco-diff-editor .line-insert.line-numbers {
+  color: var(--stream-monaco-line-number) !important;
+}
+.stream-monaco-diff-root .monaco-editor .stream-monaco-fallback-line-insert,
+.stream-monaco-diff-root .monaco-diff-editor .stream-monaco-fallback-line-insert {
+  background: var(--stream-monaco-added-line-fill) !important;
+  border: 0 !important;
+  box-shadow: var(--stream-monaco-added-line-shadow);
+}
+.stream-monaco-diff-root .monaco-editor .stream-monaco-fallback-line-delete,
+.stream-monaco-diff-root .monaco-diff-editor .stream-monaco-fallback-line-delete {
+  background: var(--stream-monaco-removed-line-fill) !important;
+  border: 0 !important;
+  box-shadow: var(--stream-monaco-removed-line-shadow);
+}
+.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;
+}
+.stream-monaco-diff-root .monaco-editor .stream-monaco-fallback-gutter-delete,
+.stream-monaco-diff-root .monaco-diff-editor .stream-monaco-fallback-gutter-delete {
+  background: var(--stream-monaco-removed-gutter) !important;
+}
+.stream-monaco-diff-root .monaco-editor .stream-monaco-fallback-line-number-delete,
+.stream-monaco-diff-root .monaco-diff-editor .stream-monaco-fallback-line-number-delete {
+  color: var(--stream-monaco-removed-fg) !important;
+}
+.stream-monaco-diff-root .monaco-editor .stream-monaco-fallback-line-number-insert,
+.stream-monaco-diff-root .monaco-diff-editor .stream-monaco-fallback-line-number-insert {
+  color: var(--stream-monaco-added-fg) !important;
+}
+.stream-monaco-diff-root.stream-monaco-diff-style-bar .monaco-diff-editor .gutter-insert {
+  background:
+    linear-gradient(
+      90deg,
+      var(--stream-monaco-added-fg) 0 4px,
+      transparent 4px 100%
+    ) !important;
+}
+.stream-monaco-diff-root.stream-monaco-diff-style-bar .monaco-diff-editor .gutter-delete,
+.stream-monaco-diff-root.stream-monaco-diff-style-bar .monaco-editor .inline-deleted-margin-view-zone {
+  background:
+    linear-gradient(
+      90deg,
+      var(--stream-monaco-removed-fg) 0 4px,
+      transparent 4px 100%
+    ) !important;
+}
+.stream-monaco-diff-root.stream-monaco-diff-style-bar .monaco-editor .line-insert,
+.stream-monaco-diff-root.stream-monaco-diff-style-bar .monaco-diff-editor .line-insert {
+  background:
+    color-mix(in srgb, var(--stream-monaco-added-line) 34%, transparent) !important;
+  box-shadow: none !important;
+}
+.stream-monaco-diff-root.stream-monaco-diff-style-bar .monaco-editor .line-delete,
+.stream-monaco-diff-root.stream-monaco-diff-style-bar .monaco-diff-editor .line-delete {
+  background:
+    color-mix(in srgb, var(--stream-monaco-removed-line) 34%, transparent) !important;
+  box-shadow: none !important;
+}
+.stream-monaco-diff-root.stream-monaco-diff-style-bar .monaco-editor .char-insert,
+.stream-monaco-diff-root.stream-monaco-diff-style-bar .monaco-diff-editor .char-insert {
+  background:
+    color-mix(in srgb, var(--stream-monaco-added-inline) 76%, transparent) !important;
+  border: 0 !important;
+  border-bottom: 1px solid
+    color-mix(in srgb, var(--stream-monaco-added-fg) 30%, transparent) !important;
+  box-shadow: inset 0 -1px 0
+    color-mix(in srgb, var(--stream-monaco-added-fg) 26%, transparent);
+}
+.stream-monaco-diff-root.stream-monaco-diff-style-bar .monaco-editor .char-delete,
+.stream-monaco-diff-root.stream-monaco-diff-style-bar .monaco-diff-editor .char-delete,
+.stream-monaco-diff-root.stream-monaco-diff-style-bar .monaco-editor .inline-deleted-text {
+  background:
+    color-mix(in srgb, var(--stream-monaco-removed-inline) 76%, transparent) !important;
+  border: 0 !important;
+  border-bottom: 1px solid
+    color-mix(in srgb, var(--stream-monaco-removed-fg) 30%, transparent) !important;
+  box-shadow: inset 0 -1px 0
+    color-mix(in srgb, var(--stream-monaco-removed-fg) 26%, transparent);
+}
+.stream-monaco-diff-root .monaco-diff-editor .diffOverview {
+  background: color-mix(in srgb, var(--stream-monaco-editor-bg) 84%, var(--stream-monaco-editor-fg) 16%);
+  border-left: 1px solid var(--stream-monaco-panel-border);
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .monaco-diff-editor .diffOverview {
+  background:
+    linear-gradient(
+      180deg,
+      color-mix(in srgb, var(--stream-monaco-editor-bg) 96%, black 4%) 0%,
+      color-mix(in srgb, var(--stream-monaco-editor-bg) 90%, var(--stream-monaco-editor-fg) 10%) 100%
+    );
+  border-left-color: color-mix(in srgb, var(--stream-monaco-editor-fg) 10%, transparent);
+  box-shadow: inset 1px 0 0 rgb(255 255 255 / 0.03);
+}
+.stream-monaco-diff-root .monaco-diff-editor .diffViewport {
+  border-radius: 999px;
+  background: color-mix(in srgb, var(--stream-monaco-editor-fg) 18%, transparent);
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .monaco-diff-editor .diffViewport {
+  background: color-mix(in srgb, var(--stream-monaco-editor-fg) 24%, transparent);
+  box-shadow:
+    inset 0 1px 0 rgb(255 255 255 / 0.08),
+    0 10px 18px -14px rgb(2 6 23 / 0.92);
+}
+.stream-monaco-diff-root .monaco-diff-editor .diffViewport:hover {
+  background: color-mix(in srgb, var(--stream-monaco-editor-fg) 24%, transparent);
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .monaco-diff-editor .diffViewport:hover {
+  background: color-mix(in srgb, var(--stream-monaco-editor-fg) 31%, transparent);
+}
+.stream-monaco-diff-root .monaco-diff-editor .diffViewport:active {
+  background: color-mix(in srgb, var(--stream-monaco-editor-fg) 32%, transparent);
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .monaco-diff-editor .diffViewport:active {
+  background: color-mix(in srgb, var(--stream-monaco-editor-fg) 38%, transparent);
+}
+.stream-monaco-diff-root .monaco-scrollable-element.modified-in-monaco-diff-editor .slider {
+  border-radius: 999px;
+}
+.stream-monaco-diff-root .monaco-editor .line-numbers {
+  color: var(--stream-monaco-line-number) !important;
+  left: var(--stream-monaco-line-number-left) !important;
+  width: var(--stream-monaco-line-number-width) !important;
+  text-align: var(--stream-monaco-line-number-align) !important;
+}
+.stream-monaco-diff-root .monaco-editor .line-numbers.active-line-number {
+  color: var(--stream-monaco-line-number-active) !important;
+}
+.stream-monaco-diff-root .monaco-editor .line-delete.line-numbers,
+.stream-monaco-diff-root .monaco-diff-editor .line-delete.line-numbers {
+  color: var(--stream-monaco-removed-fg) !important;
+}
+.stream-monaco-diff-root .monaco-editor .line-insert.line-numbers,
+.stream-monaco-diff-root .monaco-diff-editor .line-insert.line-numbers {
+  color: var(--stream-monaco-added-fg) !important;
+}
+.stream-monaco-diff-root .monaco-diff-editor .editor.original .margin,
+.stream-monaco-diff-root .monaco-diff-editor .editor.original .margin-view-overlays,
+.stream-monaco-diff-root .monaco-diff-editor .editor.original .margin-view-zones {
+  width: var(--stream-monaco-original-margin-width, auto) !important;
+}
+.stream-monaco-diff-root .monaco-diff-editor .editor.original .current-line {
+  width: var(--stream-monaco-original-margin-width, auto) !important;
+}
+.stream-monaco-diff-root .monaco-diff-editor .editor.original .monaco-scrollable-element.editor-scrollable {
+  left: var(--stream-monaco-original-scrollable-left, auto) !important;
+  width: var(--stream-monaco-original-scrollable-width, auto) !important;
+}
+.stream-monaco-diff-root .monaco-diff-editor .editor.modified .margin,
+.stream-monaco-diff-root .monaco-diff-editor .editor.modified .margin-view-overlays,
+.stream-monaco-diff-root .monaco-diff-editor .editor.modified .margin-view-zones {
+  width: var(--stream-monaco-modified-margin-width) !important;
+}
+.stream-monaco-diff-root .monaco-diff-editor .editor.modified .current-line {
+  width: var(--stream-monaco-modified-margin-width) !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;
+  width: var(
+    --stream-monaco-modified-scrollable-width,
+    calc(100% - var(--stream-monaco-modified-margin-width))
+  ) !important;
+}
+.stream-monaco-diff-root .monaco-editor .diagonal-fill {
+  opacity: 0.38;
+  background-size: 10px 10px;
 }
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines-widget {
   pointer-events: auto;
   box-sizing: border-box;
 }
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .diff-hidden-lines-widget,
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .fold-unchanged {
+  display: none !important;
+}
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .diff-hidden-lines {
+  display: none !important;
+}
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original {
+  width: 0 !important;
+  min-width: 0 !important;
+  flex: 0 0 0 !important;
+  border: 0 !important;
+  overflow: hidden !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.modified {
+  left: 0 !important;
+  width: 100% !important;
+  border-left: 0 !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,
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .line-insert,
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .line-numbers,
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-diff-editor .editor.original .diagonal-fill {
+  opacity: 0 !important;
+  background: transparent !important;
+  box-shadow: none !important;
+  pointer-events: none !important;
+}
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines {
   height: auto;
   width: 100%;
-  transform: translateY(-10px);
-  padding: 4px 4px 6px;
+  transform: none;
+  padding: 0 8px;
   box-sizing: border-box;
 }
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-editor .diff-hidden-lines-widget {
+  height: 24px !important;
+}
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-editor .diff-hidden-lines {
+  height: 24px;
+  padding: 0 8px;
+}
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines .top,
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines .bottom {
   display: none !important;
@@ -726,18 +1538,30 @@ var DiffEditorManager = class DiffEditorManager {
 }
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center {
   align-items: center;
-  gap: 10px;
-  max-width: calc(100% - 6px);
+  gap: 0;
+  max-width: calc(100% - 4px);
   min-height: 32px;
   margin: 0 auto;
-  padding: 4px 10px 4px 8px;
-  border-radius: 14px;
-  border: 1px solid var(--stream-monaco-border);
-  background: linear-gradient(180deg, var(--stream-monaco-surface) 0%, color-mix(in srgb, var(--stream-monaco-surface) 92%, var(--stream-monaco-editor-bg) 8%) 100%);
-  box-shadow: 0 14px 26px -22px var(--stream-monaco-widget-shadow);
+  padding: 0;
+  border-radius: 12px;
+  border: 1px solid color-mix(in srgb, var(--stream-monaco-editor-fg) 8%, transparent);
+  background: color-mix(
+    in srgb,
+    var(--stream-monaco-editor-bg) 96%,
+    var(--stream-monaco-editor-fg) 4%
+  );
+  box-shadow: 0 18px 28px -28px var(--stream-monaco-widget-shadow);
   box-sizing: border-box;
   overflow: hidden;
-  transition: background-color 0.16s ease, border-color 0.16s ease, box-shadow 0.16s ease, transform 0.16s ease;
+  transition: background-color 0.16s ease, border-color 0.16s ease, box-shadow 0.16s ease;
+}
+.stream-monaco-diff-root.stream-monaco-diff-inline .monaco-editor .diff-hidden-lines .center {
+  min-height: 24px;
+  height: 24px;
+  border-radius: 10px;
+}
+.stream-monaco-diff-root.stream-monaco-diff-unchanged-style-simple .monaco-editor .diff-hidden-lines .center {
+  min-height: 28px;
 }
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center.stream-monaco-clickable {
   cursor: pointer;
@@ -754,27 +1578,47 @@ var DiffEditorManager = class DiffEditorManager {
   visibility: hidden;
 }
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center.stream-monaco-unchanged-merged-secondary {
-  padding-left: 10px;
+  padding-left: 0;
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .monaco-editor .diff-hidden-lines .center,
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge {
+  border-color: color-mix(in srgb, var(--stream-monaco-editor-fg) 16%, transparent);
+  background: color-mix(
+    in srgb,
+    var(--stream-monaco-editor-bg) 88%,
+    var(--stream-monaco-editor-fg) 12%
+  );
+  box-shadow: 0 22px 34px -30px rgb(2 6 23 / 0.92);
 }
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center:hover,
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center.stream-monaco-focus-within {
-  background: linear-gradient(180deg, var(--stream-monaco-surface-hover) 0%, color-mix(in srgb, var(--stream-monaco-surface-hover) 92%, var(--stream-monaco-editor-bg) 8%) 100%);
-  border-color: var(--stream-monaco-border-strong);
-  box-shadow: 0 18px 30px -24px var(--stream-monaco-widget-shadow);
-  transform: translateY(-1px);
+  background: color-mix(
+    in srgb,
+    var(--stream-monaco-editor-bg) 94%,
+    var(--stream-monaco-editor-fg) 6%
+  );
+  border-color: color-mix(in srgb, var(--stream-monaco-editor-fg) 12%, transparent);
+  box-shadow: 0 18px 30px -28px var(--stream-monaco-widget-shadow);
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .monaco-editor .diff-hidden-lines .center:hover,
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .monaco-editor .diff-hidden-lines .center.stream-monaco-focus-within,
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-summary:hover,
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-summary:focus-visible,
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-summary.stream-monaco-focus-visible {
+  background: color-mix(
+    in srgb,
+    var(--stream-monaco-editor-bg) 82%,
+    var(--stream-monaco-editor-fg) 18%
+  );
+  border-color: color-mix(in srgb, var(--stream-monaco-editor-fg) 22%, transparent);
+  box-shadow: 0 24px 36px -30px rgb(2 6 23 / 0.94);
 }
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center.stream-monaco-unchanged-merged-secondary .stream-monaco-unchanged-primary {
   display: none !important;
 }
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-primary,
 .stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-primary {
-  display: flex;
-  align-items: center;
-  flex: 0 0 auto;
-  width: auto !important;
-  min-width: max-content;
-  overflow: visible;
-  justify-content: flex-start !important;
+  display: none !important;
 }
 .stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-primary {
   width: 100% !important;
@@ -792,7 +1636,7 @@ var DiffEditorManager = class DiffEditorManager {
   border-radius: 999px;
   text-decoration: none;
   color: inherit;
-  background: color-mix(in srgb, var(--stream-monaco-unchanged-fg) 12%, transparent);
+  background: color-mix(in srgb, var(--stream-monaco-unchanged-fg) 10%, var(--stream-monaco-editor-bg) 90%);
   border: 1px solid color-mix(in srgb, var(--stream-monaco-unchanged-fg) 10%, transparent);
   font-size: 11px;
   font-weight: 700;
@@ -815,8 +1659,8 @@ var DiffEditorManager = class DiffEditorManager {
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-expand:hover,
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-expand:focus-visible,
 .stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-expand:hover {
-  background: color-mix(in srgb, var(--stream-monaco-unchanged-fg) 18%, transparent);
-  border-color: color-mix(in srgb, var(--stream-monaco-unchanged-fg) 22%, transparent);
+  background: color-mix(in srgb, var(--stream-monaco-unchanged-fg) 14%, var(--stream-monaco-editor-bg) 86%);
+  border-color: color-mix(in srgb, var(--stream-monaco-unchanged-fg) 18%, transparent);
   transform: translateY(-1px);
 }
 .stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-expand:hover {
@@ -828,28 +1672,38 @@ var DiffEditorManager = class DiffEditorManager {
 .stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-meta {
   display: flex;
   align-items: center;
-  gap: 8px;
+  gap: 10px;
   min-width: 0;
   flex: 1 1 auto;
   overflow: hidden;
-  color: var(--stream-monaco-muted);
+  color: color-mix(in srgb, var(--stream-monaco-editor-fg) 54%, transparent);
   white-space: nowrap;
 }
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-meta,
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-meta {
+  color: color-mix(in srgb, var(--stream-monaco-editor-fg) 78%, transparent);
+}
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center.stream-monaco-unchanged-merged-secondary .stream-monaco-unchanged-meta {
-  justify-content: center;
+  justify-content: flex-start;
 }
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-count,
 .stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-count {
   display: inline-flex;
   align-items: center;
   flex: 0 0 auto;
-  padding: 2px 8px;
-  border-radius: 999px;
-  background: var(--stream-monaco-surface-soft);
-  color: var(--stream-monaco-unchanged-fg);
-  font-size: 11px;
-  font-weight: 700;
-  letter-spacing: 0.01em;
+  padding: 0;
+  border-radius: 0;
+  background: transparent;
+  color: color-mix(in srgb, var(--stream-monaco-editor-fg) 58%, transparent);
+  font-size: 13px;
+  line-height: 14px;
+  font-weight: 500;
+  letter-spacing: 0;
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-count,
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-count {
+  color: color-mix(in srgb, var(--stream-monaco-editor-fg) 92%, transparent);
+  font-weight: 600;
 }
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-separator {
   flex: 0 0 auto;
@@ -879,49 +1733,341 @@ var DiffEditorManager = class DiffEditorManager {
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center.stream-monaco-unchanged-merged-secondary .stream-monaco-unchanged-breadcrumb {
   display: none;
 }
+.stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-meta {
+  justify-content: flex-start;
+  padding: 0 18px 0 16px;
+}
+.stream-monaco-diff-root.stream-monaco-diff-unchanged-style-metadata .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-meta {
+  padding: 0 28px;
+}
+.stream-monaco-diff-root.stream-monaco-diff-unchanged-style-simple .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-meta {
+  justify-content: center;
+  padding: 0 10px;
+}
+.stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-separator,
+.stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-breadcrumb,
+.stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-expand {
+  display: none !important;
+}
 .stream-monaco-diff-root .stream-monaco-diff-unchanged-overlay {
   position: absolute;
   inset: 0;
   pointer-events: none;
   z-index: 12;
 }
+.stream-monaco-diff-root.stream-monaco-diff-inline .stream-monaco-diff-unchanged-overlay {
+  display: none !important;
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-overlay [hidden] {
+  display: none !important;
+}
 .stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge {
   position: absolute;
   display: grid;
-  grid-template-columns: minmax(max-content, 1fr) auto minmax(max-content, 1fr);
+  grid-template-columns: var(--stream-monaco-unchanged-rail-width, 54px) minmax(0, 1fr);
   align-items: center;
-  column-gap: 12px;
+  column-gap: 0;
   min-height: 32px;
-  padding: 4px 12px 4px 10px;
-  border-radius: 14px;
-  border: 1px solid color-mix(in srgb, var(--stream-monaco-unchanged-fg) 24%, transparent);
-  background: linear-gradient(180deg, color-mix(in srgb, var(--stream-monaco-editor-bg) 88%, var(--stream-monaco-unchanged-fg) 12%) 0%, color-mix(in srgb, var(--stream-monaco-editor-bg) 94%, var(--stream-monaco-unchanged-fg) 6%) 100%);
-  box-shadow: 0 14px 26px -22px var(--stream-monaco-widget-shadow);
+  padding: 0;
+  border-radius: 12px;
+  border: 1px solid color-mix(in srgb, var(--stream-monaco-editor-fg) 8%, transparent);
+  background: color-mix(
+    in srgb,
+    var(--stream-monaco-editor-bg) 96%,
+    var(--stream-monaco-editor-fg) 4%
+  );
+  box-shadow: 0 18px 28px -28px var(--stream-monaco-widget-shadow);
   box-sizing: border-box;
   overflow: hidden;
   pointer-events: auto;
-  transition: background-color 0.16s ease, border-color 0.16s ease, box-shadow 0.16s ease, transform 0.16s ease;
+  transition: background-color 0.16s ease, border-color 0.16s ease, box-shadow 0.16s ease;
 }
-.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge:hover,
-.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge.stream-monaco-focus-visible {
-  background: linear-gradient(180deg, color-mix(in srgb, var(--stream-monaco-editor-bg) 84%, var(--stream-monaco-unchanged-fg) 16%) 0%, color-mix(in srgb, var(--stream-monaco-editor-bg) 92%, var(--stream-monaco-unchanged-fg) 8%) 100%);
-  border-color: color-mix(in srgb, var(--stream-monaco-unchanged-fg) 32%, transparent);
-  box-shadow: 0 18px 30px -24px var(--stream-monaco-widget-shadow);
-  transform: translateY(-1px);
+.stream-monaco-diff-root.stream-monaco-diff-side-by-side .stream-monaco-diff-unchanged-bridge {
+  min-height: 24px;
+  border-radius: 10px;
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge:not(.stream-monaco-diff-unchanged-bridge-metadata):not(.stream-monaco-diff-unchanged-bridge-simple) {
+  border-color: color-mix(in srgb, var(--stream-monaco-editor-fg) 18%, transparent);
+  background:
+    linear-gradient(
+      180deg,
+      color-mix(in srgb, var(--stream-monaco-editor-bg) 84%, var(--stream-monaco-editor-fg) 16%) 0%,
+      color-mix(in srgb, var(--stream-monaco-editor-bg) 88%, var(--stream-monaco-editor-fg) 12%) 100%
+    );
+  box-shadow:
+    inset 0 1px 0 rgb(255 255 255 / 0.03),
+    0 22px 34px -30px rgb(2 6 23 / 0.92);
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-metadata {
+  grid-template-columns: minmax(0, 1fr);
+  min-height: 32px;
+  border-radius: 0;
+  border-left: 0;
+  border-right: 0;
+  box-shadow: none;
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-metadata {
+  border-top: 1px solid color-mix(in srgb, var(--stream-monaco-editor-fg) 14%, transparent);
+  border-bottom: 1px solid color-mix(in srgb, var(--stream-monaco-editor-fg) 14%, transparent);
+  background: color-mix(
+    in srgb,
+    var(--stream-monaco-editor-bg) 92%,
+    var(--stream-monaco-editor-fg) 8%
+  );
+  box-shadow:
+    inset 0 1px 0 rgb(255 255 255 / 0.02),
+    inset 0 -1px 0 rgb(15 23 42 / 0.22);
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-simple {
+  grid-template-columns: minmax(0, 1fr);
+  min-height: 28px;
+  border: 0;
+  border-radius: 0;
+  background: transparent;
+  box-shadow: none;
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-simple {
+  background: transparent;
 }
 .stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge:focus {
   outline: none;
 }
-.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-meta {
-  justify-self: center;
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-rail {
+  display: grid;
+  grid-auto-rows: minmax(0, 1fr);
+  align-self: stretch;
+  min-height: 100%;
+  border-right: 1px solid color-mix(in srgb, var(--stream-monaco-editor-fg) 7%, transparent);
+  background: color-mix(
+    in srgb,
+    var(--stream-monaco-editor-bg) 94%,
+    var(--stream-monaco-editor-fg) 6%
+  );
+  z-index: 1;
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-rail {
+  border-right-color: color-mix(in srgb, var(--stream-monaco-editor-fg) 12%, transparent);
+  background:
+    linear-gradient(
+      180deg,
+      color-mix(in srgb, var(--stream-monaco-editor-bg) 82%, var(--stream-monaco-editor-fg) 18%) 0%,
+      color-mix(in srgb, var(--stream-monaco-editor-bg) 88%, var(--stream-monaco-editor-fg) 12%) 100%
+    );
+  box-shadow:
+    inset 0 1px 0 rgb(255 255 255 / 0.04),
+    inset -1px 0 0 rgb(15 23 42 / 0.22);
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-line-info .stream-monaco-unchanged-rail {
+  justify-items: stretch;
+  border-right: 1px solid color-mix(in srgb, var(--stream-monaco-editor-fg) 8%, transparent);
+  background: color-mix(
+    in srgb,
+    var(--stream-monaco-editor-bg) 92%,
+    var(--stream-monaco-editor-fg) 8%
+  );
+  border-radius: 10px 0 0 10px;
+  overflow: hidden;
+  box-shadow: inset -1px 0 0 color-mix(in srgb, var(--stream-monaco-editor-fg) 6%, transparent);
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-line-info .stream-monaco-unchanged-rail {
+  border-right-color: color-mix(in srgb, var(--stream-monaco-editor-fg) 14%, transparent);
+  background: color-mix(
+    in srgb,
+    var(--stream-monaco-editor-bg) 80%,
+    var(--stream-monaco-editor-fg) 20%
+  );
+  box-shadow:
+    inset 0 1px 0 rgb(255 255 255 / 0.04),
+    inset -1px 0 0 rgb(15 23 42 / 0.24);
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-reveal {
+  border-bottom-color: color-mix(in srgb, var(--stream-monaco-editor-fg) 12%, transparent);
+  color: color-mix(in srgb, var(--stream-monaco-editor-fg) 68%, transparent);
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-reveal {
+  appearance: none;
+  display: inline-flex;
+  align-items: center;
   justify-content: center;
+  width: 100%;
+  min-height: 15px;
+  padding: 0;
+  border: 0;
+  border-bottom: 1px solid color-mix(in srgb, var(--stream-monaco-editor-fg) 7%, transparent);
+  background: transparent;
+  color: color-mix(in srgb, var(--stream-monaco-editor-fg) 54%, transparent);
+  cursor: pointer;
+  font: inherit;
+  transition: background-color 0.14s ease, color 0.14s ease;
 }
-.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-spacer {
-  display: block;
-  visibility: hidden;
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-line-info .stream-monaco-unchanged-reveal {
   width: 100%;
-  height: 1px;
-  flex: 0 0 auto;
+  min-width: 100%;
+  margin-left: 0;
+  border-bottom-color: color-mix(in srgb, var(--stream-monaco-editor-fg) 8%, transparent);
+  background: transparent;
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-line-info .stream-monaco-unchanged-reveal:first-child {
+  border-radius: 10px 0 0 0;
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-line-info .stream-monaco-unchanged-reveal:last-child {
+  border-radius: 0 0 0 10px;
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-line-info .stream-monaco-unchanged-reveal:first-child:last-child {
+  border-radius: 10px 0 0 10px;
+}
+.stream-monaco-diff-root.stream-monaco-diff-side-by-side .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-reveal {
+  min-height: 12px;
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-reveal .codicon {
+  font-size: 18px;
+  line-height: 1;
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-reveal:last-child {
+  border-bottom: 0;
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-reveal:hover,
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-reveal:focus-visible,
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-reveal.stream-monaco-focus-visible {
+  background: color-mix(in srgb, var(--stream-monaco-editor-bg) 88%, var(--stream-monaco-editor-fg) 12%);
+  color: color-mix(in srgb, var(--stream-monaco-editor-fg) 68%, transparent);
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-reveal:hover,
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-reveal:focus-visible,
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-reveal.stream-monaco-focus-visible {
+  background: color-mix(in srgb, var(--stream-monaco-editor-bg) 74%, var(--stream-monaco-editor-fg) 26%);
+  color: color-mix(in srgb, var(--stream-monaco-editor-fg) 90%, transparent);
+  box-shadow: inset 0 1px 0 rgb(255 255 255 / 0.06);
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-line-info .stream-monaco-unchanged-reveal {
+  border-bottom-color: color-mix(in srgb, var(--stream-monaco-editor-fg) 14%, transparent);
+  background: transparent;
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-summary {
+  appearance: none;
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  min-width: 0;
+  min-height: 30px;
+  padding: 0 18px 0 16px;
+  border: 0;
+  background: transparent;
+  box-sizing: border-box;
+  color: inherit;
+  text-align: left;
+  cursor: pointer;
+  font: inherit;
+  z-index: 1;
+  transition: background-color 0.14s ease;
+}
+.stream-monaco-diff-root.stream-monaco-diff-side-by-side .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-summary {
+  min-height: 22px;
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-summary.stream-monaco-unchanged-summary-metadata {
+  min-height: 30px;
+  padding: 0 28px;
+  cursor: default;
+  pointer-events: none;
+}
+.stream-monaco-diff-root.stream-monaco-diff-side-by-side .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-summary.stream-monaco-unchanged-summary-metadata {
+  min-height: 22px;
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-summary.stream-monaco-unchanged-summary-simple {
+  justify-content: center;
+  min-height: 28px;
+  padding: 0 10px;
+  cursor: default;
+  pointer-events: none;
+}
+.stream-monaco-diff-root.stream-monaco-diff-side-by-side .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-summary.stream-monaco-unchanged-summary-simple {
+  min-height: 22px;
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-summary:hover,
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-summary:focus-visible,
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-summary.stream-monaco-focus-visible {
+  background: color-mix(in srgb, var(--stream-monaco-editor-bg) 91%, var(--stream-monaco-editor-fg) 9%);
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-simple .stream-monaco-unchanged-summary:hover,
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-simple .stream-monaco-unchanged-summary:focus-visible,
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-simple .stream-monaco-unchanged-summary.stream-monaco-focus-visible {
+  background: transparent;
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-simple .stream-monaco-unchanged-summary:hover,
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-simple .stream-monaco-unchanged-summary:focus-visible,
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-simple .stream-monaco-unchanged-summary.stream-monaco-focus-visible {
+  background: color-mix(in srgb, var(--stream-monaco-editor-bg) 96%, transparent);
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-metadata .stream-monaco-unchanged-summary:hover,
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-metadata .stream-monaco-unchanged-summary:focus-visible,
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-metadata .stream-monaco-unchanged-summary.stream-monaco-focus-visible {
+  background: transparent;
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-metadata .stream-monaco-unchanged-summary:hover,
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-metadata .stream-monaco-unchanged-summary:focus-visible,
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-metadata .stream-monaco-unchanged-summary.stream-monaco-focus-visible {
+  background: transparent;
+  box-shadow: none;
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-meta {
+  justify-self: stretch;
+  justify-content: flex-start;
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-meta.stream-monaco-unchanged-meta-simple {
+  justify-content: center;
+}
+.stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-metadata-label,
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-metadata-label {
+  display: inline-flex;
+  align-items: center;
+  min-width: 0;
+  color: color-mix(in srgb, var(--stream-monaco-editor-fg) 60%, transparent);
+  font-size: 13px;
+  line-height: 14px;
+  font-weight: 500;
+  letter-spacing: 0.01em;
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-metadata-label,
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-metadata-label {
+  color: color-mix(in srgb, var(--stream-monaco-editor-fg) 88%, transparent);
+  font-weight: 550;
+}
+.stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-simple-bar,
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-simple-bar {
+  width: min(100%, calc(100% - 20px));
+  height: 10px;
+  border-radius: 999px;
+  background: color-mix(in srgb, var(--stream-monaco-editor-bg) 88%, var(--stream-monaco-editor-fg) 12%);
+  box-shadow: inset 0 1px 0 rgb(255 255 255 / 0.7);
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .monaco-editor .diff-hidden-lines .center .stream-monaco-unchanged-simple-bar,
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-simple-bar {
+  height: 9px;
+  background: linear-gradient(
+    90deg,
+    color-mix(in srgb, var(--stream-monaco-editor-bg) 78%, var(--stream-monaco-editor-fg) 22%) 0%,
+    color-mix(in srgb, var(--stream-monaco-editor-bg) 72%, var(--stream-monaco-editor-fg) 28%) 100%
+  );
+  box-shadow:
+    inset 0 1px 0 rgb(255 255 255 / 0.04),
+    inset 0 0 0 1px rgb(148 163 184 / 0.06);
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-pane-divider {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: var(--stream-monaco-unchanged-split-offset, 50%);
+  width: 1px;
+  background: color-mix(in srgb, var(--stream-monaco-editor-fg) 7%, transparent);
+  pointer-events: none;
+  transform: translateX(-0.5px);
+}
+.stream-monaco-diff-root.stream-monaco-diff-appearance-dark .stream-monaco-diff-unchanged-bridge .stream-monaco-unchanged-pane-divider {
+  background: color-mix(in srgb, var(--stream-monaco-editor-fg) 12%, transparent);
+}
+.stream-monaco-diff-root .stream-monaco-diff-unchanged-bridge.stream-monaco-diff-unchanged-bridge-simple .stream-monaco-unchanged-pane-divider {
+  top: 8px;
+  bottom: 8px;
 }
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines-compact {
   align-items: center;
@@ -931,7 +2077,7 @@ var DiffEditorManager = class DiffEditorManager {
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines-compact .text {
   padding: 0 6px;
   border-radius: 999px;
-  background: var(--stream-monaco-surface-soft);
+  background: color-mix(in srgb, var(--stream-monaco-unchanged-fg) 10%, var(--stream-monaco-editor-bg) 90%);
   color: var(--stream-monaco-unchanged-fg);
 }
 .stream-monaco-diff-root .monaco-editor .fold-unchanged {
@@ -943,10 +2089,10 @@ var DiffEditorManager = class DiffEditorManager {
   margin-left: 4px;
   border-radius: 999px;
   color: var(--stream-monaco-unchanged-fg);
-  background: var(--stream-monaco-surface);
+  background: color-mix(in srgb, var(--stream-monaco-surface) 92%, var(--stream-monaco-editor-bg) 8%);
   border: 1px solid var(--stream-monaco-border);
-  box-shadow: 0 10px 18px -18px var(--stream-monaco-widget-shadow);
-  opacity: 0.88 !important;
+  box-shadow: 0 12px 20px -18px var(--stream-monaco-widget-shadow);
+  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:hover,
@@ -955,7 +2101,7 @@ var DiffEditorManager = class DiffEditorManager {
   transform: translateY(-1px);
   background: var(--stream-monaco-surface-hover);
   border-color: var(--stream-monaco-border-strong);
-  box-shadow: 0 14px 24px -18px var(--stream-monaco-widget-shadow);
+  box-shadow: 0 16px 26px -18px var(--stream-monaco-widget-shadow);
 }
 .stream-monaco-diff-root .monaco-editor .diff-hidden-lines .center:focus,
 .stream-monaco-diff-root .monaco-editor .fold-unchanged:focus {
@@ -974,29 +2120,43 @@ var DiffEditorManager = class DiffEditorManager {
   display: none;
   gap: 6px;
   pointer-events: auto;
-  padding: 4px;
+  padding: 6px;
   border-radius: 999px;
-  background: color-mix(in srgb, #f8f8f8 92%, #000 8%);
-  border: 1px solid color-mix(in srgb, #ddd 88%, #000 12%);
-  box-shadow: 0 2px 12px rgb(0 0 0 / 10%);
+  background: color-mix(in srgb, var(--stream-monaco-editor-bg) 80%, var(--stream-monaco-editor-fg) 20%);
+  border: 1px solid color-mix(in srgb, var(--stream-monaco-editor-fg) 12%, transparent);
+  box-shadow: 0 18px 34px -24px var(--stream-monaco-widget-shadow);
+  backdrop-filter: blur(14px);
 }
 .stream-monaco-diff-hunk-actions button {
   appearance: none;
-  border: 0;
+  border: 1px solid transparent;
   border-radius: 999px;
-  padding: 3px 9px;
+  padding: 4px 10px;
   font-size: 11px;
   line-height: 1.35;
-  background: white;
-  color: #222;
+  font-weight: 700;
+  background: color-mix(in srgb, var(--stream-monaco-editor-bg) 94%, var(--stream-monaco-editor-fg) 6%);
+  color: var(--stream-monaco-editor-fg);
   cursor: pointer;
+  transition: background-color 0.14s ease, border-color 0.14s ease, transform 0.14s ease;
+}
+.stream-monaco-diff-hunk-actions button[data-action="revert"] {
+  background: color-mix(in srgb, var(--stream-monaco-removed-line) 78%, var(--stream-monaco-editor-bg) 22%);
+  border-color: var(--stream-monaco-removed-border);
+  color: color-mix(in srgb, var(--stream-monaco-removed-fg) 82%, var(--stream-monaco-editor-fg) 18%);
+}
+.stream-monaco-diff-hunk-actions button[data-action="stage"] {
+  background: color-mix(in srgb, var(--stream-monaco-added-line) 78%, var(--stream-monaco-editor-bg) 22%);
+  border-color: var(--stream-monaco-added-border);
+  color: color-mix(in srgb, var(--stream-monaco-added-fg) 82%, var(--stream-monaco-editor-fg) 18%);
 }
 .stream-monaco-diff-hunk-actions button:hover {
-  background: #f1f1f1;
+  transform: translateY(-1px);
 }
 .stream-monaco-diff-hunk-actions button:disabled {
   opacity: 0.45;
   cursor: default;
+  transform: none;
 }
 `;
 		document.head.append(style);
@@ -1062,8 +2222,10 @@ var DiffEditorManager = class DiffEditorManager {
 			modified: current.modified,
 			modelState: this.cloneSerializableValue(this.diffPersistedUnchangedModelState)
 		});
+		this.applyPendingDiffScrollRestore();
 	}
 	scheduleRestorePersistedDiffUnchangedState() {
+		if (this.diffHideUnchangedRegionsDeferred) return;
 		if (!this.diffPersistedUnchangedModelState) return;
 		this.rafScheduler.schedule("restore-diff-unchanged-state", () => {
 			requestAnimationFrame(() => {
@@ -1071,6 +2233,256 @@ var DiffEditorManager = class DiffEditorManager {
 			});
 		});
 	}
+	clearDeferredDiffUnchangedRegionsIdleTimer() {
+		if (this.diffHideUnchangedRegionsIdleTimer != null) {
+			clearTimeout(this.diffHideUnchangedRegionsIdleTimer);
+			this.diffHideUnchangedRegionsIdleTimer = null;
+		}
+	}
+	clearPendingDiffThemeSync() {
+		if (this.diffThemeSyncRafId != null) {
+			cancelAnimationFrame(this.diffThemeSyncRafId);
+			this.diffThemeSyncRafId = null;
+		}
+	}
+	withLockedDiffScrollPosition(callback) {
+		var _originalEditor$getSc, _modifiedEditor$getSc, _originalEditor$getSc2, _modifiedEditor$getSc2;
+		if (!this.diffEditorView) {
+			callback();
+			return;
+		}
+		const originalEditor = this.diffEditorView.getOriginalEditor();
+		const modifiedEditor = this.diffEditorView.getModifiedEditor();
+		const originalTop = ((_originalEditor$getSc = originalEditor.getScrollTop) === null || _originalEditor$getSc === void 0 ? void 0 : _originalEditor$getSc.call(originalEditor)) ?? 0;
+		const modifiedTop = ((_modifiedEditor$getSc = modifiedEditor.getScrollTop) === null || _modifiedEditor$getSc === void 0 ? void 0 : _modifiedEditor$getSc.call(modifiedEditor)) ?? 0;
+		const originalLeft = ((_originalEditor$getSc2 = originalEditor.getScrollLeft) === null || _originalEditor$getSc2 === void 0 ? void 0 : _originalEditor$getSc2.call(originalEditor)) ?? 0;
+		const modifiedLeft = ((_modifiedEditor$getSc2 = modifiedEditor.getScrollLeft) === null || _modifiedEditor$getSc2 === void 0 ? void 0 : _modifiedEditor$getSc2.call(modifiedEditor)) ?? 0;
+		callback();
+		const restore = () => {
+			var _originalEditor$setSc, _modifiedEditor$setSc, _originalEditor$setSc2, _modifiedEditor$setSc2;
+			(_originalEditor$setSc = originalEditor.setScrollTop) === null || _originalEditor$setSc === void 0 || _originalEditor$setSc.call(originalEditor, originalTop);
+			(_modifiedEditor$setSc = modifiedEditor.setScrollTop) === null || _modifiedEditor$setSc === void 0 || _modifiedEditor$setSc.call(modifiedEditor, modifiedTop);
+			(_originalEditor$setSc2 = originalEditor.setScrollLeft) === null || _originalEditor$setSc2 === void 0 || _originalEditor$setSc2.call(originalEditor, originalLeft);
+			(_modifiedEditor$setSc2 = modifiedEditor.setScrollLeft) === null || _modifiedEditor$setSc2 === void 0 || _modifiedEditor$setSc2.call(modifiedEditor, modifiedLeft);
+		};
+		restore();
+		requestAnimationFrame(restore);
+	}
+	captureDiffScrollPosition() {
+		var _originalEditor$getSc3, _modifiedEditor$getSc3, _originalEditor$getSc4, _modifiedEditor$getSc4;
+		if (!this.diffEditorView) return null;
+		const originalEditor = this.diffEditorView.getOriginalEditor();
+		const modifiedEditor = this.diffEditorView.getModifiedEditor();
+		return {
+			originalTop: ((_originalEditor$getSc3 = originalEditor.getScrollTop) === null || _originalEditor$getSc3 === void 0 ? void 0 : _originalEditor$getSc3.call(originalEditor)) ?? 0,
+			modifiedTop: ((_modifiedEditor$getSc3 = modifiedEditor.getScrollTop) === null || _modifiedEditor$getSc3 === void 0 ? void 0 : _modifiedEditor$getSc3.call(modifiedEditor)) ?? 0,
+			originalLeft: ((_originalEditor$getSc4 = originalEditor.getScrollLeft) === null || _originalEditor$getSc4 === void 0 ? void 0 : _originalEditor$getSc4.call(originalEditor)) ?? 0,
+			modifiedLeft: ((_modifiedEditor$getSc4 = modifiedEditor.getScrollLeft) === null || _modifiedEditor$getSc4 === void 0 ? void 0 : _modifiedEditor$getSc4.call(modifiedEditor)) ?? 0
+		};
+	}
+	captureModifiedViewportAnchor() {
+		var _modifiedEditor$getCo;
+		if (!this.diffEditorView) return null;
+		const modifiedEditor = this.diffEditorView.getModifiedEditor();
+		const editorRoot = (_modifiedEditor$getCo = modifiedEditor.getContainerDomNode) === null || _modifiedEditor$getCo === void 0 ? void 0 : _modifiedEditor$getCo.call(modifiedEditor);
+		if (!(editorRoot instanceof HTMLElement)) return null;
+		const editorRect = editorRoot.getBoundingClientRect();
+		const anchorNode = Array.from(editorRoot.querySelectorAll(".line-numbers")).map((node) => {
+			var _node$textContent;
+			const lineNumber = Number.parseInt(((_node$textContent = node.textContent) === null || _node$textContent === void 0 ? void 0 : _node$textContent.trim()) || "", 10);
+			const rect = node.getBoundingClientRect();
+			return {
+				node,
+				lineNumber,
+				rect
+			};
+		}).filter(({ lineNumber, rect }) => {
+			return Number.isFinite(lineNumber) && rect.height > 0 && rect.bottom > editorRect.top + 1 && rect.top < editorRect.bottom - 1;
+		}).sort((a, b) => a.rect.top - b.rect.top)[0];
+		if (!anchorNode) return null;
+		return {
+			lineNumber: anchorNode.lineNumber,
+			topOffset: anchorNode.rect.top - editorRect.top
+		};
+	}
+	restoreDiffScrollPosition(position) {
+		if (!this.diffEditorView || !position) return;
+		const originalEditor = this.diffEditorView.getOriginalEditor();
+		const modifiedEditor = this.diffEditorView.getModifiedEditor();
+		const apply = () => {
+			var _originalEditor$setSc3, _modifiedEditor$setSc3, _originalEditor$setSc4, _modifiedEditor$setSc4;
+			(_originalEditor$setSc3 = originalEditor.setScrollTop) === null || _originalEditor$setSc3 === void 0 || _originalEditor$setSc3.call(originalEditor, position.originalTop);
+			(_modifiedEditor$setSc3 = modifiedEditor.setScrollTop) === null || _modifiedEditor$setSc3 === void 0 || _modifiedEditor$setSc3.call(modifiedEditor, position.modifiedTop);
+			(_originalEditor$setSc4 = originalEditor.setScrollLeft) === null || _originalEditor$setSc4 === void 0 || _originalEditor$setSc4.call(originalEditor, position.originalLeft);
+			(_modifiedEditor$setSc4 = modifiedEditor.setScrollLeft) === null || _modifiedEditor$setSc4 === void 0 || _modifiedEditor$setSc4.call(modifiedEditor, position.modifiedLeft);
+		};
+		apply();
+		requestAnimationFrame(() => {
+			apply();
+			requestAnimationFrame(apply);
+		});
+	}
+	restoreModifiedViewportAnchor(anchor) {
+		var _modifiedEditor$getCo2;
+		if (!this.diffEditorView || !anchor) return;
+		const originalEditor = this.diffEditorView.getOriginalEditor();
+		const modifiedEditor = this.diffEditorView.getModifiedEditor();
+		const editorRoot = (_modifiedEditor$getCo2 = modifiedEditor.getContainerDomNode) === null || _modifiedEditor$getCo2 === void 0 ? void 0 : _modifiedEditor$getCo2.call(modifiedEditor);
+		if (!(editorRoot instanceof HTMLElement)) return;
+		const apply = () => {
+			var _Array$from$map$find, _modifiedEditor$getSc5, _originalEditor$setSc5, _modifiedEditor$setSc5;
+			const editorRect = editorRoot.getBoundingClientRect();
+			const currentNode = (_Array$from$map$find = Array.from(editorRoot.querySelectorAll(".line-numbers")).map((node) => {
+				var _node$textContent2;
+				const lineNumber = Number.parseInt(((_node$textContent2 = node.textContent) === null || _node$textContent2 === void 0 ? void 0 : _node$textContent2.trim()) || "", 10);
+				return {
+					node,
+					lineNumber
+				};
+			}).find(({ lineNumber }) => lineNumber === anchor.lineNumber)) === null || _Array$from$map$find === void 0 ? void 0 : _Array$from$map$find.node;
+			if (!(currentNode instanceof HTMLElement)) return;
+			const currentTop = currentNode.getBoundingClientRect().top - editorRect.top;
+			const delta = currentTop - anchor.topOffset;
+			if (Math.abs(delta) < .5) return;
+			const nextTop = (((_modifiedEditor$getSc5 = modifiedEditor.getScrollTop) === null || _modifiedEditor$getSc5 === void 0 ? void 0 : _modifiedEditor$getSc5.call(modifiedEditor)) ?? 0) + delta;
+			(_originalEditor$setSc5 = originalEditor.setScrollTop) === null || _originalEditor$setSc5 === void 0 || _originalEditor$setSc5.call(originalEditor, nextTop);
+			(_modifiedEditor$setSc5 = modifiedEditor.setScrollTop) === null || _modifiedEditor$setSc5 === void 0 || _modifiedEditor$setSc5.call(modifiedEditor, nextTop);
+		};
+		apply();
+	}
+	scheduleRestoreModifiedViewportAnchor(anchor, durationFrames = 8, delayFrames = 0) {
+		if (!anchor) return;
+		let remainingDelay = Math.max(0, delayFrames);
+		let remainingFrames = Math.max(0, durationFrames);
+		const step = () => {
+			if (remainingDelay > 0) {
+				remainingDelay--;
+				requestAnimationFrame(step);
+				return;
+			}
+			this.restoreModifiedViewportAnchor(anchor);
+			if (remainingFrames <= 0) return;
+			remainingFrames--;
+			requestAnimationFrame(step);
+		};
+		step();
+	}
+	queuePendingDiffScrollRestore(position, budget = 2) {
+		if (!position || budget < 1) {
+			this.pendingDiffScrollRestorePosition = null;
+			this.pendingDiffScrollRestoreBudget = 0;
+			return;
+		}
+		this.pendingDiffScrollRestorePosition = { ...position };
+		this.pendingDiffScrollRestoreBudget = budget;
+	}
+	applyPendingDiffScrollRestore() {
+		if (!this.pendingDiffScrollRestorePosition || this.pendingDiffScrollRestoreBudget < 1) return;
+		this.restoreDiffScrollPosition(this.pendingDiffScrollRestorePosition);
+		this.pendingDiffScrollRestoreBudget -= 1;
+		if (this.pendingDiffScrollRestoreBudget < 1) this.pendingDiffScrollRestorePosition = null;
+	}
+	resolveDiffPresentationEditorOptions(hideUnchangedRegions = this.resolveDiffHideUnchangedRegionsOption()) {
+		return {
+			readOnly: this.options.readOnly ?? true,
+			lineDecorationsWidth: this.options.lineDecorationsWidth,
+			lineNumbersMinChars: this.options.lineNumbersMinChars,
+			glyphMargin: this.options.glyphMargin,
+			fontFamily: this.options.fontFamily,
+			fontSize: this.options.fontSize,
+			lineHeight: this.options.lineHeight,
+			padding: this.options.padding,
+			renderLineHighlight: this.options.renderLineHighlight,
+			renderLineHighlightOnlyWhenFocus: this.options.renderLineHighlightOnlyWhenFocus,
+			renderOverviewRuler: this.options.renderOverviewRuler,
+			scrollBeyondLastLine: this.options.scrollBeyondLastLine ?? false,
+			scrollbar: {
+				...defaultScrollbar,
+				...this.options.scrollbar || {}
+			},
+			hideUnchangedRegions: this.diffHideUnchangedRegionsDeferred ? {
+				...hideUnchangedRegions,
+				enabled: false
+			} : hideUnchangedRegions
+		};
+	}
+	refreshDiffPresentation() {
+		var _this$diffHeightManag;
+		if (!this.diffEditorView) return;
+		const hideUnchangedRegions = this.resolveDiffHideUnchangedRegionsOption();
+		const presentationOptions = this.resolveDiffPresentationEditorOptions(hideUnchangedRegions);
+		this.diffHideUnchangedRegionsResolved = hideUnchangedRegions;
+		this.diffUpdateThrottleMs = this.resolveDiffStreamingThrottleMs();
+		if (this.lastContainer) {
+			this.lastContainer.style.maxHeight = this.maxHeightCSS;
+			this.lastContainer.style.removeProperty("--stream-monaco-editor-bg");
+			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);
+		});
+		(_this$diffHeightManag = this.diffHeightManager) === null || _this$diffHeightManag === void 0 || _this$diffHeightManag.update();
+		this.applyDiffRootAppearanceClass();
+		this.schedulePatchDiffUnchangedRegionsAfterInteraction(1);
+		this.repositionDiffHunkNodes();
+	}
+	restoreDeferredDiffUnchangedRegions() {
+		this.clearDeferredDiffUnchangedRegionsIdleTimer();
+		if (!this.diffEditorView) return;
+		const hideUnchangedRegions = this.diffHideUnchangedRegionsResolved;
+		if (!(hideUnchangedRegions === null || hideUnchangedRegions === void 0 ? void 0 : hideUnchangedRegions.enabled)) return;
+		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 });
+		});
+		this.schedulePatchDiffUnchangedRegionsAfterInteraction(1);
+		if (this.shouldAutoScrollDiff) {
+			var _this$modifiedModel;
+			this.maybeScrollDiffToBottom((_this$modifiedModel = this.modifiedModel) === null || _this$modifiedModel === void 0 ? void 0 : _this$modifiedModel.getLineCount());
+		}
+	}
+	markDiffStreamingActivity() {
+		const hideUnchangedRegions = this.diffHideUnchangedRegionsResolved;
+		if (!this.diffEditorView || !(hideUnchangedRegions === null || hideUnchangedRegions === void 0 ? void 0 : hideUnchangedRegions.enabled)) return;
+		this.clearDeferredDiffUnchangedRegionsIdleTimer();
+		this.rafScheduler.cancel("restore-diff-unchanged-state");
+		this.diffHideUnchangedRegionsIdleTimer = setTimeout(() => {
+			this.restoreDeferredDiffUnchangedRegions();
+		}, 1800);
+		if (this.diffHideUnchangedRegionsDeferred) return;
+		this.diffHideUnchangedRegionsDeferred = true;
+		this.hideAllDiffUnchangedBridgeEntries();
+		this.withLockedDiffScrollPosition(() => {
+			var _this$diffEditorView15;
+			(_this$diffEditorView15 = this.diffEditorView) === null || _this$diffEditorView15 === void 0 || _this$diffEditorView15.updateOptions({ hideUnchangedRegions: {
+				...hideUnchangedRegions,
+				enabled: false
+			} });
+		});
+		this.schedulePatchDiffUnchangedRegionsAfterInteraction(1);
+	}
+	notifyThemeChange(themeName) {
+		const resolvedThemeName = typeof themeName === "string" ? themeName : themeName === null || themeName === void 0 ? void 0 : themeName.name;
+		if (typeof resolvedThemeName === "string") this.options.theme = resolvedThemeName;
+		this.diffRootAppearanceSignature = null;
+		this.clearPendingDiffThemeSync();
+		if (this.lastContainer) {
+			this.lastContainer.style.removeProperty("--stream-monaco-editor-bg");
+			this.lastContainer.style.removeProperty("--stream-monaco-editor-fg");
+		}
+		const sync = () => {
+			this.diffThemeSyncRafId = null;
+			this.applyDiffRootAppearanceClass();
+			this.schedulePatchDiffUnchangedRegionsAfterInteraction(1);
+			this.repositionDiffHunkNodes();
+		};
+		requestAnimationFrame(() => {
+			this.diffThemeSyncRafId = requestAnimationFrame(sync);
+		});
+	}
 	bindPersistOnMouseRelease(bucket, node) {
 		this.createDomDisposable(bucket, node, "mousedown", (event) => {
 			const mouseEvent = event;
@@ -1099,6 +2511,8 @@ var DiffEditorManager = class DiffEditorManager {
 		this.rafScheduler.cancel("patch-diff-unchanged-regions");
 		this.rafScheduler.cancel("capture-diff-unchanged-state");
 		this.rafScheduler.cancel("restore-diff-unchanged-state");
+		this.clearDeferredDiffUnchangedRegionsIdleTimer();
+		this.diffHideUnchangedRegionsDeferred = false;
 	}
 	bindFocusVisibleClass(bucket, node) {
 		this.createDomDisposable(bucket, node, "focus", () => node.classList.add("stream-monaco-focus-visible"));
@@ -1115,20 +2529,21 @@ var DiffEditorManager = class DiffEditorManager {
 	}
 	clearDiffUnchangedBridgeOverlay(removeContainer = true) {
 		var _this$diffUnchangedBr;
-		if (this.lastContainer) {
-			const bridgedCenters = this.lastContainer.querySelectorAll(".stream-monaco-unchanged-bridge-source");
-			bridgedCenters.forEach((node) => node.classList.remove("stream-monaco-unchanged-bridge-source"));
-		}
+		this.clearDiffUnchangedBridgeSources();
 		if (this.diffUnchangedBridgeOverlay) this.diffUnchangedBridgeOverlay.replaceChildren();
-		if (this.diffUnchangedBridgeDisposables.length > 0) {
-			for (const d of this.diffUnchangedBridgeDisposables) try {
-				d.dispose();
-			} catch {}
-			this.diffUnchangedBridgeDisposables.length = 0;
-		}
+		if (this.diffUnchangedBridgeOverlay) this.diffUnchangedBridgeOverlay.style.transform = "translate3d(0px, 0px, 0px)";
+		this.diffUnchangedBridgeEntries.clear();
+		this.diffUnchangedBridgePool.length = 0;
+		this.diffUnchangedOverlayScrollTop = 0;
+		this.diffUnchangedOverlayScrollLeft = 0;
 		if (removeContainer && ((_this$diffUnchangedBr = this.diffUnchangedBridgeOverlay) === null || _this$diffUnchangedBr === void 0 ? void 0 : _this$diffUnchangedBr.parentElement)) this.diffUnchangedBridgeOverlay.remove();
 		if (removeContainer) this.diffUnchangedBridgeOverlay = null;
 	}
+	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"));
+	}
 	ensureDiffUnchangedBridgeOverlay() {
 		if (!this.lastContainer) return null;
 		if (!this.diffUnchangedBridgeOverlay) {
@@ -1139,6 +2554,255 @@ var DiffEditorManager = class DiffEditorManager {
 		}
 		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();
+		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)";
+		const { top, left } = this.readDiffUnchangedOverlayScrollState();
+		this.diffUnchangedOverlayScrollTop = top;
+		this.diffUnchangedOverlayScrollLeft = left;
+	}
+	applyDiffUnchangedOverlayScrollCompensation() {
+		const overlay = this.diffUnchangedBridgeOverlay;
+		if (!overlay || overlay.hidden) return;
+		const { top, left } = this.readDiffUnchangedOverlayScrollState();
+		const deltaY = this.diffUnchangedOverlayScrollTop - top;
+		const deltaX = this.diffUnchangedOverlayScrollLeft - left;
+		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);
+		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;
+		if (!zones) return false;
+		const changedZoneIds = zoneIds.filter((id) => {
+			var _zones$id;
+			const delegate = (_zones$id = zones[id]) === null || _zones$id === void 0 ? void 0 : _zones$id.delegate;
+			return delegate && delegate.heightInPx !== targetHeight;
+		});
+		if (changedZoneIds.length === 0) return false;
+		editor.changeViewZones((accessor) => {
+			for (const id of changedZoneIds) {
+				var _zones$id2;
+				const delegate = (_zones$id2 = zones[id]) === null || _zones$id2 === void 0 ? void 0 : _zones$id2.delegate;
+				if (!delegate) continue;
+				delegate.heightInPx = targetHeight;
+				accessor.layoutZone(id);
+			}
+		});
+		return true;
+	}
+	syncDiffUnchangedViewZoneHeights() {
+		var _originalEditor$getCo, _modifiedEditor$getCo3;
+		if (!this.diffEditorView) return false;
+		const targetHeight = this.resolveDiffUnchangedViewZoneHeight();
+		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);
+		const modifiedChanged = this.syncDiffUnchangedViewZoneHeightsForEditor(modifiedEditor, (_modifiedEditor$getCo3 = modifiedEditor.getContainerDomNode) === null || _modifiedEditor$getCo3 === void 0 ? void 0 : _modifiedEditor$getCo3.call(modifiedEditor), targetHeight);
+		return originalChanged || modifiedChanged;
+	}
+	getDiffUnchangedNodeId(node) {
+		const existingId = this.diffUnchangedNodeIds.get(node);
+		if (existingId) return existingId;
+		const nextId = `diff-unchanged-${++this.diffUnchangedNodeIdSequence}`;
+		this.diffUnchangedNodeIds.set(node, nextId);
+		return nextId;
+	}
+	getDiffUnchangedBridgeKey(secondaryNode, primaryNode) {
+		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 entry = {
+			key,
+			bridge,
+			rail: null,
+			summary,
+			visualMeta,
+			divider,
+			activate: () => {},
+			topButton: null,
+			bottomButton: null
+		};
+		summary.onclick = (event) => {
+			event.preventDefault();
+			this.activateDiffUnchangedBridgeEntry(entry);
+		};
+		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;
+			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;
+			(_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) {
+				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);
+			}
+			this.schedulePatchDiffUnchangedRegionsAfterScroll();
+		};
+		bridge.addEventListener("wheel", onWheel, { passive: false });
+		this.diffUnchangedRegionDisposables.push({ dispose: () => bridge.removeEventListener("wheel", onWheel) });
+		bridge.append(summary, divider);
+		return entry;
+	}
+	acquireDiffUnchangedBridgeEntry(key) {
+		const existing = this.diffUnchangedBridgeEntries.get(key);
+		if (existing) return existing;
+		const entry = this.diffUnchangedBridgePool.pop() ?? this.createDiffUnchangedBridgeEntry(key);
+		entry.key = key;
+		entry.bridge.hidden = false;
+		entry.bridge.removeAttribute("aria-hidden");
+		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");
+		this.diffUnchangedBridgePool.push(entry);
+	}
+	hideAllDiffUnchangedBridgeEntries() {
+		for (const entry of Array.from(this.diffUnchangedBridgeEntries.values())) this.releaseDiffUnchangedBridgeEntry(entry);
+		this.clearDiffUnchangedBridgeSources();
+	}
+	schedulePatchDiffUnchangedRegionsAfterInteraction(frames = 1) {
+		this.rafScheduler.schedule("patch-diff-unchanged-regions-after-interaction", () => {
+			let remaining = Math.max(0, frames);
+			const step = () => {
+				if (remaining > 0) {
+					remaining--;
+					requestAnimationFrame(step);
+					return;
+				}
+				this.schedulePatchDiffUnchangedRegions();
+			};
+			step();
+		});
+	}
+	activateDiffUnchangedBridgeEntry(entry) {
+		this.hideAllDiffUnchangedBridgeEntries();
+		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();
+			this.hideAllDiffUnchangedBridgeEntries();
+			this.activateDiffUnchangedHandle(handle);
+			this.schedulePatchDiffUnchangedRegionsAfterInteraction();
+		} : null;
+		entry[slot] = button;
+	}
+	syncDiffUnchangedBridgeRail(entry, showTopHandle, topHandle, showBottomHandle, bottomHandle) {
+		if (!entry.rail) {
+			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);
+		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);
+	}
+	pruneDiffUnchangedBridgeEntries(visibleKeys) {
+		for (const [key, entry] of Array.from(this.diffUnchangedBridgeEntries)) {
+			if (visibleKeys.has(key)) continue;
+			this.releaseDiffUnchangedBridgeEntry(entry);
+		}
+	}
 	dispatchSyntheticMouseDown(node) {
 		const view = node.ownerDocument.defaultView;
 		if (!view) return;
@@ -1151,14 +2815,152 @@ var DiffEditorManager = class DiffEditorManager {
 			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);
+		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$diffEditorView, _this$diffEditorView$, _this$diffEditorView$2, _this$diffEditorView2, _this$diffEditorView3, _this$diffEditorView4;
+		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$diffEditorView = this.diffEditorView) === null || _this$diffEditorView === void 0 || (_this$diffEditorView$2 = (_this$diffEditorView$ = _this$diffEditorView.getOriginalEditor()).getContainerDomNode) === null || _this$diffEditorView$2 === void 0 ? void 0 : _this$diffEditorView$2.call(_this$diffEditorView$);
-		const modifiedHost = (_this$diffEditorView2 = this.diffEditorView) === null || _this$diffEditorView2 === void 0 || (_this$diffEditorView4 = (_this$diffEditorView3 = _this$diffEditorView2.getModifiedEditor()).getContainerDomNode) === null || _this$diffEditorView4 === void 0 ? void 0 : _this$diffEditorView4.call(_this$diffEditorView3);
+		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();
@@ -1169,39 +2971,39 @@ var DiffEditorManager = class DiffEditorManager {
 		const diffRect = diffRoot.getBoundingClientRect();
 		return nodeCenter < diffRect.left + diffRect.width / 2 ? "secondary" : "primary";
 	}
-	patchDiffUnchangedCenter(node) {
+	patchDiffUnchangedCenter(node, pairIndex = 0) {
 		node.classList.add("stream-monaco-clickable");
-		node.title = "Click to expand all hidden unchanged lines";
+		node.title = "Click to expand all unmodified lines";
 		const mergeRole = this.resolveDiffUnchangedMergeRole(node);
 		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");
 		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;
 			meta.classList.add("stream-monaco-unchanged-meta");
-			const metaChildren = Array.from(meta.children);
-			metaChildren.forEach((child, index) => {
-				if (!(child instanceof HTMLElement)) return;
-				child.classList.remove("stream-monaco-unchanged-count", "stream-monaco-unchanged-separator", "stream-monaco-unchanged-breadcrumb");
-				if (index === 0) child.classList.add("stream-monaco-unchanged-count");
-				else if (child.classList.contains("breadcrumb-item")) child.classList.add("stream-monaco-unchanged-breadcrumb");
-				else child.classList.add("stream-monaco-unchanged-separator");
-			});
+			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 action = node.querySelector("a");
 		if (action instanceof HTMLElement) {
 			action.classList.add("stream-monaco-unchanged-expand");
 			action.dataset.streamMonacoLabel = "Expand all";
-			action.title = "Expand all hidden lines";
-			action.setAttribute("aria-label", "Expand all hidden lines");
+			action.title = "Expand all unmodified lines";
+			action.setAttribute("aria-label", "Expand all unmodified lines");
 			action.toggleAttribute("aria-hidden", shouldUseMergedSecondary);
 			action.tabIndex = shouldUseMergedSecondary ? -1 : 0;
 			if (action.dataset.streamMonacoExpandPatched !== "true") {
 				action.dataset.streamMonacoExpandPatched = "true";
 				this.createDomDisposable(this.diffUnchangedRegionDisposables, action, "click", () => {
+					this.hideAllDiffUnchangedBridgeEntries();
 					this.scheduleCapturePersistedDiffUnchangedState(1);
+					this.schedulePatchDiffUnchangedRegionsAfterInteraction();
 				});
 			}
 		}
@@ -1218,83 +3020,100 @@ var DiffEditorManager = class DiffEditorManager {
 				const target = event.target instanceof HTMLElement ? event.target : null;
 				if (target === null || target === void 0 ? void 0 : target.closest("a, .breadcrumb-item")) return;
 				event.preventDefault();
+				this.hideAllDiffUnchangedBridgeEntries();
 				activate();
 				this.scheduleCapturePersistedDiffUnchangedState(1);
+				this.schedulePatchDiffUnchangedRegionsAfterInteraction();
 			});
 		}
 	}
-	renderMergedDiffUnchangedBridge(secondaryNode, primaryNode) {
-		var _countSource$textCont;
-		if (!this.lastContainer) return;
+	renderMergedDiffUnchangedBridge(secondaryNode, primaryNode, pairIndex, pairCount) {
+		var _countSource$textCont2, _secondaryNode$closes;
+		if (!this.lastContainer) return null;
 		const overlay = this.ensureDiffUnchangedBridgeOverlay();
-		if (!overlay) return;
+		if (!overlay) return null;
 		const containerRect = this.lastContainer.getBoundingClientRect();
 		const secondaryRect = secondaryNode.getBoundingClientRect();
 		const primaryRect = primaryNode.getBoundingClientRect();
 		const primaryStyle = globalThis.getComputedStyle(primaryNode);
-		const primaryAction = primaryNode.querySelector(".stream-monaco-unchanged-expand");
-		const primaryActionRect = primaryAction === null || primaryAction === void 0 ? void 0 : primaryAction.getBoundingClientRect();
 		const countSource = primaryNode.querySelector(".stream-monaco-unchanged-count") ?? secondaryNode.querySelector(".stream-monaco-unchanged-count");
-		const countText = (countSource === null || countSource === void 0 || (_countSource$textCont = countSource.textContent) === null || _countSource$textCont === void 0 ? void 0 : _countSource$textCont.trim()) || "Hidden lines";
+		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 unchangedRegionStyle = this.resolveDiffUnchangedRegionStyleOption();
+		const metadataLabel = unchangedRegionStyle === "metadata" ? this.resolveDiffMetadataLabel(primaryNode, pairIndex) : null;
 		const editorSurface = primaryNode.closest(".monaco-editor") ?? primaryNode;
 		const editorSurfaceStyle = globalThis.getComputedStyle(editorSurface);
+		const primaryHidden = primaryNode.parentElement;
+		const secondaryHidden = secondaryNode.parentElement;
+		const primaryWidget = primaryHidden === null || primaryHidden === void 0 ? void 0 : primaryHidden.parentElement;
+		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 key = this.getDiffUnchangedBridgeKey(secondaryNode, primaryNode);
 		secondaryNode.classList.add("stream-monaco-unchanged-bridge-source");
 		primaryNode.classList.add("stream-monaco-unchanged-bridge-source");
-		const bridge = document.createElement("div");
+		const entry = this.acquireDiffUnchangedBridgeEntry(key);
+		const { bridge, summary, divider } = entry;
 		bridge.className = "stream-monaco-diff-unchanged-bridge";
-		bridge.tabIndex = 0;
-		bridge.setAttribute("role", "button");
-		bridge.setAttribute("aria-label", `${countText}. Expand all hidden lines`);
-		bridge.title = "Expand all hidden lines";
-		bridge.style.left = `${secondaryRect.left - containerRect.left}px`;
-		bridge.style.top = `${primaryRect.top - containerRect.top}px`;
-		bridge.style.width = `${primaryRect.right - secondaryRect.left}px`;
-		bridge.style.height = `${Math.max(secondaryRect.height, primaryRect.height)}px`;
+		bridge.classList.add(`stream-monaco-diff-unchanged-bridge-${unchangedRegionStyle}`);
+		const secondaryAnchorRect = (secondaryWidget === null || secondaryWidget === void 0 ? void 0 : secondaryWidget.getBoundingClientRect()) ?? secondaryRect;
+		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 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);
-		const visualPrimary = document.createElement("span");
-		visualPrimary.className = "stream-monaco-unchanged-primary";
-		const visualAction = document.createElement("span");
-		visualAction.className = "stream-monaco-unchanged-expand";
-		visualAction.dataset.streamMonacoLabel = "Expand all";
-		visualAction.setAttribute("aria-hidden", "true");
-		visualAction.innerHTML = "<span class=\"codicon codicon-unfold\"></span>";
-		visualPrimary.append(visualAction);
-		const visualMeta = document.createElement("div");
-		visualMeta.className = "stream-monaco-unchanged-meta";
-		const visualCount = document.createElement("span");
-		visualCount.className = "stream-monaco-unchanged-count";
-		visualCount.textContent = countText;
-		visualMeta.append(visualCount);
-		const spacer = document.createElement("span");
-		spacer.className = "stream-monaco-unchanged-spacer";
-		spacer.style.width = `${(primaryActionRect === null || primaryActionRect === void 0 ? void 0 : primaryActionRect.width) ?? 102}px`;
-		bridge.append(visualPrimary, visualMeta, spacer);
-		overlay.append(bridge);
-		this.bindFocusVisibleClass(this.diffUnchangedBridgeDisposables, bridge);
-		const activate = () => {
+		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);
+		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);
+		} else if (entry.rail) {
+			entry.rail.hidden = true;
+			entry.rail.setAttribute("aria-hidden", "true");
+		}
+		entry.activate = () => {
 			const action = primaryNode.querySelector("a, button") ?? secondaryNode.querySelector("a, button");
 			if (action instanceof HTMLElement) {
 				action.click();
 				this.scheduleCapturePersistedDiffUnchangedState(1);
 			}
 		};
-		this.createDomDisposable(this.diffUnchangedBridgeDisposables, bridge, "click", (event) => {
-			const mouseEvent = event;
-			if (mouseEvent.button !== 0) return;
-			event.preventDefault();
-			activate();
-		});
-		this.createDomDisposable(this.diffUnchangedBridgeDisposables, bridge, "keydown", (event) => {
-			const keyboardEvent = event;
-			if (keyboardEvent.key !== "Enter" && keyboardEvent.key !== " ") return;
-			keyboardEvent.preventDefault();
-			activate();
-		});
+		if (summary.parentElement !== bridge) bridge.append(summary);
+		if (divider.parentElement !== bridge) bridge.append(divider);
+		if (bridge.parentElement !== overlay) overlay.append(bridge);
+		return key;
 	}
 	patchDiffUnchangedFoldGlyph(node) {
 		if (node.dataset.streamMonacoFoldGlyphPatched === "true") return;
@@ -1315,8 +3134,10 @@ var DiffEditorManager = class DiffEditorManager {
 	}
 	scanAndPatchDiffUnchangedRegions() {
 		if (!this.lastContainer) return;
+		this.applyDiffRootAppearanceClass();
+		const viewZoneHeightsChanged = this.syncDiffUnchangedViewZoneHeights();
 		const centers = this.lastContainer.querySelectorAll(".diff-hidden-lines .center");
-		centers.forEach((node) => this.patchDiffUnchangedCenter(node));
+		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) => {
 			node.removeAttribute("title");
@@ -1324,25 +3145,34 @@ var DiffEditorManager = class DiffEditorManager {
 			node.removeAttribute("role");
 			node.removeAttribute("tabindex");
 		});
-		this.clearDiffUnchangedBridgeOverlay(false);
+		this.clearDiffUnchangedBridgeSources();
 		const secondaryCenters = Array.from(centers).filter((node) => node.classList.contains("stream-monaco-unchanged-merged-secondary")).sort((a, b) => a.getBoundingClientRect().top - b.getBoundingClientRect().top);
 		const primaryCenters = Array.from(centers).filter((node) => node.classList.contains("stream-monaco-unchanged-merged-primary")).sort((a, b) => a.getBoundingClientRect().top - b.getBoundingClientRect().top);
 		const pairCount = Math.min(secondaryCenters.length, primaryCenters.length);
+		const visibleKeys = /* @__PURE__ */ new Set();
 		for (let i = 0; i < pairCount; i++) {
 			const secondaryNode = secondaryCenters[i];
 			const primaryNode = primaryCenters[i];
 			const topDelta = Math.abs(secondaryNode.getBoundingClientRect().top - primaryNode.getBoundingClientRect().top);
 			if (topDelta > 6) continue;
-			this.renderMergedDiffUnchangedBridge(secondaryNode, primaryNode);
+			const key = this.renderMergedDiffUnchangedBridge(secondaryNode, primaryNode, i, pairCount);
+			if (key) visibleKeys.add(key);
 		}
+		this.pruneDiffUnchangedBridgeEntries(visibleKeys);
+		this.syncDiffUnchangedOverlayScrollBaseline();
 		const foldGlyphs = this.lastContainer.querySelectorAll(".fold-unchanged");
 		foldGlyphs.forEach((node) => this.patchDiffUnchangedFoldGlyph(node));
+		if (viewZoneHeightsChanged) this.schedulePatchDiffUnchangedRegions();
 	}
 	schedulePatchDiffUnchangedRegions() {
 		this.rafScheduler.schedule("patch-diff-unchanged-regions", () => {
 			this.scanAndPatchDiffUnchangedRegions();
 		});
 	}
+	schedulePatchDiffUnchangedRegionsAfterScroll() {
+		this.applyDiffUnchangedOverlayScrollCompensation();
+		this.schedulePatchDiffUnchangedRegions();
+	}
 	setupDiffUnchangedRegionEnhancements() {
 		var _globalThis$getComput, _globalThis;
 		this.disposeDiffUnchangedRegionEnhancements();
@@ -1351,14 +3181,14 @@ var DiffEditorManager = class DiffEditorManager {
 		this.ensureDiffUiStyle();
 		const containerStyle = (_globalThis$getComput = (_globalThis = globalThis).getComputedStyle) === null || _globalThis$getComput === void 0 ? void 0 : _globalThis$getComput.call(_globalThis, this.lastContainer);
 		if (!containerStyle || containerStyle.position === "static") this.lastContainer.style.position = "relative";
-		this.lastContainer.classList.add("stream-monaco-diff-root");
+		this.applyDiffRootAppearanceClass();
 		this.schedulePatchDiffUnchangedRegions();
 		if (typeof MutationObserver !== "undefined") {
 			this.diffUnchangedRegionObserver = new MutationObserver((mutations) => {
 				const shouldRepatch = mutations.some((mutation) => {
 					const target = mutation.target instanceof HTMLElement ? mutation.target : null;
 					if (target === null || target === void 0 ? void 0 : target.closest(".stream-monaco-diff-unchanged-overlay")) return false;
-					const changedNodes = [...mutation.addedNodes, ...mutation.removedNodes];
+					const changedNodes = Array.from(mutation.addedNodes).concat(Array.from(mutation.removedNodes));
 					if (changedNodes.length > 0 && changedNodes.every((node) => {
 						return node instanceof HTMLElement && node.classList.contains("stream-monaco-diff-unchanged-overlay");
 					})) return false;
@@ -1373,15 +3203,19 @@ var DiffEditorManager = class DiffEditorManager {
 		}
 		const originalEditor = this.diffEditorView.getOriginalEditor();
 		const modifiedEditor = this.diffEditorView.getModifiedEditor();
-		const repatch = () => this.schedulePatchDiffUnchangedRegions();
+		const repatch = () => {
+			this.applyDiffRootAppearanceClass();
+			this.schedulePatchDiffUnchangedRegions();
+		};
 		this.diffUnchangedRegionDisposables.push(this.diffEditorView.onDidUpdateDiff(() => {
 			repatch();
 			this.scheduleRestorePersistedDiffUnchangedState();
 		}));
 		this.diffUnchangedRegionDisposables.push(originalEditor.onDidLayoutChange(repatch));
 		this.diffUnchangedRegionDisposables.push(modifiedEditor.onDidLayoutChange(repatch));
-		this.diffUnchangedRegionDisposables.push(originalEditor.onDidScrollChange(repatch));
-		this.diffUnchangedRegionDisposables.push(modifiedEditor.onDidScrollChange(repatch));
+		this.diffUnchangedRegionDisposables.push(originalEditor.onDidScrollChange(() => this.schedulePatchDiffUnchangedRegionsAfterScroll()));
+		this.diffUnchangedRegionDisposables.push(modifiedEditor.onDidScrollChange(() => this.schedulePatchDiffUnchangedRegionsAfterScroll()));
+		this.createDomDisposable(this.diffUnchangedRegionDisposables, this.lastContainer, "scroll", () => this.schedulePatchDiffUnchangedRegionsAfterScroll());
 	}
 	setupDiffHunkInteractions() {
 		var _globalThis$getComput2, _globalThis2;
@@ -1407,11 +3241,15 @@ var DiffEditorManager = class DiffEditorManager {
 			}));
 			this.diffHunkDisposables.push(editor.onMouseLeave(() => this.scheduleHideDiffHunkActions()));
 			this.diffHunkDisposables.push(editor.onDidScrollChange(() => this.repositionDiffHunkNodes()));
-			this.diffHunkDisposables.push(editor.onDidLayoutChange(() => this.repositionDiffHunkNodes()));
+			this.diffHunkDisposables.push(editor.onDidLayoutChange(() => {
+				this.applyDiffRootAppearanceClass();
+				this.repositionDiffHunkNodes();
+			}));
 		};
 		bindHover(originalEditor, "original");
 		bindHover(modifiedEditor, "modified");
 		this.diffHunkDisposables.push(this.diffEditorView.onDidUpdateDiff(() => {
+			this.applyDiffRootAppearanceClass();
 			this.diffHunkLineChanges = this.getEffectiveLineChanges();
 			if (this.diffHunkActiveChange) this.hideDiffHunkActions();
 		}));
@@ -1432,9 +3270,21 @@ var DiffEditorManager = class DiffEditorManager {
 	}
 	hideDiffHunkActions() {
 		this.diffHunkActiveChange = null;
+		this.diffHunkActiveHoverSide = null;
 		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;
 	}
@@ -1469,8 +3319,8 @@ var DiffEditorManager = class DiffEditorManager {
 		return best;
 	}
 	handleDiffHunkMouseMove(side, event) {
-		var _event$target$positio;
-		const line = (_event$target$positio = event.target.position) === null || _event$target$positio === void 0 ? void 0 : _event$target$positio.lineNumber;
+		var _event$target$positio2;
+		const line = (_event$target$positio2 = event.target.position) === null || _event$target$positio2 === void 0 ? void 0 : _event$target$positio2.lineNumber;
 		if (!line) {
 			this.scheduleHideDiffHunkActions(120);
 			return;
@@ -1482,6 +3332,7 @@ var DiffEditorManager = class DiffEditorManager {
 		}
 		this.cancelScheduledHideDiffHunkActions();
 		this.diffHunkActiveChange = change;
+		this.diffHunkActiveHoverSide = this.isDiffInlineMode() ? this.inferInlineDiffHunkHoverSide(change, event) : null;
 		this.repositionDiffHunkNodes();
 	}
 	isOriginalEditorCollapsed() {
@@ -1490,6 +3341,12 @@ var DiffEditorManager = class DiffEditorManager {
 		const info = (_this$diffEditorView$3 = (_this$diffEditorView$4 = this.diffEditorView.getOriginalEditor()).getLayoutInfo) === null || _this$diffEditorView$3 === void 0 ? void 0 : _this$diffEditorView$3.call(_this$diffEditorView$4);
 		return !info || info.width < 24;
 	}
+	isDiffInlineMode() {
+		var _this$lastContainer;
+		const diffRoot = (_this$lastContainer = this.lastContainer) === null || _this$lastContainer === void 0 ? void 0 : _this$lastContainer.querySelector(".monaco-diff-editor");
+		if (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();
@@ -1524,8 +3381,37 @@ var DiffEditorManager = class DiffEditorManager {
 		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);
+		if (!lang) return;
+		if (models.original.getLanguageId() !== lang) monaco_shim_exports.editor.setModelLanguage(models.original, lang);
+		if (models.modified.getLanguageId() !== lang) monaco_shim_exports.editor.setModelLanguage(models.modified, lang);
+	}
+	restoreDiffViewState(viewState) {
+		if (!this.diffEditorView || !viewState) return;
+		const restore = () => {
+			try {
+				var _this$diffEditorView25;
+				(_this$diffEditorView25 = this.diffEditorView) === null || _this$diffEditorView25 === void 0 || _this$diffEditorView25.restoreViewState(viewState);
+			} catch {}
+		};
+		restore();
+		requestAnimationFrame(restore);
+	}
+	disposePreviousDiffModel(model, owned, nextModel) {
+		if (!model || !owned || model === nextModel) return;
+		model.dispose();
+	}
+	disposePendingPreparedDiffViewModel() {
+		if (!this.pendingPreparedDiffViewModel) return;
+		try {
+			this.pendingPreparedDiffViewModel.dispose();
+		} catch {}
+		this.pendingPreparedDiffViewModel = null;
+	}
 	syncDiffKnownValues() {
-		var _this$diffEditorView5, _this$diffEditorView6, _this$diffEditorView7, _this$diffHeightManag;
+		var _this$diffEditorView26, _this$diffEditorView27, _this$diffEditorView28, _this$diffHeightManag2;
 		if (this.originalModel) this.lastKnownOriginalCode = this.originalModel.getValue();
 		if (this.modifiedModel) {
 			this.lastKnownModifiedCode = this.modifiedModel.getValue();
@@ -1534,8 +3420,8 @@ var DiffEditorManager = class DiffEditorManager {
 		this.lastKnownModifiedDirty = false;
 		this._hasScrollBar = false;
 		this.cachedComputedHeightDiff = this.computedHeight();
-		this.cachedScrollHeightDiff = ((_this$diffEditorView5 = this.diffEditorView) === null || _this$diffEditorView5 === void 0 || (_this$diffEditorView7 = (_this$diffEditorView6 = _this$diffEditorView5.getModifiedEditor()).getScrollHeight) === null || _this$diffEditorView7 === void 0 ? void 0 : _this$diffEditorView7.call(_this$diffEditorView6)) ?? this.cachedScrollHeightDiff;
-		(_this$diffHeightManag = this.diffHeightManager) === null || _this$diffHeightManag === void 0 || _this$diffHeightManag.update();
+		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;
@@ -1546,8 +3432,7 @@ var DiffEditorManager = class DiffEditorManager {
 			if (!hasOriginal) return;
 			const text = this.getLinesText(this.originalModel, lineChange.originalStartLineNumber, lineChange.originalEndLineNumber);
 			if (!text) return;
-			const anchor = hasModified ? lineChange.modifiedStartLineNumber : Math.max(1, lineChange.modifiedStartLineNumber || lineChange.modifiedEndLineNumber || this.modifiedModel.getLineCount());
-			const range = this.getInsertRangeBeforeLine(this.modifiedModel, anchor);
+			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,
@@ -1581,7 +3466,7 @@ var DiffEditorManager = class DiffEditorManager {
 			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 - 1);
+			const anchor = hasOriginal ? lineChange.originalEndLineNumber : Math.max(0, lineChange.originalStartLineNumber);
 			const range = this.getInsertRangeAfterLine(this.originalModel, anchor);
 			this.originalModel.applyEdits([{
 				range,
@@ -1590,26 +3475,34 @@ var DiffEditorManager = class DiffEditorManager {
 			}]);
 		}
 	}
-	applyDiffHunkAction(side, action) {
+	async applyDiffHunkAction(side, action) {
 		if (!this.diffHunkActiveChange || !this.originalModel || !this.modifiedModel) return;
-		this.flushOriginalAppendBufferSync();
-		this.flushModifiedAppendBufferSync();
-		const context = {
-			action,
-			side,
-			lineChange: this.diffHunkActiveChange,
-			originalModel: this.originalModel,
-			modifiedModel: this.modifiedModel
-		};
-		let allowDefault = true;
-		if (typeof this.options.onDiffHunkAction === "function") try {
-			allowDefault = this.options.onDiffHunkAction(context) !== false;
-		} catch (error$1) {
-			console.warn("onDiffHunkAction callback threw an error:", error$1);
-		}
-		if (allowDefault) this.applyDefaultDiffHunkAction(context);
-		this.syncDiffKnownValues();
-		this.hideDiffHunkActions();
+		if (this.diffHunkActionInFlight) return;
+		this.diffHunkActionInFlight = true;
+		this.setDiffHunkNodeEnabled(this.diffHunkUpperNode, false);
+		this.setDiffHunkNodeEnabled(this.diffHunkLowerNode, false);
+		try {
+			this.flushOriginalAppendBufferSync();
+			this.flushModifiedAppendBufferSync();
+			const context = {
+				action,
+				side,
+				lineChange: this.diffHunkActiveChange,
+				originalModel: this.originalModel,
+				modifiedModel: this.modifiedModel
+			};
+			let allowDefault = true;
+			if (typeof this.options.onDiffHunkAction === "function") try {
+				allowDefault = await this.options.onDiffHunkAction(context) !== false;
+			} catch (error$1) {
+				console.warn("onDiffHunkAction callback threw an error:", error$1);
+			}
+			if (allowDefault) this.applyDefaultDiffHunkAction(context);
+			this.syncDiffKnownValues();
+			this.hideDiffHunkActions();
+		} finally {
+			this.diffHunkActionInFlight = false;
+		}
 	}
 	setDiffHunkNodeEnabled(node, enabled) {
 		if (!node) return;
@@ -1619,13 +3512,13 @@ var DiffEditorManager = class DiffEditorManager {
 		});
 	}
 	positionDiffHunkNode(node, side, anchorLine, extraOffsetY = 0) {
-		var _editor$getScrollTop;
+		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$getScrollTop = editor.getScrollTop) === null || _editor$getScrollTop === void 0 ? void 0 : _editor$getScrollTop.call(editor)) ?? 0);
+		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;
@@ -1649,16 +3542,32 @@ var DiffEditorManager = class DiffEditorManager {
 		const hasModified = this.hasModifiedLines(change);
 		this.setDiffHunkNodeEnabled(this.diffHunkUpperNode, hasOriginal);
 		this.setDiffHunkNodeEnabled(this.diffHunkLowerNode, hasModified);
-		const originalCollapsed = this.isOriginalEditorCollapsed();
+		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);
+				this.diffHunkLowerNode.style.display = "none";
+				return;
+			}
+			if (hasModified) {
+				const lowerAnchor = Math.max(1, change.modifiedStartLineNumber || change.modifiedEndLineNumber || 1);
+				this.positionDiffHunkNode(this.diffHunkLowerNode, "modified", lowerAnchor);
+				this.diffHunkUpperNode.style.display = "none";
+				return;
+			}
+			this.hideDiffHunkActions();
+			return;
+		}
 		if (hasOriginal) {
-			const upperSide = originalCollapsed ? "modified" : "original";
-			const upperAnchor = originalCollapsed ? Math.max(1, change.modifiedStartLineNumber || change.modifiedEndLineNumber || 1) : change.originalStartLineNumber;
+			const upperSide = "original";
+			const upperAnchor = change.originalStartLineNumber;
 			this.positionDiffHunkNode(this.diffHunkUpperNode, upperSide, upperAnchor);
 		} else this.diffHunkUpperNode.style.display = "none";
 		if (hasModified) {
-			const samePane = originalCollapsed;
 			const lowerAnchor = change.modifiedStartLineNumber;
-			this.positionDiffHunkNode(this.diffHunkLowerNode, "modified", lowerAnchor, samePane ? 32 : 0);
+			this.positionDiffHunkNode(this.diffHunkLowerNode, "modified", lowerAnchor);
 		} else this.diffHunkLowerNode.style.display = "none";
 	}
 	scheduleFlushAppendBufferDiff() {
@@ -1696,7 +3605,7 @@ var DiffEditorManager = class DiffEditorManager {
 		this.appendToModel(this.originalModel, text);
 	}
 	computedHeight() {
-		var _originalEditor$getMo, _modifiedEditor$getMo, _originalEditor$getSc, _modifiedEditor$getSc;
+		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();
@@ -1705,15 +3614,16 @@ var DiffEditorManager = class DiffEditorManager {
 		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$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);
+		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);
 	}
 	isOverflowAutoDiff() {
-		return !!this.lastContainer && this.lastContainer.style.overflow === "auto";
+		if (!this.lastContainer) return false;
+		return this.computedHeight() >= this.maxHeightValue - 1;
 	}
 	shouldPerformImmediateRevealDiff() {
-		return this.autoScrollOnUpdate && this.shouldAutoScrollDiff && this.hasVerticalScrollbarModified() && this.isOverflowAutoDiff();
+		return this.autoScrollOnUpdate && this.shouldAutoScrollDiff && !this.diffHideUnchangedRegionsDeferred && this.hasVerticalScrollbarModified() && this.isOverflowAutoDiff();
 	}
 	suppressScrollWatcherDiff(ms) {
 		if (!this.diffScrollWatcher || typeof this.diffScrollWatcher.setSuppressed !== "function") return;
@@ -1834,9 +3744,9 @@ var DiffEditorManager = class DiffEditorManager {
 				ticket,
 				line
 			});
-			const strategy = this.revealStrategyOption ?? this.options.revealStrategy ?? "centerIfOutside";
+			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 = ScrollType && typeof ScrollType.Smooth !== "undefined" ? ScrollType.Smooth : void 0;
+			const smooth = !this.diffHideUnchangedRegionsDeferred && ScrollType && typeof ScrollType.Smooth !== "undefined" ? ScrollType.Smooth : void 0;
 			try {
 				const me = this.diffEditorView.getModifiedEditor();
 				if (strategy === "bottom") if (typeof smooth !== "undefined") me.revealLine(line, smooth);
@@ -1856,9 +3766,9 @@ var DiffEditorManager = class DiffEditorManager {
 				lastRevealLineDiff: this.lastRevealLineDiff
 			});
 			try {
-				var _this$diffEditorView8, _this$diffEditorView9, _this$diffEditorView10;
+				var _this$diffEditorView29, _this$diffEditorView30, _this$diffEditorView31;
 				this.shouldAutoScrollDiff = true;
-				this.lastScrollTopDiff = ((_this$diffEditorView8 = this.diffEditorView) === null || _this$diffEditorView8 === void 0 || (_this$diffEditorView10 = (_this$diffEditorView9 = _this$diffEditorView8.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView10 === void 0 ? void 0 : _this$diffEditorView10.call(_this$diffEditorView9)) ?? this.lastScrollTopDiff;
+				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;
 			} catch {}
 		});
 	}
@@ -1877,9 +3787,9 @@ var DiffEditorManager = class DiffEditorManager {
 			ticket
 		});
 		try {
-			var _this$diffEditorView11, _this$diffEditorView12, _this$diffEditorView13;
+			var _this$diffEditorView32, _this$diffEditorView33, _this$diffEditorView34;
 			this.shouldAutoScrollDiff = true;
-			this.lastScrollTopDiff = ((_this$diffEditorView11 = this.diffEditorView) === null || _this$diffEditorView11 === void 0 || (_this$diffEditorView13 = (_this$diffEditorView12 = _this$diffEditorView11.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView13 === void 0 ? void 0 : _this$diffEditorView13.call(_this$diffEditorView12)) ?? this.lastScrollTopDiff;
+			this.lastScrollTopDiff = ((_this$diffEditorView32 = this.diffEditorView) === null || _this$diffEditorView32 === void 0 || (_this$diffEditorView34 = (_this$diffEditorView33 = _this$diffEditorView32.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView34 === void 0 ? void 0 : _this$diffEditorView34.call(_this$diffEditorView33)) ?? this.lastScrollTopDiff;
 		} catch {}
 	}
 	scheduleImmediateRevealAfterLayoutDiff(line) {
@@ -1920,7 +3830,11 @@ var DiffEditorManager = class DiffEditorManager {
 		const lang = processedLanguage(language) || language;
 		this.originalModel = monaco_shim_exports.editor.createModel(originalCode, lang);
 		this.modifiedModel = monaco_shim_exports.editor.createModel(modifiedCode, lang);
+		this.originalModelOwned = true;
+		this.modifiedModelOwned = true;
 		const hideUnchangedRegions = this.resolveDiffHideUnchangedRegionsOption();
+		this.diffHideUnchangedRegionsResolved = hideUnchangedRegions;
+		this.diffHideUnchangedRegionsDeferred = false;
 		this.diffEditorView = monaco_shim_exports.editor.createDiffEditor(container, {
 			automaticLayout: true,
 			scrollBeyondLastLine: false,
@@ -1944,7 +3858,7 @@ var DiffEditorManager = class DiffEditorManager {
 		});
 		this.lastKnownOriginalCode = originalCode;
 		this.lastKnownModifiedCode = modifiedCode;
-		this.diffUpdateThrottleMs = this.diffUpdateThrottleMsOption ?? this.options.diffUpdateThrottleMs ?? 50;
+		this.diffUpdateThrottleMs = this.resolveDiffStreamingThrottleMs();
 		this.shouldAutoScrollDiff = !!(this.autoScrollInitial && this.diffAutoScroll);
 		if (this.diffScrollWatcher) {
 			this.diffScrollWatcher.dispose();
@@ -1980,35 +3894,40 @@ var DiffEditorManager = class DiffEditorManager {
 		this.diffHeightManager = createHeightManager(container, () => this.computedHeight());
 		this.diffHeightManager.update();
 		const initialComputed = this.computedHeight();
-		if (initialComputed >= this.maxHeightValue - 1) {
-			container.style.height = `${this.maxHeightValue}px`;
-			container.style.overflow = "auto";
-		}
+		if (initialComputed >= this.maxHeightValue - 1) container.style.height = `${this.maxHeightValue}px`;
 		const me = this.diffEditorView.getModifiedEditor();
 		this.cachedScrollHeightDiff = ((_me$getScrollHeight2 = me.getScrollHeight) === null || _me$getScrollHeight2 === void 0 ? void 0 : _me$getScrollHeight2.call(me)) ?? null;
 		this.cachedLineHeightDiff = ((_me$getOption = me.getOption) === null || _me$getOption === void 0 ? void 0 : _me$getOption.call(me, monaco_shim_exports.editor.EditorOption.lineHeight)) ?? null;
 		this.cachedComputedHeightDiff = this.computedHeight();
 		const oEditor = this.diffEditorView.getOriginalEditor();
 		const mEditor = this.diffEditorView.getModifiedEditor();
+		this.disposeDiffPresentationTracking();
+		this.diffComputedVersions = null;
+		this.diffPresentationDisposables.push(this.diffEditorView.onDidUpdateDiff(() => {
+			this.diffComputedVersions = this.captureCurrentDiffVersions();
+			this.scheduleSyncDiffPresentationDecorations();
+		}));
+		this.diffPresentationDisposables.push(oEditor.onDidChangeModelContent(() => {
+			this.scheduleSyncDiffPresentationDecorations();
+		}));
+		this.diffPresentationDisposables.push(mEditor.onDidChangeModelContent(() => {
+			this.scheduleSyncDiffPresentationDecorations();
+		}));
 		(_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$diffHeightManag2, _this$diffHeightManag3;
+				var _oEditor$getScrollHei, _oEditor$getOption, _this$diffHeightManag3, _this$diffHeightManag4;
 				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$diffHeightManag2 = this.diffHeightManager) === null || _this$diffHeightManag2 === void 0 ? void 0 : _this$diffHeightManag2.isSuppressed()) return;
-				(_this$diffHeightManag3 = this.diffHeightManager) === null || _this$diffHeightManag3 === void 0 || _this$diffHeightManag3.update();
+				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 prevOverflow = this.lastContainer.style.overflow;
-					const newOverflow = computed$1 >= this.maxHeightValue - 1 ? "auto" : "hidden";
-					if (prevOverflow !== newOverflow) {
-						this.lastContainer.style.overflow = newOverflow;
-						if (newOverflow === "auto" && this.shouldAutoScrollDiff) {
-							var _this$modifiedModel;
-							this.maybeScrollDiffToBottom((_this$modifiedModel = this.modifiedModel) === null || _this$modifiedModel === void 0 ? void 0 : _this$modifiedModel.getLineCount());
-						}
+					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());
 					}
 				}
 			});
@@ -2016,22 +3935,18 @@ 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$diffHeightManag4, _this$diffHeightManag5;
+				var _mEditor$getScrollHei, _mEditor$getOption, _this$diffHeightManag5, _this$diffHeightManag6;
 				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$diffHeightManag4 = this.diffHeightManager) === null || _this$diffHeightManag4 === void 0 ? void 0 : _this$diffHeightManag4.isSuppressed()) return;
-				(_this$diffHeightManag5 = this.diffHeightManager) === null || _this$diffHeightManag5 === void 0 || _this$diffHeightManag5.update();
+				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 prevOverflow = this.lastContainer.style.overflow;
-					const newOverflow = computed$1 >= this.maxHeightValue - 1 ? "auto" : "hidden";
-					if (prevOverflow !== newOverflow) {
-						this.lastContainer.style.overflow = newOverflow;
-						if (newOverflow === "auto" && this.shouldAutoScrollDiff) {
-							var _this$modifiedModel2;
-							this.maybeScrollDiffToBottom((_this$modifiedModel2 = this.modifiedModel) === null || _this$modifiedModel2 === void 0 ? void 0 : _this$modifiedModel2.getLineCount());
-						}
+					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());
 					}
 				}
 			});
@@ -2043,6 +3958,8 @@ var DiffEditorManager = class DiffEditorManager {
 		this.maybeScrollDiffToBottom(this.modifiedModel.getLineCount(), this.lastKnownModifiedLineCount ?? void 0);
 		this.setupDiffUnchangedRegionEnhancements();
 		this.setupDiffHunkInteractions();
+		this.applyDiffRootAppearanceClass();
+		this.scheduleSyncDiffPresentationDecorations();
 		return this.diffEditorView;
 	}
 	updateDiff(originalCode, modifiedCode, codeLanguage) {
@@ -2061,6 +3978,7 @@ var DiffEditorManager = class DiffEditorManager {
 		if (this.lastKnownModifiedCode == null) this.lastKnownModifiedCode = this.modifiedModel.getValue();
 		const prevO = this.lastKnownOriginalCode;
 		const prevM = this.lastKnownModifiedCode;
+		if (originalCode !== prevO || modifiedCode !== prevM) this.markDiffStreamingActivity();
 		let didImmediate = false;
 		if (originalCode !== prevO && originalCode.startsWith(prevO)) {
 			this.appendOriginal(originalCode.slice(prevO.length));
@@ -2088,6 +4006,7 @@ var DiffEditorManager = class DiffEditorManager {
 		}
 		const prev = this.lastKnownOriginalCode ?? this.originalModel.getValue();
 		if (prev === newCode) return;
+		this.markDiffStreamingActivity();
 		if (newCode.startsWith(prev) && prev.length < newCode.length) this.appendOriginal(newCode.slice(prev.length), codeLanguage);
 		else {
 			this.flushOriginalAppendBufferSync();
@@ -2103,6 +4022,7 @@ var DiffEditorManager = class DiffEditorManager {
 		}
 		const prev = this.lastKnownModifiedCode ?? this.modifiedModel.getValue();
 		if (prev === newCode) return;
+		this.markDiffStreamingActivity();
 		if (newCode.startsWith(prev) && prev.length < newCode.length) this.appendModified(newCode.slice(prev.length), codeLanguage);
 		else {
 			this.flushModifiedAppendBufferSync();
@@ -2116,28 +4036,17 @@ var DiffEditorManager = class DiffEditorManager {
 				const computed$1 = this.computedHeight();
 				if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer) {
 					this.lastContainer.style.height = `${this.maxHeightValue}px`;
-					this.lastContainer.style.overflow = "auto";
+					this.lastContainer.style.overflow = "hidden";
 				}
 				if (shouldImmediate) this.scheduleImmediateRevealAfterLayoutDiff(newLine);
 				else this.maybeScrollDiffToBottom(newLine, prevLine);
-				if (this.autoScrollOnUpdate && this.shouldAutoScrollDiff) try {
-					var _editor3, _me2$getModel, _me2$getScrollTop;
-					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 me2 = this.diffEditorView.getModifiedEditor();
-					const targetLine = ((_me2$getModel = me2.getModel()) === null || _me2$getModel === void 0 ? void 0 : _me2$getModel.getLineCount()) ?? newLine;
-					if (typeof immediate !== "undefined") me2.revealLine(targetLine, immediate);
-					else me2.revealLine(targetLine);
-					this.lastRevealLineDiff = targetLine;
-					this.shouldAutoScrollDiff = true;
-					this.lastScrollTopDiff = ((_me2$getScrollTop = me2.getScrollTop) === null || _me2$getScrollTop === void 0 ? void 0 : _me2$getScrollTop.call(me2)) ?? this.lastScrollTopDiff;
-				} catch {}
 			}
 		}
 		this.lastKnownModifiedCode = newCode;
 	}
 	appendOriginal(appendText, codeLanguage) {
 		if (!this.diffEditorView || !this.originalModel || !appendText) return;
+		this.markDiffStreamingActivity();
 		if (codeLanguage) {
 			const lang = processedLanguage(codeLanguage);
 			if (lang && this.originalModel.getLanguageId() !== lang) monaco_shim_exports.editor.setModelLanguage(this.originalModel, lang);
@@ -2147,6 +4056,7 @@ var DiffEditorManager = class DiffEditorManager {
 	}
 	appendModified(appendText, codeLanguage) {
 		if (!this.diffEditorView || !this.modifiedModel || !appendText) return;
+		this.markDiffStreamingActivity();
 		if (codeLanguage) {
 			const lang = processedLanguage(codeLanguage);
 			if (lang && this.modifiedModel.getLanguageId() !== lang) monaco_shim_exports.editor.setModelLanguage(this.modifiedModel, lang);
@@ -2162,6 +4072,102 @@ var DiffEditorManager = class DiffEditorManager {
 		if (this.originalModel && this.originalModel.getLanguageId() !== language) monaco_shim_exports.editor.setModelLanguage(this.originalModel, language);
 		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$5, _this$diffEditorView$6, _this$diffEditorView$7, _this$diffEditorView$8;
+		if (!this.diffEditorView) return;
+		const transitionRequestId = ++this.diffModelTransitionRequestId;
+		this.disposePendingPreparedDiffViewModel();
+		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 nextOriginalValue = nextOriginal.getValue();
+		const nextModifiedValue = nextModified.getValue();
+		const sameContent = currentOriginalValue === nextOriginalValue && currentModifiedValue === nextModifiedValue;
+		const preserveViewState = options.preserveViewState ?? sameContent;
+		let preparedViewModel = null;
+		if (preserveViewState && sameContent) try {
+			preparedViewModel = this.diffEditorView.createViewModel({
+				original: nextOriginal,
+				modified: nextModified
+			});
+			this.pendingPreparedDiffViewModel = preparedViewModel;
+			await preparedViewModel.waitForDiff();
+		} catch {
+			if (preparedViewModel === this.pendingPreparedDiffViewModel) this.pendingPreparedDiffViewModel = null;
+			try {
+				preparedViewModel === null || preparedViewModel === void 0 || preparedViewModel.dispose();
+			} catch {}
+			preparedViewModel = null;
+		}
+		if (preparedViewModel === this.pendingPreparedDiffViewModel) this.pendingPreparedDiffViewModel = null;
+		if (!this.diffEditorView || this.diffModelTransitionRequestId !== transitionRequestId) {
+			if (preparedViewModel) try {
+				preparedViewModel.dispose();
+			} catch {}
+			return;
+		}
+		const nextModelTarget = preparedViewModel ?? {
+			original: nextOriginal,
+			modified: nextModified
+		};
+		if (!this.originalModel || !this.modifiedModel) {
+			this.diffEditorView.setModel(nextModelTarget);
+			this.originalModel = nextOriginal;
+			this.modifiedModel = nextModified;
+			this.originalModelOwned = false;
+			this.modifiedModelOwned = false;
+			this.syncDiffKnownValues();
+			this.refreshDiffPresentation();
+			return;
+		}
+		this.rafScheduler.cancel("diff");
+		this.pendingDiffUpdate = null;
+		this.flushOriginalAppendBufferSync();
+		this.flushModifiedAppendBufferSync();
+		const currentOriginal = this.originalModel;
+		const currentModified = this.modifiedModel;
+		const shouldRestorePersistedUnchangedState = preserveViewState && !sameContent;
+		const preservedScrollPosition = preserveViewState ? this.captureDiffScrollPosition() : null;
+		const preservedViewportAnchor = preserveViewState && sameContent ? this.captureModifiedViewportAnchor() : null;
+		const viewState = preserveViewState ? this.diffEditorView.saveViewState() : null;
+		this.queuePendingDiffScrollRestore(preservedScrollPosition, shouldRestorePersistedUnchangedState ? 2 : 0);
+		if (shouldRestorePersistedUnchangedState) this.capturePersistedDiffUnchangedState();
+		const applyModelSwap = () => {
+			var _this$diffEditorView35;
+			(_this$diffEditorView35 = this.diffEditorView) === null || _this$diffEditorView35 === void 0 || _this$diffEditorView35.setModel(nextModelTarget);
+		};
+		if (preserveViewState) this.withLockedDiffScrollPosition(applyModelSwap);
+		else applyModelSwap();
+		const previousOriginalOwned = this.originalModelOwned;
+		const previousModifiedOwned = this.modifiedModelOwned;
+		this.originalModel = nextOriginal;
+		this.modifiedModel = nextModified;
+		this.originalModelOwned = false;
+		this.modifiedModelOwned = false;
+		this.lastKnownOriginalCode = nextOriginalValue;
+		this.lastKnownModifiedCode = nextModifiedValue;
+		this.lastKnownModifiedLineCount = nextModified.getLineCount();
+		this.lastKnownModifiedDirty = false;
+		this._hasScrollBar = false;
+		this.cachedScrollHeightDiff = ((_this$diffEditorView$5 = (_this$diffEditorView$6 = this.diffEditorView.getModifiedEditor()).getScrollHeight) === null || _this$diffEditorView$5 === void 0 ? void 0 : _this$diffEditorView$5.call(_this$diffEditorView$6)) ?? null;
+		this.cachedLineHeightDiff = ((_this$diffEditorView$7 = (_this$diffEditorView$8 = this.diffEditorView.getModifiedEditor()).getOption) === null || _this$diffEditorView$7 === void 0 ? void 0 : _this$diffEditorView$7.call(_this$diffEditorView$8, monaco_shim_exports.editor.EditorOption.lineHeight)) ?? null;
+		this.cachedComputedHeightDiff = this.computedHeight();
+		this.diffHunkLineChanges = this.getEffectiveLineChanges();
+		this.hideDiffHunkActions();
+		this.clearDiffUnchangedBridgeOverlay(false);
+		this.syncDiffUnchangedViewZoneHeights();
+		this.diffComputedVersions = null;
+		if (viewState) this.restoreDiffViewState(viewState);
+		this.refreshDiffPresentation();
+		this.scheduleSyncDiffPresentationDecorations();
+		if (shouldRestorePersistedUnchangedState) this.scheduleRestorePersistedDiffUnchangedState();
+		this.applyPendingDiffScrollRestore();
+		if (preservedViewportAnchor) this.scheduleRestoreModifiedViewportAnchor(preservedViewportAnchor);
+		this.disposePreviousDiffModel(currentOriginal, previousOriginalOwned, nextOriginal);
+		this.disposePreviousDiffModel(currentModified, previousModifiedOwned, nextModified);
+	}
 	getDiffEditorView() {
 		return this.diffEditorView;
 	}
@@ -2172,6 +4178,8 @@ var DiffEditorManager = class DiffEditorManager {
 		};
 	}
 	cleanup() {
+		this.diffModelTransitionRequestId += 1;
+		this.disposePendingPreparedDiffViewModel();
 		this.rafScheduler.cancel("diff");
 		this.pendingDiffUpdate = null;
 		this.rafScheduler.cancel("appendDiff");
@@ -2186,6 +4194,7 @@ var DiffEditorManager = class DiffEditorManager {
 		this.rafScheduler.cancel("sync-last-known-modified");
 		this.disposeDiffHunkInteractions();
 		this.disposeDiffUnchangedRegionEnhancements();
+		this.disposeDiffPresentationTracking();
 		if (this.diffScrollWatcher) {
 			this.diffScrollWatcher.dispose();
 			this.diffScrollWatcher = null;
@@ -2198,18 +4207,18 @@ var DiffEditorManager = class DiffEditorManager {
 			this.diffEditorView.dispose();
 			this.diffEditorView = null;
 		}
-		if (this.originalModel) {
-			this.originalModel.dispose();
-			this.originalModel = null;
-		}
-		if (this.modifiedModel) {
-			this.modifiedModel.dispose();
-			this.modifiedModel = null;
-		}
+		if (this.originalModel && this.originalModelOwned) this.originalModel.dispose();
+		if (this.modifiedModel && this.modifiedModelOwned) this.modifiedModel.dispose();
+		this.originalModel = null;
+		this.modifiedModel = null;
+		this.originalModelOwned = false;
+		this.modifiedModelOwned = false;
 		this.lastKnownOriginalCode = null;
 		this.lastKnownModifiedCode = null;
+		this.diffRootAppearanceSignature = null;
 		if (this.lastContainer) {
 			this.lastContainer.classList.remove("stream-monaco-diff-root");
+			this.lastContainer.classList.remove(...DiffEditorManager.diffLineStyleClasses, ...DiffEditorManager.diffUnchangedRegionStyleClasses, ...DiffEditorManager.diffLayoutModeClasses, ...DiffEditorManager.diffAppearanceClasses);
 			this.lastContainer.innerHTML = "";
 			this.lastContainer = null;
 		}
@@ -2228,8 +4237,15 @@ var DiffEditorManager = class DiffEditorManager {
 		this.revealTicketDiff = 0;
 		this.lastRevealLineDiff = null;
 		this.diffPersistedUnchangedModelState = null;
+		this.pendingDiffScrollRestorePosition = null;
+		this.pendingDiffScrollRestoreBudget = 0;
+		this.diffHideUnchangedRegionsResolved = null;
+		this.diffHideUnchangedRegionsDeferred = false;
+		this.clearPendingDiffThemeSync();
 	}
 	safeClean() {
+		this.diffModelTransitionRequestId += 1;
+		this.disposePendingPreparedDiffViewModel();
 		this.rafScheduler.cancel("diff");
 		this.pendingDiffUpdate = null;
 		this.rafScheduler.cancel("appendDiff");
@@ -2243,6 +4259,7 @@ var DiffEditorManager = class DiffEditorManager {
 		this.hideDiffHunkActions();
 		this.cancelScheduledHideDiffHunkActions();
 		this.disposeDiffUnchangedRegionEnhancements();
+		this.disposeDiffPresentationTracking();
 		if (this.diffScrollWatcher) {
 			this.diffScrollWatcher.dispose();
 			this.diffScrollWatcher = null;
@@ -2269,6 +4286,8 @@ var DiffEditorManager = class DiffEditorManager {
 		this.revealTicketDiff = 0;
 		this.lastRevealLineDiff = null;
 		this.diffPersistedUnchangedModelState = null;
+		this.diffHideUnchangedRegionsDeferred = false;
+		this.clearPendingDiffThemeSync();
 		this.rafScheduler.cancel("content-size-change-diff");
 		this.rafScheduler.cancel("sync-last-known-modified");
 	}
@@ -2327,7 +4346,7 @@ var DiffEditorManager = class DiffEditorManager {
 				const computed$1 = this.computedHeight();
 				if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer) {
 					this.lastContainer.style.height = `${this.maxHeightValue}px`;
-					this.lastContainer.style.overflow = "auto";
+					this.lastContainer.style.overflow = "hidden";
 				}
 				if (shouldImmediate) this.scheduleImmediateRevealAfterLayoutDiff(newMLineCount);
 				else this.maybeScrollDiffToBottom(newMLineCount, prevMLineCount);
@@ -2421,7 +4440,7 @@ var DiffEditorManager = class DiffEditorManager {
 				const computed$2 = this.computedHeight();
 				if (computed$2 >= this.maxHeightValue - 1 && this.lastContainer) {
 					this.lastContainer.style.height = `${this.maxHeightValue}px`;
-					this.lastContainer.style.overflow = "auto";
+					this.lastContainer.style.overflow = "hidden";
 				}
 				if (shouldImmediate$1) this.scheduleImmediateRevealAfterLayoutDiff(newLine$1);
 				else this.maybeScrollDiffToBottom(newLine$1, prevLine);
@@ -2453,23 +4472,11 @@ var DiffEditorManager = class DiffEditorManager {
 		if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer) this.lastContainer.style.height = `${this.maxHeightValue}px`;
 		if (shouldImmediate) this.scheduleImmediateRevealAfterLayoutDiff(newLine);
 		else this.maybeScrollDiffToBottom(newLine, prevLine);
-		if (this.autoScrollOnUpdate && this.shouldAutoScrollDiff) try {
-			var _editor4, _me2$getModel2, _me2$getScrollTop2;
-			const ScrollType = monaco_shim_exports.ScrollType || ((_editor4 = monaco_shim_exports.editor) === null || _editor4 === void 0 ? void 0 : _editor4.ScrollType);
-			const immediate = ScrollType && typeof ScrollType.Immediate !== "undefined" ? ScrollType.Immediate : void 0;
-			const me2 = this.diffEditorView.getModifiedEditor();
-			const targetLine = ((_me2$getModel2 = me2.getModel()) === null || _me2$getModel2 === void 0 ? void 0 : _me2$getModel2.getLineCount()) ?? newLine;
-			if (typeof immediate !== "undefined") me2.revealLine(targetLine, immediate);
-			else me2.revealLine(targetLine);
-			this.lastRevealLineDiff = targetLine;
-			this.shouldAutoScrollDiff = true;
-			this.lastScrollTopDiff = ((_me2$getScrollTop2 = me2.getScrollTop) === null || _me2$getScrollTop2 === void 0 ? void 0 : _me2$getScrollTop2.call(me2)) ?? this.lastScrollTopDiff;
-		} catch {}
 		if (suppressedByFlush) watcherApi.setSuppressed(false);
 		try {
-			var _this$diffEditorView14, _this$diffEditorView15, _this$diffEditorView16;
+			var _this$diffEditorView36, _this$diffEditorView37, _this$diffEditorView38;
 			this.shouldAutoScrollDiff = true;
-			this.lastScrollTopDiff = ((_this$diffEditorView14 = this.diffEditorView) === null || _this$diffEditorView14 === void 0 || (_this$diffEditorView16 = (_this$diffEditorView15 = _this$diffEditorView14.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView16 === void 0 ? void 0 : _this$diffEditorView16.call(_this$diffEditorView15)) ?? this.lastScrollTopDiff;
+			this.lastScrollTopDiff = ((_this$diffEditorView36 = this.diffEditorView) === null || _this$diffEditorView36 === void 0 || (_this$diffEditorView38 = (_this$diffEditorView37 = _this$diffEditorView36.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView38 === void 0 ? void 0 : _this$diffEditorView38.call(_this$diffEditorView37)) ?? this.lastScrollTopDiff;
 		} catch {}
 	}
 	applyMinimalEditToModel(model, prev, next) {
@@ -3440,7 +5447,9 @@ let globalAppliedThemeName = null;
 *   updateModified: (newCode: string, codeLanguage?: string) => void,
 *   appendOriginal: (appendText: string, codeLanguage?: string) => void,
 *   appendModified: (appendText: string, codeLanguage?: string) => void,
+*   setDiffModels: (models: DiffModelPair, options?: DiffModelTransitionOptions) => Promise<void>,
 *   setTheme: (theme: MonacoTheme) => Promise<void>,
+*   refreshDiffPresentation: () => void,
 *   setLanguage: (language: MonacoLanguage) => void,
 *   getCurrentTheme: () => string,
 *   getEditor: () => typeof monaco.editor,
@@ -3460,7 +5469,9 @@ let globalAppliedThemeName = null;
 * @property {Function} updateModified - 仅更新 Diff 的 modified 内容（增量更新）
 * @property {Function} appendOriginal - 在 Diff 的 original 末尾追加（显式流式场景）
 * @property {Function} appendModified - 在 Diff 的 modified 末尾追加（显式流式场景）
+* @property {Function} setDiffModels - 切换为一对新的 Diff models；当内容未变化时自动走保留视图状态的无抖动路径
 * @property {Function} setTheme - 切换编辑器主题，返回 Promise，在主题应用完成时 resolve
+* @property {Function} refreshDiffPresentation - 在不 remount 的情况下，重算 diff chrome / unchanged overlay 的表现层
 * @property {Function} setLanguage - 切换编辑器语言
 * @property {Function} getCurrentTheme - 获取当前主题名称
 * @property {Function} getEditor - 获取 Monaco 的静态 editor 对象（用于静态方法调用）
@@ -3578,12 +5589,14 @@ function useMonaco(monacoOptions = {}) {
 		try {
 			monaco_shim_exports.editor.setTheme(themeName);
 			globalAppliedThemeName = themeName;
+			monacoOptions.theme = themeName;
 		} catch {
 			try {
 				const maybeHighlighter = await registerMonacoThemes(themes, languages$1);
 				if (token !== globalThemeRequestSeq) return;
 				monaco_shim_exports.editor.setTheme(themeName);
 				globalAppliedThemeName = themeName;
+				monacoOptions.theme = themeName;
 				await tryLoadAndSetShikiTheme(maybeHighlighter, themeName).catch(() => void 0);
 			} catch (err2) {
 				console.warn(`Failed to set theme "${themeName}":`, err2);
@@ -3591,6 +5604,11 @@ function useMonaco(monacoOptions = {}) {
 			}
 		}
 		if (token !== globalThemeRequestSeq) return;
+		try {
+			diffMgr === null || diffMgr === void 0 || diffMgr.notifyThemeChange(themeName);
+		} catch (err) {
+			console.warn("diff theme sync threw an error:", err);
+		}
 		try {
 			if (typeof monacoOptions.onThemeChange === "function") await monacoOptions.onThemeChange(themeName);
 		} catch (err) {
@@ -3642,7 +5660,7 @@ function useMonaco(monacoOptions = {}) {
 			const ds = monacoOptions.onBeforeCreate(monaco_shim_exports);
 			if (ds) disposals.push(...ds);
 		}
-		const initialThemeName = requestedThemeName ?? monacoOptions.theme ?? globalRequestedThemeName ?? currentTheme.value;
+		const initialThemeName = monacoOptions.theme ?? requestedThemeName ?? globalRequestedThemeName ?? currentTheme.value;
 		await ensureThemeRegistered(initialThemeName);
 		editorMgr = new EditorManager(monacoOptions, maxHeightValue, maxHeightCSS, autoScrollOnUpdate, autoScrollInitial, autoScrollThresholdPx, autoScrollThresholdLines, monacoOptions.revealDebounceMs);
 		editorView = await editorMgr.createEditor(container, code, language, initialThemeName);
@@ -3673,7 +5691,7 @@ function useMonaco(monacoOptions = {}) {
 			const ds = monacoOptions.onBeforeCreate(monaco_shim_exports);
 			if (ds) disposals.push(...ds);
 		}
-		const initialThemeName = requestedThemeName ?? monacoOptions.theme ?? globalRequestedThemeName ?? currentTheme.value;
+		const initialThemeName = monacoOptions.theme ?? requestedThemeName ?? globalRequestedThemeName ?? currentTheme.value;
 		await ensureThemeRegistered(initialThemeName);
 		try {
 			monaco_shim_exports.editor.setTheme(initialThemeName);
@@ -3924,6 +5942,16 @@ function useMonaco(monacoOptions = {}) {
 	function appendModified(appendText, codeLanguage) {
 		if (diffMgr) diffMgr.appendModified(appendText, codeLanguage);
 	}
+	async function setDiffModels(models, options) {
+		if (!diffMgr) return;
+		await diffMgr.setDiffModels(models, options);
+		const activeModels = diffMgr.getDiffModels();
+		originalModel = activeModels.original;
+		modifiedModel = activeModels.modified;
+	}
+	function refreshDiffPresentation() {
+		if (diffMgr) diffMgr.refreshDiffPresentation();
+	}
 	return {
 		createEditor,
 		createDiffEditor,
@@ -3947,7 +5975,9 @@ function useMonaco(monacoOptions = {}) {
 		updateModified,
 		appendOriginal,
 		appendModified,
+		setDiffModels,
 		setTheme: setThemeInternal,
+		refreshDiffPresentation,
 		setLanguage(language) {
 			if (editorMgr) {
 				editorMgr.setLanguage(language, languages$1);
@@ -3979,6 +6009,7 @@ function useMonaco(monacoOptions = {}) {
 			return diffEditorView;
 		},
 		getDiffModels() {
+			if (diffMgr) return diffMgr.getDiffModels();
 			return {
 				original: originalModel,
 				modified: modifiedModel