@devries-cameron20 / t3code-1 / commits / 9588f0c0ef
Fork 0

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

fix(server): a file picker closes when its page is replaced (#22062)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>

Steliyan Slavov committed Oct 30, 2026 at 23:25 UTC 9588f0c0ef6af592bb815a568662b4173dfc81d0
2 files changed +287 -5
apps/server/src/preview/ServerBrowser.test.ts
+263 -4
@@ -139,6 +139,18 @@ function makeSession(
139 };
140 }
141
142 +function fileChooserElement(accept: string) {
143 + return {
144 + getAttribute: async () => accept,
145 + evaluate: (probe: (element: { ownerDocument: unknown }) => boolean) =>
146 + Promise.resolve(
147 + probe({
148 + ownerDocument: (globalThis as typeof globalThis & { document?: unknown }).document,
149 + }),
150 + ),
151 + };
152 +}
153 +
154 function makeContext(onClose?: (context: BrowserContext) => void) {
155 const events = new NodeEvents.EventEmitter();
156 const nativeFileChooser = vi.fn();
@@ -160,7 +172,7 @@ function makeContext(onClose?: (context: BrowserContext) => void) {
172 if (
173 !events.emit("filechooser", {
174 isMultiple: () => false,
163 - element: () => ({ getAttribute: async () => ".csv" }),
175 + element: () => fileChooserElement(".csv"),
176 setFiles: setChooserFiles,
177 })
178 ) {
@@ -1296,7 +1308,7 @@ it.live("a page's file picker goes to the controller and takes its uploaded file
1308 const setFiles = vi.fn(async (_files: unknown) => {});
1309 page.emit("filechooser", {
1310 isMultiple: () => false,
1299 - element: () => ({ getAttribute: async () => ".csv" }),
1311 + element: () => fileChooserElement(".csv"),
1312 setFiles,
1313 });
1314 let offered = yield* Queue.take(viewer.output);
@@ -1321,6 +1333,253 @@ it.live("a page's file picker goes to the controller and takes its uploaded file
1333 ).pipe(Effect.provide(layer)),
1334 );
1335
1336 +it.live("overlapping file pickers keep the newer offer answerable", () =>
1337 + Effect.scoped(
1338 + Effect.gen(function* () {
1339 + const { browser, tabId } = yield* ready;
1340 + const page = contexts[0]!.page;
1341 + const viewer = yield* browser.attachViewer(viewerInput(tabId, true));
1342 + yield* viewer.input({ type: "takeControl" });
1343 + const accept = Promise.withResolvers<string | null>();
1344 + const firstFiles = vi.fn(async (_files: unknown) => {});
1345 + const secondFiles = vi.fn(async (_files: unknown) => {});
1346 + page.emit("filechooser", {
1347 + isMultiple: () => false,
1348 + element: () => ({ ...fileChooserElement(""), getAttribute: () => accept.promise }),
1349 + setFiles: firstFiles,
1350 + });
1351 + page.emit("filechooser", {
1352 + isMultiple: () => false,
1353 + element: () => fileChooserElement(".csv"),
1354 + setFiles: secondFiles,
1355 + });
1356 + accept.resolve(".txt");
1357 + let first = yield* Queue.take(viewer.output);
1358 + while (first._tag !== "fileChooser") first = yield* Queue.take(viewer.output);
1359 + let second = yield* Queue.take(viewer.output);
1360 + while (second._tag !== "fileChooser") second = yield* Queue.take(viewer.output);
1361 + expect(second.accept).toBe(".csv");
1362 + expect(
1363 + yield* browser.answerFileChooser({
1364 + threadId: scope.thread.threadId,
1365 + tabId,
1366 + chooserId: second.id,
1367 + files: [{ name: "a.csv", mimeType: "text/csv", buffer: Buffer.from("a") }],
1368 + }),
1369 + ).toBe(true);
1370 + expect(firstFiles).not.toHaveBeenCalled();
1371 + expect(secondFiles).toHaveBeenCalledOnce();
1372 + }),
1373 + ).pipe(Effect.provide(layer)),
1374 +);
1375 +
1376 +it.live("a detached file picker stays open across same-document navigation", () =>
1377 + Effect.scoped(
1378 + Effect.gen(function* () {
1379 + const { browser, tabId } = yield* ready;
1380 + const page = contexts[0]!.page;
1381 + const pageDocument = {};
1382 + vi.stubGlobal("document", pageDocument);
1383 + yield* Effect.addFinalizer(() => Effect.sync(() => vi.unstubAllGlobals()));
1384 + const detachedInput = { isConnected: false, ownerDocument: pageDocument };
1385 + const navigationProbe = Promise.withResolvers<boolean>();
1386 + const navigationProbeStarted = Promise.withResolvers<void>();
1387 + const navigationProbeFinished = Promise.withResolvers<void>();
1388 + let probeCount = 0;
1389 + const viewer = yield* browser.attachViewer(viewerInput(tabId, true));
1390 + yield* viewer.input({ type: "takeControl" });
1391 + page.emit("filechooser", {
1392 + isMultiple: () => false,
1393 + element: () => ({
1394 + getAttribute: async () => "",
1395 + evaluate: (probe: (element: typeof detachedInput) => boolean) => {
1396 + probeCount++;
1397 + if (probeCount === 1) return Promise.resolve(probe(detachedInput));
1398 + navigationProbeStarted.resolve();
1399 + return navigationProbe.promise.then((current) => {
1400 + const result = probe(detachedInput);
1401 + navigationProbeFinished.resolve();
1402 + return current && result;
1403 + });
1404 + },
1405 + }),
1406 + setFiles: vi.fn(async (_files: unknown) => {}),
1407 + });
1408 + let offered = yield* Queue.take(viewer.output);
1409 + while (offered._tag !== "fileChooser") offered = yield* Queue.take(viewer.output);
1410 +
1411 + page.emit("framenavigated", page);
1412 + yield* Effect.promise(() => navigationProbeStarted.promise);
1413 + navigationProbe.resolve(true);
1414 + yield* Effect.promise(() => navigationProbeFinished.promise);
1415 + yield* viewer.input({ type: "releaseControl" });
1416 + let closedAfterNavigation = false;
1417 + let control = yield* Queue.take(viewer.output);
1418 + while (control._tag !== "control" || control.controller === "you") {
1419 + if (control._tag === "fileChooserClosed") closedAfterNavigation = true;
1420 + control = yield* Queue.take(viewer.output);
1421 + }
1422 + expect(closedAfterNavigation).toBe(false);
1423 + yield* viewer.input({ type: "takeControl" });
1424 + let restoredControl = yield* Queue.take(viewer.output);
1425 + while (restoredControl._tag !== "control" || restoredControl.controller !== "you") {
1426 + restoredControl = yield* Queue.take(viewer.output);
1427 + }
1428 +
1429 + expect(
1430 + yield* browser.answerFileChooser({
1431 + threadId: scope.thread.threadId,
1432 + tabId,
1433 + chooserId: offered.id,
1434 + files: [{ name: "a.csv", mimeType: "text/csv", buffer: Buffer.from("a") }],
1435 + }),
1436 + ).toBe(true);
1437 + }),
1438 + ).pipe(Effect.provide(layer)),
1439 +);
1440 +
1441 +it.live.each(["main", "iframe"])(
1442 + "a file picker closes at %s document commit before DOMContentLoaded",
1443 + (frame) =>
1444 + Effect.scoped(
1445 + Effect.gen(function* () {
1446 + const { browser, tabId } = yield* ready;
1447 + const page = contexts[0]!.page;
1448 + const viewer = yield* browser.attachViewer(viewerInput(tabId, true));
1449 + yield* viewer.input({ type: "takeControl" });
1450 + const setFiles = vi.fn(async (_files: unknown) => {});
1451 + const probeStarted = Promise.withResolvers<void>();
1452 + const probeSettled = Promise.withResolvers<void>();
1453 + let probeCount = 0;
1454 + page.emit("filechooser", {
1455 + isMultiple: () => false,
1456 + element: () => ({
1457 + getAttribute: async () => "",
1458 + evaluate: () => {
1459 + probeCount++;
1460 + if (probeCount === 1) return Promise.resolve(true);
1461 + probeStarted.resolve();
1462 + return Promise.reject(new Error("Execution context was destroyed")).finally(() =>
1463 + probeSettled.resolve(),
1464 + );
1465 + },
1466 + }),
1467 + setFiles,
1468 + });
1469 + let offered = yield* Queue.take(viewer.output);
1470 + while (offered._tag !== "fileChooser") offered = yield* Queue.take(viewer.output);
1471 +
1472 + page.emit("framenavigated", frame === "main" ? page : makeFrame());
1473 + yield* Effect.promise(() => probeStarted.promise);
1474 + yield* Effect.promise(() => probeSettled.promise);
1475 + let closed = yield* Queue.take(viewer.output);
1476 + while (closed._tag !== "fileChooserClosed") closed = yield* Queue.take(viewer.output);
1477 + expect(closed.id).toBe(offered.id);
1478 + expect(
1479 + yield* browser.answerFileChooser({
1480 + threadId: scope.thread.threadId,
1481 + tabId,
1482 + chooserId: offered.id,
1483 + files: [{ name: "a.csv", mimeType: "text/csv", buffer: Buffer.from("a") }],
1484 + }),
1485 + ).toBe(false);
1486 + expect(setFiles).not.toHaveBeenCalled();
1487 + }),
1488 + ).pipe(Effect.provide(layer)),
1489 +);
1490 +
1491 +it.live("a file picker closes when its page is replaced while control changes hands", () =>
1492 + Effect.scoped(
1493 + Effect.gen(function* () {
1494 + const { broker, browser, tabId } = yield* ready;
1495 + const page = contexts[0]!.page;
1496 + const first = yield* browser.attachViewer(viewerInput(tabId, true));
1497 + yield* first.input({ type: "takeControl" });
1498 + const current = Promise.withResolvers<boolean>();
1499 + const probeStarted = Promise.withResolvers<void>();
1500 + let probeCount = 0;
1501 + page.emit("filechooser", {
1502 + isMultiple: () => false,
1503 + element: () => ({
1504 + getAttribute: async () => "",
1505 + evaluate: () => {
1506 + probeCount++;
1507 + if (probeCount === 1) return Promise.resolve(true);
1508 + probeStarted.resolve();
1509 + return current.promise;
1510 + },
1511 + }),
1512 + setFiles: vi.fn(async (_files: unknown) => {}),
1513 + });
1514 + let offered = yield* Queue.take(first.output);
1515 + while (offered._tag !== "fileChooser") offered = yield* Queue.take(first.output);
1516 +
1517 + page.emit("framenavigated", page);
1518 + yield* Effect.promise(() => probeStarted.promise);
1519 + const second = yield* browser.attachViewer(viewerInput(tabId, true));
1520 + yield* first.input({ type: "releaseControl" });
1521 + yield* second.input({ type: "takeControl" });
1522 + let reoffered = yield* Queue.take(second.output);
1523 + while (reoffered._tag !== "fileChooser") reoffered = yield* Queue.take(second.output);
1524 + current.resolve(false);
1525 + let closed = yield* Queue.take(second.output);
1526 + while (closed._tag !== "fileChooserClosed") closed = yield* Queue.take(second.output);
1527 + expect(closed.id).toBe(reoffered.id);
1528 + const status = yield* broker.invoke<PreviewAutomationStatus>({
1529 + scope,
1530 + tabId,
1531 + operation: "status",
1532 + input: {},
1533 + });
1534 + expect(status.fileChooser).toBeNull();
1535 + }),
1536 + ).pipe(Effect.provide(layer)),
1537 +);
1538 +
1539 +it.live("a file picker is not offered after its document changes while reading accept", () =>
1540 + Effect.scoped(
1541 + Effect.gen(function* () {
1542 + const { broker, browser, tabId } = yield* ready;
1543 + const page = contexts[0]!.page;
1544 + const viewer = yield* browser.attachViewer(viewerInput(tabId, true));
1545 + yield* viewer.input({ type: "takeControl" });
1546 + const accept = Promise.withResolvers<string | null>();
1547 + const acceptRead = Promise.withResolvers<void>();
1548 + const current = Promise.withResolvers<boolean>();
1549 + const probeStarted = Promise.withResolvers<void>();
1550 + page.emit("filechooser", {
1551 + isMultiple: () => false,
1552 + element: () => ({
1553 + getAttribute: () => {
1554 + acceptRead.resolve();
1555 + return accept.promise;
1556 + },
1557 + evaluate: () => {
1558 + probeStarted.resolve();
1559 + return current.promise;
1560 + },
1561 + }),
1562 + setFiles: vi.fn(async (_files: unknown) => {}),
1563 + });
1564 +
1565 + yield* Effect.promise(() => acceptRead.promise);
1566 + page.emit("framenavigated", page);
1567 + accept.resolve("");
1568 + yield* Effect.promise(() => accept.promise);
1569 + yield* Effect.promise(() => probeStarted.promise);
1570 + current.resolve(false);
1571 + yield* Effect.promise(() => current.promise);
1572 + const status = yield* broker.invoke<PreviewAutomationStatus>({
1573 + scope,
1574 + tabId,
1575 + operation: "status",
1576 + input: {},
1577 + });
1578 + expect(status.fileChooser).toBeNull();
1579 + }),
1580 + ).pipe(Effect.provide(layer)),
1581 +);
1582 +
1583 it.live("only the current controller can answer a file picker", () =>
1584 Effect.scoped(
1585 Effect.gen(function* () {
@@ -1330,7 +1589,7 @@ it.live("only the current controller can answer a file picker", () =>
1589 const setFiles = vi.fn(async (_files: unknown) => {});
1590 contexts[0]!.page.emit("filechooser", {
1591 isMultiple: () => false,
1333 - element: () => ({ getAttribute: async () => "" }),
1592 + element: () => fileChooserElement(""),
1593 setFiles,
1594 });
1595 let offered = yield* Queue.take(first.output);
@@ -1439,7 +1698,7 @@ it.effect("a stalled desktop viewer still gets its size, control and reconnect",
1698 yield* viewer.input({ type: "takeControl" });
1699 context.page.emit("filechooser", {
1700 isMultiple: () => false,
1442 - element: () => ({ getAttribute: async () => ".csv" }),
1701 + element: () => fileChooserElement(".csv"),
1702 setFiles: vi.fn(async () => {}),
1703 });
1704 let chooser = yield* Queue.take(viewer.output);
apps/server/src/preview/ServerBrowser.ts
+24 -1
@@ -811,6 +811,7 @@ const make = Effect.gen(function* () {
811 const control = new SessionControl(snapshot.automationOwner ?? null, () =>
812 ServerBrowserPage.invalidateRefs(page),
813 );
814 + let pendingFileChooserOffer = Promise.resolve();
815 const tab: ServerTab = {
816 threadId: ThreadId.make(snapshot.threadId),
817 tabId: snapshot.tabId,
@@ -826,7 +827,11 @@ const make = Effect.gen(function* () {
827 control,
828 agentOperating: false,
829 fileChooserIntercepted: false,
829 - onFileChooser: (chooser) => void offerFileChooser(tab, chooser),
830 + onFileChooser: (chooser) => {
831 + pendingFileChooserOffer = pendingFileChooserOffer
832 + .then(() => offerFileChooser(tab, chooser))
833 + .catch(constVoid);
834 + },
835 isolatedContext,
836 desktop: desktop === null ? null : { close: desktop.close },
837 profileId: snapshot.profileId,
@@ -888,6 +893,12 @@ const make = Effect.gen(function* () {
893 void reportLoaded(tab);
894 });
895 page.on("framenavigated", (frame) => {
896 + const open = tab.fileChooser;
897 + if (open) {
898 + void isFileChooserCurrent(open.chooser).then((current) => {
899 + if (!current && tab.fileChooser?.chooser === open.chooser) closeFileChooser(tab);
900 + });
901 + }
902 // Same-document navigations (SPA routes) fire no load event.
903 if (frame === page.mainFrame() && !tab.loading) void reportLoaded(tab);
904 if (!desktop) void recordFrameCopies(tab, frame);
@@ -1097,6 +1108,17 @@ const make = Effect.gen(function* () {
1108 }
1109 : null;
1110
1111 + // Not isConnected: upload helpers often click an input never added to the page. The handle's
1112 + // context is destroyed with its document, so a replaced document rejects.
1113 + const isFileChooserCurrent = (chooser: FileChooser) =>
1114 + chooser
1115 + .element()
1116 + .evaluate(
1117 + (element) =>
1118 + element.ownerDocument === (globalThis as unknown as { document: unknown }).document,
1119 + )
1120 + .catch(() => false);
1121 +
1122 const offerFileChooser = async (tab: ServerTab, chooser: FileChooser) => {
1123 const previous = tab.fileChooser;
1124 const accept =
@@ -1104,6 +1126,7 @@ const make = Effect.gen(function* () {
1126 .element()
1127 .getAttribute("accept")
1128 .catch(() => null)) ?? "";
1129 + if (!(await isFileChooserCurrent(chooser))) return;
1130 if (previous) closeFileChooser(tab);
1131 tab.fileChooser = {
1132 id: NodeCrypto.randomUUID(),