Skip to content

Commit be43da4

Browse files
fix(web): PDF previews keep their page when the agent responds (#23732)
Co-authored-by: maria-rcks <[email protected]>
1 parent 3bd744f commit be43da4

2 files changed

Lines changed: 84 additions & 8 deletions

File tree

‎apps/web/src/components/files/AttachmentFilePreview.browser.test.tsx‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2345,6 +2345,72 @@ it("toggles a Mermaid attachment between diagram and source through the lazy pre
23452345
expect(screen.container.querySelector('[role="alert"]')).toBeNull();
23462346
});
23472347

2348+
it("keeps a workspace PDF open across URL renewals and reloads it when the file changes", async () => {
2349+
const { WorkspaceBrowserPreview } = await import("./FilePreviewPanel");
2350+
using _native = vi.spyOn(navigator, "pdfViewerEnabled", "get").mockReturnValue(true);
2351+
const original = URL.createObjectURL(new Blob(["%PDF-1.4"], { type: "application/pdf" }));
2352+
const edited = URL.createObjectURL(new Blob(["%PDF-1.4 edited"], { type: "application/pdf" }));
2353+
const preview = (mutation: string) => (
2354+
<WorkspaceBrowserPreview
2355+
environmentId={EnvironmentId.make("test")}
2356+
threadRef={{ environmentId: EnvironmentId.make("test"), threadId: ThreadId.make("test") }}
2357+
draft={false}
2358+
workspaceRoot="/repo"
2359+
absolutePath="/repo/planning.pdf"
2360+
title="Planning PDF"
2361+
workspaceMutationId={mutation}
2362+
/>
2363+
);
2364+
assetUrlState.mockReturnValue({
2365+
_tag: "Success",
2366+
url: `${original}#initial`,
2367+
expiresAt: 0,
2368+
fileRevision: "one",
2369+
});
2370+
try {
2371+
await using screen = await render(preview("first"));
2372+
const opened = screen.container.querySelector("iframe");
2373+
expect(opened?.src.startsWith(original)).toBe(true);
2374+
2375+
// An agent command renews the signed URL but leaves the file alone.
2376+
assetUrlState.mockReturnValue({
2377+
_tag: "Success",
2378+
url: `${original}#renewed`,
2379+
expiresAt: 0,
2380+
fileRevision: "one",
2381+
});
2382+
await screen.rerender(preview("second"));
2383+
expect(assetUrlState).toHaveBeenLastCalledWith(expect.anything(), expect.anything(), "second");
2384+
expect(screen.container.querySelector("iframe")).toBe(opened);
2385+
2386+
assetUrlState.mockReturnValue({
2387+
_tag: "Success",
2388+
url: edited,
2389+
expiresAt: 0,
2390+
fileRevision: "two",
2391+
});
2392+
await screen.rerender(preview("third"));
2393+
const reloaded = screen.container.querySelector("iframe");
2394+
expect(reloaded).not.toBe(opened);
2395+
expect(reloaded?.src.startsWith(edited)).toBe(true);
2396+
2397+
// Servers without revisions hold the preview back until a fresh grant arrives.
2398+
assetUrlState.mockReturnValue({
2399+
_tag: "Success",
2400+
url: `${edited}#stale`,
2401+
expiresAt: 0,
2402+
waiting: true,
2403+
});
2404+
await screen.rerender(preview("fourth"));
2405+
expect(screen.container.querySelector("iframe")).toBeNull();
2406+
assetUrlState.mockReturnValue({ _tag: "Success", url: original, expiresAt: 0 });
2407+
await screen.rerender(preview("fourth"));
2408+
expect(screen.container.querySelector("iframe")?.src.startsWith(original)).toBe(true);
2409+
} finally {
2410+
URL.revokeObjectURL(original);
2411+
URL.revokeObjectURL(edited);
2412+
}
2413+
});
23482414
it("unwraps one text attachment without turning off the word wrap setting", async () => {
23492415
const file = new Blob(["a long line"], { type: "text/plain" });
23502416
await using screen = await render(

‎apps/web/src/components/files/FilePreviewPanel.tsx‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ function WorkspaceImagePreview(props: {
222222
);
223223
}
224224

225-
function WorkspaceBrowserPreview(props: {
225+
export function WorkspaceBrowserPreview(props: {
226226
readonly environmentId: EnvironmentId;
227227
readonly threadRef: ScopedThreadRef;
228228
readonly draft: boolean;
@@ -231,18 +231,25 @@ function WorkspaceBrowserPreview(props: {
231231
readonly title: string;
232232
readonly workspaceMutationId: string | null;
233233
}) {
234+
const pdf = isPdfPreviewFile(props.absolutePath);
234235
const resource = workspaceAssetResource({
235-
kind: "workspace-file",
236+
kind: pdf ? "media-file" : "workspace-file",
236237
threadRef: props.threadRef,
237238
draft: props.draft,
238239
workspaceRoot: props.workspaceRoot,
239240
absolutePath: props.absolutePath,
240241
});
241-
const assetUrl = useAssetUrlState(props.environmentId, resource);
242+
const assetUrl = useAssetUrlState(
243+
props.environmentId,
244+
resource,
245+
pdf ? props.workspaceMutationId : undefined,
246+
);
247+
const fileRevision = pdf && assetUrl._tag === "Success" ? assetUrl.fileRevision : undefined;
248+
const revision = fileRevision ?? props.workspaceMutationId;
242249
const revisionSuffix =
243-
props.workspaceMutationId === null
250+
revision === null
244251
? ""
245-
: `${assetUrl._tag === "Success" && assetUrl.url.includes("?") ? "&" : "?"}workspace-revision=${encodeURIComponent(props.workspaceMutationId)}`;
252+
: `${assetUrl._tag === "Success" && assetUrl.url.includes("?") ? "&" : "?"}${fileRevision !== undefined ? "file" : "workspace"}-revision=${encodeURIComponent(revision)}`;
246253

247254
if (assetUrl._tag === "Failure") {
248255
return (
@@ -251,7 +258,10 @@ function WorkspaceBrowserPreview(props: {
251258
</div>
252259
);
253260
}
254-
if (assetUrl._tag !== "Success") {
261+
if (
262+
assetUrl._tag !== "Success" ||
263+
(pdf && assetUrl.fileRevision === undefined && assetUrl.waiting)
264+
) {
255265
return (
256266
<div className="flex min-h-0 flex-1 items-center justify-center text-muted-foreground">
257267
<Spinner size="lg" />
@@ -261,9 +271,9 @@ function WorkspaceBrowserPreview(props: {
261271
return (
262272
<BrowserDocumentFrame
263273
src={`${assetUrl.url}${revisionSuffix}`}
264-
documentKey={`${props.environmentId}:${resource._tag}:${props.threadRef.threadId}:${props.absolutePath}:${props.workspaceMutationId}`}
274+
documentKey={`${props.environmentId}:${resource._tag}:${props.threadRef.threadId}:${props.absolutePath}:${revision}`}
265275
title={props.title}
266-
pdf={isPdfPreviewFile(props.absolutePath)}
276+
pdf={pdf}
267277
/>
268278
);
269279
}

0 commit comments

Comments
 (0)