@devries-cameron20 / t3code-1 / commits / f89af364ec
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(web): avoid false errors when cancelling preview popouts (#34315)

Romil committed Nov 12, 2026 at 10:22 UTC f89af364ec11eabba65295492db0b10ad20a3b37
2 files changed +56
apps/web/src/browser/serverPictureInPicture.browser.test.ts new
+55
@@ -0,0 +1,55 @@
1 +import { EnvironmentId, ThreadId } from "@t3tools/contracts";
2 +import { expect, it, vi } from "vite-plus/test";
3 +
4 +const mocks = vi.hoisted(() => ({ readAccess: vi.fn() }));
5 +
6 +vi.mock(import("~/state/previewStream"), () => ({
7 + readPreviewStreamAccess: mocks.readAccess,
8 +}));
9 +
10 +import { closeServerPictureInPicture, openServerPictureInPicture } from "./serverPictureInPicture";
11 +
12 +function setup() {
13 + return {
14 + [Symbol.dispose]() {
15 + closeServerPictureInPicture();
16 + mocks.readAccess.mockReset();
17 + },
18 + };
19 +}
20 +
21 +it("cancels pending playback without reporting a failed popout", async () => {
22 + using _cleanup = setup();
23 + const opening = openServerPictureInPicture({
24 + environmentId: EnvironmentId.make("environment"),
25 + threadId: ThreadId.make("thread"),
26 + tabId: "tab",
27 + seed: null,
28 + });
29 + const video = document.querySelector("video")!;
30 + const tracks = (video.srcObject as MediaStream).getTracks();
31 + closeServerPictureInPicture();
32 + await expect(opening).resolves.toBeUndefined();
33 + expect(video.isConnected).toBe(false);
34 + expect(tracks.length).toBeGreaterThan(0);
35 + expect(tracks.every((track) => track.readyState === "ended")).toBe(true);
36 + expect(mocks.readAccess).not.toHaveBeenCalled();
37 +});
38 +
39 +it("still reports playback failures for an active popout", async () => {
40 + using _cleanup = setup();
41 + const error = new Error("Playback failed");
42 + using _play = vi.spyOn(HTMLMediaElement.prototype, "play").mockRejectedValue(error);
43 + const opening = openServerPictureInPicture({
44 + environmentId: EnvironmentId.make("environment"),
45 + threadId: ThreadId.make("thread"),
46 + tabId: "tab",
47 + seed: null,
48 + });
49 + const video = document.querySelector("video")!;
50 + const tracks = (video.srcObject as MediaStream).getTracks();
51 + await expect(opening).rejects.toBe(error);
52 + expect(video.isConnected).toBe(false);
53 + expect(tracks.every((track) => track.readyState === "ended")).toBe(true);
54 + expect(mocks.readAccess).not.toHaveBeenCalled();
55 +});
apps/web/src/browser/serverPictureInPicture.ts
+1
@@ -175,6 +175,7 @@ export async function openServerPictureInPicture(input: {
175 video.webkitSetPresentationMode?.("picture-in-picture");
176 }
177 } catch (error) {
178 + if (stopped) return;
179 onLeave();
180 throw error;
181 }