Commit f8ed2a039b7deaa324beda29b44cc74c846311f7 | the-knife

apps/mobile/package.json+1-1

...	@@ -131,7 +131,7 @@	...	@@ -131,7 +131,7 @@
131	},	131	},
132	"devDependencies": {	132	"devDependencies": {
133	"@effect/vitest": "catalog:",	133	"@effect/vitest": "catalog:",
134	"@pierre/trees": "1.0.0-beta.4",	134	"@pierre/trees": "1.0.0-beta.6",
135	"@types/react": "~19.3.0",	135	"@types/react": "~19.3.0",
136	"@types/react-dom": "~19.2.3",	136	"@types/react-dom": "~19.2.3",
137	"babel-preset-expo": "~58.0.8",	137	"babel-preset-expo": "~58.0.8",

apps/mobile/src/features/review/reviewModel.ts+2-3

apps/web/package.json+1-1

...	@@ -25,7 +25,7 @@	...	@@ -25,7 +25,7 @@
25	"@legendapp/list": "catalog:",	25	"@legendapp/list": "catalog:",
26	"@noble/hashes": "catalog:",	26	"@noble/hashes": "catalog:",
27	"@pierre/diffs": "catalog:",	27	"@pierre/diffs": "catalog:",
28	"@pierre/trees": "1.0.0-beta.4",	28	"@pierre/trees": "1.0.0-beta.6",
29	"@t3tools/client-runtime": "workspace:*",	29	"@t3tools/client-runtime": "workspace:*",
30	"@t3tools/contracts": "workspace:*",	30	"@t3tools/contracts": "workspace:*",
31	"@t3tools/shared": "workspace:*",	31	"@t3tools/shared": "workspace:*",

apps/web/src/components/diffs/AnnotatableCodeView.tsx+1-1

...	@@ -35,7 +35,7 @@ interface DiffCommentAnnotationGroup {	...	@@ -35,7 +35,7 @@ interface DiffCommentAnnotationGroup {
35	}	35	}
36		36
37	type DiffCommentLineAnnotation = DiffLineAnnotation<DiffCommentAnnotationGroup>;	37	type DiffCommentLineAnnotation = DiffLineAnnotation<DiffCommentAnnotationGroup>;
38	export type AnnotatableCodeViewHandle = CodeViewHandle<DiffCommentAnnotationGroup>;	38	export type AnnotatableCodeViewHandle = CodeViewHandle<DiffCommentAnnotationGroup, undefined>;
39	const EMPTY_REVIEW_COMMENTS: ReadonlyArray<ReviewCommentContext> = [];	39	const EMPTY_REVIEW_COMMENTS: ReadonlyArray<ReviewCommentContext> = [];
40		40
41	function annotationSide(range: SelectedLineRange): AnnotationSide {	41	function annotationSide(range: SelectedLineRange): AnnotationSide {

apps/web/src/components/diffs/StyledDiffCodeView.test.tsx+5-2

apps/web/src/components/diffs/StyledDiffCodeView.tsx+4-4

...	@@ -261,16 +261,16 @@ const DIFF_VIEW_UNSAFE_CSS = `${DIFF_SURFACE_THEME_UNSAFE_CSS}	...	@@ -261,16 +261,16 @@ const DIFF_VIEW_UNSAFE_CSS = `${DIFF_SURFACE_THEME_UNSAFE_CSS}
261	`;	261	`;
262		262
263	export type StyledDiffCodeViewOptions<LAnnotation> = Omit<	263	export type StyledDiffCodeViewOptions<LAnnotation> = Omit<
264	NonNullable<CodeViewProps<LAnnotation>["options"]>,	264	NonNullable<CodeViewProps<LAnnotation, undefined>["options"]>,
265	"unsafeCSS" \| "itemMetrics" \| "layout"	265	"unsafeCSS" \| "itemMetrics" \| "layout"
266	>;	266	>;
267		267
268	type StyledDiffCodeViewProps<LAnnotation> = (	268	type StyledDiffCodeViewProps<LAnnotation> = (
269	\| Omit<ControlledCodeViewProps<LAnnotation>, "options">	269	\| Omit<ControlledCodeViewProps<LAnnotation, undefined>, "options">
270	\| Omit<UncontrolledCodeViewProps<LAnnotation>, "options">	270	\| Omit<UncontrolledCodeViewProps<LAnnotation, undefined>, "options">
271	) & {	271	) & {
272	readonly options?: StyledDiffCodeViewOptions<LAnnotation>;	272	readonly options?: StyledDiffCodeViewOptions<LAnnotation>;
273	readonly viewerRef?: Ref<CodeViewHandle<LAnnotation>>;	273	readonly viewerRef?: Ref<CodeViewHandle<LAnnotation, undefined>>;
274	/**	274	/**
275	* Appended to the shared stylesheet inside the viewer's shadow root, for a surface that has	275	* Appended to the shared stylesheet inside the viewer's shadow root, for a surface that has
276	* to restyle chrome the viewer owns — such as replacing its per-file line counts.	276	* to restyle chrome the viewer owns — such as replacing its per-file line counts.

apps/web/src/components/files/FilePreviewPanel.tsx+188-98

 @@ -11,9 +11,23 @@ import {
   isWorkspaceImagePreviewPath,
   isWorkspaceVideoPreviewPath,
 } from "@t3tools/shared/filePreview";
-import { VirtualizedFile, type SelectedLineRange } from "@pierre/diffs";
+import {
-import { Editor } from "@pierre/diffs/editor";
+  DEFAULT_TOKENIZE_MAX_LENGTH,
-import { EditProvider, File, type FileOptions, Virtualizer } from "@pierre/diffs/react";
+  VirtualizedFile,
+  getFiletypeFromFileName,
+  type File as FileInstance,
+  type FileContents,
+  type PostRenderPhase,
+  type SelectedLineRange,
+} from "@pierre/diffs";
+import {
+  Editor,
+  type EditorChangeEvent,
+  type EditorFactory,
+  type EditorOptions,
+} from "@pierre/diffs/edit";
+import type { WorkerPoolManager } from "@pierre/diffs/worker";
+import { EditProvider, File, Virtualizer, useWorkerPool } from "@pierre/diffs/react";
 import { DiffWorkerPoolProvider } from "../DiffWorkerPoolProvider";
 import {
   isAtomCommandInterrupted,
 @@ -80,7 +94,7 @@ import {
 import SourceFilePreview from "./ReadOnlySourcePreview";
 import { resolveCenteredFileLineScrollTop } from "./fileLineReveal";
 import { DiffCommentAnnotation } from "../diffs/DiffCommentAnnotation";
-import { projectFileCacheKey, projectFileEditorCacheKey } from "./fileContentRevision";
+import { projectFileCacheKey } from "./fileContentRevision";
 import {
   filePreviewReadErrorMessage,
   isMarkdownPreviewFile,
 @@ -91,6 +105,7 @@ import {
 import { useFileSaveCoordinator } from "./useFileSaveCoordinator";
 import {
   getOptimisticProjectFileQueryData,
+  getProjectFileContents,
   setProjectFileQueryData,
   useProjectFileQuery,
 } from "./projectFilesQueryState";
 @@ -117,7 +132,12 @@ const FILE_EXPLORER_STORAGE_KEY = "t3code.fileExplorerOpen";
 const RENDER_MARKDOWN_STORAGE_KEY = "t3code.renderMarkdown";
 const RENDER_BROWSER_FILE_STORAGE_KEY = "t3code.renderBrowserFile";
 const RENDER_TABLE_STORAGE_KEY = "t3code.renderTable";
-type FilePostRender = NonNullable<FileOptions<unknown>["onPostRender"]>;
+// Shared by the read-only and annotated surfaces, so it is generic over annotation metadata.
+type FilePostRender = <LAnnotation>(
+  fileContainer: HTMLElement,
+  instance: FileInstance<LAnnotation, undefined>,
+  phase: PostRenderPhase,
+) => void;
 function WorkspaceImagePreview(props: {
   readonly environmentId: EnvironmentId;
 @@ -547,6 +567,67 @@ function useFileLineReveal(
   );
 }
+const createFileEditor: EditorFactory<FileCommentAnnotationGroup, undefined> = (
+  editorType,
+  options,
+  editStateKey,
+) => new Editor(editorType, options, editStateKey);
+function editableFileContents(
+  environmentId: EnvironmentId,
+  cwd: string,
+  relativePath: string,
+  contents: string,
+): FileContents {
+  return {
+    name: relativePath,
+    contents,
+    cacheKey: `editor:${environmentId}:${projectFileCacheKey(cwd, relativePath, contents)}`,
+  };
+}
+function needsWorkerHighlight(workerPool: WorkerPoolManager | undefined, file: FileContents) {
+  if (workerPool?.isWorkingPool() !== true) return false;
+  if ((file.lang ?? getFiletypeFromFileName(file.name)) === "text") return false;
+  let lines = 1;
+  for (
+    let index = file.contents.indexOf("\n");
+    index !== -1;
+    index = file.contents.indexOf("\n", index + 1)
+  ) {
+    lines += 1;
+  }
+  return lines <= DEFAULT_TOKENIZE_MAX_LENGTH;
+}
+/**
+ * Pierre highlights an active edit session on the main thread, so each version
+ * of the file becomes editable only once it has rendered the worker's
+ * highlight. A failed worker highlight falls back to main-thread highlighting.
+ */
+function useEditableAfterHighlight(file: FileContents) {
+  const workerPool = useWorkerPool();
+  const [highlightedFile, setHighlightedFile] = useState<FileContents | null>(null);
+  const needsHighlight = useMemo(() => needsWorkerHighlight(workerPool, file), [file, workerPool]);
+  const ready = !needsHighlight || highlightedFile === file;
+  useEffect(() => {
+    if (ready || workerPool === undefined) return;
+    workerPool.primeFileHighlightCache(file).catch(() => setHighlightedFile(file));
+  }, [file, ready, workerPool]);
+  const onPostRender = useCallback(
+    (renderedFile: FileContents | undefined, phase: PostRenderPhase) => {
+      if (ready || phase === "unmount" || renderedFile?.cacheKey !== file.cacheKey) return;
+      // The pool caches a result just before the instance renders it, so a
+      // render that sees the cache has painted highlighted rows.
+      if (workerPool?.getFileResultCache(file) !== undefined) setHighlightedFile(file);
+    },
+    [file, ready, workerPool],
+  );
+  return { ready, onPostRender };
+}
 interface EditableFileSurfaceProps {
   environmentId: EnvironmentId;
   cwd: string;
 @@ -597,46 +678,65 @@ function EditableFileSurface({
     relativePath,
     onPendingChange,
   });
-  const editor = useMemo(
+  // The editor owns the draft, so its own edits echoing back through the file
-    () =>
+  // query keep the file identity. Only a change from elsewhere replaces it.
-      new Editor<FileCommentAnnotationGroup>({
+  const [externalFile, setExternalFile] = useState(() =>
-        persistState: true,
+    editableFileContents(environmentId, cwd, relativePath, contents),
-        persistStateStorage: "inMemory",
+  );
-        onChange: (file, nextLineAnnotations) => {
+  const [editedContents, setEditedContents] = useState<string | null>(null);
-          setProjectFileQueryData(environmentId, cwd, relativePath, file.contents);
+  if (contents !== (editedContents ?? externalFile.contents)) {
-          saveCoordinator.change(file.contents);
+    setExternalFile(editableFileContents(environmentId, cwd, relativePath, contents));
-          if (nextLineAnnotations) {
+    setEditedContents(null);
-            const remapped = remapFileCommentAnnotations(
+  }
-              nextLineAnnotations as FileCommentLineAnnotation[],
+  const { ready: editable, onPostRender: onEditablePostRender } =
-            );
+    useEditableAfterHighlight(externalFile);
-            setLineAnnotations(remapped);
+  const editorRef = useRef<Editor<"file", FileCommentAnnotationGroup, undefined> | null>(null);
-            for (const annotation of remapped) {
+  const editorOptions = useMemo<EditorOptions<"file", FileCommentAnnotationGroup, undefined>>(
-              for (const entry of annotation.metadata.entries) {
+    () => ({
-                if (entry.kind !== "comment") continue;
+      onAttach: (editor) => {
-                addReviewComment(
+        editorRef.current = editor;
-                  composerDraftTarget,
+      },
-                  buildFileReviewComment({
+      onComplete: () => {
-                    id: entry.id,
+        editorRef.current = null;
-                    filePath: relativePath,
+      },
-                    startLine: entry.startLine,
+    }),
-                    endLine: entry.endLine,
+    [],
-                    text: entry.text,
-                    contents: file.contents,
-                  }),
-                );
-              }
-            }
-          }
-        },
-      }),
-    [addReviewComment, composerDraftTarget, cwd, environmentId, relativePath, saveCoordinator],
   );
-  useEffect(
+  // Mirrors the draft out to the save queue, the optimistic file query and the
-    () => () => {
+  // composer's review comments.
-      editor.cleanUp();
+  const handleEditChange = useCallback(
+    ({
+      file,
+      lineAnnotations: nextLineAnnotations,
+    }: EditorChangeEvent<"file", FileCommentAnnotationGroup, undefined>) => {
+      // Adopting an external change reports it as an edit; it is already on disk.
+      if (file.contents === getProjectFileContents(environmentId, cwd, relativePath)) return;
+      setEditedContents(file.contents);
+      setProjectFileQueryData(environmentId, cwd, relativePath, file.contents);
+      saveCoordinator.change(file.contents);
+      if (!nextLineAnnotations) return;
+      const remapped = remapFileCommentAnnotations(nextLineAnnotations);
+      // The editor hands back the array it was given until an edit moves an annotation.
+      setLineAnnotations((current) => (current === nextLineAnnotations ? current : remapped));
+      for (const annotation of remapped) {
+        for (const entry of annotation.metadata.entries) {
+          if (entry.kind !== "comment") continue;
+          addReviewComment(
+            composerDraftTarget,
+            buildFileReviewComment({
+              id: entry.id,
+              filePath: relativePath,
+              startLine: entry.startLine,
+              endLine: entry.endLine,
+              text: entry.text,
+              contents: file.contents,
+            }),
+          );
+        }
+      }
     },
-    [editor],
+    [addReviewComment, composerDraftTarget, cwd, environmentId, relativePath, saveCoordinator],
   );
   const removeAnnotationEntry = useCallback(
 @@ -695,47 +795,44 @@ function EditableFileSurface({
     ],
   );
-  const beginComment = useCallback(
+  const beginComment = useCallback((range: SelectedLineRange) => {
-    (range: SelectedLineRange) => {
+    editorRef.current?.setSelections([]);
-      editor.setSelections([]);
+    editorRef.current?.blur();
-      editor.blur();
+    const { startLine, endLine } = normalizeFileCommentRange(range);
-      const { startLine, endLine } = normalizeFileCommentRange(range);
+    const draftEntry: FileCommentAnnotationEntry = {
-      const draftEntry: FileCommentAnnotationEntry = {
+      id: nextFileCommentId(),
-        id: nextFileCommentId(),
+      kind: "draft",
-        kind: "draft",
+      startLine,
-        startLine,
+      endLine,
-        endLine,
+      text: "",
-        text: "",
+    };
-      };
+    setLineAnnotations((current) => {
-      setLineAnnotations((current) => {
+      const withoutDraft = current.flatMap((annotation) => {
-        const withoutDraft = current.flatMap((annotation) => {
+        const entries = annotation.metadata.entries.filter((entry) => entry.kind !== "draft");
-          const entries = annotation.metadata.entries.filter((entry) => entry.kind !== "draft");
+        return entries.length > 0 ? [{ ...annotation, metadata: { entries } }] : [];
-          return entries.length > 0 ? [{ ...annotation, metadata: { entries } }] : [];
-        });
-        const existingIndex = withoutDraft.findIndex(
-          (annotation) => annotation.lineNumber === endLine,
-        );
-        if (existingIndex < 0) {
-          return [
-            ...withoutDraft,
-            {
-              lineNumber: endLine,
-              metadata: { entries: [draftEntry] },
-            },
-          ];
-        }
-        return withoutDraft.map((annotation, index) =>
-          index === existingIndex
-            ? {
-                ...annotation,
-                metadata: { entries: [...annotation.metadata.entries, draftEntry] },
-              }
-            : annotation,
-        );
       });
-    },
+      const existingIndex = withoutDraft.findIndex(
-    [editor],
+        (annotation) => annotation.lineNumber === endLine,
-  );
+      );
+      if (existingIndex < 0) {
+        return [
+          ...withoutDraft,
+          {
+            lineNumber: endLine,
+            metadata: { entries: [draftEntry] },
+          },
+        ];
+      }
+      return withoutDraft.map((annotation, index) =>
+        index === existingIndex
+          ? {
+              ...annotation,
+              metadata: { entries: [...annotation.metadata.entries, draftEntry] },
+            }
+          : annotation,
+      );
+    });
+  }, []);
   const hasOpenCommentForm = lineAnnotations.some((annotation) =>
     annotation.metadata.entries.some((entry) => entry.kind === "draft"),
   );
 @@ -744,11 +841,11 @@ function EditableFileSurface({
     if (!root) return;
     return installFileEditorDismissal({
       root,
-      editor,
+      editor: { setSelections: (selections) => editorRef.current?.setSelections(selections) },
       isBlocked: () => hasOpenCommentForm,
       onDismiss: () => setSelectedRange(null),
     });
-  }, [editor, hasOpenCommentForm, setSelectedRange]);
+  }, [hasOpenCommentForm, setSelectedRange]);
   const handleLineSelectionEnd = useCallback(
     (range: SelectedLineRange | null) => {
       setSelectedRange(range);
 @@ -762,6 +859,7 @@ function EditableFileSurface({
   const handlePostRender = useCallback<FilePostRender>(
     (fileContainer, instance, phase) => {
       onPostRender(fileContainer, instance, phase);
+      onEditablePostRender(instance.file, phase);
       if (selectionFrameRef.current !== null) {
         cancelAnimationFrame(selectionFrameRef.current);
 @@ -775,11 +873,11 @@ function EditableFileSurface({
         instance.setSelectedLines(selectedRange, { notify: false });
       });
     },
-    [onPostRender, selectedRange],
+    [onEditablePostRender, onPostRender, selectedRange],
   );
   return (
-    <EditProvider editor={editor}>
+    <EditProvider createEditor={createFileEditor}>
       <div ref={surfaceRef} className="flex min-h-0 flex-1">
         <Virtualizer
           className="file-preview-virtualizer min-h-0 flex-1 overflow-auto"
 @@ -789,17 +887,10 @@ function EditableFileSurface({
           }}
         >
           <File<FileCommentAnnotationGroup>
-            file={{
+            file={externalFile}
-              name: relativePath,
+            edit={editable}
-              contents,
+            editorOptions={editorOptions}
-              cacheKey: projectFileEditorCacheKey(
+            onEditChange={handleEditChange}
-                environmentId,
-                cwd,
-                relativePath,
-                contents,
-                editor.getFile(),
-              ),
-            }}
             options={{
               disableFileHeader: true,
               enableGutterUtility: !hasOpenCommentForm,
 @@ -832,7 +923,6 @@ function EditableFileSurface({
               </div>
             )}
             className="min-h-full"
-            contentEditable
           />
         </Virtualizer>
       </div>

apps/web/src/components/files/ReadOnlySourcePreview.tsx+1-1

...	@@ -17,7 +17,7 @@ export default function ReadOnlySourcePreview(props: {	...	@@ -17,7 +17,7 @@ export default function ReadOnlySourcePreview(props: {
17	readonly name: string;	17	readonly name: string;
18	readonly text: string;	18	readonly text: string;
19	readonly cacheKey?: string;	19	readonly cacheKey?: string;
20	readonly onPostRender?: FileOptions<unknown>["onPostRender"];	20	readonly onPostRender?: FileOptions<unknown, undefined>["onPostRender"];
21	}) {	21	}) {
22	const { resolvedTheme } = useTheme();	22	const { resolvedTheme } = useTheme();
23	const wordWrap = useClientSettings((settings) => settings.wordWrap);	23	const wordWrap = useClientSettings((settings) => settings.wordWrap);

apps/web/src/components/files/fileContentRevision.test.ts+1-24

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	import { describe, expect, it } from "vite-plus/test";	1	import { describe, expect, it } from "vite-plus/test";
2		2
3	import { projectFileCacheKey, projectFileEditorCacheKey } from "./fileContentRevision";	3	import { projectFileCacheKey } from "./fileContentRevision";
4		4
5	describe("file cache identity", () => {	5	describe("file cache identity", () => {
6	it("changes for same-length edits", () => {	6	it("changes for same-length edits", () => {
...	@@ -8,27 +8,4 @@ describe("file cache identity", () => {	...	@@ -8,27 +8,4 @@ describe("file cache identity", () => {
8	projectFileCacheKey("/repo", "file.json", "nodeVeasdrs"),	8	projectFileCacheKey("/repo", "file.json", "nodeVeasdrs"),
9	);	9	);
10	});	10	});
11
12	it("keeps editor identity stable for locally edited contents", () => {
13	const cacheKey = projectFileEditorCacheKey("local", "/repo", "file.json", "after", undefined);
14
15	expect(
16	projectFileEditorCacheKey("local", "/repo", "file.json", "after edit", {
17	cacheKey,
18	contents: "after edit",
19	}),
20	).toBe(cacheKey);
21	});
22
23	it("rotates editor identity for external contents and environments", () => {
24	const cacheKey = projectFileEditorCacheKey("local", "/repo", "file.json", "before", undefined);
25	const editorFile = { cacheKey, contents: "before" };
26
27	expect(
28	projectFileEditorCacheKey("local", "/repo", "file.json", "external edit", editorFile),
29	).not.toBe(cacheKey);
30	expect(projectFileEditorCacheKey("remote", "/repo", "file.json", "before", undefined)).not.toBe(
31	cacheKey,
32	);
33	});
34	});	11	});

apps/web/src/components/files/fileContentRevision.ts-18

...	@@ -10,21 +10,3 @@ function fileContentRevision(contents: string): string {	...	@@ -10,21 +10,3 @@ function fileContentRevision(contents: string): string {
10	export function projectFileCacheKey(cwd: string, relativePath: string, contents: string): string {	10	export function projectFileCacheKey(cwd: string, relativePath: string, contents: string): string {
11	return `${cwd}:${relativePath}:${fileContentRevision(contents)}`;	11	return `${cwd}:${relativePath}:${fileContentRevision(contents)}`;
12	}	12	}
13
14	interface EditorFileIdentity {
15	readonly cacheKey?: string;
16	readonly contents: string;
17	}
18
19	export function projectFileEditorCacheKey(
20	environmentId: string,
21	cwd: string,
22	relativePath: string,
23	contents: string,
24	editorFile: EditorFileIdentity \| undefined,
25	): string {
26	if (editorFile?.contents === contents && editorFile.cacheKey) {
27	return editorFile.cacheKey;
28	}
29	return `editor:${environmentId}:${projectFileCacheKey(cwd, relativePath, contents)}`;
30	}

apps/web/src/components/files/fileEditorHighlight.test.ts deleted-299

...	@@ -1,299 +0,0 @@
1	import {
2	FileRenderer,
3	getSharedHighlighter,
4	type BaseCodeOptions,
5	type DiffsHighlighter,
6	type FileContents,
7	type HighlightedToken,
8	type RenderRange,
9	} from "@pierre/diffs";
10	import { TextDocument } from "@pierre/diffs/editor";
11	import { WorkerPoolManager, type WorkerRequest, type WorkerResponse } from "@pierre/diffs/worker";
12	import * as NodeWorkerThreads from "node:worker_threads";
13	import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
14
15	type DocumentChange = NonNullable<ReturnType<TextDocument<unknown>["applyEdits"]>>;
16	interface Tokenizer {
17	readonly themeType: "light" \| "dark";
18	tokenize(change: DocumentChange, range: RenderRange): Map<number, HighlightedToken[]>;
19	cleanUp(): void;
20	}
21
22	// This dependency-internal tokenizer is the one used by Editor.#rerender.
23	const tokenizerUrl = new URL("./editor/tokenizer.js", import.meta.resolve("@pierre/diffs"));
24	const { EditorTokenizer } = (await import(/* @vite-ignore */ tokenizerUrl.href)) as {
25	EditorTokenizer: new (options: {
26	codeOptions: BaseCodeOptions;
27	highlighter: DiffsHighlighter;
28	textDocument: TextDocument<unknown>;
29	setStyle: (style: string) => void;
30	onDeferTokenize: (lines: Map<number, HighlightedToken[]>, theme: "light" \| "dark") => void;
31	}) => Tokenizer;
32	};
33
34	const workerModule = import.meta.resolve("@pierre/diffs/worker/worker.js");
35	const source = Array.from(
36	{ length: 7_000 },
37	(_, index) =>
38	`export const section${index} = <p>Long wrapped source line ${index} for the file editor.</p>;`,
39	).join("\n");
40	const options = {
41	theme: "pierre-dark",
42	themeType: "dark",
43	preferredHighlighter: "shiki-wasm",
44	useTokenTransformer: true,
45	overflow: "wrap",
46	disableFileHeader: true,
47	} as const;
48	const range: RenderRange = {
49	startingLine: 6_950,
50	totalLines: 150,
51	bufferBefore: 0,
52	bufferAfter: 0,
53	};
54
55	interface HeldResponse {
56	data: WorkerResponse;
57	deliver: () => void;
58	}
59	let responses: HeldResponse[];
60	let responseWaiters: ((response: HeldResponse) => void)[];
61	let terminationPromises: Promise<number>[];
62	let pool: WorkerPoolManager;
63	let renderer: FileRenderer;
64	let tokenizer: Tokenizer;
65	let file: FileContents;
66	let document: TextDocument<unknown>;
67	const animationFrames = new Set<ReturnType<typeof setImmediate>>();
68
69	function nextResponse(): Promise<HeldResponse> {
70	const response = responses.shift();
71	return response
72	? Promise.resolve(response)
73	: new Promise((resolve) => responseWaiters.push(resolve));
74	}
75
76	class WorkerTransport {
77	private readonly worker = new NodeWorkerThreads.Worker(
78	`const { parentPort, workerData } = require("node:worker_threads");
79	globalThis.self = {
80	addEventListener(type, listener) {
81	if (type === "message") parentPort.on("message", data => listener({ data }));
82	if (type === "error") process.on("uncaughtException", listener);
83	}
84	};
85	globalThis.postMessage = data => parentPort.postMessage(data);
86	import(workerData.moduleUrl);`,
87	{ eval: true, workerData: { moduleUrl: workerModule }, execArgv: [] },
88	);
89
90	addEventListener(
91	type: "message" \| "error",
92	listener: (event: { data: WorkerResponse } \| Error) => void,
93	) {
94	if (type === "error") {
95	this.worker.on("error", listener);
96	return;
97	}
98	this.worker.on("message", (data: WorkerResponse) => {
99	const response = { data, deliver: () => listener({ data }) };
100	if (data.type !== "success" \|\| data.requestType !== "file") {
101	response.deliver();
102	return;
103	}
104	const waiter = responseWaiters.shift();
105	if (waiter) waiter(response);
106	else responses.push(response);
107	});
108	}
109
110	postMessage(message: WorkerRequest) {
111	this.worker.postMessage(message, []);
112	}
113
114	terminate() {
115	terminationPromises.push(this.worker.terminate());
116	}
117	}
118
119	function applyChange(change: DocumentChange) {
120	// Keep the installed editor's non-DOM order, including the existing contents patch.
121	renderer.updateRenderCache(tokenizer.tokenize(change, range), tokenizer.themeType);
122	file.contents = document.getText();
123	if (change.lineDelta !== 0) renderer.applyDocumentChange(document);
124	}
125
126	function append(text: string) {
127	const position = document.positionAt(document.getText().length);
128	const change = document.applyEdits([
129	{ range: { start: position, end: position }, newText: text },
130	]);
131	expect(change).toBeDefined();
132	applyChange(change!);
133	}
134
135	function undo() {
136	const change = document.undo()?.[0];
137	expect(change).toBeDefined();
138	applyChange(change!);
139	}
140
141	function renderContents() {
142	const result = renderer.renderFile(file, range);
143	expect(result?.totalLines).toBe(document.lineCount);
144	return renderer.renderFullHTML(result!);
145	}
146
147	beforeEach(async () => {
148	responses = [];
149	responseWaiters = [];
150	terminationPromises = [];
151	vi.stubGlobal("requestAnimationFrame", (callback: FrameRequestCallback) => {
152	const frame = setImmediate(() => {
153	animationFrames.delete(frame);
154	callback(0);
155	});
156	animationFrames.add(frame);
157	return frame;
158	});
159	vi.stubGlobal("cancelAnimationFrame", (frame: ReturnType<typeof setImmediate>) => {
160	animationFrames.delete(frame);
161	clearImmediate(frame);
162	});
163	vi.stubGlobal("window", { matchMedia: () => ({ matches: true }) });
164	pool = new WorkerPoolManager(
165	// Adapt browser transport only; Pierre's real worker produces each response.
166	{ workerFactory: () => new WorkerTransport() as unknown as globalThis.Worker, poolSize: 1 },
167	options,
168	);
169	await pool.initialize(["tsx"]);
170	const highlighter = await getSharedHighlighter({
171	themes: ["pierre-dark"],
172	langs: ["tsx"],
173	preferredHighlighter: "shiki-wasm",
174	});
175	file = { name: "wrapped.tsx", contents: source, cacheKey: "editable-file" };
176	document = new TextDocument(file.name, source, "tsx");
177	renderer = new FileRenderer(options, () => {}, pool);
178	tokenizer = new EditorTokenizer({
179	codeOptions: options,
180	highlighter,
181	textDocument: document,
182	setStyle: () => {},
183	onDeferTokenize: (lines, theme) => renderer.updateRenderCache(lines, theme),
184	});
185	renderContents();
186	});
187
188	async function cleanUpFixture() {
189	tokenizer?.cleanUp();
190	renderer?.cleanUp();
191	pool?.terminate();
192	await Promise.all(terminationPromises);
193	// Pool termination can queue a final broadcast after its workers have exited.
194	for (const frame of animationFrames) clearImmediate(frame);
195	animationFrames.clear();
196	vi.unstubAllGlobals();
197	}
198
199	afterEach(cleanUpFixture);
200
201	describe("editable file highlighting", () => {
202	it("cleans up an already terminated worker pool", async () => {
203	(await nextResponse()).deliver();
204	expect(pool.getStats().totalWorkers).toBe(1);
205	pool.terminate();
206	await Promise.all(terminationPromises);
207	expect(pool.getStats().totalWorkers).toBe(0);
208
209	const animationFrame = globalThis.requestAnimationFrame;
210	const cancelFrame = globalThis.cancelAnimationFrame;
211	const window = globalThis.window;
212	try {
213	await cleanUpFixture();
214	// Deliver the real Immediate queue after cleanup has removed the browser globals.
215	await new Promise<void>((resolve) => setImmediate(resolve));
216	} finally {
217	vi.stubGlobal("requestAnimationFrame", animationFrame);
218	vi.stubGlobal("cancelAnimationFrame", cancelFrame);
219	vi.stubGlobal("window", window);
220	}
221	});
222
223	it("still accepts an asynchronous highlight when the file has not changed", async () => {
224	expect(renderContents()).not.toContain('style="color:');
225	(await nextResponse()).deliver();
226	expect(renderContents()).toContain('style="color:');
227	expect(pool.getFileResultCache(file)).toBeDefined();
228	});
229
230	it.each([1, 60])(
231	"ignores a dispatched highlight after %i Enter edits and highlights the new version",
232	async (count) => {
233	const oldResponse = await nextResponse();
234	for (let index = 0; index < count; index += 1) append("\n");
235	append("export const EDITED_MARKER = 1;");
236	oldResponse.deliver();
237	expect(renderContents()).toContain("EDITED_MARKER");
238	const currentResponse = await nextResponse();
239	currentResponse.deliver();
240	expect(renderContents()).toContain("EDITED_MARKER");
241	const firstLines = renderer.renderFile(file, { ...range, startingLine: 0, totalLines: 20 });
242	expect(renderer.renderFullHTML(firstLines!)).toContain('style="color:');
243	expect(document.lineCount).toBe(7_000 + count);
244	},
245	);
246
247	it("does not replace a same-line edit with stale tokens", async () => {
248	const oldResponse = await nextResponse();
249	append(" EDITED_MARKER");
250	oldResponse.deliver();
251	expect(renderContents()).toContain("EDITED_MARKER");
252	expect(document.lineCount).toBe(7_000);
253	(await nextResponse()).deliver();
254	expect(renderContents()).toContain("EDITED_MARKER");
255	});
256
257	it("keeps undo edits after an older highlight arrives", async () => {
258	const oldResponse = await nextResponse();
259	append("\nexport const RETAINED_MARKER = 1;");
260	append("\nexport const UNDONE_MARKER = 2;");
261	undo();
262	oldResponse.deliver();
263	const html = renderContents();
264	expect(html).toContain("RETAINED_MARKER");
265	expect(html).not.toContain("UNDONE_MARKER");
266	(await nextResponse()).deliver();
267	expect(renderContents()).toContain("RETAINED_MARKER");
268	undo();
269	expect(document.getText()).toBe(source);
270	expect(renderContents()).not.toContain("RETAINED_MARKER");
271	const redone = document.redo()?.[0];
272	expect(redone).toBeDefined();
273	applyChange(redone!);
274	expect(renderContents()).toContain("RETAINED_MARKER");
275	});
276
277	it("evicts the pre-edit shared cache without losing already-highlighted lines", async () => {
278	(await nextResponse()).deliver();
279	expect(pool.getFileResultCache(file)).toBeDefined();
280	append("\nexport const EDITED_MARKER = 1;");
281	expect(pool.getFileResultCache(file)).toBeUndefined();
282	expect(renderContents()).toContain("EDITED_MARKER");
283	const firstLines = renderer.renderFile(file, { ...range, startingLine: 0, totalLines: 20 });
284	expect(renderer.renderFullHTML(firstLines!)).toContain('style="color:');
285	});
286
287	it("reopens the edited file with the same cache key while an old response is pending", async () => {
288	const oldResponse = await nextResponse();
289	append("\nexport const REOPENED_MARKER = 1;");
290	renderer.cleanUp();
291	renderer = new FileRenderer(options, () => {}, pool);
292	file = { ...file };
293	expect(renderContents()).toContain("REOPENED_MARKER");
294	oldResponse.deliver();
295	(await nextResponse()).deliver();
296	expect(renderContents()).toContain("REOPENED_MARKER");
297	expect(renderContents()).toContain('style="color:');
298	});
299	});

apps/web/src/components/files/fileEditorLanguageReadiness.test.ts deleted-199

...	@@ -1,199 +0,0 @@
1	import {
2	FileRenderer,
3	disposeHighlighter,
4	getSharedHighlighter,
5	type BaseCodeOptions,
6	type DiffsHighlighter,
7	type FileContents,
8	type HighlightedToken,
9	} from "@pierre/diffs";
10	import { TextDocument } from "@pierre/diffs/editor";
11	import { WorkerPoolManager, type WorkerRequest, type WorkerResponse } from "@pierre/diffs/worker";
12	import * as NodeWorkerThreads from "node:worker_threads";
13	import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
14
15	type DocumentChange = NonNullable<ReturnType<TextDocument<unknown>["applyEdits"]>>;
16	interface Tokenizer {
17	tokenize(change: DocumentChange): Map<number, HighlightedToken[]>;
18	cleanUp(): void;
19	}
20
21	const tokenizerUrl = new URL("./editor/tokenizer.js", import.meta.resolve("@pierre/diffs"));
22	const { EditorTokenizer } = (await import(/* @vite-ignore */ tokenizerUrl.href)) as {
23	EditorTokenizer: new (options: {
24	codeOptions: BaseCodeOptions;
25	highlighter: DiffsHighlighter;
26	textDocument: TextDocument<unknown>;
27	setStyle: (style: string) => void;
28	onDeferTokenize: () => void;
29	}) => Tokenizer;
30	};
31
32	const workerModule = import.meta.resolve("@pierre/diffs/worker/worker.js");
33	const options = {
34	theme: "pierre-dark",
35	themeType: "dark",
36	preferredHighlighter: "shiki-wasm",
37	useTokenTransformer: true,
38	} as const;
39	const source = "export const View = () => <div>Ready</div>;";
40	let pool: WorkerPoolManager;
41	let renderer: FileRenderer;
42	let terminationPromises: Promise<number>[];
43	const pendingAnimationFrames = new Set<ReturnType<typeof setImmediate>>();
44
45	class WorkerTransport {
46	private readonly worker = new NodeWorkerThreads.Worker(
47	`const { parentPort, workerData } = require("node:worker_threads");
48	globalThis.self = {
49	addEventListener(type, listener) {
50	if (type === "message") parentPort.on("message", data => listener({ data }));
51	if (type === "error") process.on("uncaughtException", listener);
52	}
53	};
54	globalThis.postMessage = data => parentPort.postMessage(data);
55	import(workerData.moduleUrl);`,
56	{ eval: true, workerData: { moduleUrl: workerModule }, execArgv: [] },
57	);
58
59	addEventListener(
60	type: "message" \| "error",
61	listener: (event: { data: WorkerResponse } \| Error) => void,
62	) {
63	if (type === "error") this.worker.on("error", listener);
64	else this.worker.on("message", (data: WorkerResponse) => listener({ data }));
65	}
66
67	postMessage(message: WorkerRequest) {
68	this.worker.postMessage(message, []);
69	}
70
71	terminate() {
72	terminationPromises.push(this.worker.terminate());
73	}
74	}
75
76	function firstEnter(highlighter: DiffsHighlighter, file: FileContents, language: string) {
77	const document = new TextDocument(file.name, file.contents, language);
78	const tokenizer = new EditorTokenizer({
79	codeOptions: options,
80	highlighter,
81	textDocument: document,
82	setStyle: () => {},
83	onDeferTokenize: () => {},
84	});
85	try {
86	const end = document.positionAt(file.contents.length);
87	const change = document.applyEdits([{ range: { start: end, end }, newText: "\n" }]);
88	expect(change).toBeDefined();
89	// This is the synchronous first edit, before the tokenizer's debounced prebuild.
90	const dirtyLines = tokenizer.tokenize(change!);
91	expect([...dirtyLines.keys()]).toEqual([0, 1]);
92	expect(document.getText()).toBe(`${file.contents}\n`);
93	} finally {
94	tokenizer.cleanUp();
95	}
96	}
97
98	beforeEach(async () => {
99	terminationPromises = [];
100	vi.stubGlobal("requestAnimationFrame", (callback: FrameRequestCallback) => {
101	const handle = setImmediate(() => {
102	pendingAnimationFrames.delete(handle);
103	callback(0);
104	});
105	pendingAnimationFrames.add(handle);
106	return handle;
107	});
108	vi.stubGlobal("cancelAnimationFrame", (handle: ReturnType<typeof setImmediate>) => {
109	pendingAnimationFrames.delete(handle);
110	clearImmediate(handle);
111	});
112	vi.stubGlobal("window", { matchMedia: () => ({ matches: true }) });
113	await disposeHighlighter();
114	pool = new WorkerPoolManager(
115	// Adapt transport only. The installed Pierre worker resolves and highlights the file.
116	{ workerFactory: () => new WorkerTransport() as unknown as globalThis.Worker, poolSize: 1 },
117	options,
118	);
119	await pool.initialize();
120	renderer = new FileRenderer(options, undefined, pool);
121	});
122
123	afterEach(async () => {
124	renderer?.cleanUp();
125	pool?.terminate();
126	await Promise.all(terminationPromises);
127	await disposeHighlighter();
128	// Drain the pool's final state broadcast before removing the animation frame stubs.
129	await new Promise<void>((resolve) => setImmediate(resolve));
130	for (const handle of pendingAnimationFrames) clearImmediate(handle);
131	pendingAnimationFrames.clear();
132	vi.unstubAllGlobals();
133	});
134
135	describe("editable file language readiness", () => {
136	it.each(["hydrate", "renderFile"] as const)(
137	"%s prepares the inferred language before the first edit of a worker-highlighted file",
138	async (method) => {
139	const file = { name: "cold.tsx", contents: source, cacheKey: "cold-tsx" };
140	await pool.primeFileHighlightCache(file);
141	expect(pool.getFileResultCache(file)).toBeDefined();
142	const mainHighlighter = await getSharedHighlighter({
143	themes: ["pierre-dark"],
144	langs: ["text"],
145	});
146	expect(mainHighlighter.getLoadedLanguages()).not.toContain("tsx");
147	renderer[method](file);
148	// Read-only worker rendering must not load editor grammars on the main thread.
149	expect(mainHighlighter.getLoadedLanguages()).not.toContain("tsx");
150	const highlighter = await renderer.initializeHighlighter();
151	firstEnter(highlighter, file, "tsx");
152	},
153	);
154
155	it.each(["hydrate", "renderFile"] as const)(
156	"%s respects an explicit language when the filename suggests plain text",
157	async (method) => {
158	const file: FileContents = {
159	name: "source.txt",
160	lang: "tsx",
161	contents: source,
162	cacheKey: "explicit-tsx",
163	};
164	await pool.primeFileHighlightCache(file);
165	renderer[method](file);
166	firstEnter(await renderer.initializeHighlighter(), file, "tsx");
167	},
168	);
169
170	it("loads a newly opened language after reusing a worker-backed renderer", async () => {
171	const previousFile: FileContents = {
172	name: "previous.ts",
173	contents: "export const value = 1;",
174	cacheKey: "previous-ts",
175	};
176	await getSharedHighlighter({ themes: ["pierre-dark"], langs: ["typescript"] });
177	renderer.renderFile(previousFile);
178	firstEnter(await renderer.initializeHighlighter(), previousFile, "typescript");
179	const nextFile = { name: "next.tsx", contents: source, cacheKey: "next-tsx" };
180	renderer.renderFile(nextFile);
181	firstEnter(await renderer.initializeHighlighter(), nextFile, "tsx");
182	});
183
184	it("prepares a hydrated non-worker file even when its theme was already loaded", async () => {
185	renderer.cleanUp();
186	renderer = new FileRenderer(options);
187	const file = { name: "local.tsx", contents: source, cacheKey: "local-tsx" };
188	renderer.hydrate(file);
189	firstEnter(await renderer.initializeHighlighter(), file, "tsx");
190	});
191
192	it("keeps plain text editable without loading an unrelated grammar", async () => {
193	const file = { name: "notes.txt", contents: "Plain text", cacheKey: "plain-text" };
194	renderer.renderFile(file);
195	const highlighter = await renderer.initializeHighlighter();
196	firstEnter(highlighter, file, "text");
197	expect(highlighter.getLoadedLanguages()).not.toContain("tsx");
198	});
199	});

apps/web/src/components/files/fileEditorVirtualization.test.ts+38-18

 @@ -4,7 +4,7 @@ import {
   Virtualizer,
   type FileContents,
 } from "@pierre/diffs";
-import { Editor, TextDocument } from "@pierre/diffs/editor";
+import { Editor, TextDocument } from "@pierre/diffs/edit";
 import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vite-plus/test";
 const renderingManagerUrl = new URL(
 @@ -22,10 +22,21 @@ class MeasuredElement {
   children: MeasuredElement[] = [];
   dataset: Record<string, string> = {};
   nextElementSibling: MeasuredElement | null = null;
+  shadowRoot: MeasuredElement | null = null;
   width = 283;
   constructor(readonly height = 0) {}
+  attachShadow() {
+    this.shadowRoot ??= new MeasuredElement();
+    return this.shadowRoot;
+  }
+  appendChild(child: MeasuredElement) {
+    this.children.push(child);
+    return child;
+  }
   getBoundingClientRect() {
     MeasuredElement.geometryReads += 1;
     return { top: 0, height: this.height, width: this.width };
 @@ -108,8 +119,10 @@ class LayoutVirtualizer extends Virtualizer {
 class MeasuredFile extends VirtualizedFile {
   override top = 0;
+  // Rows are measured by hand here; the virtualizer only needs to reconcile them.
+  override onRender = () => false;
-  override attachEditor(editor: Parameters<VirtualizedFile["attachEditor"]>[0]) {
+  override __attachEditor(editor: Parameters<VirtualizedFile["__attachEditor"]>[0]) {
     this.editor = editor;
     return () => {
       this.editor = undefined;
 @@ -117,7 +130,9 @@ class MeasuredFile extends VirtualizedFile {
   }
   async initialize(file: FileContents) {
-    this.prepareCodeViewItem(file, 0);
+    this.updateCodeViewLayout(file, 0);
+    // Document changes require the session an attached editor installs.
+    (this as unknown as { installEditSession(file: FileContents): void }).installEditSession(file);
     await this.fileRenderer.initializeHighlighter();
     expect(
       this.fileRenderer.renderFile(file, {
 @@ -180,7 +195,7 @@ class MeasuredFile extends VirtualizedFile {
 }
 const instances: MeasuredFile[] = [];
-const editors: Editor<undefined>[] = [];
+const editors: Editor<"file", undefined, undefined>[] = [];
 beforeAll(async () => {
   await getSharedHighlighter({
 @@ -225,7 +240,7 @@ async function makeFixture(
     cacheKey: `wrapped:${overflow}`,
     lang: "text",
   };
-  const document = new TextDocument(file.name, contents, "text");
+  const document = new TextDocument<"file", undefined>(file.name, contents, "text");
   const instance = new MeasuredFile(
     {
       overflow,
 @@ -274,7 +289,7 @@ describe("wrapped editor document changes", () => {
     const before = instance.getLinePosition(previousLastLine);
     expect(before).toEqual({ top: 120328, height: 60 });
     const viewport = { top: before!.top - 100, bottom: before!.top + 80 };
-    expect(instance.getAdvancedStickySpecs(viewport)).toEqual({ topOffset: 118240, height: 2156 });
+    expect(instance.getAdvancedStickySpecs(viewport)).toEqual({ topOffset: 118240, height: 2096 });
     append();
 @@ -282,7 +297,7 @@ describe("wrapped editor document changes", () => {
     expect(instance.getLinePosition(previousLastLine)).toEqual({ top: before!.top, height: 20 });
     expect(instance.getLinePosition(document.lineCount)).toEqual({ top: 120348, height: 20 });
     expect(instance.getVirtualizedHeight()).toBe(120376);
-    expect(instance.getAdvancedStickySpecs(viewport)).toEqual({ topOffset: 118240, height: 2136 });
+    expect(instance.getAdvancedStickySpecs(viewport)).toEqual({ topOffset: 118240, height: 2096 });
   });
   it("invalidates changed and shifted rows after an insertion in the middle", async () => {
 @@ -373,7 +388,7 @@ describe("wrapped editor document changes", () => {
     const { instance, file, append } = await makeFixture();
     append();
     instance.setMetrics({ hunkLineCount: 50, lineHeight: 24, diffHeaderHeight: 44, spacing: 8 });
-    instance.prepareCodeViewItem(file, 0);
+    instance.updateCodeViewLayout(file, 0);
     expect(instance.getLinePosition(6001)).toEqual({ top: 144008, height: 24 });
   });
 @@ -381,7 +396,7 @@ describe("wrapped editor document changes", () => {
     const { instance, file, append } = await makeFixture();
     append();
     instance.setLineAnnotations([{ lineNumber: 10, metadata: undefined }]);
-    instance.prepareCodeViewItem(file, 0);
+    instance.updateCodeViewLayout(file, 0);
     expect(instance.getLinePosition(6001)).toEqual({ top: 120008, height: 20 });
   });
 });
 @@ -476,11 +491,11 @@ describe("wrapped measurement widths", () => {
       "document",
       Object.assign(new EditorElement(), { createElement: () => new EditorElement() }),
     );
-    const first = new Editor<undefined>();
+    const first = new Editor("file");
     editors.push(first);
     first.edit(instance);
     first.cleanUp();
-    const second = new Editor<undefined>();
+    const second = new Editor("file");
     editors.push(second);
     second.edit(instance);
     instance.resizeContent(482.25);
 @@ -531,12 +546,16 @@ class EditorElement extends MeasuredElement {
   style: Record<string, string> = {};
   parentElement: EditorElement | null = null;
-  appendChild(child: EditorElement) {
+  override appendChild(child: EditorElement) {
     child.parentElement = this;
     this.children.push(child);
     return child;
   }
+  append(child: EditorElement) {
+    this.appendChild(child);
+  }
   prepend(child: EditorElement) {
     child.parentElement = this;
     this.children.unshift(child);
 @@ -630,14 +649,15 @@ async function makeEditorFixture(lineCount: number) {
     langs: ["text"],
     preferredHighlighter: "shiki-wasm",
   });
-  const editor = new Editor<undefined>();
+  const editor = new Editor("file");
   editors.push(editor);
   editor.edit(instance);
-  editor.__syncRenderView(highlighter, measuredElement(host), file, undefined, {
+  editor.__syncRenderView({
-    startingLine: 0,
+    highlighter,
-    totalLines: 1,
+    fileContainer: measuredElement(host),
-    bufferBefore: 0,
+    file,
-    bufferAfter: 0,
+    lineAnnotations: undefined,
+    renderRange: { startingLine: 0, totalLines: 1, bufferBefore: 0, bufferAfter: 0 },
   });
   const append = (count: number) => {
     const lines = editor.getText().split("\n");

apps/web/src/components/files/projectFilesQueryState.ts+12

...	@@ -89,6 +89,18 @@ export function getOptimisticProjectFileQueryData(	...	@@ -89,6 +89,18 @@ export function getOptimisticProjectFileQueryData(
89	return appAtomRegistry.get(optimisticFileAtom(environmentId, cwd, relativePath))?.data ?? null;	89	return appAtomRegistry.get(optimisticFileAtom(environmentId, cwd, relativePath))?.data ?? null;
90	}	90	}
91		91
		92	/** The contents the Files panel shows, read outside React so it is current within a frame. */
		93	export function getProjectFileContents(
		94	environmentId: EnvironmentId,
		95	cwd: string,
		96	relativePath: string,
		97	): string \| undefined {
		98	const optimistic = getOptimisticProjectFileQueryData(environmentId, cwd, relativePath);
		99	if (optimistic) return optimistic.contents;
		100	const result = appAtomRegistry.get(getProjectFileQueryAtom(environmentId, cwd, relativePath));
		101	return Option.getOrUndefined(AsyncResult.value(result))?.contents;
		102	}
		103
92	export function confirmProjectFileQueryData(	104	export function confirmProjectFileQueryData(
93	environmentId: EnvironmentId,	105	environmentId: EnvironmentId,
94	cwd: string,	106	cwd: string,

apps/web/src/components/pullRequest/PullRequestCodeTab.tsx+3-1

 @@ -254,7 +254,9 @@ function PullRequestCodeTab({
     readonly slices: ReadonlyArray<DiffSlice>;
   }>({ key: "", cursor: null, slices: NO_SLICES });
   const parseCache = useRef(new Map<string, RenderablePatch>());
-  const [viewer, setViewer] = useState<CodeViewHandle<ReviewAnnotationGroup> | null>(null);
+  const [viewer, setViewer] = useState<CodeViewHandle<ReviewAnnotationGroup, undefined> | null>(
+    null,
+  );
   const referenceKey = pullRequestReviewKey(reference);
   const commit = selectedCommitOid;

apps/web/src/lib/diffRendering.test.ts+4

 @@ -402,6 +402,10 @@ describe("a file whose name a patch header cannot carry plainly", () => {
     expect(pathOf(quotedPatch("line\\nfile.txt"))).toBe("line\nfile.txt");
   });
+  it("keeps a backslash the name really has", () => {
+    expect(pathOf(quotedPatch("back\\\\slash.txt"))).toBe("back\\slash.txt");
+  });
   it("reads the octal a host with core.quotePath on writes for a name outside ASCII", () => {
     expect(pathOf(quotedPatch("caf\\303\\251/r\\303\\251sum\\303\\251.ts"))).toBe("café/résumé.ts");
   });

apps/web/src/lib/diffRendering.ts+4-11

 @@ -1,7 +1,6 @@
 import { parsePatchFiles } from "@pierre/diffs/utils/parsePatchFiles";
 import { parseDiffFromFile } from "@pierre/diffs";
 import type { FileDiffMetadata } from "@pierre/diffs/types";
-import { unquoteGitPatchPath } from "@t3tools/shared/gitPatchPath";
 const DIFF_THEME_NAMES = {
   light: "pierre-light",
 @@ -201,17 +200,11 @@ export function getRenderablePatch(
 }
 /**
- * What the patch called the file, as the file's own name. Git writes a name holding a tab, a
+ * The file's own name. Git quotes and escapes a name holding a tab, a newline, a quote or a
- * newline, a quote or a backslash quoted and escaped, and the parser hands one of those back still
+ * backslash, and the parser decodes it, so this is the name the host knows the file by.
- * escaped. A viewed mark, a review comment and a file's contents are all asked for by this path,
- * and the host knows the file only under the name it really has.
  */
-function fileDiffPath(raw: string): string {
-  return unquoteGitPatchPath(raw);
-}
 export function resolveFileDiffPath(fileDiff: FileDiffMetadata): string {
-  return fileDiffPath(fileDiff.name ?? fileDiff.prevName ?? "");
+  return fileDiff.name ?? fileDiff.prevName ?? "";
 }
 /**
 @@ -219,7 +212,7 @@ export function resolveFileDiffPath(fileDiff: FileDiffMetadata): string {
  * path, and the hosts that resolve a diff position against both sides need both names.
  */
 export function resolveFileDiffPreviousPath(fileDiff: FileDiffMetadata): string {
-  return fileDiffPath(fileDiff.prevName ?? fileDiff.name ?? "");
+  return fileDiff.prevName ?? fileDiff.name ?? "";
 }
 /**

apps/web/vite.config.ts+1-1

...	@@ -190,7 +190,7 @@ export default defineConfig(() => {	...	@@ -190,7 +190,7 @@ export default defineConfig(() => {
190	"@clerk/clerk-js",	190	"@clerk/clerk-js",
191	"@clerk/react/internal",	191	"@clerk/react/internal",
192	"@pierre/diffs",	192	"@pierre/diffs",
193	"@pierre/diffs/editor",	193	"@pierre/diffs/edit",
194	"@pierre/diffs/react",	194	"@pierre/diffs/react",
195	"@pierre/diffs/worker/worker.js",	195	"@pierre/diffs/worker/worker.js",
196	"effect/Array",	196	"effect/Array",

patches/@pierre%2Fdiffs@1.3.0-beta.10.patch deleted-238

...	@@ -1,238 +0,0 @@
1	diff --git a/dist/components/VirtualizedFile.d.ts b/dist/components/VirtualizedFile.d.ts
2	--- a/dist/components/VirtualizedFile.d.ts
3	+++ b/dist/components/VirtualizedFile.d.ts
4	@@ -42,7 +42,7 @@ declare class VirtualizedFile<LAnnotation = undefined> extends File<LAnnotation> {
5	private computeApproximateSize;
6	setVisibility(visible: boolean): void;
7	rerender(): void;
8	- applyDocumentChange(textDocument: DiffsTextDocument, newLineAnnotations?: LineAnnotation<LAnnotation>[], shouldUpdateBuffer?: boolean): void;
9	+ applyDocumentChange(textDocument: DiffsTextDocument, newLineAnnotations?: LineAnnotation<LAnnotation>[], shouldUpdateBuffer?: boolean, startLine?: number): void;
10	protected renderPreparedFile({
11	fileContainer,
12	file,
13	diff --git a/dist/components/VirtualizedFile.js b/dist/components/VirtualizedFile.js
14	--- a/dist/components/VirtualizedFile.js
15	+++ b/dist/components/VirtualizedFile.js
16	@@ -20,6 +20,7 @@
17	cache = {
18	heights: /* @__PURE__ */ new Map(),
19	checkpoints: [],
20	+ codeWidth: void 0,
21	fileAnnotationHeight: 0
22	};
23	isVisible = false;
24	@@ -31,6 +32,8 @@
25	super(options, workerManager, isContainerManaged);
26	this.virtualizer = virtualizer;
27	this.metrics = metrics;
28	+ const simpleVirtualizer = this.getSimpleVirtualizer();
29	+ if (simpleVirtualizer != null) this.resizeManager.onResize = () => simpleVirtualizer.requestHeightReconcile(this);
30	}
31	setMetrics(metrics, force = false) {
32	if (!force && areObjectsEqual(this.metrics, metrics)) return;
33	@@ -70,10 +73,12 @@
34	if (this.isAdvancedMode()) throw new Error("VirtualizedFile.setThemeType cannot be used inside CodeView. Update CodeView options instead.");
35	super.setThemeType(themeType);
36	}
37	- resetLayoutCache(recompute = false, resetRenderRange = true) {
38	+ resetLayoutCache(recompute = false, resetRenderRange = true, startLine = 0) {
39	this.layoutDirty = true;
40	- this.cache.fileAnnotationHeight = 0;
41	- if (this.cache.heights.size > 0) this.cache.heights.clear();
42	+ if (startLine === 0) this.cache.fileAnnotationHeight = 0;
43	+ // Dropping unchanged wrapped rows moves the viewport before they can be remeasured.
44	+ if (startLine === 0) this.cache.heights.clear();
45	+ else for (const lineIndex of this.cache.heights.keys()) if (lineIndex >= startLine) this.cache.heights.delete(lineIndex);
46	if (this.cache.checkpoints.length > 0) this.cache.checkpoints.length = 0;
47	if (this.renderRange != null && resetRenderRange) this.renderRange = void 0;
48	if (recompute && this.isSimpleMode()) this.computeApproximateSize();
49	@@ -91,6 +96,13 @@
50	if (this.code == null) return hasHeightChange;
51	const content = this.code.children[1];
52	if (!(content instanceof HTMLElement)) return hasHeightChange;
53	+ const codeWidth = this.code.getBoundingClientRect().width;
54	+ if (!(codeWidth > 0)) return hasHeightChange;
55	+ if (this.cache.codeWidth != null && this.cache.codeWidth !== codeWidth) {
56	+ this.resetLayoutCache(false, false);
57	+ hasHeightChange = true;
58	+ }
59	+ this.cache.codeWidth = codeWidth;
60	const hasFileAnnotations = includesFileAnnotations(this.lineAnnotations);
61	if (this.renderRange != null && hasFileAnnotations && shouldRenderFileAnnotations(this.renderRange)) {
62	const nextFileAnnotationHeight = measureFileAnnotationHeight(content) ?? 0;
63	@@ -287,11 +299,11 @@
64	this.forceRenderOverride = true;
65	this.virtualizer.instanceChanged(this, false);
66	}
67	- applyDocumentChange(textDocument, newLineAnnotations, shouldUpdateBuffer = false) {
68	+ applyDocumentChange(textDocument, newLineAnnotations, shouldUpdateBuffer = false, startLine = 0) {
69	const previousRenderRange = this.renderRange;
70	super.applyDocumentChange(textDocument, newLineAnnotations);
71	this.getSimpleVirtualizer()?.markDOMDirty();
72	- this.resetLayoutCache(this.isSimpleMode(), false);
73	+ this.resetLayoutCache(this.isSimpleMode(), false, startLine);
74	if (shouldUpdateBuffer && previousRenderRange !== void 0 && this.file !== void 0) {
75	const windowSpecs = this.virtualizer.getWindowSpecs();
76	const renderRange = this.computeRenderRangeFromWindow(this.file, this.top ?? 0, windowSpecs);
77	diff --git a/dist/editor/editor.js b/dist/editor/editor.js
78	index ff78e2a..f9df318 100644
79	--- a/dist/editor/editor.js
80	+++ b/dist/editor/editor.js
81	@@ -146,14 +146,11 @@ var Editor = class {
82	const file = fileInstance.__getCurrentFile?.();
83	if (file !== void 0) requirePersistedCacheKey(file);
84	}
85	- const { useTokenTransformer, enableGutterUtility, enableLineSelection, lineHoverHighlight = "disabled", ...rest } = fileInstance.options;
86	- if (useTokenTransformer !== true \|\| enableGutterUtility === true \|\| enableLineSelection === true \|\| lineHoverHighlight !== "disabled") {
87	+ const { useTokenTransformer, ...rest } = fileInstance.options;
88	+ if (useTokenTransformer !== true) {
89	fileInstance.setOptions({
90	...rest,
91	- useTokenTransformer: true,
92	- enableGutterUtility: false,
93	- enableLineSelection: false,
94	- lineHoverHighlight: "disabled"
95	+ useTokenTransformer: true
96	});
97	fileInstance.rerender();
98	}
99	@@ -908,6 +905,7 @@ var Editor = class {
100	return lineNumber - 1;
101	};
102	this.#editorEventDisposes.push(addEventListener(gutterEl, "pointerdown", (e) => {
103	+ if (this.#fileInstance?.options.enableLineSelection === true) return;
104	const gutterRow = resolveGutterTarget(e.composedPath()[0]);
105	if (gutterRow?.dataset.lineType === "change-deletion") {
106	const code = gutterRow.closest("[data-code]");
107	@@ -1522,6 +1520,12 @@ var Editor = class {
108	if (gutterEl !== void 0) gutterEl.style.gridRow = "span " + gridRow;
109	}
110	fileInstance.updateRenderCache(dirtyLines, tokenizer.themeType, !didLineCountChange, didLineCountChange);
111	+ if (fileInstance.file !== void 0) fileInstance.file.contents = textDocument.getText();
112	- if (didLineCountChange) fileInstance.applyDocumentChange(textDocument, newLineAnnotations, shouldUpdateBuffer);
113	+ if (didLineCountChange) {
114	+ const previousLineCount = change.lineCount - change.lineDelta;
115	+ // A wider or narrower line-number gutter can rewrap unchanged rows.
116	+ const layoutStartLine = String(previousLineCount).length === String(change.lineCount).length ? change.startLine : 0;
117	+ fileInstance.applyDocumentChange(textDocument, newLineAnnotations, shouldUpdateBuffer, layoutStartLine);
118	+ }
119	if (this.#isDiff && (this.#diffSyle === "unified" \|\| didLineCountChange)) this.#resetCache();
120	if (newLineAnnotations !== void 0) {
121	@@ -1788,6 +1787,7 @@ var Editor = class {
122	}
123	}
124	#setSelectedLinesSafe(range, lineNumberOnly = false) {
125	+ if (this.#fileInstance?.options.controlledSelection === true) return;
126	try {
127	this.#fileInstance?.setSelectedLines(range, {
128	notify: false,
129	diff --git a/dist/managers/ResizeManager.d.ts b/dist/managers/ResizeManager.d.ts
130	--- a/dist/managers/ResizeManager.d.ts
131	+++ b/dist/managers/ResizeManager.d.ts
132	@@ -5,6 +5,8 @@
133	columnVariables?: ResizeManagerColumnVariableMode;
134	}
135	declare class ResizeManager {
136	+ /** Schedule owner measurement after an observed code or gutter size change. */
137	+ onResize?: () => void;
138	private static resizeObserver;
139	private static managersByElement;
140	private static getResizeObserver;
141	diff --git a/dist/managers/ResizeManager.js b/dist/managers/ResizeManager.js
142	--- a/dist/managers/ResizeManager.js
143	+++ b/dist/managers/ResizeManager.js
144	@@ -19,6 +19,7 @@
145	for (const [manager, managerEntries] of entriesByManager) manager.handleResizeEntries(managerEntries);
146	}
147	observedNodes = /* @__PURE__ */ new Map();
148	+ onResize;
149	setup(pre, { disableAnnotations, columnVariables = "apply" }) {
150	const annotationUpdates = /* @__PURE__ */ new Set();
151	const applyColumnVariables = columnVariables === "apply";
152	@@ -212,6 +213,7 @@
153	this.applyAnnotationUpdates(annotationUpdates);
154	annotationUpdates.clear();
155	this.applyColumnUpdates(codeUpdates);
156	+ if (codeUpdates.size > 0) this.onResize?.();
157	codeUpdates.clear();
158	}
159	applyAnnotationUpdates(annotationUpdates) {
160	diff --git a/dist/react/utils/useFileInstance.js b/dist/react/utils/useFileInstance.js
161	index e9f62f5..af82a46 100644
162	--- a/dist/react/utils/useFileInstance.js
163	+++ b/dist/react/utils/useFileInstance.js
164	@@ -91,10 +91,7 @@ function mergeFileOptions({ options, controlledSelection, contentEditable, hasCu
165	};
166	if (needsEditorOptions) merged = {
167	...merged,
168	- useTokenTransformer: true,
169	- enableGutterUtility: false,
170	- enableLineSelection: false,
171	- lineHoverHighlight: "disabled"
172	+ useTokenTransformer: true
173	};
174	return merged;
175	}
176	diff --git a/dist/renderers/FileRenderer.js b/dist/renderers/FileRenderer.js
177	--- a/dist/renderers/FileRenderer.js
178	+++ b/dist/renderers/FileRenderer.js
179	@@ -107,10 +107,10 @@
180	result: massiveFile ? void 0 : cache?.result,
181	renderRange: void 0
182	};
183	+ this.computedLang = file.lang ?? getFiletypeFromFileName(file.name);
184	if (this.workerManager?.isWorkingPool() === true) {
185	if (this.renderCache.result == null && !massiveFile) this.workerManager.highlightFileAST(this, file);
186	} else if (this.highlighter == null) {
187	- this.computedLang = file.lang ?? getFiletypeFromFileName(file.name);
188	this.initializeHighlighter();
189	}
190	}
191	@@ -163,6 +163,8 @@
192	if (this.renderCache == null) return;
193	const { file, result } = this.renderCache;
194	if (result == null) return;
195	+ this.workerManager?.cleanUpTasks(this);
196	+ if (file.cacheKey != null) this.workerManager?.evictFileFromCache(file.cacheKey);
197	const lineCache = this.lineCache != null && isLineCacheForFile(this.lineCache, file) ? this.lineCache : void 0;
198	for (const [line, tokens] of dirtyLines) {
199	if (lineCache != null && line < lineCache.lines.length) {
200	@@ -268,6 +270,7 @@
201	const forcePlainText = !hasContent \|\| isFilePlainText(file) \|\| isFileMassive(lines.length, this.getTokenizeMaxLength());
202	const newContent = !areFilesEqual(file, this.renderCache.file);
203	const newRenderRange = !areRenderRangesEqual(this.renderCache.renderRange, renderRange);
204	+ this.computedLang = file.lang ?? getFiletypeFromFileName(file.name);
205	if (this.workerManager?.isWorkingPool() === true) {
206	if (forcePlainText \|\| this.renderCache.result == null \|\| !this.renderCache.highlighted && (newContent \|\| newRenderRange)) {
207	this.renderCache.file = file;
208	@@ -278,7 +281,6 @@
209	}
210	if (!forcePlainText && hasContent && (!this.renderCache.highlighted \|\| forceHighlight)) this.workerManager.highlightFileAST(this, file);
211	} else {
212	- this.computedLang = file.lang ?? getFiletypeFromFileName(file.name);
213	const hasThemes = this.highlighter != null && areThemesAttached(options.theme);
214	const hasLangs = this.highlighter != null && areLanguagesAttached(this.computedLang);
215	const canHighlight = !forcePlainText && hasLangs;
216	diff --git a/package.json b/package.json
217	index ff61c90..1e170e5 100644
218	--- a/package.json
219	+++ b/package.json
220	@@ -55,6 +55,18 @@
221	"./worker/worker-portable.js": {
222	"types": "./dist/worker/worker-portable.d.ts",
223	"import": "./dist/worker/worker-portable.js"
224	+ },
225	+ "./types": {
226	+ "types": "./dist/types.d.ts",
227	+ "import": "./dist/types.js"
228	+ },
229	+ "./utils/getFiletypeFromFileName": {
230	+ "types": "./dist/utils/getFiletypeFromFileName.d.ts",
231	+ "import": "./dist/utils/getFiletypeFromFileName.js"
232	+ },
233	+ "./utils/parsePatchFiles": {
234	+ "types": "./dist/utils/parsePatchFiles.d.ts",
235	+ "import": "./dist/utils/parsePatchFiles.js"
236	}
237	},
238	"publishConfig": {

patches/@pierre%2Fdiffs@1.5.2.patch created+146

...	@@ -0,0 +1,146 @@
1	diff --git a/dist/components/VirtualizedFile.d.ts b/dist/components/VirtualizedFile.d.ts
2	--- a/dist/components/VirtualizedFile.d.ts
3	+++ b/dist/components/VirtualizedFile.d.ts
4	@@ -49,7 +49,7 @@
5	setVisibility(visible: boolean): void;
6	rerender(): void;
7	syncGhostTextRows(): void;
8	- applyDocumentChange(textDocument: TextDocument<'file', LAnnotation>, newLineAnnotations?: LineAnnotation<LAnnotation>[], shouldUpdateBuffer?: boolean): void;
9	+ applyDocumentChange(textDocument: TextDocument<'file', LAnnotation>, newLineAnnotations?: LineAnnotation<LAnnotation>[], shouldUpdateBuffer?: boolean, startLine?: number): void;
10	render({ fileContainer, file, forceRender, lineAnnotations, ...props }: FileRenderProps<LAnnotation>): boolean;
11	protected finalizeRender(): void;
12	private updatePendingRender;
13	diff --git a/dist/components/VirtualizedFile.js b/dist/components/VirtualizedFile.js
14	--- a/dist/components/VirtualizedFile.js
15	+++ b/dist/components/VirtualizedFile.js
16	@@ -23,6 +23,7 @@
17	heights: /* @__PURE__ */ new Map(),
18	checkpoints: [],
19	fileAnnotationHeight: 0,
20	+ codeWidth: void 0,
21	ghostTextRows: NO_GHOST_TEXT_ROWS
22	};
23	pendingRender;
24	@@ -35,6 +36,8 @@
25	super(options, workerManager, isContainerManaged);
26	this.virtualizer = virtualizer;
27	this.metrics = metrics;
28	+ const simpleVirtualizer = this.getSimpleVirtualizer();
29	+ if (simpleVirtualizer != null) this.resizeManager.onResize = () => simpleVirtualizer.requestHeightReconcile(this);
30	}
31	setMetrics(metrics, force = false) {
32	const nextMetrics = computeVirtualFileMetrics(metrics);
33	@@ -86,10 +89,12 @@
34	if (this.isAdvancedMode()) throw new Error("VirtualizedFile.setThemeType cannot be used inside CodeView. Update CodeView options instead.");
35	super.setThemeType(themeType);
36	}
37	- resetLayoutCache(recompute = false, resetRenderRange = true) {
38	+ resetLayoutCache(recompute = false, resetRenderRange = true, startLine = 0) {
39	this.layoutDirty = true;
40	- this.cache.fileAnnotationHeight = 0;
41	- if (this.cache.heights.size > 0) this.cache.heights.clear();
42	+ if (startLine === 0) this.cache.fileAnnotationHeight = 0;
43	+ // Dropping unchanged wrapped rows moves the viewport before they can be remeasured.
44	+ if (startLine === 0) this.cache.heights.clear();
45	+ else for (const lineIndex of this.cache.heights.keys()) if (lineIndex >= startLine) this.cache.heights.delete(lineIndex);
46	if (this.cache.checkpoints.length > 0) this.cache.checkpoints.length = 0;
47	this.cache.ghostTextRows = NO_GHOST_TEXT_ROWS;
48	if (this.renderRange != null && resetRenderRange) this.renderRange = void 0;
49	@@ -135,6 +140,13 @@
50	if (this.code == null) return hasHeightChange;
51	const content = this.code.children[1];
52	if (!(content instanceof HTMLElement)) return hasHeightChange;
53	+ const codeWidth = this.code.getBoundingClientRect().width;
54	+ if (!(codeWidth > 0)) return hasHeightChange;
55	+ if (this.cache.codeWidth != null && this.cache.codeWidth !== codeWidth) {
56	+ this.resetLayoutCache(false, false);
57	+ hasHeightChange = true;
58	+ }
59	+ this.cache.codeWidth = codeWidth;
60	if (this.renderRange != null && shouldRenderFileAnnotations(this.renderRange)) {
61	const nextFileAnnotationHeight = measureFileAnnotationHeight(content) ?? 0;
62	if (nextFileAnnotationHeight !== this.cache.fileAnnotationHeight) {
63	@@ -358,12 +370,12 @@
64	codeView.instanceChanged(this, true);
65	} else this.getSimpleVirtualizer()?.requestHeightReconcile(this);
66	}
67	- applyDocumentChange(textDocument, newLineAnnotations, shouldUpdateBuffer = false) {
68	+ applyDocumentChange(textDocument, newLineAnnotations, shouldUpdateBuffer = false, startLine = 0) {
69	const { renderRange: previousRenderRange } = this;
70	this.getAdvancedVirtualizer()?.capturePendingLayoutAnchor();
71	super.applyDocumentChange(textDocument, newLineAnnotations);
72	this.getSimpleVirtualizer()?.markDOMDirty();
73	- this.resetLayoutCache(this.isSimpleMode(), false);
74	+ this.resetLayoutCache(this.isSimpleMode(), false, startLine);
75	const file = this.getRenderedFile();
76	if (!this.isSimpleMode()) this.computeApproximateSize(true);
77	else if (shouldUpdateBuffer && previousRenderRange != null && file != null) {
78	diff --git a/dist/editor/editor.js b/dist/editor/editor.js
79	--- a/dist/editor/editor.js
80	+++ b/dist/editor/editor.js
81	@@ -1899,7 +1899,11 @@
82	changedDocumentLines: this.#isDiff && !didLineCountChange ? getChangedDocumentLines(textDocument, change) : void 0,
83	documentLineCount: textDocument.lineCount
84	});
85	- if (didLineCountChange) applyDocumentChange(textDocument, newLineAnnotations, shouldUpdateBuffer);
86	+ if (didLineCountChange) {
87	+ // A wider or narrower line-number gutter can rewrap unchanged rows.
88	+ const layoutStartLine = String(change.previousLineCount).length === String(change.lineCount).length ? change.startLine : 0;
89	+ applyDocumentChange(textDocument, newLineAnnotations, shouldUpdateBuffer, layoutStartLine);
90	+ }
91	if (didLineCountChange \|\| this.#isDiff && this.#diffSyle === "unified") this.#resetCache();
92	if (newLineAnnotations != null) {
93	this.#lineAnnotations = newLineAnnotations;
94	diff --git a/dist/managers/ResizeManager.d.ts b/dist/managers/ResizeManager.d.ts
95	--- a/dist/managers/ResizeManager.d.ts
96	+++ b/dist/managers/ResizeManager.d.ts
97	@@ -5,6 +5,8 @@
98	columnVariables?: ResizeManagerColumnVariableMode;
99	}
100	declare class ResizeManager {
101	+ /** Schedule owner measurement after an observed code or gutter size change. */
102	+ onResize?: () => void;
103	private static resizeObserver;
104	private static managersByElement;
105	private static getResizeObserver;
106	diff --git a/dist/managers/ResizeManager.js b/dist/managers/ResizeManager.js
107	--- a/dist/managers/ResizeManager.js
108	+++ b/dist/managers/ResizeManager.js
109	@@ -19,6 +19,7 @@
110	for (const [manager, managerEntries] of entriesByManager) manager.handleResizeEntries(managerEntries);
111	}
112	observedNodes = /* @__PURE__ */ new Map();
113	+ onResize;
114	setup(pre, { disableAnnotations, columnVariables = "apply" }) {
115	const annotationUpdates = /* @__PURE__ */ new Set();
116	const applyColumnVariables = columnVariables === "apply";
117	@@ -212,6 +213,7 @@
118	this.applyAnnotationUpdates(annotationUpdates);
119	annotationUpdates.clear();
120	this.applyColumnUpdates(codeUpdates);
121	+ if (codeUpdates.size > 0) this.onResize?.();
122	codeUpdates.clear();
123	}
124	applyAnnotationUpdates(annotationUpdates) {
125	diff --git a/package.json b/package.json
126	--- a/package.json
127	+++ b/package.json
128	@@ -58,6 +58,18 @@
129	"./worker/worker-portable.js": {
130	"types": "./dist/worker/worker-portable.d.ts",
131	"import": "./dist/worker/worker-portable.js"
132	+ },
133	+ "./types": {
134	+ "types": "./dist/types.d.ts",
135	+ "import": "./dist/types.js"
136	+ },
137	+ "./utils/getFiletypeFromFileName": {
138	+ "types": "./dist/utils/getFiletypeFromFileName.d.ts",
139	+ "import": "./dist/utils/getFiletypeFromFileName.js"
140	+ },
141	+ "./utils/parsePatchFiles": {
142	+ "types": "./dist/utils/parsePatchFiles.d.ts",
143	+ "import": "./dist/utils/parsePatchFiles.js"
144	}
145	},
146	"publishConfig": {

pnpm-lock.yaml+89-29

 @@ -25,8 +25,8 @@ catalogs:
       specifier: 1.8.0
       version: 1.8.0
     '@pierre/diffs':
-      specifier: 1.3.0-beta.10
+      specifier: 1.5.2
-      version: 1.3.0-beta.10
+      version: 1.5.2
     jose:
       specifier: 6.2.2
       version: 6.2.2
 @@ -103,7 +103,7 @@ patchedDependencies:
   '@opencode/client@2.0.23': f725d6e6d9af0d56dc6ed71b863518fbfc751af1773cff2311209d2c404cf4cd
   '@opencode/protocol@2.0.23': 17a82f6c2c98fd0371e786c211a4fbdaaba403577a25733e5e99a0c25a16a685
   '@opencode/schema@2.0.23': 650f1b8602789407c010861284272dcb6bd6de01ec6a75bf3c0904a0e7596d59
-  '@pierre/diffs@1.3.0-beta.10': 0ccee155b93b63d810e2c1a40c1fd676fb6fbcfa72cf6430dcedf1a3ae475ab4
+  '@pierre/diffs@1.5.2': ba1766e9669d5699e31f0dde5a52f5d47f389f49a286de54489a409ba2527289
   '@react-native-ai/apple@0.12.0': 2d09870c2848d185cb05b53ed823a46e12dba519324d8dd8e584e28731990f9d
   '@react-native-menu/menu@2.0.0': a4866ecfcd44f318043de839d20110c17e14909004900f002ffe12050376f2ba
   '@react-navigation/native-stack@7.17.6': e667c3cef8c78bb9ff4882ee5bd23a432247b843060a9499eb5f07e9e2295552
 @@ -277,7 +277,7 @@ importers:
         version: 1.9.1
       '@pierre/diffs':
         specifier: 'catalog:'
-        version: 1.3.0-beta.10(patch_hash=0ccee155b93b63d810e2c1a40c1fd676fb6fbcfa72cf6430dcedf1a3ae475ab4)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
+        version: 1.5.2(patch_hash=ba1766e9669d5699e31f0dde5a52f5d47f389f49a286de54489a409ba2527289)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
       '@react-native-ai/apple':
         specifier: 0.12.0
         version: 0.12.0(patch_hash=2d09870c2848d185cb05b53ed823a46e12dba519324d8dd8e584e28731990f9d)(react-native@0.88.0-rc.3(@babel/core@7.29.7)(@react-native/metro-config@0.88.0-rc.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))
 @@ -502,8 +502,8 @@ importers:
         specifier: 4.0.1
         version: 4.0.1(patch_hash=359f6fb2f7b3ec145bb72208edb9034f02489791aa2491a55cdbd69bd56ee0d2)(@types/node@24.12.4)(@vitest/ui@5.0.1)(bufferutil@4.1.0)(effect@4.0.1(patch_hash=a33cba07c41f32374c2aaa86ea4a84d3ab9a872a78c94b65e929b19f8361856f))(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@pierre/trees':
-        specifier: 1.0.0-beta.4
+        specifier: 1.0.0-beta.6
-        version: 1.0.0-beta.4(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
+        version: 1.0.0-beta.6(@pierre/theme@2.0.0)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(shiki@4.2.0)
       '@types/react':
         specifier: ~19.3.0
         version: 19.3.0
 @@ -666,10 +666,10 @@ importers:
         version: 1.8.0
       '@pierre/diffs':
         specifier: 'catalog:'
-        version: 1.3.0-beta.10(patch_hash=0ccee155b93b63d810e2c1a40c1fd676fb6fbcfa72cf6430dcedf1a3ae475ab4)(@shikijs/themes@4.3.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+        version: 1.5.2(patch_hash=ba1766e9669d5699e31f0dde5a52f5d47f389f49a286de54489a409ba2527289)(@shikijs/themes@4.3.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@pierre/trees':
-        specifier: 1.0.0-beta.4
+        specifier: 1.0.0-beta.6
-        version: 1.0.0-beta.4(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+        version: 1.0.0-beta.6(@pierre/theme@1.1.0)(@shikijs/themes@4.3.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(shiki@4.2.0)
       '@t3tools/client-runtime':
         specifier: workspace:*
         version: link:../../packages/client-runtime
 @@ -4444,18 +4444,27 @@ packages:
     resolution: {integrity: sha512-ODOov0sGMJMf3jPonOkgGqPknTsu+DdQ7kD++gz8aI+aFMOMHFbWAA2taqXXVTdP+OTOQR/znGvSpmkeI0WTYQ==}
     engines: {node: '>=14.18.0'}
-  '@pierre/diffs@1.3.0-beta.10':
+  '@pierre/diffs@1.5.2':
-    resolution: {integrity: sha512-efyFM9GRfI6WkmHJP0CnZBopuM8yCwGqIKbZHoe1D5PV15VDkr7Vpi8EZt40AYrN1km//utQtYhHDSwt2KwjSg==}
+    resolution: {integrity: sha512-QVxIWQEnNoko22k63maERzozd29+FtaUNpRrZiw603WMe5R1mFSED+jMtPkcVP3SDYS1DWg5K7sa7sJbr3xkNQ==}
     peerDependencies:
       react: ^18.3.1 || ^19.0.0
       react-dom: ^18.3.1 || ^19.0.0
+    peerDependenciesMeta:
+      react:
+        optional: true
+      react-dom:
+        optional: true
   '@pierre/theme@1.1.0':
     resolution: {integrity: sha512-GC2OWTAfTIIWWYhPCygwG8t2EtePQkRfON4MI2rwIkJylmiyqIttJID2dCL8sUD8cNdEvYkEyfEHHKMeCiDLoQ==}
     engines: {vscode: ^1.0.0}
-  '@pierre/theming@0.0.2':
+  '@pierre/theme@2.0.0':
-    resolution: {integrity: sha512-QM1M4stXfnzfaE8I8YbjXSApV8c+2dBsXJj8eYg9WTpBR/cTmCZIcfGnN4p13iRrYu2Br/R/OJfEL7uR8Qjctw==}
+    resolution: {integrity: sha512-yNDd9GYLQl1mEUJR8AneJ5e4ohLIHQd/wZLWr4fagt78vS2RwwZNW530vVgHqXFAyFVcFlRmGUD5ramXH46OXw==}
+    engines: {vscode: ^1.0.0}
+  '@pierre/theming@1.0.0':
+    resolution: {integrity: sha512-WsdrnhKfjeyXGDikZmN9pkpeZ5S/cl6EE72feiSc0tlynT1tMYqXqouhuv/foK+PY9OEnebOAVRQn3+rAstR8g==}
     peerDependencies:
       '@pierre/theme': ^1.1.0
       '@shikijs/themes': ^3.0.0 || ^4.0.0
 @@ -4474,8 +4483,28 @@ packages:
       shiki:
         optional: true
-  '@pierre/trees@1.0.0-beta.4':
+  '@pierre/theming@1.0.1':
-    resolution: {integrity: sha512-OfT1yk9ne8Te5+GB5zUY8yqE6B8BqjBHQJleH4lu8ltwNpoocZl4vXt1AzlEExpxI/pp+AFX5QG+lR3JjtTEag==}
+    resolution: {integrity: sha512-WCI5Qd7iprDpISL9fBYOLe8RV53+b7mFNA3bPzl60/2CKCSrsKN8zEcep6Y3BAzvARlmca50zGjDodqPGiTUKA==}
+    peerDependencies:
+      '@pierre/theme': ^1.1.0 || ^2.0.0
+      '@shikijs/themes': ^3.0.0 || ^4.0.0
+      react: ^18.3.1 || ^19.0.0
+      react-dom: ^18.3.1 || ^19.0.0
+      shiki: ^3.0.0 || ^4.0.0
+    peerDependenciesMeta:
+      '@pierre/theme':
+        optional: true
+      '@shikijs/themes':
+        optional: true
+      react:
+        optional: true
+      react-dom:
+        optional: true
+      shiki:
+        optional: true
+  '@pierre/trees@1.0.0-beta.6':
+    resolution: {integrity: sha512-zxeuSFM9TveM7b5XofweJALCtm/tGYV9HZzdbf7Uf+kBxIlUyz24/EHaGRjB0dsmmfDQl2ETz7AWwJ15lhSnpw==}
     peerDependencies:
       react: ^18.3.1 || ^19.0.0
       react-dom: ^18.3.1 || ^19.0.0
 @@ -14869,65 +14898,96 @@ snapshots:
       tslib: 2.8.1
       webcrypto-core: 1.9.2
-  '@pierre/diffs@1.3.0-beta.10(patch_hash=0ccee155b93b63d810e2c1a40c1fd676fb6fbcfa72cf6430dcedf1a3ae475ab4)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
+  '@pierre/diffs@1.5.2(patch_hash=ba1766e9669d5699e31f0dde5a52f5d47f389f49a286de54489a409ba2527289)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
     dependencies:
-      '@pierre/theme': 1.1.0
+      '@pierre/theme': 2.0.0
-      '@pierre/theming': 0.0.2(@pierre/theme@1.1.0)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(shiki@4.2.0)
+      '@pierre/theming': 1.0.1(@pierre/theme@2.0.0)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(shiki@4.2.0)
       '@shikijs/transformers': 4.2.0
       diff: 9.0.0
       hast-util-to-html: 9.0.5
       lru_map: 0.4.1
+      shiki: 4.2.0
+    optionalDependencies:
       react: 19.3.0
       react-dom: 19.3.0(react@19.3.0)
-      shiki: 4.2.0
     transitivePeerDependencies:
       - '@shikijs/themes'
-  '@pierre/diffs@1.3.0-beta.10(patch_hash=0ccee155b93b63d810e2c1a40c1fd676fb6fbcfa72cf6430dcedf1a3ae475ab4)(@shikijs/themes@4.3.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@pierre/diffs@1.5.2(patch_hash=ba1766e9669d5699e31f0dde5a52f5d47f389f49a286de54489a409ba2527289)(@shikijs/themes@4.3.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@pierre/theme': 1.1.0
+      '@pierre/theme': 2.0.0
-      '@pierre/theming': 0.0.2(@pierre/theme@1.1.0)(@shikijs/themes@4.3.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(shiki@4.2.0)
+      '@pierre/theming': 1.0.1(@pierre/theme@2.0.0)(@shikijs/themes@4.3.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(shiki@4.2.0)
       '@shikijs/transformers': 4.2.0
       diff: 9.0.0
       hast-util-to-html: 9.0.5
       lru_map: 0.4.1
+      shiki: 4.2.0
+    optionalDependencies:
       react: 19.2.6
       react-dom: 19.2.6(react@19.2.6)
-      shiki: 4.2.0
     transitivePeerDependencies:
       - '@shikijs/themes'
-  '@pierre/theme@1.1.0': {}
+  '@pierre/theme@1.1.0':
+    optional: true
+  '@pierre/theme@2.0.0': {}
-  '@pierre/theming@0.0.2(@pierre/theme@1.1.0)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(shiki@4.2.0)':
+  '@pierre/theming@1.0.0(@pierre/theme@1.1.0)(@shikijs/themes@4.3.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(shiki@4.2.0)':
     optionalDependencies:
       '@pierre/theme': 1.1.0
+      '@shikijs/themes': 4.3.0
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      shiki: 4.2.0
+  '@pierre/theming@1.0.0(@pierre/theme@2.0.0)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(shiki@4.2.0)':
+    optionalDependencies:
+      '@pierre/theme': 2.0.0
       '@shikijs/themes': 4.2.0
       react: 19.3.0
       react-dom: 19.3.0(react@19.3.0)
       shiki: 4.2.0
-  '@pierre/theming@0.0.2(@pierre/theme@1.1.0)(@shikijs/themes@4.3.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(shiki@4.2.0)':
+  '@pierre/theming@1.0.1(@pierre/theme@2.0.0)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(shiki@4.2.0)':
     optionalDependencies:
-      '@pierre/theme': 1.1.0
+      '@pierre/theme': 2.0.0
+      '@shikijs/themes': 4.2.0
+      react: 19.3.0
+      react-dom: 19.3.0(react@19.3.0)
+      shiki: 4.2.0
+  '@pierre/theming@1.0.1(@pierre/theme@2.0.0)(@shikijs/themes@4.3.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(shiki@4.2.0)':
+    optionalDependencies:
+      '@pierre/theme': 2.0.0
       '@shikijs/themes': 4.3.0
       react: 19.2.6
       react-dom: 19.2.6(react@19.2.6)
       shiki: 4.2.0
-  '@pierre/trees@1.0.0-beta.4(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@pierre/trees@1.0.0-beta.6(@pierre/theme@1.1.0)(@shikijs/themes@4.3.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(shiki@4.2.0)':
     dependencies:
+      '@pierre/theming': 1.0.0(@pierre/theme@1.1.0)(@shikijs/themes@4.3.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(shiki@4.2.0)
       preact: 11.0.0-beta.0
       preact-render-to-string: 6.6.5(preact@11.0.0-beta.0)
       react: 19.2.6
       react-dom: 19.2.6(react@19.2.6)
+    transitivePeerDependencies:
+      - '@pierre/theme'
+      - '@shikijs/themes'
+      - shiki
-  '@pierre/trees@1.0.0-beta.4(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
+  '@pierre/trees@1.0.0-beta.6(@pierre/theme@2.0.0)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(shiki@4.2.0)':
     dependencies:
+      '@pierre/theming': 1.0.0(@pierre/theme@2.0.0)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(shiki@4.2.0)
       preact: 11.0.0-beta.0
       preact-render-to-string: 6.6.5(preact@11.0.0-beta.0)
       react: 19.3.0
       react-dom: 19.3.0(react@19.3.0)
+    transitivePeerDependencies:
+      - '@pierre/theme'
+      - '@shikijs/themes'
+      - shiki
   '@polka/url@1.0.0-next.29': {}

pnpm-workspace.yaml+4-2

...	@@ -41,7 +41,7 @@ catalog:	...	@@ -41,7 +41,7 @@ catalog:
41	"@legendapp/list": 3.3.5	41	"@legendapp/list": 3.3.5
42	"@noble/curves": 1.9.1	42	"@noble/curves": 1.9.1
43	"@noble/hashes": 1.8.0	43	"@noble/hashes": 1.8.0
44	"@pierre/diffs": 1.3.0-beta.10	44	"@pierre/diffs": 1.5.2
45	"@tailwindcss/node": 4.3.3	45	"@tailwindcss/node": 4.3.3
46	"@tailwindcss/oxide": 4.3.3	46	"@tailwindcss/oxide": 4.3.3
47	"@tailwindcss/vite": 4.3.3	47	"@tailwindcss/vite": 4.3.3
...	@@ -270,7 +270,9 @@ patchedDependencies:	...	@@ -270,7 +270,9 @@ patchedDependencies:
270	"@opencode/client@2.0.23": patches/@opencode__client@2.0.23.patch	270	"@opencode/client@2.0.23": patches/@opencode__client@2.0.23.patch
271	"@opencode/protocol@2.0.23": patches/@opencode__protocol@2.0.23.patch	271	"@opencode/protocol@2.0.23": patches/@opencode__protocol@2.0.23.patch
272	"@opencode/schema@2.0.23": patches/@opencode__schema@2.0.23.patch	272	"@opencode/schema@2.0.23": patches/@opencode__schema@2.0.23.patch
273	"@pierre/diffs@1.3.0-beta.10": patches/@pierre%2Fdiffs@1.3.0-beta.10.patch	273	# Exports the dependency-light subpaths mobile and the web diff parser import, and keeps
		274	# measured wrapped-row heights above an edit (fileEditorVirtualization.test.ts).
		275	"@pierre/diffs@1.5.2": patches/@pierre%2Fdiffs@1.5.2.patch
274	"@react-native-ai/apple@0.12.0": patches/@react-native-ai__apple@0.12.0.patch	276	"@react-native-ai/apple@0.12.0": patches/@react-native-ai__apple@0.12.0.patch
275	"@react-native-menu/menu@2.0.0": patches/@react-native-menu__menu@2.0.0.patch	277	"@react-native-menu/menu@2.0.0": patches/@react-native-menu__menu@2.0.0.patch
276	"@react-navigation/native-stack@7.17.6": patches/@react-navigation%2Fnative-stack@7.17.6.patch	278	"@react-navigation/native-stack@7.17.6": patches/@react-navigation%2Fnative-stack@7.17.6.patch

author	Julius Marminge <julius0216@outlook.com> 2026-10-06 18:06:57-07:00
committer	GitHub <noreply@github.com> 2026-10-06 18:06:57-07:00
log	f8ed2a039b7deaa324beda29b44cc74c846311f7
tree	0cf2e65a08e52357bed3325526f9435b9b24d4de
parent	d021f57bf3a500e419e800c3eb957568bed8f713
signature	Signed by PGP key B5690EEEBB952194

...	@@ -2,7 +2,6 @@ import { parsePatchFiles } from "@pierre/diffs/utils/parsePatchFiles";	...	@@ -2,7 +2,6 @@ import { parsePatchFiles } from "@pierre/diffs/utils/parsePatchFiles";
2	import type { ChangeTypes, FileDiffMetadata } from "@pierre/diffs/types";	2	import type { ChangeTypes, FileDiffMetadata } from "@pierre/diffs/types";
3	import type { ThreadCheckpointSummary } from "@t3tools/client-runtime/state/thread-checkpoints";	3	import type { ThreadCheckpointSummary } from "@t3tools/client-runtime/state/thread-checkpoints";
4	import type { ReviewDiffPreviewSource } from "@t3tools/contracts";	4	import type { ReviewDiffPreviewSource } from "@t3tools/contracts";
5	import { unquoteGitPatchPath } from "@t3tools/shared/gitPatchPath";
6	import * as Arr from "effect/Array";	5	import * as Arr from "effect/Array";
7	import { pipe } from "effect/Function";	6	import { pipe } from "effect/Function";
8	import * as Order from "effect/Order";	7	import * as Order from "effect/Order";
...	@@ -374,8 +373,8 @@ function buildRenderableRows(file: FileDiffMetadata): ReadonlyArray<ReviewRender	...	@@ -374,8 +373,8 @@ function buildRenderableRows(file: FileDiffMetadata): ReadonlyArray<ReviewRender
374	}	373	}
375		374
376	function mapRenderableFile(file: FileDiffMetadata): ReviewRenderableFile {	375	function mapRenderableFile(file: FileDiffMetadata): ReviewRenderableFile {
377	const path = unquoteGitPatchPath(file.name \|\| file.prevName \|\| "");	376	const path = file.name \|\| file.prevName \|\| "";
378	const previousPath = file.prevName ? unquoteGitPatchPath(file.prevName) : null;	377	const previousPath = file.prevName \|\| null;
379	const additions = file.hunks.reduce((total, hunk) => total + hunk.additionLines, 0);	378	const additions = file.hunks.reduce((total, hunk) => total + hunk.additionLines, 0);
380	const deletions = file.hunks.reduce((total, hunk) => total + hunk.deletionLines, 0);	379	const deletions = file.hunks.reduce((total, hunk) => total + hunk.deletionLines, 0);
381	const cacheKey = file.cacheKey ?? `${previousPath ?? "none"}:${path}:${file.type}`;	380	const cacheKey = file.cacheKey ?? `${previousPath ?? "none"}:${path}:${file.type}`;

...	@@ -98,7 +98,7 @@ vi.mock("@pierre/diffs/worker/worker.js?worker", async () => {	...	@@ -98,7 +98,7 @@ vi.mock("@pierre/diffs/worker/worker.js?worker", async () => {
98		98
99	vi.mock("@pierre/diffs/react", async (importOriginal) => ({	99	vi.mock("@pierre/diffs/react", async (importOriginal) => ({
100	...(await importOriginal<typeof import("@pierre/diffs/react")>()),	100	...(await importOriginal<typeof import("@pierre/diffs/react")>()),
101	CodeView: (props: CodeViewProps) => {	101	CodeView: (props: CodeViewProps<undefined, undefined>) => {
102	return props.items?.map((item) =>	102	return props.items?.map((item) =>
103	item.type === "file" ? <FileOutput key={item.id} file={item.file} /> : null,	103	item.type === "file" ? <FileOutput key={item.id} file={item.file} /> : null,
104	);	104	);
...	@@ -115,6 +115,7 @@ function FileOutput({ file }: { file: FileContents }) {	...	@@ -115,6 +115,7 @@ function FileOutput({ file }: { file: FileContents }) {
115	testState.renderPools.push(pool);	115	testState.renderPools.push(pool);
116	const renderer = new FileRenderer(	116	const renderer = new FileRenderer(
117	{ theme: "pierre-dark", preferredHighlighter: "shiki-wasm" },	117	{ theme: "pierre-dark", preferredHighlighter: "shiki-wasm" },
		118	undefined,
118	render,	119	render,
119	pool,	120	pool,
120	);	121	);
...	@@ -301,8 +302,10 @@ describe("code-view worker lifecycle", () => {	...	@@ -301,8 +302,10 @@ describe("code-view worker lifecycle", () => {
301	expect(pool.getStats().totalWorkers).toBe(2);	302	expect(pool.getStats().totalWorkers).toBe(2);
302	expect(testState.terminations).toHaveLength(0);	303	expect(testState.terminations).toHaveLength(0);
303	await act(async () => renderer!.update(renderViews(0)));	304	await act(async () => renderer!.update(renderViews(0)));
		305	// Pierre gives up on a held startup after 10 seconds; the idle timer then tears the pool down.
		306	const timedOut = expect(pending).rejects.toThrow("worker initialization timed out");
304	await vi.advanceTimersByTimeAsync(30_000);	307	await vi.advanceTimersByTimeAsync(30_000);
305	await pending;	308	await timedOut;
306	await Promise.all(testState.terminations);	309	await Promise.all(testState.terminations);
307	await act(async () => {	310	await act(async () => {
308	for (const deliver of testState.heldResponses) deliver();	311	for (const deliver of testState.heldResponses) deliver();

chore(deps): upgrade @pierre/diffs to 1.5.2 and @pierre/trees to beta.6 (#16644)