@openclaw/diffs 2026.8.1-beta.3 → 2026.8.2

package/node_modules/@pierre/diffs/dist/react/utils/useUnresolvedFileInstance.js

@@ -1,12 +1,12 @@
 import { areOptionsEqual } from "../../utils/areOptionsEqual.js";
 import { parseMergeConflictDiffFromFile } from "../../utils/parseMergeConflictDiffFromFile.js";
 import { UnresolvedFile } from "../../components/UnresolvedFile.js";
-import { noopRender } from "../constants.js";
 import { useStableCallback } from "./useStableCallback.js";
+import { noopRender } from "../constants.js";
 import { WorkerPoolContext } from "../WorkerPoolContext.js";
 import { useCallback, useContext, useEffect, useLayoutEffect, useRef, useState } from "react";
 //#region src/react/utils/useUnresolvedFileInstance.ts
-const useIsometricEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
+const useIsomorphicLayoutEffect = typeof window === "undefined" ? useEffect : useLayoutEffect;
 function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLines, prerenderedHTML, hasConflictUtility, hasGutterRenderUtility, hasCustomHeader, disableWorkerPool }) {
 	const [{ fileDiff, actions, markerRows }, setState] = useState(() => {
 		const { fileDiff, actions, markerRows } = parseMergeConflictDiffFromFile(file, options?.maxContextLines);
@@ -55,7 +55,7 @@ function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLin
 			instanceRef.current = null;
 		}
 	});
-	useIsometricEffect(() => {
+	useIsomorphicLayoutEffect(() => {
 		if (instanceRef.current == null) return;
 		const instance = instanceRef.current;
 		const newOptions = mergeUnresolvedOptions({
@@ -66,7 +66,7 @@ function useUnresolvedFileInstance({ file, options, lineAnnotations, selectedLin
 			onMergeConflictAction,
 			options
 		});
-		const forceRender = !areOptionsEqual(instance.options, newOptions);
+		const forceRender = newOptions !== void 0 && !areOptionsEqual(instance.options, newOptions);
 		instance.setOptions(newOptions);
 		instance.render({
 			fileDiff,

package/node_modules/@pierre/diffs/dist/react/utils/useUnresolvedFileInstance.js.map

@@ -1 +1 @@
-{"version":3,"file":"useUnresolvedFileInstance.js","names":["UnresolvedFileClass"],"sources":["../../../src/react/utils/useUnresolvedFileInstance.ts"],"sourcesContent":["import {\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n  useState,\n} from 'react';\n\nimport {\n  UnresolvedFile,\n  UnresolvedFile as UnresolvedFileClass,\n  type UnresolvedFileOptions,\n} from '../../components/UnresolvedFile';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type {\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n  MergeConflictActionPayload,\n  MergeConflictMarkerRow,\n  SelectedLineRange,\n} from '../../types';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport {\n  type MergeConflictDiffAction,\n  parseMergeConflictDiffFromFile,\n} from '../../utils/parseMergeConflictDiffFromFile';\nimport { noopRender } from '../constants';\nimport type { UnresolvedFileReactOptions } from '../UnresolvedFile';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsometricEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface UseUnresolvedFileInstanceProps<LAnnotation> {\n  file: FileContents;\n  options?: UnresolvedFileReactOptions<LAnnotation>;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  hasConflictUtility: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  disableWorkerPool: boolean;\n}\n\ninterface UseUnresolvedFileInstanceReturn<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  actions: (MergeConflictDiffAction | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n  getInstance(): UnresolvedFile<LAnnotation> | undefined;\n}\n\nexport function useUnresolvedFileInstance<LAnnotation>({\n  file,\n  options,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  hasConflictUtility,\n  hasGutterRenderUtility,\n  hasCustomHeader,\n  disableWorkerPool,\n}: UseUnresolvedFileInstanceProps<LAnnotation>): UseUnresolvedFileInstanceReturn<LAnnotation> {\n  const [{ fileDiff, actions, markerRows }, setState] = useState(() => {\n    const { fileDiff, actions, markerRows } = parseMergeConflictDiffFromFile(\n      file,\n      options?.maxContextLines\n    );\n    return { fileDiff, actions, markerRows };\n  });\n  // UnresolvedFile is intentionally uncontrolled in React. Keep an internal\n  // source-of-truth file so sequential conflict actions apply to the latest\n  // resolved contents rather than the initial prop value.\n  const onMergeConflictAction = useStableCallback(\n    (\n      payload: MergeConflictActionPayload,\n      instance: UnresolvedFile<LAnnotation>\n    ) => {\n      setState((prevState) => {\n        const { fileDiff, actions, markerRows } =\n          instance.resolveConflict(\n            payload.conflict.conflictIndex,\n            payload.resolution,\n            prevState.fileDiff\n          ) ?? {};\n        if (fileDiff == null || actions == null || markerRows == null) {\n          return prevState;\n        } else {\n          return { fileDiff, actions, markerRows };\n        }\n      });\n    }\n  );\n  const controlledSelection = selectedLines !== undefined;\n  const poolManager = useContext(WorkerPoolContext);\n  const instanceRef = useRef<UnresolvedFileClass<LAnnotation> | null>(null);\n  const ref = useStableCallback((fileContainer: HTMLElement | null) => {\n    if (fileContainer != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'useUnresolvedFileInstance: An instance should not already exist when a node is created'\n        );\n      }\n      instanceRef.current = new UnresolvedFileClass(\n        mergeUnresolvedOptions({\n          controlledSelection,\n          hasConflictUtility,\n          hasCustomHeader,\n          hasGutterRenderUtility,\n          onMergeConflictAction,\n          options,\n        }),\n        !disableWorkerPool ? poolManager : undefined,\n        true\n      );\n      void instanceRef.current.hydrate({\n        fileDiff,\n        actions,\n        markerRows,\n        fileContainer,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error(\n          'useUnresolvedFileInstance: A UnresolvedFile instance should exist when unmounting'\n        );\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n    }\n  });\n\n  useIsometricEffect(() => {\n    if (instanceRef.current == null) return;\n    const instance = instanceRef.current;\n    const newOptions = mergeUnresolvedOptions({\n      controlledSelection,\n      hasConflictUtility,\n      hasCustomHeader,\n      hasGutterRenderUtility,\n      onMergeConflictAction,\n      options,\n    });\n    const forceRender = !areOptionsEqual(instance.options, newOptions);\n    instance.setOptions(newOptions);\n    void instance.render({\n      fileDiff,\n      actions,\n      markerRows,\n      lineAnnotations,\n      forceRender,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n  });\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'diff'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n\n  const getInstance = useCallback(() => {\n    return instanceRef.current ?? undefined;\n  }, []);\n\n  return { ref, getHoveredLine, fileDiff, actions, markerRows, getInstance };\n}\n\ninterface MergeUnresolvedOptionsProps<LAnnotation> {\n  options: UnresolvedFileReactOptions<LAnnotation> | undefined;\n  controlledSelection: boolean;\n  onMergeConflictAction: UnresolvedFileOptions<LAnnotation>['onMergeConflictAction'];\n  hasConflictUtility: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n}\n\nfunction mergeUnresolvedOptions<LAnnotation>({\n  options,\n  controlledSelection,\n  onMergeConflictAction,\n  hasConflictUtility,\n  hasCustomHeader,\n  hasGutterRenderUtility,\n}: MergeUnresolvedOptionsProps<LAnnotation>): UnresolvedFileOptions<LAnnotation> {\n  return {\n    ...options,\n    controlledSelection,\n    onMergeConflictAction,\n    hunkSeparators:\n      options?.hunkSeparators === 'custom'\n        ? noopRender\n        : options?.hunkSeparators,\n    // Add a placeholder type for the custom render\n    mergeConflictActionsType:\n      hasConflictUtility || options?.mergeConflictActionsType === 'custom'\n        ? noopRender\n        : options?.mergeConflictActionsType,\n    renderCustomHeader: hasCustomHeader ? noopRender : undefined,\n    renderGutterUtility: hasGutterRenderUtility ? noopRender : undefined,\n  };\n}\n"],"mappings":";;;;;;;;AAiCA,MAAM,qBACJ,OAAO,WAAW,cAAc,YAAY;AAuB9C,SAAgB,0BAAuC,EACrD,MACA,SACA,iBACA,eACA,iBACA,oBACA,wBACA,iBACA,qBAC4F;CAC5F,MAAM,CAAC,EAAE,UAAU,SAAS,cAAc,YAAY,eAAe;EACnE,MAAM,EAAE,UAAU,SAAS,eAAe,+BACxC,MACA,SAAS,eACX;EACA,OAAO;GAAE;GAAU;GAAS;EAAW;CACzC,CAAC;CAID,MAAM,wBAAwB,mBAE1B,SACA,aACG;EACH,UAAU,cAAc;GACtB,MAAM,EAAE,UAAU,SAAS,eACzB,SAAS,gBACP,QAAQ,SAAS,eACjB,QAAQ,YACR,UAAU,QACZ,KAAK,CAAC;GACR,IAAI,YAAY,QAAQ,WAAW,QAAQ,cAAc,MACvD,OAAO;QAEP,OAAO;IAAE;IAAU;IAAS;GAAW;EAE3C,CAAC;CACH,CACF;CACA,MAAM,sBAAsB,kBAAkB,KAAA;CAC9C,MAAM,cAAc,WAAW,iBAAiB;CAChD,MAAM,cAAc,OAAgD,IAAI;CACxE,MAAM,MAAM,mBAAmB,kBAAsC;EACnE,IAAI,iBAAiB,MAAM;GACzB,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,wFACF;GAEF,YAAY,UAAU,IAAIA,eACxB,uBAAuB;IACrB;IACA;IACA;IACA;IACA;IACA;GACF,CAAC,GACD,CAAC,oBAAoB,cAAc,KAAA,GACnC,IACF;GACA,YAAiB,QAAQ,QAAQ;IAC/B;IACA;IACA;IACA;IACA;IACA;GACF,CAAC;EACH,OAAO;GACL,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,mFACF;GAEF,YAAY,QAAQ,QAAQ;GAC5B,YAAY,UAAU;EACxB;CACF,CAAC;CAED,yBAAyB;EACvB,IAAI,YAAY,WAAW,MAAM;EACjC,MAAM,WAAW,YAAY;EAC7B,MAAM,aAAa,uBAAuB;GACxC;GACA;GACA;GACA;GACA;GACA;EACF,CAAC;EACD,MAAM,cAAc,CAAC,gBAAgB,SAAS,SAAS,UAAU;EACjE,SAAS,WAAW,UAAU;EAC9B,SAAc,OAAO;GACnB;GACA;GACA;GACA;GACA;EACF,CAAC;EACD,IAAI,kBAAkB,KAAA,GACpB,SAAS,iBAAiB,aAAa;CAE3C,CAAC;CAYD,OAAO;EAAE;EAAK,gBAVS,kBAEN;GACf,OAAO,YAAY,SAAS,eAAe;EAC7C,GAAG,CAAC,CAMuB;EAAG;EAAU;EAAS;EAAY,aAJzC,kBAAkB;GACpC,OAAO,YAAY,WAAW,KAAA;EAChC,GAAG,CAAC,CAEmE;CAAE;AAC3E;AAWA,SAAS,uBAAoC,EAC3C,SACA,qBACA,uBACA,oBACA,iBACA,0BAC+E;CAC/E,OAAO;EACL,GAAG;EACH;EACA;EACA,gBACE,SAAS,mBAAmB,WACxB,aACA,SAAS;EAEf,0BACE,sBAAsB,SAAS,6BAA6B,WACxD,aACA,SAAS;EACf,oBAAoB,kBAAkB,aAAa,KAAA;EACnD,qBAAqB,yBAAyB,aAAa,KAAA;CAC7D;AACF"}
+{"version":3,"file":"useUnresolvedFileInstance.js","names":["UnresolvedFileClass"],"sources":["../../../src/react/utils/useUnresolvedFileInstance.ts"],"sourcesContent":["import {\n  useCallback,\n  useContext,\n  useEffect,\n  useLayoutEffect,\n  useRef,\n  useState,\n} from 'react';\n\nimport {\n  UnresolvedFile,\n  UnresolvedFile as UnresolvedFileClass,\n  type UnresolvedFileOptions,\n} from '../../components/UnresolvedFile';\nimport type { GetHoveredLineResult } from '../../managers/InteractionManager';\nimport type {\n  DiffLineAnnotation,\n  FileContents,\n  FileDiffMetadata,\n  MergeConflictActionPayload,\n  MergeConflictMarkerRow,\n  SelectedLineRange,\n} from '../../types';\nimport { areOptionsEqual } from '../../utils/areOptionsEqual';\nimport {\n  type MergeConflictDiffAction,\n  parseMergeConflictDiffFromFile,\n} from '../../utils/parseMergeConflictDiffFromFile';\nimport { noopRender } from '../constants';\nimport type { UnresolvedFileReactOptions } from '../UnresolvedFile';\nimport { WorkerPoolContext } from '../WorkerPoolContext';\nimport { useStableCallback } from './useStableCallback';\n\nconst useIsomorphicLayoutEffect =\n  typeof window === 'undefined' ? useEffect : useLayoutEffect;\n\ninterface UseUnresolvedFileInstanceProps<LAnnotation> {\n  file: FileContents;\n  options?: UnresolvedFileReactOptions<LAnnotation>;\n  lineAnnotations: DiffLineAnnotation<LAnnotation>[] | undefined;\n  selectedLines: SelectedLineRange | null | undefined;\n  prerenderedHTML: string | undefined;\n  hasConflictUtility: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n  disableWorkerPool: boolean;\n}\n\ninterface UseUnresolvedFileInstanceReturn<LAnnotation> {\n  fileDiff: FileDiffMetadata;\n  actions: (MergeConflictDiffAction | undefined)[];\n  markerRows: MergeConflictMarkerRow[];\n  ref(node: HTMLElement | null): void;\n  getHoveredLine(): GetHoveredLineResult<'diff'> | undefined;\n  getInstance(): UnresolvedFile<LAnnotation> | undefined;\n}\n\nexport function useUnresolvedFileInstance<LAnnotation>({\n  file,\n  options,\n  lineAnnotations,\n  selectedLines,\n  prerenderedHTML,\n  hasConflictUtility,\n  hasGutterRenderUtility,\n  hasCustomHeader,\n  disableWorkerPool,\n}: UseUnresolvedFileInstanceProps<LAnnotation>): UseUnresolvedFileInstanceReturn<LAnnotation> {\n  const [{ fileDiff, actions, markerRows }, setState] = useState(() => {\n    const { fileDiff, actions, markerRows } = parseMergeConflictDiffFromFile(\n      file,\n      options?.maxContextLines\n    );\n    return { fileDiff, actions, markerRows };\n  });\n  // UnresolvedFile is intentionally uncontrolled in React. Keep an internal\n  // source-of-truth file so sequential conflict actions apply to the latest\n  // resolved contents rather than the initial prop value.\n  const onMergeConflictAction = useStableCallback(\n    (\n      payload: MergeConflictActionPayload,\n      instance: UnresolvedFile<LAnnotation>\n    ) => {\n      setState((prevState) => {\n        const { fileDiff, actions, markerRows } =\n          instance.resolveConflict(\n            payload.conflict.conflictIndex,\n            payload.resolution,\n            prevState.fileDiff\n          ) ?? {};\n        if (fileDiff == null || actions == null || markerRows == null) {\n          return prevState;\n        } else {\n          return { fileDiff, actions, markerRows };\n        }\n      });\n    }\n  );\n  const controlledSelection = selectedLines !== undefined;\n  const poolManager = useContext(WorkerPoolContext);\n  const instanceRef = useRef<UnresolvedFileClass<LAnnotation> | null>(null);\n  const ref = useStableCallback((fileContainer: HTMLElement | null) => {\n    if (fileContainer != null) {\n      if (instanceRef.current != null) {\n        throw new Error(\n          'useUnresolvedFileInstance: An instance should not already exist when a node is created'\n        );\n      }\n      instanceRef.current = new UnresolvedFileClass(\n        mergeUnresolvedOptions({\n          controlledSelection,\n          hasConflictUtility,\n          hasCustomHeader,\n          hasGutterRenderUtility,\n          onMergeConflictAction,\n          options,\n        }),\n        !disableWorkerPool ? poolManager : undefined,\n        true\n      );\n      void instanceRef.current.hydrate({\n        fileDiff,\n        actions,\n        markerRows,\n        fileContainer,\n        lineAnnotations,\n        prerenderedHTML,\n      });\n    } else {\n      if (instanceRef.current == null) {\n        throw new Error(\n          'useUnresolvedFileInstance: A UnresolvedFile instance should exist when unmounting'\n        );\n      }\n      instanceRef.current.cleanUp();\n      instanceRef.current = null;\n    }\n  });\n\n  useIsomorphicLayoutEffect(() => {\n    if (instanceRef.current == null) return;\n    const instance = instanceRef.current;\n    const newOptions = mergeUnresolvedOptions({\n      controlledSelection,\n      hasConflictUtility,\n      hasCustomHeader,\n      hasGutterRenderUtility,\n      onMergeConflictAction,\n      options,\n    });\n    // setOptions(undefined) is a no-op, so an undefined merge result never\n    // requires a forced render — comparing it against the instance's\n    // constructor-default options would force a full render on every commit.\n    const forceRender =\n      newOptions !== undefined &&\n      !areOptionsEqual(instance.options, newOptions);\n    instance.setOptions(newOptions);\n    void instance.render({\n      fileDiff,\n      actions,\n      markerRows,\n      lineAnnotations,\n      forceRender,\n    });\n    if (selectedLines !== undefined) {\n      instance.setSelectedLines(selectedLines);\n    }\n  });\n\n  const getHoveredLine = useCallback(():\n    | GetHoveredLineResult<'diff'>\n    | undefined => {\n    return instanceRef.current?.getHoveredLine();\n  }, []);\n\n  const getInstance = useCallback(() => {\n    return instanceRef.current ?? undefined;\n  }, []);\n\n  return { ref, getHoveredLine, fileDiff, actions, markerRows, getInstance };\n}\n\ninterface MergeUnresolvedOptionsProps<LAnnotation> {\n  options: UnresolvedFileReactOptions<LAnnotation> | undefined;\n  controlledSelection: boolean;\n  onMergeConflictAction: UnresolvedFileOptions<LAnnotation>['onMergeConflictAction'];\n  hasConflictUtility: boolean;\n  hasGutterRenderUtility: boolean;\n  hasCustomHeader: boolean;\n}\n\nfunction mergeUnresolvedOptions<LAnnotation>({\n  options,\n  controlledSelection,\n  onMergeConflictAction,\n  hasConflictUtility,\n  hasCustomHeader,\n  hasGutterRenderUtility,\n}: MergeUnresolvedOptionsProps<LAnnotation>): UnresolvedFileOptions<LAnnotation> {\n  return {\n    ...options,\n    controlledSelection,\n    onMergeConflictAction,\n    hunkSeparators:\n      options?.hunkSeparators === 'custom'\n        ? noopRender\n        : options?.hunkSeparators,\n    // Add a placeholder type for the custom render\n    mergeConflictActionsType:\n      hasConflictUtility || options?.mergeConflictActionsType === 'custom'\n        ? noopRender\n        : options?.mergeConflictActionsType,\n    renderCustomHeader: hasCustomHeader ? noopRender : undefined,\n    renderGutterUtility: hasGutterRenderUtility ? noopRender : undefined,\n  };\n}\n"],"mappings":";;;;;;;;AAiCA,MAAM,4BACJ,OAAO,WAAW,cAAc,YAAY;AAuB9C,SAAgB,0BAAuC,EACrD,MACA,SACA,iBACA,eACA,iBACA,oBACA,wBACA,iBACA,qBAC4F;CAC5F,MAAM,CAAC,EAAE,UAAU,SAAS,cAAc,YAAY,eAAe;EACnE,MAAM,EAAE,UAAU,SAAS,eAAe,+BACxC,MACA,SAAS,eACX;EACA,OAAO;GAAE;GAAU;GAAS;EAAW;CACzC,CAAC;CAID,MAAM,wBAAwB,mBAE1B,SACA,aACG;EACH,UAAU,cAAc;GACtB,MAAM,EAAE,UAAU,SAAS,eACzB,SAAS,gBACP,QAAQ,SAAS,eACjB,QAAQ,YACR,UAAU,QACZ,KAAK,CAAC;GACR,IAAI,YAAY,QAAQ,WAAW,QAAQ,cAAc,MACvD,OAAO;QAEP,OAAO;IAAE;IAAU;IAAS;GAAW;EAE3C,CAAC;CACH,CACF;CACA,MAAM,sBAAsB,kBAAkB,KAAA;CAC9C,MAAM,cAAc,WAAW,iBAAiB;CAChD,MAAM,cAAc,OAAgD,IAAI;CACxE,MAAM,MAAM,mBAAmB,kBAAsC;EACnE,IAAI,iBAAiB,MAAM;GACzB,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,wFACF;GAEF,YAAY,UAAU,IAAIA,eACxB,uBAAuB;IACrB;IACA;IACA;IACA;IACA;IACA;GACF,CAAC,GACD,CAAC,oBAAoB,cAAc,KAAA,GACnC,IACF;GACA,YAAiB,QAAQ,QAAQ;IAC/B;IACA;IACA;IACA;IACA;IACA;GACF,CAAC;EACH,OAAO;GACL,IAAI,YAAY,WAAW,MACzB,MAAM,IAAI,MACR,mFACF;GAEF,YAAY,QAAQ,QAAQ;GAC5B,YAAY,UAAU;EACxB;CACF,CAAC;CAED,gCAAgC;EAC9B,IAAI,YAAY,WAAW,MAAM;EACjC,MAAM,WAAW,YAAY;EAC7B,MAAM,aAAa,uBAAuB;GACxC;GACA;GACA;GACA;GACA;GACA;EACF,CAAC;EAID,MAAM,cACJ,eAAe,KAAA,KACf,CAAC,gBAAgB,SAAS,SAAS,UAAU;EAC/C,SAAS,WAAW,UAAU;EAC9B,SAAc,OAAO;GACnB;GACA;GACA;GACA;GACA;EACF,CAAC;EACD,IAAI,kBAAkB,KAAA,GACpB,SAAS,iBAAiB,aAAa;CAE3C,CAAC;CAYD,OAAO;EAAE;EAAK,gBAVS,kBAEN;GACf,OAAO,YAAY,SAAS,eAAe;EAC7C,GAAG,CAAC,CAMuB;EAAG;EAAU;EAAS;EAAY,aAJzC,kBAAkB;GACpC,OAAO,YAAY,WAAW,KAAA;EAChC,GAAG,CAAC,CAEmE;CAAE;AAC3E;AAWA,SAAS,uBAAoC,EAC3C,SACA,qBACA,uBACA,oBACA,iBACA,0BAC+E;CAC/E,OAAO;EACL,GAAG;EACH;EACA;EACA,gBACE,SAAS,mBAAmB,WACxB,aACA,SAAS;EAEf,0BACE,sBAAsB,SAAS,6BAA6B,WACxD,aACA,SAAS;EACf,oBAAoB,kBAAkB,aAAa,KAAA;EACnD,qBAAqB,yBAAyB,aAAa,KAAA;CAC7D;AACF"}

package/node_modules/@pierre/diffs/dist/renderers/DiffHunksRenderer.d.ts

@@ -1,5 +1,5 @@
 import { Element, ElementContent, Properties } from "../node_modules/.pnpm/@types_hast@3.0.4/node_modules/@types/hast/index.js";
-import { BaseDiffOptions, BaseDiffOptionsWithDefaults, CustomPreProperties, DiffLineAnnotation, ExpansionDirections, FileDiffMetadata, FileHeaderRenderMode, HunkData, HunkExpansionRegion, LineTypes, RenderDiffOptions, RenderRange, ThemedDiffResult } from "../types.js";
+import { BaseCodeOptions, BaseDiffOptions, BaseDiffOptionsWithDefaults, CustomPreProperties, DiffLineAnnotation, DiffsHighlighter, DiffsTextDocument, ExpansionDirections, FileDiffMetadata, FileHeaderRenderMode, HighlightedToken, HunkData, HunkExpansionRegion, LineTypes, RenderDiffOptions, RenderRange, ThemedDiffResult } from "../types.js";
 import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
 import { DiffLineMetadata } from "../utils/iterateOverDiff.js";
 
@@ -81,16 +81,58 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   private additionAnnotations;
   private computedLang;
   private renderCache;
+  private editSessionActive;
   constructor(options?: DiffHunksRendererOptions, onRenderUpdate?: (() => unknown) | undefined, workerManager?: WorkerPoolManager | undefined);
   cleanUp(): void;
   recycle(): void;
+  /**
+   * Enter edit-session mode: hunk updates preserve the current region
+   * skeleton instead of recomputing hunks, and rendering happens locally
+   * with the token transformer forced on (worker-pool requests/results are
+   * suspended for this renderer). An empty additions document gets one row so
+   * the editor has a line for its caret. Called on every editor attach,
+   * including a re-attach after recycle.
+   */
+  beginEditSession(): void;
+  /** Leave edit-session mode. The exit recompute is the host's concern. */
+  endEditSession(): void;
+  /**
+   * Ensures that the DOM is compatible with editor render updates
+   */
+  editorRenderReady(): boolean;
+  /**
+   * Re-highlights the current diff in the background and swaps the fresh
+   * result in (with a re-render) once it completes. Needed after an edit
+   * session's exit recompute: session passes plain-fill shifted lines in the
+   * cached result, and the recompute mutates the diff in place (same object,
+   * same cacheKey), so identity/cacheKey checks would otherwise treat the
+   * stale highlight as current forever. The current result — content-correct,
+   * mostly highlighted — keeps rendering until the fresh one lands, so no
+   * interim paint drops highlighting.
+   */
+  refreshHighlightedResult(): Promise<void>;
+  private applyRefreshedResult;
+  get diffCache(): FileDiffMetadata | undefined;
   clearRenderCache(): void;
   setOptions(options: DiffHunksRendererOptions): void;
   mergeOptions(options: Partial<DiffHunksRendererOptions>): void;
   expandHunk(index: number, direction: ExpansionDirections, expansionLineCount?: number): void;
   getExpandedHunk(hunkIndex: number): HunkExpansionRegion;
   getExpandedHunksMap(): Map<number, HunkExpansionRegion>;
+  /** Replace the whole expansion map (session-exit expansion remapping). */
+  setExpandedHunksMap(expandedHunks: Map<number, HunkExpansionRegion>): void;
   setLineAnnotations(lineAnnotations: DiffLineAnnotation<LAnnotation>[]): void;
+  /**
+   * Returns true when a session-mode pass changed the region skeleton itself
+   * (a gap edit synthesized or merged regions), which changes the rendered
+   * row set without a line-count change — the host must escalate to a full
+   * re-render instead of its cheap refresh path.
+   */
+  updateRenderCache(dirtyLines: Map<number, Array<HighlightedToken>>, themeType: 'dark' | 'light', lineCountChangeInFlight?: boolean): boolean;
+  private applyExpansionRemap;
+  applyDocumentChange(textDocument: DiffsTextDocument): void;
+  private applySessionDocumentChange;
+  private markEditSessionPass;
   protected getUnifiedLineDecoration({
     lineType
   }: UnifiedLineDecorationProps): LineDecoration;
@@ -102,8 +144,10 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   protected getUnifiedInjectedRowsForLine?: (ctx: RenderedLineContext) => UnifiedInjectedRowPlacement | undefined;
   protected getSplitInjectedRowsForLine?: (ctx: RenderedLineContext) => SplitInjectedRowPlacement | undefined;
   protected getOptionsWithDefaults(): DiffHunksRendererOptionsWithDefaults;
-  private initializeHighlighter;
+  initializeHighlighter(): Promise<DiffsHighlighter>;
   hydrate(diff: FileDiffMetadata | undefined): void;
+  private getLocalHighlightTheme;
+  getEffectiveCodeOptions(): Pick<BaseCodeOptions, 'theme' | 'tokenizeMaxLineLength'>;
   private getRenderOptions;
   renderDiff(diff?: FileDiffMetadata | undefined, renderRange?: RenderRange): HunksRenderResult | undefined;
   asyncRender(diff: FileDiffMetadata, renderRange?: RenderRange): Promise<HunksRenderResult>;
@@ -111,6 +155,7 @@ declare class DiffHunksRenderer<LAnnotation = undefined> {
   private asyncHighlight;
   private renderDiffWithHighlighter;
   onHighlightSuccess(diff: FileDiffMetadata, result: ThemedDiffResult, options: RenderDiffOptions, highlighted?: boolean): void;
+  private applyHighlightResult;
   private getMatchingWorkerResultCache;
   private hasHighlightedRenderCache;
   onHighlightError(error: unknown): void;

package/node_modules/@pierre/diffs/dist/renderers/DiffHunksRenderer.d.ts.map

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