Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7c05044
refactor(web): share the browser dialog card
BelKed Nov 14, 2026
5b2f2e7
fix(desktop): page dialogs in Browser tabs stay in their tab
BelKed Nov 14, 2026
aaffcbe
fix(web): answer page dialogs in the desktop Browser panel
BelKed Nov 14, 2026
20ff8e7
fix(desktop): hold page dialogs from guest attach
BelKed Nov 14, 2026
7d12d21
fix(web): browser dialog card sits above the page
BelKed Nov 14, 2026
907c200
fix(desktop): navigation dismisses a pending page dialog
BelKed Nov 14, 2026
957aa8f
fix(desktop): closed tab drops its pending dialog
BelKed Nov 14, 2026
2e42cb5
fix(desktop): tab dialog follows the live hold
BelKed Nov 15, 2026
486cd38
Merge remote-tracking branch 'origin/main' into t3/dialog-hold-early
BelKed Nov 15, 2026
99ac996
fix(desktop): prompt keeps Electron's rejection
BelKed Nov 15, 2026
c6a047b
fix(web): browser dialog card matches the app alert dialog
BelKed Nov 16, 2026
87b8d48
Merge remote-tracking branch 'origin/main' into t3/dialog-hold-early
BelKed Nov 16, 2026
2922d46
Merge remote-tracking branch 'origin/main' into t3/preview-dialogs-st…
juliusmarminge Nov 16, 2026
2a7c0f6
fix(desktop): page dialog answers apply only to the dialog they were for
juliusmarminge Nov 16, 2026
2e4d005
fix(web): page dialogs can be answered in the floating mini player
juliusmarminge Nov 16, 2026
53dac3a
Merge remote-tracking branch 'origin/main' into t3/preview-dialogs-st…
juliusmarminge Nov 16, 2026
b62dd49
Merge remote-tracking branch 'upstream/main' into t3/preview-dialogs-…
BelKed Nov 19, 2026
68200b1
fix(web): long page dialogs keep their buttons in view
BelKed Nov 19, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/desktop/src/ipc/channels.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ export const PREVIEW_SET_ZOOM_FACTOR_CHANNEL = "desktop:preview-set-zoom-factor"
export const PREVIEW_HARD_RELOAD_CHANNEL = "desktop:preview-hard-reload";
export const PREVIEW_SET_COLOR_SCHEME_CHANNEL = "desktop:preview-set-color-scheme";
export const PREVIEW_SET_AUDIO_MUTED_CHANNEL = "desktop:preview-set-audio-muted";
export const PREVIEW_ANSWER_DIALOG_CHANNEL = "desktop:preview-answer-dialog";
export const PREVIEW_FIND_IN_PAGE_CHANNEL = "desktop:preview-find-in-page";
export const PREVIEW_STOP_FIND_IN_PAGE_CHANNEL = "desktop:preview-stop-find-in-page";
export const PREVIEW_SET_SHOWN_CHANNEL = "desktop:preview-set-shown";
Expand Down
11 changes: 11 additions & 0 deletions apps/desktop/src/ipc/methods/preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
DesktopPreviewRecordingSaveInputSchema,
DesktopPreviewRegisterWebviewInputSchema,
DesktopPreviewScreenshotArtifactSchema,
DesktopPreviewAnswerDialogInputSchema,
DesktopPreviewSetAudioMutedInputSchema,
DesktopPreviewSetShownInputSchema,
DesktopPreviewSetCaptureDrawnInputSchema,
Expand Down Expand Up @@ -228,6 +229,15 @@ const setAudioMuted = DesktopIpc.makeIpcMethod({
yield* manager.setAudioMuted(tabId, audioMuted);
}),
});
const answerDialog = DesktopIpc.makeIpcMethod({
channel: IpcChannels.PREVIEW_ANSWER_DIALOG_CHANNEL,
payload: DesktopPreviewAnswerDialogInputSchema,
result: Schema.Void,
handler: Effect.fn("desktop.ipc.preview.answerDialog")(function* ({ tabId, dialogId, accept }) {
const manager = yield* PreviewManager.PreviewManager;
yield* manager.answerDialog(tabId, dialogId, accept);
}),
});
const setShown = DesktopIpc.makeIpcMethod({
channel: IpcChannels.PREVIEW_SET_SHOWN_CHANNEL,
payload: DesktopPreviewSetShownInputSchema,
Expand Down Expand Up @@ -516,6 +526,7 @@ export const methods = [
setColorScheme,
setZoomFactor,
setAudioMuted,
answerDialog,
setShown,
setCaptureDrawn,
openDevTools,
Expand Down
2 changes: 2 additions & 0 deletions apps/desktop/src/preload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,8 @@ contextBridge.exposeInMainWorld("desktopBridge", {
ipcRenderer.invoke(IpcChannels.PREVIEW_SET_COLOR_SCHEME_CHANNEL, { tabId, colorScheme }),
setAudioMuted: (tabId, audioMuted) =>
ipcRenderer.invoke(IpcChannels.PREVIEW_SET_AUDIO_MUTED_CHANNEL, { tabId, audioMuted }),
answerDialog: (tabId, dialogId, accept) =>
ipcRenderer.invoke(IpcChannels.PREVIEW_ANSWER_DIALOG_CHANNEL, { tabId, dialogId, accept }),
findInPage: (tabId, text, { forward, newSession }) =>
ipcRenderer.invoke(IpcChannels.PREVIEW_FIND_IN_PAGE_CHANNEL, {
tabId,
Expand Down
154 changes: 152 additions & 2 deletions apps/desktop/src/preview/Manager.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ const makeTestPreviewWebContents = (
navigationHistory: { canGoBack: () => false, canGoForward: () => false },
setIgnoreMenuShortcuts: vi.fn(),
setWindowOpenHandler: vi.fn(),
listeners: () => [],
debugger: {
isAttached: () => false,
attach: vi.fn(),
Expand Down Expand Up @@ -501,6 +502,7 @@ const makeFaviconWebContents = (options?: {
focusedFrame: {} as object | null,
setIgnoreMenuShortcuts: vi.fn(),
setWindowOpenHandler: vi.fn(),
listeners: () => [],
executeJavaScriptInIsolatedWorld,
debugger: {
isAttached: () => false,
Expand Down Expand Up @@ -1251,6 +1253,7 @@ describe("PreviewManager", () => {
navigationHistory: { canGoBack: () => false, canGoForward: () => false },
setIgnoreMenuShortcuts: vi.fn(),
setWindowOpenHandler: vi.fn(),
listeners: () => [],
debugger: {
isAttached: () => false,
attach: vi.fn(),
Expand Down Expand Up @@ -1358,6 +1361,7 @@ describe("PreviewManager", () => {
navigationHistory: { canGoBack: () => false, canGoForward: () => false },
setIgnoreMenuShortcuts: vi.fn(),
setWindowOpenHandler: vi.fn(),
listeners: () => [],
get debugger() {
if (destroyed) throw new Error("Object has been destroyed");
return wcDebugger;
Expand Down Expand Up @@ -1630,6 +1634,7 @@ describe("PreviewManager", () => {
navigationHistory: { canGoBack: () => false, canGoForward: () => false },
setIgnoreMenuShortcuts: vi.fn(),
setWindowOpenHandler: vi.fn(),
listeners: () => [],
debugger: {
isAttached: () => attach.mock.calls.length > detach.mock.calls.length + chromiumDetaches,
attach,
Expand Down Expand Up @@ -1708,14 +1713,22 @@ describe("PreviewManager", () => {
),
);

const makeAudioWebContents = (id: number) => {
const makeAudioWebContents = (id: number, nativeDialog?: (...args: never[]) => void) => {
const listeners = new Map<string, (...args: never[]) => void>();
if (nativeDialog) listeners.set("-run-dialog", nativeDialog);
let debuggerMessage: ((...args: ReadonlyArray<unknown>) => void) | undefined;
const setAudioMuted = vi.fn();
let audible = false;
let audibleAfterFirstRead = false;
let audibleReads = 0;
return {
setAudioMuted,
emit: (event: string, ...args: ReadonlyArray<unknown>) => {
(listeners.get(event) as ((...args: ReadonlyArray<unknown>) => void) | undefined)?.(
...args,
);
},
emitDebuggerMessage: (method: string) => debuggerMessage?.({}, method, {}, ""),
emitAudioState: (next: boolean) => {
audible = next;
listeners.get("audio-state-changed")?.({ audible: next } as never);
Expand Down Expand Up @@ -1747,16 +1760,23 @@ describe("PreviewManager", () => {
off: vi.fn((event: string) => {
listeners.delete(event);
}),
once: vi.fn((event: string, listener: (...args: never[]) => void) => {
listeners.set(event, listener);
}),
ipc: { on: vi.fn(), off: vi.fn() },
send: webviewSend,
navigationHistory: { canGoBack: () => false, canGoForward: () => false },
setIgnoreMenuShortcuts: vi.fn(),
setWindowOpenHandler: vi.fn(),
listeners: (event: string) =>
event === "-run-dialog" && nativeDialog ? [nativeDialog] : [],
debugger: {
isAttached: () => false,
attach: vi.fn(),
sendCommand: vi.fn(async () => undefined),
on: vi.fn(),
on: vi.fn((event: string, listener: (...args: ReadonlyArray<unknown>) => void) => {
if (event === "message") debuggerMessage = listener;
}),
off: vi.fn(),
},
} as never,
Expand Down Expand Up @@ -1785,6 +1805,134 @@ describe("PreviewManager", () => {
),
);

effectIt.effect(
"holds a page dialog on its tab until it is answered or the guest goes away",
() =>
withManager((manager) =>
Effect.gen(function* () {
const guest = makeAudioWebContents(42);
fromId.mockReturnValue(guest.wc);
const states: PreviewManager.PreviewTabState[] = [];
const answer = vi.fn();
const dialogInfo = {
dialogType: "confirm",
messageText: "Delete it?",
defaultPromptText: "",
};

yield* manager.subscribeStateChanges((_tabId, state) =>
Effect.sync(() => {
states.push(state);
}),
);
yield* manager.createTab("tab_dialog");
yield* manager.prepareWebview(guest.wc);
yield* manager.registerWebview("tab_dialog", 42);
yield* Effect.yieldNow;

guest.emit("-run-dialog", dialogInfo, answer);
yield* Effect.yieldNow;
Comment thread
BelKed marked this conversation as resolved.
Resolved
expect(states.at(-1)?.dialog).toEqual({
id: 1,
type: "confirm",
message: "Delete it?",
defaultValue: "",
});
expect(answer).not.toHaveBeenCalled();

yield* manager.answerDialog("tab_dialog", 1, true);
yield* Effect.yieldNow;
expect(answer).toHaveBeenCalledExactlyOnceWith(true, "");
expect(states.at(-1)?.dialog).toBeUndefined();

const answeredByAgent = vi.fn();
guest.emit("-run-dialog", dialogInfo, answeredByAgent);
yield* Effect.yieldNow;
guest.emitDebuggerMessage("Page.javascriptDialogClosed");
yield* Effect.yieldNow;
expect(states.at(-1)?.dialog).toBeUndefined();
yield* manager.answerDialog("tab_dialog", 2, true);
expect(answeredByAgent).not.toHaveBeenCalled();

const replacedAnswer = vi.fn();
guest.emit("-run-dialog", dialogInfo, replacedAnswer);
yield* Effect.yieldNow;
const replacement = makeAudioWebContents(43);
fromId.mockReturnValue(replacement.wc);
yield* manager.prepareWebview(replacement.wc);
yield* manager.registerWebview("tab_dialog", 43);
yield* Effect.yieldNow;
expect(states.at(-1)?.dialog).toBeUndefined();
expect(replacedAnswer).toHaveBeenCalledExactlyOnceWith(false, "");

const closing = makeAudioWebContents(46);
fromId.mockReturnValue(closing.wc);
const closingAnswer = vi.fn();
yield* manager.createTab("tab_dialog_closed");
yield* manager.prepareWebview(closing.wc);
yield* manager.registerWebview("tab_dialog_closed", 46);
yield* Effect.yieldNow;
closing.emit("-run-dialog", dialogInfo, closingAnswer);
yield* Effect.yieldNow;
yield* manager.closeTab("tab_dialog_closed");
yield* Effect.yieldNow;
expect(closingAnswer).toHaveBeenCalledExactlyOnceWith(false, "");
expect(states.at(-1)?.dialog).toBeUndefined();

const doomed = makeAudioWebContents(44);
fromId.mockReturnValue(doomed.wc);
yield* manager.createTab("tab_dialog_destroyed");
yield* manager.prepareWebview(doomed.wc);
yield* manager.registerWebview("tab_dialog_destroyed", 44);
yield* Effect.yieldNow;
doomed.emit("-run-dialog", dialogInfo, vi.fn());
yield* Effect.yieldNow;
expect(states.at(-1)?.dialog).toBeDefined();
doomed.emit("destroyed");
yield* Effect.yieldNow;
expect(states.at(-1)?.dialog).toBeUndefined();
}),
),
);

effectIt.effect("holds a page dialog raised before the guest is registered", () =>
withManager((manager) =>
Effect.gen(function* () {
const native = vi.fn();
const guest = makeAudioWebContents(45, native);
fromId.mockReturnValue(guest.wc);
const states: PreviewManager.PreviewTabState[] = [];
const answer = vi.fn();

yield* manager.subscribeStateChanges((_tabId, state) =>
Effect.sync(() => {
states.push(state);
}),
);
yield* manager.createTab("tab_dialog_early");
yield* manager.prepareWebview(guest.wc);
guest.emit(
"-run-dialog",
{ dialogType: "alert", messageText: "Hi", defaultPromptText: "" },
answer,
);
yield* manager.registerWebview("tab_dialog_early", 45);
yield* Effect.yieldNow;

expect(native).not.toHaveBeenCalled();
expect(states.at(-1)?.dialog).toEqual({
id: 1,
type: "alert",
message: "Hi",
defaultValue: "",
});

yield* manager.answerDialog("tab_dialog_early", 1, true);
expect(answer).toHaveBeenCalledExactlyOnceWith(true, "");
}),
),
);

effectIt.effect("ignores audio state from a replaced guest", () =>
withManager((manager) =>
Effect.gen(function* () {
Expand Down Expand Up @@ -2701,6 +2849,7 @@ describe("PreviewManager", () => {
navigationHistory: { canGoBack: () => false, canGoForward: () => false },
setIgnoreMenuShortcuts: vi.fn(),
setWindowOpenHandler: vi.fn(),
listeners: () => [],
debugger: {
isAttached: () => false,
attach: vi.fn(),
Expand Down Expand Up @@ -3303,6 +3452,7 @@ describe("PreviewManager", () => {
navigationHistory: { canGoBack: () => false, canGoForward: () => false },
setIgnoreMenuShortcuts: vi.fn(),
setWindowOpenHandler: vi.fn(),
listeners: () => [],
debugger: {
isAttached: () => false,
attach: vi.fn(),
Expand Down
Loading
Loading