stream-monaco 0.0.2 → 0.0.4

package/dist/index.cjs

@@ -29,6 +29,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 //#endregion
 const monaco_editor = __toESM(require("monaco-editor"));
+const node_process = __toESM(require("node:process"));
 const alien_signals = __toESM(require("alien-signals"));
 const __shikijs_monaco = __toESM(require("@shikijs/monaco"));
 const shiki = __toESM(require("shiki"));
@@ -227,34 +228,107 @@ __export(monaco_shim_exports, { default: () => monaco });
 __reExport(monaco_shim_exports, require("monaco-editor"));
 const monaco = monaco_editor;
 
+//#endregion
+//#region src/utils/logger.ts
+let seq = 0;
+const DEBUG = (() => {
+	try {
+		if (typeof window !== "undefined" && window.__STREAM_MONACO_DEBUG__ !== void 0) return Boolean(window.__STREAM_MONACO_DEBUG__);
+		try {
+			const proc = node_process.default;
+			if (proc && proc.env && proc.env.NODE_ENV === "production") return false;
+		} catch {}
+	} catch {}
+	return true;
+})();
+function log(tag, ...args) {
+	if (!DEBUG) return;
+	try {
+		seq += 1;
+		const id = `#${seq}`;
+		const ts = typeof performance !== "undefined" && performance.now ? performance.now().toFixed(1) : Date.now();
+		console.warn(`${id} [${tag}] @${ts}ms`, ...args);
+	} catch (err) {
+		try {
+			console.warn("[logger] fallback", tag, ...args, err);
+		} catch {}
+	}
+}
+function error(tag, ...args) {
+	if (!DEBUG) return;
+	try {
+		console.error(`[${tag}]`, ...args);
+	} catch (err) {
+		try {
+			console.error("[logger] fallback error", tag, ...args, err);
+		} catch {}
+	}
+}
+
 //#endregion
 //#region src/utils/height.ts
 function createHeightManager(container, computeNext) {
 	let raf = null;
+	let debounceTimer = null;
 	let lastApplied = -1;
 	let suppressed = false;
+	const HYSTERESIS_PX = 12;
+	const DEBOUNCE_MS = 0;
 	function apply() {
 		const next = computeNext();
+		if (next == null) return;
+		log("heightManager", "computeNext ->", {
+			next,
+			lastApplied
+		});
+		if (!Number.isFinite(next) || next <= 0) {
+			log("heightManager", "invalid next height, ignoring", next);
+			return;
+		}
+		if (lastApplied !== -1 && Math.abs(next - lastApplied) <= HYSTERESIS_PX) return;
 		if (next === lastApplied) return;
 		suppressed = true;
 		container.style.height = `${next}px`;
 		lastApplied = next;
+		log("heightManager", "applied height ->", next);
 		queueMicrotask(() => {
 			suppressed = false;
 		});
 	}
+	function scheduleApply() {
+		if (debounceTimer != null) {
+			clearTimeout(debounceTimer);
+			debounceTimer = null;
+		}
+		if (DEBOUNCE_MS === 0) {
+			if (raf != null) return;
+			raf = requestAnimationFrame(() => {
+				raf = null;
+				apply();
+			});
+			return;
+		}
+		debounceTimer = setTimeout(() => {
+			debounceTimer = null;
+			if (raf != null) return;
+			raf = requestAnimationFrame(() => {
+				raf = null;
+				apply();
+			});
+		}, DEBOUNCE_MS);
+	}
 	function update() {
-		if (raf != null) return;
-		raf = requestAnimationFrame(() => {
-			raf = null;
-			apply();
-		});
+		scheduleApply();
 	}
 	function dispose() {
 		if (raf != null) {
 			cancelAnimationFrame(raf);
 			raf = null;
 		}
+		if (debounceTimer != null) {
+			clearTimeout(debounceTimer);
+			debounceTimer = null;
+		}
 	}
 	function isSuppressed() {
 		return suppressed;
@@ -310,18 +384,105 @@ function createScrollWatcherForEditor(ed, opts) {
 	var _ed$getScrollTop, _ed$onDidScrollChange;
 	const initial = ((_ed$getScrollTop = ed.getScrollTop) === null || _ed$getScrollTop === void 0 ? void 0 : _ed$getScrollTop.call(ed)) ?? 0;
 	opts.setLast(initial);
-	const disp = ((_ed$onDidScrollChange = ed.onDidScrollChange) === null || _ed$onDidScrollChange === void 0 ? void 0 : _ed$onDidScrollChange.call(ed, (e) => {
+	log("scrollWatcher", "initial scrollTop=", initial);
+	let suppressedExternally = false;
+	const THRESHOLD_PX = 6;
+	let domNode = null;
+	let interactionListener = null;
+	const listener = (e) => {
 		var _ed$getScrollTop2;
+		if (suppressedExternally) {
+			log("scrollWatcher", "suppressedExternally, ignoring event");
+			return;
+		}
 		const currentTop = e && typeof e.scrollTop === "number" ? e.scrollTop : ((_ed$getScrollTop2 = ed.getScrollTop) === null || _ed$getScrollTop2 === void 0 ? void 0 : _ed$getScrollTop2.call(ed)) ?? 0;
 		const delta = currentTop - opts.getLast();
 		opts.setLast(currentTop);
+		if (Math.abs(delta) < THRESHOLD_PX) {
+			log("scrollWatcher", "small delta ignored", delta);
+			try {
+				const scrollHeight = typeof ed.getScrollHeight === "function" ? ed.getScrollHeight() : void 0;
+				const li = typeof ed.getLayoutInfo === "function" ? ed.getLayoutInfo() : void 0;
+				const viewportH = (li === null || li === void 0 ? void 0 : li.height) ?? void 0;
+				if (typeof scrollHeight === "number" && typeof viewportH === "number") {
+					const distance = scrollHeight - (currentTop + viewportH);
+					if (distance <= Math.max(THRESHOLD_PX, 0)) {
+						log("scrollWatcher", "small delta but at bottom, maybe resume", { distance });
+						opts.onMaybeResume();
+					}
+				}
+			} catch {}
+			return;
+		}
+		log("scrollWatcher", "delta=", delta, "currentTop=", currentTop);
 		if (delta < 0) {
+			log("scrollWatcher", "pause detected delta=", delta);
 			opts.onPause();
 			return;
 		}
+		log("scrollWatcher", "maybe resume delta=", delta);
 		opts.onMaybeResume();
-	})) ?? null;
-	return disp;
+	};
+	const disp = ((_ed$onDidScrollChange = ed.onDidScrollChange) === null || _ed$onDidScrollChange === void 0 ? void 0 : _ed$onDidScrollChange.call(ed, listener)) ?? null;
+	const api = {
+		dispose() {
+			try {
+				if (disp && typeof disp.dispose === "function") disp.dispose();
+				else if (typeof disp === "function") disp();
+			} catch {}
+			log("scrollWatcher", "dispose");
+		},
+		setSuppressed(v) {
+			const newVal = !!v;
+			if (newVal === suppressedExternally) return;
+			suppressedExternally = newVal;
+			log("scrollWatcher", "setSuppressed =>", suppressedExternally);
+			try {
+				if (!domNode && typeof ed.getDomNode === "function") domNode = ed.getDomNode();
+				if (suppressedExternally && domNode) {
+					if (!interactionListener) {
+						interactionListener = () => {
+							try {
+								var _ed$getScrollTop3;
+								log("scrollWatcher", "user interaction detected while suppressed, cancelling suppression");
+								opts.onPause();
+								suppressedExternally = false;
+								const cur = ((_ed$getScrollTop3 = ed.getScrollTop) === null || _ed$getScrollTop3 === void 0 ? void 0 : _ed$getScrollTop3.call(ed)) ?? 0;
+								opts.setLast(cur);
+								try {
+									const scrollHeight = typeof ed.getScrollHeight === "function" ? ed.getScrollHeight() : void 0;
+									const li = typeof ed.getLayoutInfo === "function" ? ed.getLayoutInfo() : void 0;
+									const viewportH = (li === null || li === void 0 ? void 0 : li.height) ?? void 0;
+									if (typeof scrollHeight === "number" && typeof viewportH === "number") {
+										const distance = scrollHeight - (cur + viewportH);
+										if (distance <= Math.max(THRESHOLD_PX, 0)) {
+											log("scrollWatcher", "interaction moved to bottom, maybe resume", { distance });
+											opts.onMaybeResume();
+										}
+									}
+								} catch {}
+								if (domNode && interactionListener) {
+									domNode.removeEventListener("wheel", interactionListener, { passive: true });
+									domNode.removeEventListener("pointerdown", interactionListener);
+									domNode.removeEventListener("touchstart", interactionListener);
+								}
+								interactionListener = null;
+							} catch {}
+						};
+						domNode.addEventListener("wheel", interactionListener, { passive: true });
+						domNode.addEventListener("pointerdown", interactionListener);
+						domNode.addEventListener("touchstart", interactionListener);
+					}
+				} else if (domNode && interactionListener) {
+					domNode.removeEventListener("wheel", interactionListener, { passive: true });
+					domNode.removeEventListener("pointerdown", interactionListener);
+					domNode.removeEventListener("touchstart", interactionListener);
+					interactionListener = null;
+				}
+			} catch {}
+		}
+	};
+	return api;
 }
 
 //#endregion
@@ -366,11 +527,14 @@ var DiffEditorManager = class {
 		};
 	}
 	lastRevealLineDiff = null;
+	revealTicketDiff = 0;
 	revealDebounceIdDiff = null;
 	revealDebounceMs = defaultRevealDebounceMs;
 	revealIdleTimerIdDiff = null;
 	revealStrategyOption;
 	revealBatchOnIdleMsOption;
+	scrollWatcherSuppressionMs = 500;
+	diffScrollWatcherSuppressionTimer = null;
 	appendBufferDiff = [];
 	appendBufferDiffScheduled = false;
 	rafScheduler = createRafScheduler();
@@ -400,6 +564,26 @@ var DiffEditorManager = class {
 		const desired = Math.max(fromLines, scrollH);
 		return Math.min(desired, this.maxHeightValue);
 	}
+	isOverflowAutoDiff() {
+		return !!this.lastContainer && this.lastContainer.style.overflow === "auto";
+	}
+	shouldPerformImmediateRevealDiff() {
+		return this.autoScrollOnUpdate && this.shouldAutoScrollDiff && this.hasVerticalScrollbarModified() && this.isOverflowAutoDiff();
+	}
+	suppressScrollWatcherDiff(ms) {
+		if (!this.diffScrollWatcher || typeof this.diffScrollWatcher.setSuppressed !== "function") return;
+		if (this.diffScrollWatcherSuppressionTimer != null) {
+			clearTimeout(this.diffScrollWatcherSuppressionTimer);
+			this.diffScrollWatcherSuppressionTimer = null;
+		}
+		this.diffScrollWatcher.setSuppressed(true);
+		this.diffScrollWatcherSuppressionTimer = setTimeout(() => {
+			try {
+				this.diffScrollWatcher.setSuppressed(false);
+			} catch {}
+			this.diffScrollWatcherSuppressionTimer = null;
+		}, ms);
+	}
 	hasVerticalScrollbarModified() {
 		if (!this.diffEditorView) return false;
 		if (this._hasScrollBar) return true;
@@ -419,21 +603,56 @@ var DiffEditorManager = class {
 	}
 	maybeScrollDiffToBottom(targetLine, prevLineOverride) {
 		this.rafScheduler.schedule("maybe-scroll-diff", () => {
+			log("diff", "maybeScrollDiffToBottom called", {
+				targetLine,
+				prevLineOverride,
+				diffAutoScroll: this.diffAutoScroll,
+				autoScrollOnUpdate: this.autoScrollOnUpdate,
+				shouldAutoScrollDiff: this.shouldAutoScrollDiff
+			});
 			if (!this.diffEditorView) return;
-			if (!(this.diffAutoScroll && this.autoScrollOnUpdate && this.shouldAutoScrollDiff && this.hasVerticalScrollbarModified())) return;
+			const hasV = this.hasVerticalScrollbarModified();
+			log("diff", "hasVerticalScrollbarModified ->", hasV);
+			if (!(this.diffAutoScroll && this.autoScrollOnUpdate && this.shouldAutoScrollDiff && hasV)) return;
 			const me = this.diffEditorView.getModifiedEditor();
 			const model = me.getModel();
 			const currentLine = (model === null || model === void 0 ? void 0 : model.getLineCount()) ?? 1;
 			const line = targetLine ?? currentLine;
 			const prevLine = typeof prevLineOverride === "number" ? prevLineOverride : this.lastKnownModifiedLineCount ?? -1;
+			log("diff", "scroll metrics", {
+				prevLine,
+				currentLine,
+				line,
+				lastRevealLineDiff: this.lastRevealLineDiff
+			});
 			if (prevLine !== -1 && prevLine === currentLine && line === currentLine) return;
 			if (this.lastRevealLineDiff !== null && this.lastRevealLineDiff === line) return;
 			const batchMs = this.revealBatchOnIdleMsOption ?? this.options.revealBatchOnIdleMs ?? defaultRevealBatchOnIdleMs;
+			log("diff", "reveal timing", {
+				batchMs,
+				revealDebounceMs: this.revealDebounceMs,
+				revealDebounceMsOption: this.revealDebounceMsOption
+			});
 			if (typeof batchMs === "number" && batchMs > 0) {
+				if (hasV) {
+					const ticket$1 = ++this.revealTicketDiff;
+					log("diff", "has scrollbar -> immediate ticketed reveal", {
+						ticket: ticket$1,
+						line
+					});
+					this.performRevealDiffTicketed(line, ticket$1);
+					return;
+				}
 				if (this.revealIdleTimerIdDiff != null) clearTimeout(this.revealIdleTimerIdDiff);
+				const ticket = ++this.revealTicketDiff;
+				log("diff", "scheduling idle reveal", {
+					ticket,
+					batchMs,
+					line
+				});
 				this.revealIdleTimerIdDiff = setTimeout(() => {
 					this.revealIdleTimerIdDiff = null;
-					this.performRevealDiff(line);
+					this.performRevealDiffTicketed(line, ticket);
 				}, batchMs);
 				return;
 			}
@@ -444,14 +663,32 @@ var DiffEditorManager = class {
 			const ms = typeof this.revealDebounceMs === "number" && this.revealDebounceMs > 0 ? this.revealDebounceMs : typeof this.revealDebounceMsOption === "number" && this.revealDebounceMsOption > 0 ? this.revealDebounceMsOption : this.revealDebounceMs;
 			this.revealDebounceIdDiff = setTimeout(() => {
 				this.revealDebounceIdDiff = null;
-				this.performRevealDiff(line);
+				const ticket = ++this.revealTicketDiff;
+				log("diff", "debounced reveal firing", {
+					ticket,
+					line
+				});
+				this.performRevealDiffTicketed(line, ticket);
 			}, ms);
 			this.lastKnownModifiedLineCount = currentLine;
 		});
 	}
-	performRevealDiff(line) {
+	performRevealDiffTicketed(line, ticket) {
 		this.rafScheduler.schedule("revealDiff", () => {
 			var _editor;
+			if (this.diffScrollWatcher) {
+				log("diff", "performRevealDiffTicketed - suppressing watcher", {
+					ticket,
+					line,
+					ms: this.scrollWatcherSuppressionMs
+				});
+				this.suppressScrollWatcherDiff(this.scrollWatcherSuppressionMs);
+			}
+			if (ticket !== this.revealTicketDiff) return;
+			log("diff", "performRevealDiffTicketed - performing reveal", {
+				ticket,
+				line
+			});
 			const strategy = 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;
@@ -469,13 +706,71 @@ var DiffEditorManager = class {
 				} catch {}
 			}
 			this.lastRevealLineDiff = line;
+			log("diff", "performRevealDiffTicketed - revealed", {
+				line,
+				lastRevealLineDiff: this.lastRevealLineDiff
+			});
+			try {
+				var _this$diffEditorView, _this$diffEditorView$, _this$diffEditorView$2;
+				this.shouldAutoScrollDiff = true;
+				this.lastScrollTopDiff = ((_this$diffEditorView = this.diffEditorView) === null || _this$diffEditorView === void 0 || (_this$diffEditorView$2 = (_this$diffEditorView$ = _this$diffEditorView.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView$2 === void 0 ? void 0 : _this$diffEditorView$2.call(_this$diffEditorView$)) ?? this.lastScrollTopDiff;
+			} catch {}
+		});
+	}
+	performImmediateRevealDiff(line, ticket) {
+		var _editor2;
+		if (!this.diffEditorView) return;
+		if (ticket !== this.revealTicketDiff) return;
+		const ScrollType = monaco_shim_exports.ScrollType || ((_editor2 = monaco_shim_exports.editor) === null || _editor2 === void 0 ? void 0 : _editor2.ScrollType);
+		const immediate = ScrollType && typeof ScrollType.Immediate !== "undefined" ? ScrollType.Immediate : void 0;
+		const me = this.diffEditorView.getModifiedEditor();
+		if (typeof immediate !== "undefined") me.revealLine(line, immediate);
+		else me.revealLine(line);
+		this.measureViewportDiff();
+		log("diff", "performImmediateRevealDiff", {
+			line,
+			ticket
+		});
+		try {
+			var _this$diffEditorView2, _this$diffEditorView3, _this$diffEditorView4;
+			this.shouldAutoScrollDiff = true;
+			this.lastScrollTopDiff = ((_this$diffEditorView2 = this.diffEditorView) === null || _this$diffEditorView2 === void 0 || (_this$diffEditorView4 = (_this$diffEditorView3 = _this$diffEditorView2.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView4 === void 0 ? void 0 : _this$diffEditorView4.call(_this$diffEditorView3)) ?? this.lastScrollTopDiff;
+		} catch {}
+	}
+	scheduleImmediateRevealAfterLayoutDiff(line) {
+		const ticket = ++this.revealTicketDiff;
+		this.rafScheduler.schedule("immediate-reveal-diff", async () => {
+			const target = this.diffEditorView && this.diffHeightManager ? Math.min(this.computedHeight(), this.maxHeightValue) : -1;
+			if (target !== -1 && this.diffHeightManager) {
+				if (this.lastContainer) this.lastContainer.style.height = `${target}px`;
+				await this.waitForHeightAppliedDiff(target);
+			}
+			this.performImmediateRevealDiff(line, ticket);
+		});
+	}
+	waitForHeightAppliedDiff(target, timeoutMs = 500) {
+		return new Promise((resolve) => {
+			const start = typeof performance !== "undefined" && performance.now ? performance.now() : Date.now();
+			const check = () => {
+				const applied = this.lastContainer ? Number.parseFloat((this.lastContainer.style.height || "").replace("px", "")) || 0 : -1;
+				if (applied >= target - 1) {
+					resolve();
+					return;
+				}
+				if ((typeof performance !== "undefined" && performance.now ? performance.now() : Date.now()) - start > timeoutMs) {
+					resolve();
+					return;
+				}
+				requestAnimationFrame(check);
+			};
+			check();
 		});
 	}
 	async createDiffEditor(container, originalCode, modifiedCode, language, currentTheme) {
 		var _me$getScrollHeight2, _me$getOption, _oEditor$onDidContent, _mEditor$onDidContent;
 		this.cleanup();
 		this.lastContainer = container;
-		container.style.overflow = "auto";
+		container.style.overflow = "hidden";
 		container.style.maxHeight = this.maxHeightCSS;
 		const lang = processedLanguage(language) || language;
 		this.originalModel = monaco_shim_exports.editor.createModel(originalCode, lang);
@@ -524,13 +819,23 @@ var DiffEditorManager = class {
 				}
 			});
 		}
-		this.maybeScrollDiffToBottom(this.modifiedModel.getLineCount(), this.lastKnownModifiedLineCount ?? void 0);
+		log("diff", "createDiffEditor", {
+			autoScrollInitial: this.autoScrollInitial,
+			diffAutoScroll: this.diffAutoScroll
+		});
+		const MIN_VISIBLE_HEIGHT = Math.min(120, this.maxHeightValue);
+		container.style.minHeight = `${MIN_VISIBLE_HEIGHT}px`;
 		if (this.diffHeightManager) {
 			this.diffHeightManager.dispose();
 			this.diffHeightManager = null;
 		}
 		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";
+		}
 		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;
@@ -540,33 +845,54 @@ var DiffEditorManager = class {
 		(_oEditor$onDidContent = oEditor.onDidContentSizeChange) === null || _oEditor$onDidContent === void 0 || _oEditor$onDidContent.call(oEditor, () => {
 			this._hasScrollBar = false;
 			this.rafScheduler.schedule("content-size-change-diff", () => {
-				try {
-					var _oEditor$getScrollHei, _oEditor$getOption, _this$diffHeightManag, _this$diffHeightManag2;
-					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$diffHeightManag = this.diffHeightManager) === null || _this$diffHeightManag === void 0 ? void 0 : _this$diffHeightManag.isSuppressed()) return;
-					(_this$diffHeightManag2 = this.diffHeightManager) === null || _this$diffHeightManag2 === void 0 || _this$diffHeightManag2.update();
-				} catch {}
+				var _oEditor$getScrollHei, _oEditor$getOption, _this$diffHeightManag, _this$diffHeightManag2;
+				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$diffHeightManag = this.diffHeightManager) === null || _this$diffHeightManag === void 0 ? void 0 : _this$diffHeightManag.isSuppressed()) return;
+				(_this$diffHeightManag2 = this.diffHeightManager) === null || _this$diffHeightManag2 === void 0 || _this$diffHeightManag2.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());
+						}
+					}
+				}
 			});
 		});
 		(_mEditor$onDidContent = mEditor.onDidContentSizeChange) === null || _mEditor$onDidContent === void 0 || _mEditor$onDidContent.call(mEditor, () => {
 			this._hasScrollBar = false;
 			this.rafScheduler.schedule("content-size-change-diff", () => {
-				try {
-					var _mEditor$getScrollHei, _mEditor$getOption, _this$diffHeightManag3, _this$diffHeightManag4;
-					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$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();
-				} catch {}
+				var _mEditor$getScrollHei, _mEditor$getOption, _this$diffHeightManag3, _this$diffHeightManag4;
+				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$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$modifiedModel2;
+							this.maybeScrollDiffToBottom((_this$modifiedModel2 = this.modifiedModel) === null || _this$modifiedModel2 === void 0 ? void 0 : _this$modifiedModel2.getLineCount());
+						}
+					}
+				}
 			});
 		});
 		mEditor.onDidChangeModelContent(() => {
 			this.lastKnownModifiedDirty = true;
 			this.rafScheduler.schedule("sync-last-known-modified", () => this.syncLastKnownModified());
 		});
+		this.maybeScrollDiffToBottom(this.modifiedModel.getLineCount(), this.lastKnownModifiedLineCount ?? void 0);
 		return this.diffEditorView;
 	}
 	updateDiff(originalCode, modifiedCode, codeLanguage) {
@@ -626,11 +952,37 @@ var DiffEditorManager = class {
 		}
 		const prev = this.lastKnownModifiedCode ?? this.modifiedModel.getValue();
 		if (prev === newCode) return;
+		const prevLine = this.modifiedModel.getLineCount();
 		if (newCode.startsWith(prev) && prev.length < newCode.length) {
-			const prevLine = this.modifiedModel.getLineCount();
 			this.appendToModel(this.modifiedModel, newCode.slice(prev.length));
 			this.maybeScrollDiffToBottom(this.modifiedModel.getLineCount(), prevLine);
-		} else this.applyMinimalEditToModel(this.modifiedModel, prev, newCode);
+		} else {
+			this.applyMinimalEditToModel(this.modifiedModel, prev, newCode);
+			const newLine = this.modifiedModel.getLineCount();
+			if (newLine !== prevLine) {
+				const shouldImmediate = this.shouldPerformImmediateRevealDiff();
+				if (shouldImmediate) this.suppressScrollWatcherDiff(this.scrollWatcherSuppressionMs + 800);
+				const computed$1 = this.computedHeight();
+				if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer) {
+					this.lastContainer.style.height = `${this.maxHeightValue}px`;
+					this.lastContainer.style.overflow = "auto";
+				}
+				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) {
@@ -640,9 +992,7 @@ var DiffEditorManager = class {
 			if (lang && this.originalModel.getLanguageId() !== lang) monaco_shim_exports.editor.setModelLanguage(this.originalModel, lang);
 		}
 		this.appendToModel(this.originalModel, appendText);
-		try {
-			this.lastKnownOriginalCode = this.originalModel.getValue();
-		} catch {}
+		this.lastKnownOriginalCode = this.originalModel.getValue();
 	}
 	appendModified(appendText, codeLanguage) {
 		if (!this.diffEditorView || !this.modifiedModel || !appendText) return;
@@ -711,6 +1061,15 @@ var DiffEditorManager = class {
 			clearTimeout(this.revealDebounceIdDiff);
 			this.revealDebounceIdDiff = null;
 		}
+		if (this.revealIdleTimerIdDiff != null) {
+			clearTimeout(this.revealIdleTimerIdDiff);
+			this.revealIdleTimerIdDiff = null;
+		}
+		if (this.diffScrollWatcherSuppressionTimer != null) {
+			clearTimeout(this.diffScrollWatcherSuppressionTimer);
+			this.diffScrollWatcherSuppressionTimer = null;
+		}
+		this.revealTicketDiff = 0;
 		this.lastRevealLineDiff = null;
 	}
 	safeClean() {
@@ -731,6 +1090,15 @@ var DiffEditorManager = class {
 			clearTimeout(this.revealDebounceIdDiff);
 			this.revealDebounceIdDiff = null;
 		}
+		if (this.revealIdleTimerIdDiff != null) {
+			clearTimeout(this.revealIdleTimerIdDiff);
+			this.revealIdleTimerIdDiff = null;
+		}
+		if (this.diffScrollWatcherSuppressionTimer != null) {
+			clearTimeout(this.diffScrollWatcherSuppressionTimer);
+			this.diffScrollWatcherSuppressionTimer = null;
+		}
+		this.revealTicketDiff = 0;
 		this.lastRevealLineDiff = null;
 		this.rafScheduler.cancel("content-size-change-diff");
 		this.rafScheduler.cancel("sync-last-known-modified");
@@ -744,7 +1112,7 @@ var DiffEditorManager = class {
 				this.lastKnownModifiedCode = model.getValue();
 				this.lastKnownModifiedLineCount = model.getLineCount();
 			}
-		} catch {} finally {
+		} finally {
 			this.lastKnownModifiedDirty = false;
 		}
 	}
@@ -788,10 +1156,20 @@ var DiffEditorManager = class {
 			else this.applyMinimalEditToModel(m, prevM, modified);
 			this.lastKnownModifiedCode = modified;
 			const newMLineCount = m.getLineCount();
-			if (newMLineCount !== prevMLineCount) this.maybeScrollDiffToBottom(newMLineCount, prevMLineCount);
+			if (newMLineCount !== prevMLineCount) {
+				const shouldImmediate = this.shouldPerformImmediateRevealDiff();
+				if (shouldImmediate) this.suppressScrollWatcherDiff(this.scrollWatcherSuppressionMs + 800);
+				const computed$1 = this.computedHeight();
+				if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer) {
+					this.lastContainer.style.height = `${this.maxHeightValue}px`;
+					this.lastContainer.style.overflow = "auto";
+				}
+				if (shouldImmediate) this.scheduleImmediateRevealAfterLayoutDiff(newMLineCount);
+				else this.maybeScrollDiffToBottom(newMLineCount, prevMLineCount);
+			}
 		}
 	}
-	flushAppendBufferDiff() {
+	async flushAppendBufferDiff() {
 		if (!this.diffEditorView) return;
 		if (this.appendBufferDiff.length === 0) return;
 		this.appendBufferDiffScheduled = false;
@@ -801,39 +1179,128 @@ var DiffEditorManager = class {
 			this.appendBufferDiff.length = 0;
 			return;
 		}
-		const text = this.appendBufferDiff.join("");
+		let parts = this.appendBufferDiff.splice(0);
+		const prevLineInit = model.getLineCount();
+		const totalText = parts.join("");
+		const totalChars = totalText.length;
+		if (parts.length === 1 && totalChars > 5e3) {
+			const lines = totalText.split(/\r?\n/);
+			const chunkSize = 200;
+			const chunks = [];
+			for (let i = 0; i < lines.length; i += chunkSize) chunks.push(`${lines.slice(i, i + chunkSize).join("\n")}\n`);
+			if (chunks.length > 1) parts = chunks;
+		}
+		const applyChunked = parts.length > 1 && (totalChars > 2e3 || model.getLineCount && model.getLineCount() + 0 - prevLineInit > 50);
+		log("diff", "flushAppendBufferDiff start", {
+			partsCount: parts.length,
+			totalChars,
+			applyChunked
+		});
+		let prevLine = prevLineInit;
+		const watcherApi = this.diffScrollWatcher;
+		let suppressedByFlush = false;
+		if (watcherApi && typeof watcherApi.setSuppressed === "function") try {
+			if (this.diffScrollWatcherSuppressionTimer != null) {
+				clearTimeout(this.diffScrollWatcherSuppressionTimer);
+				this.diffScrollWatcherSuppressionTimer = null;
+			}
+			watcherApi.setSuppressed(true);
+			suppressedByFlush = true;
+		} catch {}
+		if (applyChunked) {
+			log("diff", "flushAppendBufferDiff applying chunked", { partsLen: parts.length });
+			let idx = 0;
+			for (const part of parts) {
+				if (!part) continue;
+				idx += 1;
+				log("diff", "flushAppendBufferDiff chunk", {
+					idx,
+					partLen: part.length,
+					prevLine
+				});
+				const lastColumn$1 = model.getLineMaxColumn(prevLine);
+				const range$1 = new monaco_shim_exports.Range(prevLine, lastColumn$1, prevLine, lastColumn$1);
+				model.applyEdits([{
+					range: range$1,
+					text: part,
+					forceMoveMarkers: true
+				}]);
+				this.lastKnownModifiedCode = model.getValue();
+				const newLine$1 = model.getLineCount();
+				this.lastKnownModifiedLineCount = newLine$1;
+				await new Promise((resolve) => typeof requestAnimationFrame !== "undefined" ? requestAnimationFrame(resolve) : setTimeout(resolve, 0));
+				const shouldImmediate$1 = this.shouldPerformImmediateRevealDiff();
+				log("diff", "flushAppendBufferDiff chunk metrics", {
+					idx,
+					newLine: newLine$1,
+					prevLine,
+					shouldImmediate: shouldImmediate$1
+				});
+				if (shouldImmediate$1) this.suppressScrollWatcherDiff(this.scrollWatcherSuppressionMs + 800);
+				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";
+				}
+				if (shouldImmediate$1) this.scheduleImmediateRevealAfterLayoutDiff(newLine$1);
+				else this.maybeScrollDiffToBottom(newLine$1, prevLine);
+				prevLine = newLine$1;
+				log("diff", "flushAppendBufferDiff chunk applied", {
+					idx,
+					newLine: newLine$1
+				});
+			}
+			if (suppressedByFlush) watcherApi.setSuppressed(false);
+			return;
+		}
+		const text = totalText;
 		this.appendBufferDiff.length = 0;
+		prevLine = model.getLineCount();
+		const lastColumn = model.getLineMaxColumn(prevLine);
+		const range = new monaco_shim_exports.Range(prevLine, lastColumn, prevLine, lastColumn);
+		model.applyEdits([{
+			range,
+			text,
+			forceMoveMarkers: true
+		}]);
+		this.lastKnownModifiedCode = model.getValue();
+		const newLine = model.getLineCount();
+		this.lastKnownModifiedLineCount = newLine;
+		const shouldImmediate = this.shouldPerformImmediateRevealDiff();
+		if (shouldImmediate) this.suppressScrollWatcherDiff(this.scrollWatcherSuppressionMs + 800);
+		const computed$1 = this.computedHeight();
+		if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer) this.lastContainer.style.height = `${this.maxHeightValue}px`;
+		if (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 {
-			const prevLine = model.getLineCount();
-			const lastColumn = model.getLineMaxColumn(prevLine);
-			const range = new monaco_shim_exports.Range(prevLine, lastColumn, prevLine, lastColumn);
-			model.applyEdits([{
-				range,
-				text,
-				forceMoveMarkers: true
-			}]);
-			try {
-				this.lastKnownModifiedCode = model.getValue();
-			} catch {}
-			const newLine = model.getLineCount();
-			this.maybeScrollDiffToBottom(newLine, prevLine);
-			this.lastKnownModifiedLineCount = newLine;
+			var _this$diffEditorView5, _this$diffEditorView6, _this$diffEditorView7;
+			this.shouldAutoScrollDiff = true;
+			this.lastScrollTopDiff = ((_this$diffEditorView5 = this.diffEditorView) === null || _this$diffEditorView5 === void 0 || (_this$diffEditorView7 = (_this$diffEditorView6 = _this$diffEditorView5.getModifiedEditor()).getScrollTop) === null || _this$diffEditorView7 === void 0 ? void 0 : _this$diffEditorView7.call(_this$diffEditorView6)) ?? this.lastScrollTopDiff;
 		} catch {}
 	}
 	applyMinimalEditToModel(model, prev, next) {
-		try {
-			const maxChars = minimalEditMaxChars;
-			const ratio = minimalEditMaxChangeRatio;
-			const maxLen = Math.max(prev.length, next.length);
-			const changeRatio = maxLen > 0 ? Math.abs(next.length - prev.length) / maxLen : 0;
-			if (prev.length + next.length > maxChars || changeRatio > ratio) {
-				model.setValue(next);
-				try {
-					if (model === this.modifiedModel) this.lastKnownModifiedLineCount = model.getLineCount();
-				} catch {}
-				return;
-			}
-		} catch {}
+		const maxChars = minimalEditMaxChars;
+		const ratio = minimalEditMaxChangeRatio;
+		const maxLen = Math.max(prev.length, next.length);
+		const changeRatio = maxLen > 0 ? Math.abs(next.length - prev.length) / maxLen : 0;
+		if (prev.length + next.length > maxChars || changeRatio > ratio) {
+			model.setValue(next);
+			if (model === this.modifiedModel) this.lastKnownModifiedLineCount = model.getLineCount();
+			return;
+		}
 		const res = computeMinimalEdit(prev, next);
 		if (!res) return;
 		const { start, endPrevIncl, replaceText } = res;
@@ -845,9 +1312,7 @@ var DiffEditorManager = class {
 			text: replaceText,
 			forceMoveMarkers: true
 		}]);
-		try {
-			if (model === this.modifiedModel) this.lastKnownModifiedLineCount = model.getLineCount();
-		} catch {}
+		if (model === this.modifiedModel) this.lastKnownModifiedLineCount = model.getLineCount();
 	}
 	appendToModel(model, appendText) {
 		if (!appendText) return;
@@ -859,9 +1324,7 @@ var DiffEditorManager = class {
 			text: appendText,
 			forceMoveMarkers: true
 		}]);
-		try {
-			if (model === this.modifiedModel) this.lastKnownModifiedLineCount = model.getLineCount();
-		} catch {}
+		if (model === this.modifiedModel) this.lastKnownModifiedLineCount = model.getLineCount();
 	}
 };
 
@@ -875,12 +1338,14 @@ var EditorManager = class {
 	_hasScrollBar = false;
 	shouldAutoScroll = true;
 	scrollWatcher = null;
+	scrollWatcherSuppressionTimer = null;
 	lastScrollTop = 0;
 	cachedScrollHeight = null;
 	cachedLineHeight = null;
 	cachedComputedHeight = null;
 	cachedLineCount = null;
 	lastKnownCodeDirty = false;
+	debug = false;
 	measureViewport() {
 		var _this$editorView$getL, _this$editorView, _this$editorView$getS, _this$editorView2, _this$editorView$getS2, _this$editorView3;
 		if (!this.editorView) return null;
@@ -908,8 +1373,10 @@ var EditorManager = class {
 	revealDebounceId = null;
 	revealDebounceMs = defaultRevealDebounceMs;
 	revealIdleTimerId = null;
+	revealTicket = 0;
 	revealStrategyOption;
 	revealBatchOnIdleMsOption;
+	scrollWatcherSuppressionMs = 500;
 	constructor(options, maxHeightValue, maxHeightCSS, autoScrollOnUpdate, autoScrollInitial, autoScrollThresholdPx, autoScrollThresholdLines, revealDebounceMsOption) {
 		this.options = options;
 		this.maxHeightValue = maxHeightValue;
@@ -920,6 +1387,21 @@ var EditorManager = class {
 		this.autoScrollThresholdLines = autoScrollThresholdLines;
 		this.revealDebounceMsOption = revealDebounceMsOption;
 	}
+	initDebugFlag() {
+		if (typeof window !== "undefined" && window.__STREAM_MONACO_DEBUG__ !== void 0) {
+			this.debug = Boolean(window.__STREAM_MONACO_DEBUG__);
+			return;
+		}
+		if (this.options && this.options.debug !== void 0) {
+			this.debug = Boolean(this.options.debug);
+			return;
+		}
+		this.debug = false;
+	}
+	dlog(...args) {
+		if (!this.debug) return;
+		log("EditorManager", ...args);
+	}
 	hasVerticalScrollbar() {
 		if (!this.editorView) return false;
 		if (this._hasScrollBar) return true;
@@ -941,19 +1423,38 @@ var EditorManager = class {
 		const lineCount = this.cachedLineCount ?? ((_editorView$getModel = editorView.getModel()) === null || _editorView$getModel === void 0 ? void 0 : _editorView$getModel.getLineCount()) ?? 1;
 		const lineHeight = editorView.getOption(monaco_shim_exports.editor.EditorOption.lineHeight);
 		const height = Math.min(lineCount * lineHeight + padding, this.maxHeightValue);
+		log("EditorManager.computedHeight", {
+			lineCount,
+			lineHeight,
+			computed: height,
+			maxHeightValue: this.maxHeightValue
+		});
 		return height;
 	}
 	maybeScrollToBottom(targetLine) {
 		this.rafScheduler.schedule("maybe-scroll", () => {
-			if (!(this.autoScrollOnUpdate && this.shouldAutoScroll && this.hasVerticalScrollbar())) return;
+			const hasVS = this.hasVerticalScrollbar();
+			this.dlog("maybeScrollToBottom called", {
+				autoScrollOnUpdate: this.autoScrollOnUpdate,
+				shouldAutoScroll: this.shouldAutoScroll,
+				hasVerticalScrollbar: hasVS,
+				targetLine
+			});
+			if (!(this.autoScrollOnUpdate && this.shouldAutoScroll && this.hasVerticalScrollbar())) {
+				this.dlog("maybeScrollToBottom skipped (auto-scroll conditions not met)");
+				return;
+			}
 			const model = this.editorView.getModel();
 			const line = targetLine ?? (model === null || model === void 0 ? void 0 : model.getLineCount()) ?? 1;
 			const batchMs = this.revealBatchOnIdleMsOption ?? this.options.revealBatchOnIdleMs ?? defaultRevealBatchOnIdleMs;
 			if (typeof batchMs === "number" && batchMs > 0) {
 				if (this.revealIdleTimerId != null) clearTimeout(this.revealIdleTimerId);
+				const ticket = ++this.revealTicket;
+				this.dlog("scheduled idle reveal ticket=", ticket, "line=", line, "batchMs=", batchMs);
 				this.revealIdleTimerId = setTimeout(() => {
 					this.revealIdleTimerId = null;
-					this.performReveal(line);
+					this.dlog("idle reveal timer firing, ticket=", ticket, "line=", line);
+					this.performReveal(line, ticket);
 				}, batchMs);
 				return;
 			}
@@ -964,14 +1465,22 @@ var EditorManager = class {
 			const ms = typeof this.revealDebounceMs === "number" && this.revealDebounceMs > 0 ? this.revealDebounceMs : typeof this.revealDebounceMsOption === "number" && this.revealDebounceMsOption > 0 ? this.revealDebounceMsOption : this.revealDebounceMs;
 			this.revealDebounceId = setTimeout(() => {
 				this.revealDebounceId = null;
-				this.performReveal(line);
+				const ticket = ++this.revealTicket;
+				this.dlog("scheduled debounce reveal ticket=", ticket, "line=", line, "ms=", ms);
+				this.performReveal(line, ticket);
 			}, ms);
 		});
 	}
-	performReveal(line) {
+	performReveal(line, ticket) {
 		this.rafScheduler.schedule("reveal", () => {
 			var _editor;
+			if (ticket !== this.revealTicket) {
+				this.dlog("performReveal skipped, stale ticket", ticket, "current", this.revealTicket);
+				return;
+			}
+			this.dlog("performReveal executing, ticket=", ticket, "line=", line);
 			const strategy = this.revealStrategyOption ?? this.options.revealStrategy ?? "centerIfOutside";
+			this.dlog("performReveal strategy=", strategy);
 			const ScrollType = monaco_shim_exports.ScrollType || ((_editor = monaco_shim_exports.editor) === null || _editor === void 0 ? void 0 : _editor.ScrollType);
 			const smooth = ScrollType && typeof ScrollType.Smooth !== "undefined" ? ScrollType.Smooth : void 0;
 			try {
@@ -988,11 +1497,59 @@ var EditorManager = class {
 			}
 		});
 	}
+	performImmediateReveal(line, ticket) {
+		this.dlog("performImmediateReveal line=", line, "ticket=", ticket);
+		try {
+			var _editor2;
+			if (!this.editorView) return;
+			if (ticket !== this.revealTicket) {
+				this.dlog("performImmediateReveal skipped, stale ticket", ticket, "current", this.revealTicket);
+				return;
+			}
+			const ScrollType = monaco_shim_exports.ScrollType || ((_editor2 = monaco_shim_exports.editor) === null || _editor2 === void 0 ? void 0 : _editor2.ScrollType);
+			const immediate = ScrollType && typeof ScrollType.Immediate !== "undefined" ? ScrollType.Immediate : void 0;
+			if (typeof immediate !== "undefined") this.editorView.revealLine(line, immediate);
+			else this.editorView.revealLine(line);
+		} catch {}
+		try {
+			this.measureViewport();
+		} catch {}
+	}
+	forceReveal(line) {
+		try {
+			var _editor3;
+			if (!this.editorView) return;
+			const ScrollType = monaco_shim_exports.ScrollType || ((_editor3 = monaco_shim_exports.editor) === null || _editor3 === void 0 ? void 0 : _editor3.ScrollType);
+			const immediate = ScrollType && typeof ScrollType.Immediate !== "undefined" ? ScrollType.Immediate : void 0;
+			if (typeof immediate !== "undefined") this.editorView.revealLine(line, immediate);
+			else this.editorView.revealLine(line);
+		} catch {}
+		try {
+			this.measureViewport();
+		} catch {}
+		try {
+			var _this$editorView4, _this$editorView4$get;
+			this.shouldAutoScroll = true;
+			this.lastScrollTop = ((_this$editorView4 = this.editorView) === null || _this$editorView4 === void 0 || (_this$editorView4$get = _this$editorView4.getScrollTop) === null || _this$editorView4$get === void 0 ? void 0 : _this$editorView4$get.call(_this$editorView4)) ?? this.lastScrollTop;
+		} catch {}
+	}
+	isOverflowAuto() {
+		try {
+			return !!this.lastContainer && this.lastContainer.style.overflow === "auto";
+		} catch {
+			return false;
+		}
+	}
+	shouldPerformImmediateReveal() {
+		return this.autoScrollOnUpdate && this.shouldAutoScroll && this.hasVerticalScrollbar() && this.isOverflowAuto();
+	}
 	async createEditor(container, code, language, currentTheme) {
-		var _this$editorView$getS3, _this$editorView4, _this$editorView$getO, _this$editorView5, _this$editorView$getM, _this$editorView$onDi, _this$editorView6;
+		var _this$editorView$getS3, _this$editorView5, _this$editorView$getO, _this$editorView6, _this$editorView$getM, _this$editorView$onDi, _this$editorView7;
 		this.cleanup();
 		this.lastContainer = container;
-		container.style.overflow = "auto";
+		this.initDebugFlag();
+		this.dlog("createEditor container, maxHeight", this.maxHeightValue);
+		container.style.overflow = "hidden";
 		container.style.maxHeight = this.maxHeightCSS;
 		this.editorView = monaco_shim_exports.editor.create(container, {
 			value: code,
@@ -1023,22 +1580,51 @@ var EditorManager = class {
 		}
 		if (this.revealIdleTimerId != null) clearTimeout(this.revealIdleTimerId);
 		this.revealIdleTimerId = null;
-		this.editorHeightManager = createHeightManager(container, () => this.computedHeight(this.editorView));
+		const MIN_VISIBLE_HEIGHT = Math.min(120, this.maxHeightValue);
+		container.style.minHeight = `${MIN_VISIBLE_HEIGHT}px`;
+		this.editorHeightManager = createHeightManager(container, () => {
+			const computed$1 = this.computedHeight(this.editorView);
+			const clamped = Math.min(computed$1, this.maxHeightValue);
+			return Math.max(clamped, MIN_VISIBLE_HEIGHT);
+		});
 		this.editorHeightManager.update();
-		this.cachedScrollHeight = ((_this$editorView$getS3 = (_this$editorView4 = this.editorView).getScrollHeight) === null || _this$editorView$getS3 === void 0 ? void 0 : _this$editorView$getS3.call(_this$editorView4)) ?? null;
-		this.cachedLineHeight = ((_this$editorView$getO = (_this$editorView5 = this.editorView).getOption) === null || _this$editorView$getO === void 0 ? void 0 : _this$editorView$getO.call(_this$editorView5, monaco_shim_exports.editor.EditorOption.lineHeight)) ?? null;
+		const initialComputed = this.computedHeight(this.editorView);
+		if (initialComputed >= this.maxHeightValue - 1) {
+			container.style.height = `${this.maxHeightValue}px`;
+			container.style.overflow = "auto";
+			this.dlog("applied immediate maxHeight on createEditor", this.maxHeightValue);
+		}
+		this.cachedScrollHeight = ((_this$editorView$getS3 = (_this$editorView5 = this.editorView).getScrollHeight) === null || _this$editorView$getS3 === void 0 ? void 0 : _this$editorView$getS3.call(_this$editorView5)) ?? null;
+		this.cachedLineHeight = ((_this$editorView$getO = (_this$editorView6 = this.editorView).getOption) === null || _this$editorView$getO === void 0 ? void 0 : _this$editorView$getO.call(_this$editorView6, monaco_shim_exports.editor.EditorOption.lineHeight)) ?? null;
 		this.cachedComputedHeight = this.computedHeight(this.editorView);
 		this.cachedLineCount = ((_this$editorView$getM = this.editorView.getModel()) === null || _this$editorView$getM === void 0 ? void 0 : _this$editorView$getM.getLineCount()) ?? null;
-		(_this$editorView$onDi = (_this$editorView6 = this.editorView).onDidContentSizeChange) === null || _this$editorView$onDi === void 0 || _this$editorView$onDi.call(_this$editorView6, () => {
+		(_this$editorView$onDi = (_this$editorView7 = this.editorView).onDidContentSizeChange) === null || _this$editorView$onDi === void 0 || _this$editorView$onDi.call(_this$editorView7, () => {
 			this._hasScrollBar = false;
 			this.rafScheduler.schedule("content-size-change", () => {
 				try {
-					var _this$editorView7, _this$editorHeightMan, _this$editorHeightMan2;
-					this.measureViewport();
-					this.cachedLineCount = ((_this$editorView7 = this.editorView) === null || _this$editorView7 === void 0 || (_this$editorView7 = _this$editorView7.getModel()) === null || _this$editorView7 === void 0 ? void 0 : _this$editorView7.getLineCount()) ?? this.cachedLineCount;
-					if ((_this$editorHeightMan = this.editorHeightManager) === null || _this$editorHeightMan === void 0 ? void 0 : _this$editorHeightMan.isSuppressed()) return;
+					var _this$editorView8, _this$editorHeightMan, _this$editorHeightMan2;
+					this.dlog("content-size-change frame");
+					const m = this.measureViewport();
+					this.dlog("content-size-change measure", m);
+					this.cachedLineCount = ((_this$editorView8 = this.editorView) === null || _this$editorView8 === void 0 || (_this$editorView8 = _this$editorView8.getModel()) === null || _this$editorView8 === void 0 ? void 0 : _this$editorView8.getLineCount()) ?? this.cachedLineCount;
+					if ((_this$editorHeightMan = this.editorHeightManager) === null || _this$editorHeightMan === void 0 ? void 0 : _this$editorHeightMan.isSuppressed()) {
+						this.dlog("content-size-change skipped height update (suppressed)");
+						return;
+					}
+					this.dlog("content-size-change calling heightManager.update");
 					(_this$editorHeightMan2 = this.editorHeightManager) === null || _this$editorHeightMan2 === void 0 || _this$editorHeightMan2.update();
-				} catch {}
+					const computed$1 = this.computedHeight(this.editorView);
+					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.shouldAutoScroll) this.maybeScrollToBottom();
+						}
+					}
+				} catch (err) {
+					error("EditorManager", "content-size-change error", err);
+				}
 			});
 		});
 		this.editorView.onDidChangeModelContent(() => {
@@ -1069,15 +1655,67 @@ var EditorManager = class {
 	}
 	syncLastKnownCode() {
 		if (!this.editorView || !this.lastKnownCodeDirty) return;
-		try {
-			const model = this.editorView.getModel();
-			if (model) {
-				this.lastKnownCode = model.getValue();
-				this.cachedLineCount = model.getLineCount() ?? this.cachedLineCount;
+		const model = this.editorView.getModel();
+		if (model) {
+			this.lastKnownCode = model.getValue();
+			this.cachedLineCount = model.getLineCount() ?? this.cachedLineCount;
+		}
+		this.lastKnownCodeDirty = false;
+	}
+	suppressScrollWatcher(ms) {
+		if (!this.scrollWatcher || typeof this.scrollWatcher.setSuppressed !== "function") return;
+		this.dlog("suppressScrollWatcher", ms);
+		if (this.scrollWatcherSuppressionTimer != null) {
+			clearTimeout(this.scrollWatcherSuppressionTimer);
+			this.scrollWatcherSuppressionTimer = null;
+		}
+		this.scrollWatcher.setSuppressed(true);
+		this.scrollWatcherSuppressionTimer = setTimeout(() => {
+			if (this.scrollWatcher && typeof this.scrollWatcher.setSuppressed === "function") {
+				this.scrollWatcher.setSuppressed(false);
+				this.dlog("suppressScrollWatcher cleared");
 			}
-		} catch {} finally {
-			this.lastKnownCodeDirty = false;
-		}
+			this.scrollWatcherSuppressionTimer = null;
+		}, ms);
+	}
+	scheduleImmediateRevealAfterLayout(line) {
+		const ticket = ++this.revealTicket;
+		this.dlog("scheduleImmediateRevealAfterLayout ticket=", ticket, "line=", line);
+		this.rafScheduler.schedule("immediate-reveal", async () => {
+			try {
+				const target = this.editorView && this.editorHeightManager ? Math.min(this.computedHeight(this.editorView), this.maxHeightValue) : -1;
+				if (target !== -1 && this.editorHeightManager) await this.waitForHeightApplied(target, 500);
+				else await new Promise((r) => requestAnimationFrame(() => requestAnimationFrame(() => r())));
+				this.dlog("running delayed immediate reveal", "ticket=", ticket, "line=", line);
+				this.performImmediateReveal(line, ticket);
+			} catch (err) {
+				error("EditorManager", "scheduleImmediateRevealAfterLayout error", err);
+			}
+		});
+	}
+	waitForHeightApplied(target, timeoutMs = 500) {
+		return new Promise((resolve) => {
+			const start = typeof performance !== "undefined" && performance.now ? performance.now() : Date.now();
+			const check = () => {
+				try {
+					var _this$editorHeightMan3, _this$editorHeightMan4;
+					const last = ((_this$editorHeightMan3 = this.editorHeightManager) === null || _this$editorHeightMan3 === void 0 || (_this$editorHeightMan4 = _this$editorHeightMan3.getLastApplied) === null || _this$editorHeightMan4 === void 0 ? void 0 : _this$editorHeightMan4.call(_this$editorHeightMan3)) ?? -1;
+					if (last !== -1 && Math.abs(last - target) <= 12) {
+						this.dlog("waitForHeightApplied satisfied", last, "target=", target);
+						resolve();
+						return;
+					}
+					const now = typeof performance !== "undefined" && performance.now ? performance.now() : Date.now();
+					if (now - start > timeoutMs) {
+						log("EditorManager", "waitForHeightApplied timeout", last, "target=", target);
+						resolve();
+						return;
+					}
+				} catch {}
+				requestAnimationFrame(check);
+			};
+			check();
+		});
 	}
 	updateCode(newCode, codeLanguage) {
 		this.pendingUpdate = {
@@ -1101,7 +1739,13 @@ var EditorManager = class {
 			this.lastKnownCode = newCode;
 			const newLineCount$1 = model.getLineCount();
 			this.cachedLineCount = newLineCount$1;
-			if (newLineCount$1 !== prevLineCount$1) this.maybeScrollToBottom(newLineCount$1);
+			if (newLineCount$1 !== prevLineCount$1) {
+				const shouldImmediate = this.shouldPerformImmediateReveal();
+				if (shouldImmediate) this.suppressScrollWatcher(this.scrollWatcherSuppressionMs);
+				const computed$1 = this.computedHeight(this.editorView);
+				if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer) this.lastContainer.style.height = `${this.maxHeightValue}px`;
+				this.forceReveal(newLineCount$1);
+			}
 			return;
 		}
 		const prevCode = this.appendBuffer.length > 0 ? this.editorView.getValue() : this.lastKnownCode ?? this.editorView.getValue();
@@ -1117,7 +1761,12 @@ var EditorManager = class {
 		this.lastKnownCode = newCode;
 		const newLineCount = model.getLineCount();
 		this.cachedLineCount = newLineCount;
-		if (newLineCount !== prevLineCount) this.maybeScrollToBottom(newLineCount);
+		if (newLineCount !== prevLineCount) {
+			const shouldImmediate = this.shouldPerformImmediateReveal();
+			if (shouldImmediate) this.suppressScrollWatcher(this.scrollWatcherSuppressionMs);
+			if (shouldImmediate) this.scheduleImmediateRevealAfterLayout(newLineCount);
+			else this.maybeScrollToBottom(newLineCount);
+		}
 	}
 	appendCode(appendText, codeLanguage) {
 		if (!this.editorView) return;
@@ -1137,21 +1786,19 @@ var EditorManager = class {
 		if (!this.editorView) return;
 		const model = this.editorView.getModel();
 		if (!model) return;
-		try {
-			const maxChars = minimalEditMaxChars;
-			const ratio = minimalEditMaxChangeRatio;
-			const maxLen = Math.max(prev.length, next.length);
-			const changeRatio = maxLen > 0 ? Math.abs(next.length - prev.length) / maxLen : 0;
-			if (prev.length + next.length > maxChars || changeRatio > ratio) {
-				const prevLineCount = model.getLineCount();
-				model.setValue(next);
-				this.lastKnownCode = next;
-				const newLineCount = model.getLineCount();
-				this.cachedLineCount = newLineCount;
-				if (newLineCount !== prevLineCount) this.maybeScrollToBottom(newLineCount);
-				return;
-			}
-		} catch {}
+		const maxChars = minimalEditMaxChars;
+		const ratio = minimalEditMaxChangeRatio;
+		const maxLen = Math.max(prev.length, next.length);
+		const changeRatio = maxLen > 0 ? Math.abs(next.length - prev.length) / maxLen : 0;
+		if (prev.length + next.length > maxChars || changeRatio > ratio) {
+			const prevLineCount = model.getLineCount();
+			model.setValue(next);
+			this.lastKnownCode = next;
+			const newLineCount = model.getLineCount();
+			this.cachedLineCount = newLineCount;
+			if (newLineCount !== prevLineCount) this.maybeScrollToBottom(newLineCount);
+			return;
+		}
 		const res = computeMinimalEdit(prev, next);
 		if (!res) return;
 		const { start, endPrevIncl, replaceText } = res;
@@ -1195,7 +1842,14 @@ var EditorManager = class {
 		const newLineCount = model.getLineCount();
 		if (lastLine !== newLineCount) {
 			this.cachedLineCount = newLineCount;
-			this.maybeScrollToBottom(newLineCount);
+			const shouldImmediate = this.shouldPerformImmediateReveal();
+			if (shouldImmediate) this.suppressScrollWatcher(this.scrollWatcherSuppressionMs);
+			const computed$1 = this.computedHeight(this.editorView);
+			if (computed$1 >= this.maxHeightValue - 1 && this.lastContainer) this.lastContainer.style.height = `${this.maxHeightValue}px`;
+			if (shouldImmediate) try {
+				this.forceReveal(newLineCount);
+			} catch {}
+			else this.maybeScrollToBottom(newLineCount);
 		}
 	}
 	setLanguage(language, languages$1) {
@@ -1213,16 +1867,33 @@ var EditorManager = class {
 		this.rafScheduler.cancel("update");
 		this.rafScheduler.cancel("sync-last-known");
 		this.rafScheduler.cancel("content-size-change");
+		this.rafScheduler.cancel("maybe-scroll");
+		this.rafScheduler.cancel("reveal");
+		this.rafScheduler.cancel("immediate-reveal");
+		this.rafScheduler.cancel("maybe-resume");
 		this.pendingUpdate = null;
 		this.rafScheduler.cancel("append");
 		this.appendBufferScheduled = false;
 		this.appendBuffer.length = 0;
+		if (this.revealDebounceId != null) {
+			clearTimeout(this.revealDebounceId);
+			this.revealDebounceId = null;
+		}
+		if (this.revealIdleTimerId != null) {
+			clearTimeout(this.revealIdleTimerId);
+			this.revealIdleTimerId = null;
+		}
+		if (this.scrollWatcherSuppressionTimer != null) {
+			clearTimeout(this.scrollWatcherSuppressionTimer);
+			this.scrollWatcherSuppressionTimer = null;
+		}
 		if (this.editorView) {
 			this.editorView.dispose();
 			this.editorView = null;
 		}
 		this.lastKnownCode = null;
 		if (this.lastContainer) {
+			this.lastContainer.style.minHeight = "";
 			this.lastContainer.innerHTML = "";
 			this.lastContainer = null;
 		}
@@ -1240,13 +1911,27 @@ var EditorManager = class {
 		this.pendingUpdate = null;
 		this.rafScheduler.cancel("sync-last-known");
 		if (this.scrollWatcher) {
-			this.scrollWatcher.dispose();
+			try {
+				this.scrollWatcher.dispose();
+			} catch {}
 			this.scrollWatcher = null;
 		}
 		if (this.revealDebounceId != null) {
 			clearTimeout(this.revealDebounceId);
 			this.revealDebounceId = null;
 		}
+		if (this.revealIdleTimerId != null) {
+			clearTimeout(this.revealIdleTimerId);
+			this.revealIdleTimerId = null;
+		}
+		if (this.scrollWatcherSuppressionTimer != null) {
+			clearTimeout(this.scrollWatcherSuppressionTimer);
+			this.scrollWatcherSuppressionTimer = null;
+		}
+		this.rafScheduler.cancel("maybe-scroll");
+		this.rafScheduler.cancel("reveal");
+		this.rafScheduler.cancel("immediate-reveal");
+		this.rafScheduler.cancel("maybe-resume");
 		this._hasScrollBar = false;
 		this.shouldAutoScroll = !!this.autoScrollInitial;
 		this.lastScrollTop = 0;
@@ -1553,6 +2238,7 @@ let RevealStrategy = /* @__PURE__ */ function(RevealStrategy$1) {
 *   getEditorView: () => monaco.editor.IStandaloneCodeEditor | null,
 *   getDiffEditorView: () => monaco.editor.IStandaloneDiffEditor | null,
 *   getDiffModels: () => { original: monaco.editor.ITextModel | null, modified: monaco.editor.ITextModel | null },
+*   getCode: () => string | { original: string, modified: string } | null,
 * }} 返回对象包含以下方法和属性：
 *
 * @property {Function} createEditor - 创建并挂载 Monaco 编辑器到指定容器
@@ -1572,6 +2258,7 @@ let RevealStrategy = /* @__PURE__ */ function(RevealStrategy$1) {
 * @property {Function} getEditorView - 获取当前编辑器实例
 * @property {Function} getDiffEditorView - 获取当前 Diff 编辑器实例
 * @property {Function} getDiffModels - 获取 Diff 的 original/modified 两个模型
+* @property {Function} getCode - 获取当前编辑器或 Diff 编辑器中的代码内容
 *
 * @throws {Error} 当主题数组不是数组或长度小于2时抛出错误
 *
@@ -1732,9 +2419,7 @@ function useMonaco(monacoOptions = {}) {
 			flush: "post",
 			immediate: true
 		});
-		try {
-			if (editorView) lastKnownCode = editorView.getValue();
-		} catch {}
+		if (editorView) lastKnownCode = editorView.getValue();
 		return editorView;
 	}
 	function computedHeight(editorView$1) {
@@ -2078,7 +2763,26 @@ function useMonaco(monacoOptions = {}) {
 			return monaco_shim_exports;
 		},
 		setUpdateThrottleMs,
-		getUpdateThrottleMs
+		getUpdateThrottleMs,
+		getCode() {
+			if (editorView) try {
+				var _editorView$getModel;
+				return ((_editorView$getModel = editorView.getModel()) === null || _editorView$getModel === void 0 ? void 0 : _editorView$getModel.getValue()) ?? null;
+			} catch {
+				return null;
+			}
+			if (diffEditorView || originalModel && modifiedModel) try {
+				const original = (originalModel === null || originalModel === void 0 ? void 0 : originalModel.getValue()) ?? "";
+				const modified = (modifiedModel === null || modifiedModel === void 0 ? void 0 : modifiedModel.getValue()) ?? "";
+				return {
+					original,
+					modified
+				};
+			} catch {
+				return null;
+			}
+			return null;
+		}
 	};
 }