@openclaw/diffs 2026.8.1-beta.3 → 2026.8.2

package/node_modules/@pierre/diffs/dist/components/File.d.ts

@@ -1,4 +1,4 @@
-import { AppliedThemeStyleCache, BaseCodeOptions, FileContents, LineAnnotation, PostRenderPhase, PrePropertiesConfig, RenderFileMetadata, RenderRange, SelectedLineRange, ThemeTypes } from "../types.js";
+import { AppliedThemeStyleCache, BaseCodeOptions, DiffsEditableComponent, DiffsEditor, DiffsTextDocument, EditorActiveLineOptions, FileContents, HighlightedToken, LineAnnotation, PostRenderPhase, PrePropertiesConfig, RenderFileMetadata, RenderRange, SelectedLineRange, ThemeTypes } from "../types.js";
 import { GetHoveredLineResult, InteractionManager, InteractionManagerBaseOptions, SelectionWriteOptions } from "../managers/InteractionManager.js";
 import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
 import { ResizeManager } from "../managers/ResizeManager.js";
@@ -22,6 +22,7 @@ interface FileHydrateProps<LAnnotation> extends Omit<FileRenderProps<LAnnotation
 interface FileOptions<LAnnotation> extends BaseCodeOptions, InteractionManagerBaseOptions<'file'> {
   disableFileHeader?: boolean;
   renderHeaderPrefix?: RenderFileMetadata;
+  renderHeaderFilenameSuffix?: RenderFileMetadata;
   renderHeaderMetadata?: RenderFileMetadata;
   renderCustomHeader?: RenderFileMetadata;
   /**
@@ -42,7 +43,7 @@ interface HydrationSetup<LAnnotation> {
   file: FileContents;
   lineAnnotations: LineAnnotation<LAnnotation>[] | undefined;
 }
-declare class File<LAnnotation = undefined> {
+declare class File<LAnnotation = undefined> implements DiffsEditableComponent<LAnnotation> {
   options: FileOptions<LAnnotation>;
   private workerManager?;
   private isContainerManaged;
@@ -71,6 +72,7 @@ declare class File<LAnnotation = undefined> {
   protected headerElement: HTMLElement | undefined;
   protected headerCustom: HTMLElement | undefined;
   protected headerPrefix: HTMLElement | undefined;
+  protected headerFilenameSuffix: HTMLElement | undefined;
   protected headerMetadata: HTMLElement | undefined;
   protected fileRenderer: FileRenderer<LAnnotation>;
   protected resizeManager: ResizeManager;
@@ -81,9 +83,11 @@ declare class File<LAnnotation = undefined> {
   file: FileContents | undefined;
   protected renderRange: RenderRange | undefined;
   protected enabled: boolean;
+  protected editor: DiffsEditor<LAnnotation> | undefined;
   constructor(options?: FileOptions<LAnnotation>, workerManager?: WorkerPoolManager | undefined, isContainerManaged?: boolean);
   private handleHighlightRender;
   rerender(): void;
+  __getCurrentFile(): FileContents | undefined;
   onThemeChange(): void;
   setOptions(options: FileOptions<LAnnotation> | undefined): void;
   protected syncInteractionOptions(): void;
@@ -94,7 +98,12 @@ declare class File<LAnnotation = undefined> {
   getHoveredLine: () => GetHoveredLineResult<'file'> | undefined;
   setLineAnnotations(lineAnnotations: LineAnnotation<LAnnotation>[]): void;
   setSelectedLines(range: SelectedLineRange | null, options?: SelectionWriteOptions): void;
+  setEditorActiveLine(lineNumber: number | null, options?: EditorActiveLineOptions): void;
+  getCodeScrollLeft(): number;
+  setCodeScrollLeft(position: number): void;
+  __getEffectiveCodeOptions(): BaseCodeOptions;
   flushManagers(): void;
+  protected shouldApplyColumnVariables(overflow: 'scroll' | 'wrap'): boolean;
   cleanUp(recycle?: boolean): void;
   virtualizedSetup(): void;
   hydrate(props: FileHydrateProps<LAnnotation>): void;
@@ -104,7 +113,15 @@ declare class File<LAnnotation = undefined> {
     lineAnnotations
   }: HydrationSetup<LAnnotation>): void;
   getOrCreateLineCache(file?: FileContents | undefined): string[];
-  render({
+  protected updateBuffers(renderRange: RenderRange): void;
+  private syncRenderViewToEditor;
+  attachEditor(editor: DiffsEditor<LAnnotation>): () => void;
+  applyDocumentChange(textDocument: DiffsTextDocument, newLineAnnotations?: LineAnnotation<LAnnotation>[]): void;
+  updateRenderCache(dirtyLines: Map<number, Array<HighlightedToken>>, themeType: 'dark' | 'light', options?: {
+    lineCountChangeInFlight?: boolean;
+  }): void;
+  render(props: FileRenderProps<LAnnotation>): boolean;
+  protected renderPreparedFile({
     file,
     fileContainer,
     forceRender,
@@ -119,13 +136,14 @@ declare class File<LAnnotation = undefined> {
   private clearAuxiliaryNodes;
   private canPartiallyRender;
   renderPlaceholder(height: number): boolean;
-  primeHighlightCache(): void;
+  primeHighlightCache(file?: FileContents | undefined): Promise<void>;
   private cleanChildNodes;
   private renderAnnotations;
   private renderGutterUtility;
   private injectUnsafeCSS;
   private applyThemeState;
   private hydrateMeasuredScrollbar;
+  protected shouldGuardRebuildScroll(): boolean;
   private applyFullRender;
   private applyPartialRender;
   private getColumns;

package/node_modules/@pierre/diffs/dist/components/File.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"File.d.ts","names":[],"sources":["../../src/components/File.ts"],"mappings":"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"}
+{"version":3,"file":"File.d.ts","names":[],"sources":["../../src/components/File.ts"],"mappings":"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"}

package/node_modules/@pierre/diffs/dist/components/File.js

@@ -1,9 +1,9 @@
-import { CUSTOM_HEADER_SLOT_ID, DEFAULT_THEMES, EMPTY_RENDER_RANGE, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID } from "../constants.js";
+import { CUSTOM_HEADER_SLOT_ID, DEFAULT_THEMES, EMPTY_RENDER_RANGE, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID } from "../constants.js";
 import { areThemesEqual } from "../utils/areThemesEqual.js";
 import { isStyleNode } from "../utils/isStyleNode.js";
+import { areFilesEqual } from "../utils/areFilesEqual.js";
 import { InteractionManager, pluckInteractionOptions } from "../managers/InteractionManager.js";
 import { ResizeManager } from "../managers/ResizeManager.js";
-import { areFilesEqual } from "../utils/areFilesEqual.js";
 import { areRenderRangesEqual } from "../utils/areRenderRangesEqual.js";
 import { getLineAnnotationName } from "../utils/getLineAnnotationName.js";
 import { isFilePlainText } from "../utils/isFilePlainText.js";
@@ -18,13 +18,15 @@ import { getMeasuredScrollbarGutter } from "../utils/scrollbarGutter.js";
 import { patchScrollbarGutterSize, wrapThemeCSS, wrapUnsafeCSS } from "../utils/cssWrappers.js";
 import { getFileRendererOptions } from "../utils/getFileRendererOptions.js";
 import { getOrCreateCodeNode } from "../utils/getOrCreateCodeNode.js";
+import { guardWebKitScrollDuringRebuild } from "../utils/guardWebKitScrollDuringRebuild.js";
 import { upsertHostThemeStyle } from "../utils/hostTheme.js";
+import { isSafari } from "../utils/platform.js";
 import { prerenderHTMLIfNecessary } from "../utils/prerenderHTMLIfNecessary.js";
 import { setPreNodeProperties } from "../utils/setWrapperNodeProps.js";
 import "./web-components.js";
 import { toHtml } from "hast-util-to-html";
 //#region src/components/File.ts
-const EMPTY_STRINGS = [];
+const EMPTY_STRINGS = [""];
 let instanceId = -1;
 var File = class {
 	options;
@@ -55,6 +57,7 @@ var File = class {
 	headerElement;
 	headerCustom;
 	headerPrefix;
+	headerFilenameSuffix;
 	headerMetadata;
 	fileRenderer;
 	resizeManager;
@@ -65,6 +68,7 @@ var File = class {
 	file;
 	renderRange;
 	enabled = true;
+	editor;
 	constructor(options = { theme: DEFAULT_THEMES }, workerManager, isContainerManaged = false) {
 		this.options = options;
 		this.workerManager = workerManager;
@@ -85,6 +89,9 @@ var File = class {
 			renderRange: this.renderRange
 		});
 	}
+	__getCurrentFile() {
+		return this.file;
+	}
 	onThemeChange() {
 		this.fileRenderer.clearRenderCache();
 		this.rerender();
@@ -128,6 +135,24 @@ var File = class {
 	setSelectedLines(range, options) {
 		this.interactionManager.setSelection(range, options);
 	}
+	setEditorActiveLine(lineNumber, options) {
+		this.interactionManager.setEditorActiveLine(lineNumber, {
+			lineNumberOnly: options?.lineNumberOnly,
+			side: options?.side ?? "additions"
+		});
+	}
+	getCodeScrollLeft() {
+		return this.code?.scrollLeft ?? 0;
+	}
+	setCodeScrollLeft(position) {
+		if (this.code != null) this.code.scrollLeft = position;
+	}
+	__getEffectiveCodeOptions() {
+		return {
+			...this.options,
+			...this.fileRenderer.getEffectiveCodeOptions()
+		};
+	}
 	flushManagers() {
 		if (!this.managersDirty || this.pre == null) {
 			this.managersDirty = false;
@@ -135,11 +160,19 @@ var File = class {
 		}
 		const { overflow = "scroll" } = this.options;
 		this.interactionManager.setup(this.pre);
-		this.resizeManager.setup(this.pre, overflow === "wrap");
+		this.resizeManager.setup(this.pre, {
+			disableAnnotations: overflow === "wrap",
+			columnVariables: this.shouldApplyColumnVariables(overflow) ? "apply" : "measure"
+		});
 		this.managersDirty = false;
 	}
+	shouldApplyColumnVariables(overflow) {
+		return overflow === "scroll" && this.lineAnnotations.length > 0;
+	}
 	cleanUp(recycle = false) {
 		this.emitPostRender(true);
+		this.editor?.cleanUp(recycle);
+		this.editor = void 0;
 		this.resizeManager.cleanUp();
 		this.interactionManager.cleanUp();
 		this.managersDirty = false;
@@ -149,26 +182,32 @@ var File = class {
 		this.fileContainer = void 0;
 		this.mounted = false;
 		if (!recycle) this.lineAnnotations = [];
-		this.annotationCache.clear();
+		this.clearAuxiliaryNodes();
 		this.pre = void 0;
+		this.code = void 0;
+		this.bufferBefore?.remove();
 		this.bufferBefore = void 0;
+		this.bufferAfter?.remove();
 		this.bufferAfter = void 0;
 		this.appliedPreAttributes = void 0;
 		this.lastRowCount = void 0;
 		this.headerElement = void 0;
 		this.headerPrefix = void 0;
+		this.headerFilenameSuffix = void 0;
 		this.headerMetadata = void 0;
 		this.headerCustom = void 0;
 		this.lastRenderedHeaderHTML = void 0;
 		if (!recycle) this.cachedHeaderHTML = void 0;
+		this.errorWrapper?.remove();
 		this.errorWrapper = void 0;
+		this.spriteSVG = void 0;
 		this.themeCSSStyle = void 0;
 		this.appliedThemeCSS = void 0;
 		this.hasAdoptedThemeCSS = false;
 		this.unsafeCSSStyle = void 0;
 		this.appliedUnsafeCSS = void 0;
+		this.placeHolder?.remove();
 		this.placeHolder = void 0;
-		this.unsafeCSSStyle = void 0;
 		if (recycle) this.fileRenderer.recycle();
 		else {
 			this.fileRenderer.cleanUp();
@@ -183,6 +222,8 @@ var File = class {
 	}
 	hydrate(props) {
 		const { fileContainer, prerenderedHTML, preventEmit = false, file, lineAnnotations } = props;
+		if (!this.enabled) throw new Error("File.hydrate: attempting to call hydrate after cleaned up");
+		if (this.fileContainer != null) throw new Error("File.hydrate: hydrate can only be called before the instance has rendered or hydrated");
 		this.hydrateElements(fileContainer, prerenderedHTML);
 		if (shouldRenderCode(this.pre, file, this.options.collapsed) || shouldRenderHeader(this.headerElement, file, this.options.disableFileHeader)) this.render({
 			...props,
@@ -246,14 +287,65 @@ var File = class {
 	getOrCreateLineCache(file = this.file) {
 		return file != null ? this.fileRenderer.getOrCreateLineCache(file) : EMPTY_STRINGS;
 	}
-	render({ file, fileContainer, forceRender = false, preventEmit = false, containerWrapper, deferManagers = false, lineAnnotations, renderRange }) {
-		const { collapsed = false, themeType = "system" } = this.options;
+	updateBuffers(renderRange) {
+		if (this.pre != null) this.applyBuffers(this.pre, renderRange);
+	}
+	syncRenderViewToEditor() {
+		const editor = this.editor;
+		const fileContainer = this.fileContainer;
+		const file = this.file;
+		const lineAnnotations = this.lineAnnotations;
+		const renderRange = this.renderRange;
+		if (editor != null && fileContainer != null && file != null) this.fileRenderer.initializeHighlighter().then((highlighter) => {
+			if (!this.enabled || this.editor !== editor || this.fileContainer !== fileContainer || this.file !== file) return;
+			editor.__syncRenderView(highlighter, fileContainer, file, lineAnnotations, renderRange);
+		});
+	}
+	attachEditor(editor) {
+		this.editor?.cleanUp();
+		this.editor = editor;
+		this.fileRenderer.beginEditSession();
+		const preparedFile = this.file == null ? void 0 : editor.__prepareFile?.(this.file);
+		if (preparedFile !== void 0 && preparedFile !== this.file) this.renderPreparedFile({
+			file: preparedFile,
+			forceRender: true,
+			preventEmit: true,
+			renderRange: this.renderRange
+		});
+		else if (this.fileRenderer.editorRenderReady()) this.syncRenderViewToEditor();
+		else this.rerender();
+		return () => {
+			this.editor = void 0;
+			this.fileRenderer.endEditSession();
+		};
+	}
+	applyDocumentChange(textDocument, newLineAnnotations) {
+		this.fileRenderer.applyDocumentChange(textDocument);
+		if (newLineAnnotations != null && newLineAnnotations !== this.lineAnnotations && this.file != null) {
+			this.setLineAnnotations(newLineAnnotations);
+			this.fileRenderer.setLineAnnotations(this.lineAnnotations);
+			this.renderAnnotations();
+		}
+	}
+	updateRenderCache(dirtyLines, themeType, options) {
+		this.fileRenderer.updateRenderCache(dirtyLines, themeType, options?.lineCountChangeInFlight);
+	}
+	render(props) {
 		if (!this.enabled) throw new Error("File.render: attempting to call render after cleaned up");
+		const file = this.editor?.__prepareFile?.(props.file) ?? props.file;
+		return this.renderPreparedFile(file === props.file ? props : {
+			...props,
+			file
+		});
+	}
+	renderPreparedFile({ file, fileContainer, forceRender = false, preventEmit = false, containerWrapper, deferManagers = false, lineAnnotations, renderRange }) {
+		this.editor?.__postponeBgTokenizeToNextFrame();
+		const { collapsed = false, themeType = "system" } = this.options;
 		const nextRenderRange = collapsed ? void 0 : renderRange;
 		const previousRenderRange = this.renderRange;
 		const themeChanged = this.hasThemeChanged();
 		const annotationsChanged = lineAnnotations != null && (lineAnnotations.length > 0 || this.lineAnnotations.length > 0) ? lineAnnotations !== this.lineAnnotations : false;
-		const didFileChange = !areFilesEqual(this.file, file);
+		const didFileChange = !areFilesEqual(this.file, file) || this.fileRenderer.hasUnkeyedFileContentsChanged(file);
 		if (!collapsed && !forceRender && areRenderRangesEqual(nextRenderRange, this.renderRange) && !didFileChange && !annotationsChanged && !themeChanged) return this.applyCachedThemeState(themeType);
 		this.renderRange = nextRenderRange;
 		if (didFileChange) this.cachedHeaderHTML = void 0;
@@ -303,10 +395,11 @@ var File = class {
 			}
 			this.applyBuffers(pre, nextRenderRange);
 			this.injectUnsafeCSS();
-			this.managersDirty = true;
-			if (!deferManagers) this.flushManagers();
 			this.renderAnnotations();
 			this.renderGutterUtility();
+			this.managersDirty = true;
+			if (!deferManagers) this.flushManagers();
+			if (this.editor != null) this.syncRenderViewToEditor();
 		} catch (error) {
 			if (disableErrorHandling) throw error;
 			console.error(error);
@@ -366,22 +459,26 @@ var File = class {
 		this.placeHolder.style.setProperty("height", `${height}px`);
 		return true;
 	}
-	primeHighlightCache() {
-		const { file, workerManager } = this;
-		if (file == null || file.cacheKey == null || workerManager == null || isFilePlainText(file)) return;
-		if (this.fileRenderer.getOrCreateLineCache(file).length > (this.options.tokenizeMaxLength ?? 1e5)) return;
-		workerManager.primeFileHighlightCache(file);
+	async primeHighlightCache(file = this.file) {
+		const { workerManager } = this;
+		if (file == null || workerManager == null || !workerManager.isWorkingPool() || file.cacheKey == null || isFilePlainText(file)) return;
+		const tokenizeMaxLength = this.options.tokenizeMaxLength ?? 1e5;
+		if (this.fileRenderer.getOrCreateLineCache(file).length > tokenizeMaxLength) return;
+		await workerManager.primeFileHighlightCache(file).catch((error) => {
+			console.error(error);
+		});
 	}
 	cleanChildNodes() {
 		this.resizeManager.cleanUp();
 		this.interactionManager.cleanUp();
+		this.clearAuxiliaryNodes();
 		this.bufferAfter?.remove();
 		this.bufferBefore?.remove();
 		this.code?.remove();
 		this.errorWrapper?.remove();
 		this.headerElement?.remove();
-		this.gutterUtilityContent?.remove();
 		this.headerPrefix?.remove();
+		this.headerFilenameSuffix?.remove();
 		this.headerMetadata?.remove();
 		this.headerCustom?.remove();
 		this.pre?.remove();
@@ -393,8 +490,8 @@ var File = class {
 		this.code = void 0;
 		this.errorWrapper = void 0;
 		this.headerElement = void 0;
-		this.gutterUtilityContent = void 0;
 		this.headerPrefix = void 0;
+		this.headerFilenameSuffix = void 0;
 		this.headerMetadata = void 0;
 		this.headerCustom = void 0;
 		this.pre = void 0;
@@ -514,12 +611,27 @@ var File = class {
 		if (shadowRoot == null || this.themeCSSStyle == null) return;
 		this.themeCSSStyle.textContent = patchScrollbarGutterSize(this.themeCSSStyle.textContent ?? "", getMeasuredScrollbarGutter(shadowRoot));
 	}
+	shouldGuardRebuildScroll() {
+		return this.editor != null && isSafari();
+	}
 	applyFullRender(result, pre) {
 		this.cleanupErrorWrapper();
 		this.applyPreNodeAttributes(pre, result);
-		this.code = getOrCreateCodeNode({ code: this.code });
-		this.code.innerHTML = this.fileRenderer.renderPartialHTML(this.fileRenderer.renderCodeAST(result));
-		pre.replaceChildren(this.code);
+		const code = this.code = getOrCreateCodeNode({ code: this.code });
+		const codeAst = this.fileRenderer.renderCodeAST(result);
+		this.editor?.__captureFocusForDOMReplacement();
+		const applyColumns = () => {
+			if (code.childElementCount >= 2) for (let i = 0; i < 2; i++) {
+				const domEl = code.children[i];
+				const astEl = codeAst[i];
+				domEl.innerHTML = toHtml(astEl.children);
+				domEl.style.cssText = astEl.properties.style;
+			}
+			else code.innerHTML = toHtml(codeAst);
+			if (!pre.contains(code)) pre.replaceChildren(code);
+		};
+		if (this.shouldGuardRebuildScroll()) guardWebKitScrollDuringRebuild(pre, applyColumns);
+		else applyColumns();
 		this.lastRowCount = result.rowCount;
 	}
 	applyPartialRender(previousRenderRange, renderRange) {
@@ -534,7 +646,7 @@ var File = class {
 		const overlapStart = Math.max(previousStart, nextStart);
 		const overlapEnd = Math.min(previousEnd, nextEnd);
 		if (overlapEnd <= overlapStart) return false;
-		if (!this.trimDOMToOverlap(columns.gutter, overlapStart, overlapEnd) || !this.trimDOMToOverlap(columns.content, overlapStart, overlapEnd)) return false;
+		if (!this.trimDOMToOverlap(columns.gutter, overlapStart, overlapEnd) || !this.trimDOMToOverlap(columns.content, overlapStart, overlapEnd)) throw new Error("File.applyPartialRender: failed to trim to overlap");
 		let { length: rowCount } = columns.content.children;
 		const renderChunk = (startingLine, totalLines) => {
 			if (totalLines <= 0) return;
@@ -678,18 +790,22 @@ var File = class {
 			this.lastRenderedHeaderHTML = headerHTML;
 		}
 		if (this.isContainerManaged) return;
-		const { renderHeaderPrefix, renderCustomHeader, renderHeaderMetadata } = this.options;
+		const { renderHeaderPrefix, renderHeaderFilenameSuffix, renderCustomHeader, renderHeaderMetadata } = this.options;
 		if (renderCustomHeader != null) {
 			const content = renderCustomHeader(file) ?? void 0;
 			this.headerCustom = this.upsertHeaderSlotElement(container, this.headerCustom, CUSTOM_HEADER_SLOT_ID, content);
 			this.headerPrefix?.remove();
+			this.headerFilenameSuffix?.remove();
 			this.headerMetadata?.remove();
 			this.headerPrefix = void 0;
+			this.headerFilenameSuffix = void 0;
 			this.headerMetadata = void 0;
 		} else {
 			const prefix = renderHeaderPrefix?.(file) ?? void 0;
+			const suffix = renderHeaderFilenameSuffix?.(file) ?? void 0;
 			const content = renderHeaderMetadata?.(file) ?? void 0;
 			this.headerPrefix = this.upsertHeaderSlotElement(container, this.headerPrefix, HEADER_PREFIX_SLOT_ID, prefix);
+			this.headerFilenameSuffix = this.upsertHeaderSlotElement(container, this.headerFilenameSuffix, HEADER_FILENAME_SUFFIX_SLOT_ID, suffix);
 			this.headerMetadata = this.upsertHeaderSlotElement(container, this.headerMetadata, HEADER_METADATA_SLOT_ID, content);
 			this.headerCustom?.remove();
 			this.headerCustom = void 0;
@@ -697,9 +813,11 @@ var File = class {
 	}
 	clearHeaderSlots() {
 		this.headerPrefix?.remove();
+		this.headerFilenameSuffix?.remove();
 		this.headerMetadata?.remove();
 		this.headerCustom?.remove();
 		this.headerPrefix = void 0;
+		this.headerFilenameSuffix = void 0;
 		this.headerMetadata = void 0;
 		this.headerCustom = void 0;
 	}
@@ -727,6 +845,7 @@ var File = class {
 		const { fileContainer: previousContainer } = this;
 		const nextContainer = fileContainer ?? previousContainer ?? document.createElement("diffs-container");
 		const containerChanged = previousContainer !== nextContainer;
+		if (previousContainer != null && containerChanged) this.editor?.__captureFocusForDOMReplacement();
 		if (containerChanged) this.emitPostRender(true);
 		this.fileContainer = nextContainer;
 		if (previousContainer != null && containerChanged) {
@@ -768,6 +887,7 @@ var File = class {
 			this.code = void 0;
 			shadowRoot.appendChild(this.pre);
 		} else if (this.pre.parentNode !== shadowRoot) {
+			this.editor?.__captureFocusForDOMReplacement();
 			container.shadowRoot?.appendChild(this.pre);
 			this.appliedPreAttributes = void 0;
 		}