diff --git a/apps/desktop/src/ipc/channels.ts b/apps/desktop/src/ipc/channels.ts index bb708a6ab7c88..8af15e80e90a9 100644 --- a/apps/desktop/src/ipc/channels.ts +++ b/apps/desktop/src/ipc/channels.ts @@ -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"; diff --git a/apps/desktop/src/ipc/methods/preview.ts b/apps/desktop/src/ipc/methods/preview.ts index f06c26014f40e..bb269e9f86f58 100644 --- a/apps/desktop/src/ipc/methods/preview.ts +++ b/apps/desktop/src/ipc/methods/preview.ts @@ -11,6 +11,7 @@ import { DesktopPreviewRecordingSaveInputSchema, DesktopPreviewRegisterWebviewInputSchema, DesktopPreviewScreenshotArtifactSchema, + DesktopPreviewAnswerDialogInputSchema, DesktopPreviewSetAudioMutedInputSchema, DesktopPreviewSetShownInputSchema, DesktopPreviewSetCaptureDrawnInputSchema, @@ -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, @@ -516,6 +526,7 @@ export const methods = [ setColorScheme, setZoomFactor, setAudioMuted, + answerDialog, setShown, setCaptureDrawn, openDevTools, diff --git a/apps/desktop/src/preload.ts b/apps/desktop/src/preload.ts index b413656a15241..5d540e04d341b 100644 --- a/apps/desktop/src/preload.ts +++ b/apps/desktop/src/preload.ts @@ -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, diff --git a/apps/desktop/src/preview/Manager.test.ts b/apps/desktop/src/preview/Manager.test.ts index 2091ff3c7f8f2..dcd329c6ffad2 100644 --- a/apps/desktop/src/preview/Manager.test.ts +++ b/apps/desktop/src/preview/Manager.test.ts @@ -338,6 +338,7 @@ const makeTestPreviewWebContents = ( navigationHistory: { canGoBack: () => false, canGoForward: () => false }, setIgnoreMenuShortcuts: vi.fn(), setWindowOpenHandler: vi.fn(), + listeners: () => [], debugger: { isAttached: () => false, attach: vi.fn(), @@ -501,6 +502,7 @@ const makeFaviconWebContents = (options?: { focusedFrame: {} as object | null, setIgnoreMenuShortcuts: vi.fn(), setWindowOpenHandler: vi.fn(), + listeners: () => [], executeJavaScriptInIsolatedWorld, debugger: { isAttached: () => false, @@ -1251,6 +1253,7 @@ describe("PreviewManager", () => { navigationHistory: { canGoBack: () => false, canGoForward: () => false }, setIgnoreMenuShortcuts: vi.fn(), setWindowOpenHandler: vi.fn(), + listeners: () => [], debugger: { isAttached: () => false, attach: vi.fn(), @@ -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; @@ -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, @@ -1708,14 +1713,22 @@ describe("PreviewManager", () => { ), ); - const makeAudioWebContents = (id: number) => { + const makeAudioWebContents = (id: number, nativeDialog?: (...args: never[]) => void) => { const listeners = new Map void>(); + if (nativeDialog) listeners.set("-run-dialog", nativeDialog); + let debuggerMessage: ((...args: ReadonlyArray) => void) | undefined; const setAudioMuted = vi.fn(); let audible = false; let audibleAfterFirstRead = false; let audibleReads = 0; return { setAudioMuted, + emit: (event: string, ...args: ReadonlyArray) => { + (listeners.get(event) as ((...args: ReadonlyArray) => void) | undefined)?.( + ...args, + ); + }, + emitDebuggerMessage: (method: string) => debuggerMessage?.({}, method, {}, ""), emitAudioState: (next: boolean) => { audible = next; listeners.get("audio-state-changed")?.({ audible: next } as never); @@ -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) => void) => { + if (event === "message") debuggerMessage = listener; + }), off: vi.fn(), }, } as never, @@ -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; + 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* () { @@ -2701,6 +2849,7 @@ describe("PreviewManager", () => { navigationHistory: { canGoBack: () => false, canGoForward: () => false }, setIgnoreMenuShortcuts: vi.fn(), setWindowOpenHandler: vi.fn(), + listeners: () => [], debugger: { isAttached: () => false, attach: vi.fn(), @@ -3303,6 +3452,7 @@ describe("PreviewManager", () => { navigationHistory: { canGoBack: () => false, canGoForward: () => false }, setIgnoreMenuShortcuts: vi.fn(), setWindowOpenHandler: vi.fn(), + listeners: () => [], debugger: { isAttached: () => false, attach: vi.fn(), diff --git a/apps/desktop/src/preview/Manager.ts b/apps/desktop/src/preview/Manager.ts index 1f28826bcc196..a7f6848fafbb7 100644 --- a/apps/desktop/src/preview/Manager.ts +++ b/apps/desktop/src/preview/Manager.ts @@ -11,6 +11,7 @@ import type { DesktopPreviewAnnotationVoiceConfig, DesktopPreviewAnnotationVoiceState, DesktopPreviewColorScheme, + DesktopPreviewDialog, DesktopPreviewFavicon, DesktopPreviewFindResultEvent, DesktopPreviewOpenLinkEvent, @@ -91,6 +92,7 @@ import { START_PICK_CHANNEL, THUMB_PRESS_CHANNEL, } from "./GuestProtocol.ts"; +import { holdPageDialogs, type PageDialogHold } from "./PageDialogs.ts"; import { isPreviewAnnotationPayload } from "./PickedElementPayload.ts"; import { captureFavicon, safeHttpOrigin, selectFaviconCandidates } from "./FaviconCapture.ts"; import { DEFAULT_RECORDING_INPUT_OPTIONS, type RecordingInputOptions } from "./RecordingInput.ts"; @@ -120,6 +122,7 @@ export interface PreviewTabState { audible: boolean; controller: "human" | "agent" | "none"; capturing: boolean; + dialog?: DesktopPreviewDialog; favicon?: DesktopPreviewFavicon; serverTab?: { readonly threadId: string; readonly tabId: string }; updatedAt: string; @@ -616,6 +619,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function const tabLifecycleGenerations = new Map(); // A guest can fail its first load before registerWebview installs its tab listeners. const guestLoadFailures = new Map(); + const dialogHolds = new Map(); const attempt = (errorContext: PreviewOperationContext, evaluate: () => A) => Effect.try({ @@ -962,6 +966,39 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function if (Option.isSome(next)) yield* emitIfCurrent(tabId, next.value); }); + const syncTabDialog = Effect.fn("PreviewManager.syncTabDialog")(function* ( + wc: Electron.WebContents, + ) { + const updatedAt = yield* currentIso; + const next = yield* SynchronizedRef.modify(tabsRef, (tabs) => { + const entry = [...tabs].find(([, tab]) => tab.webContentsId === wc.id); + if (!entry) return [Option.none(), tabs] as const; + const [tabId, current] = entry; + const dialog = dialogHolds.get(wc.id)?.current(); + const { dialog: _dialog, ...withoutDialog } = current; + const state: PreviewTabState = { + ...withoutDialog, + ...(dialog ? { dialog } : {}), + updatedAt, + }; + return [ + Option.some([tabId, state] as const), + replaceMap(tabs, (copy) => { + copy.set(tabId, state); + }), + ] as const; + }); + if (Option.isSome(next)) yield* emitIfCurrent(next.value[0], next.value[1]); + }); + + const ensureDialogHold = (wc: Electron.WebContents) => { + if (dialogHolds.has(wc.id)) return; + dialogHolds.set( + wc.id, + holdPageDialogs(wc, () => runFork(syncTabDialog(wc))), + ); + }; + const requireWebContents = Effect.fn("PreviewManager.requireWebContents")(function* ( tabId: string, ) { @@ -1104,6 +1141,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function } }); const onMessage: BrowserControlSession["onMessage"] = (_event, method) => { + if (method === "Page.javascriptDialogClosed") dialogHolds.get(wc.id)?.closed(); runFork(handleDebuggerMessage(method)); }; const control: BrowserControlSession = { @@ -1656,6 +1694,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function wc.ipc.off(RECORDING_INPUT_CHANNEL, recordingInput); wc.ipc.off(PAGE_UNHANDLED_SHORTCUT_CHANNEL, pageUnhandledShortcut); detachPasskeys(); + dialogHolds.get(wc.id)?.answer(false); }).pipe(Effect.ignore), ); const install = Effect.fn("PreviewManager.installWebContentsListeners")(function* () { @@ -1843,8 +1882,9 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function ); } const updatedAt = yield* currentIso; + const { dialog: _dialog, ...closedWithoutDialog } = closedTab; const closed: PreviewTabState = { - ...closedTab, + ...closedWithoutDialog, webContentsId: null, navStatus: { kind: "Idle" }, canGoBack: false, @@ -1969,9 +2009,11 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function } const pendingUrl = current.navStatus.kind === "Loading" ? current.navStatus.url : null; const failure = guestLoadFailures.get(webContentsId); - const { favicon: _favicon, ...currentWithoutFavicon } = current; + const { favicon: _favicon, dialog: _dialog, ...currentWithoutFavicon } = current; + const pendingDialog = dialogHolds.get(webContentsId)?.current(); const next: PreviewTabState = { ...currentWithoutFavicon, + ...(pendingDialog ? { dialog: pendingDialog } : {}), webContentsId, navStatus: failure && (pendingUrl === null || pendingUrl === failure.url) @@ -2046,6 +2088,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function ) { yield* rendererHistory.register(wc, { surface: "preview" }); const webContentsId = wc.id; + ensureDialogHold(wc); wc.on("did-start-navigation", (event) => { if (event.isMainFrame && !event.isSameDocument) guestLoadFailures.delete(webContentsId); }); @@ -2059,6 +2102,8 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function }); wc.once("destroyed", () => { guestLoadFailures.delete(webContentsId); + dialogHolds.get(webContentsId)?.closed(); + dialogHolds.delete(webContentsId); runFork(hideDestroyedGuest(webContentsId)); runFork(detachControlSession(webContentsId)); }); @@ -2119,6 +2164,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function audible: current?.audible ?? false, controller: current?.controller ?? "none", capturing: current?.capturing ?? false, + ...(current?.dialog ? { dialog: current.dialog } : {}), ...(current?.favicon ? { favicon: current.favicon } : {}), ...(current?.serverTab ? { serverTab: current.serverTab } : {}), updatedAt, @@ -2162,7 +2208,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function if (current?.webContentsId !== webContentsId) { return [Option.none(), tabs] as const; } - const { favicon: _favicon, ...currentWithoutFavicon } = current; + const { favicon: _favicon, dialog: _dialog, ...currentWithoutFavicon } = current; const next: PreviewTabState = { ...currentWithoutFavicon, webContentsId: null }; return [ Option.some(next), @@ -2686,6 +2732,22 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function ); }); + const answerDialog = Effect.fn("PreviewManager.answerDialog")(function* ( + tabId: string, + dialogId: number, + accept: boolean, + ) { + const tab = (yield* SynchronizedRef.get(tabsRef)).get(tabId); + if (!tab) { + return yield* new PreviewTabNotFoundError({ tabId }); + } + const webContentsId = tab.webContentsId; + if (webContentsId === null) return; + yield* attempt({ operation: "answerDialog", tabId, webContentsId }, () => + dialogHolds.get(webContentsId)?.answer(accept, dialogId), + ); + }); + const captureScreenshot = Effect.fn("PreviewManager.captureScreenshot")(function* ( tabId: string, ) { @@ -3732,6 +3794,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function setAnnotationTheme, setAnnotationSendEnabled, setAudioMuted, + answerDialog, setShown, setCaptureDrawn, setColorScheme, @@ -3949,6 +4012,11 @@ export class PreviewManager extends Context.Service< tabId: string, audioMuted: boolean, ) => Effect.Effect; + readonly answerDialog: ( + tabId: string, + dialogId: number, + accept: boolean, + ) => Effect.Effect; readonly setShown: (tabId: string, shown: boolean) => Effect.Effect; readonly setCaptureDrawn: (tabId: string, drawn: boolean) => Effect.Effect; readonly openDevTools: (tabId: string) => Effect.Effect; @@ -4112,6 +4180,7 @@ export const make = Effect.gen(function* PreviewManagerMake() { setColorScheme: operations.setColorScheme, setZoomFactor: operations.setZoomFactor, setAudioMuted: operations.setAudioMuted, + answerDialog: operations.answerDialog, setShown: operations.setShown, setCaptureDrawn: operations.setCaptureDrawn, openDevTools: operations.openDevTools, diff --git a/apps/desktop/src/preview/PageDialogs.test.ts b/apps/desktop/src/preview/PageDialogs.test.ts new file mode 100644 index 0000000000000..9c63f8f3aea9c --- /dev/null +++ b/apps/desktop/src/preview/PageDialogs.test.ts @@ -0,0 +1,104 @@ +import * as NodeEvents from "node:events"; +import { describe, expect, it, vi } from "vite-plus/test"; + +import { holdPageDialogs } from "./PageDialogs.ts"; + +const info = { dialogType: "confirm", messageText: "Delete it?", defaultPromptText: "" }; + +function setup() { + const contents = new NodeEvents.EventEmitter(); + const native = vi.fn(); + contents.on("-run-dialog", native); + const changed = vi.fn(); + const hold = holdPageDialogs(contents, changed); + const callback = vi.fn(); + return { contents, native, changed, hold, callback }; +} + +describe("holdPageDialogs", () => { + it("keeps a page dialog pending instead of showing the native box", () => { + const { contents, native, changed, callback } = setup(); + + contents.emit("-run-dialog", info, callback); + + expect(native).not.toHaveBeenCalled(); + expect(callback).not.toHaveBeenCalled(); + expect(changed).toHaveBeenLastCalledWith({ + id: 1, + type: "confirm", + message: "Delete it?", + defaultValue: "", + }); + }); + + it("answers only the dialog it was meant for, once", () => { + const { contents, changed, hold, callback } = setup(); + contents.emit("-run-dialog", info, callback); + + expect(hold.answer(true, 1)).toBe(true); + expect(hold.answer(false)).toBe(false); + expect(callback).toHaveBeenCalledExactlyOnceWith(true, ""); + expect(changed).toHaveBeenLastCalledWith(null); + + const next = vi.fn(); + contents.emit("-run-dialog", info, next); + expect(hold.answer(true, 1)).toBe(false); + expect(next).not.toHaveBeenCalled(); + + contents.emit("-run-dialog", info, callback); + expect(next).toHaveBeenCalledExactlyOnceWith(false, ""); + }); + + // A frame without the renderer prompt override reaches the hold + it("rejects a prompt at once like Electron and leaves a pending dialog alone", () => { + const { contents, changed, hold, callback } = setup(); + contents.emit("-run-dialog", info, callback); + changed.mockClear(); + + const prompt = vi.fn(); + contents.emit("-run-dialog", { ...info, dialogType: "prompt" }, prompt); + + expect(prompt).toHaveBeenCalledExactlyOnceWith(false, ""); + expect(changed).not.toHaveBeenCalled(); + expect(hold.current()).toEqual({ + id: 1, + type: "confirm", + message: "Delete it?", + defaultValue: "", + }); + expect(callback).not.toHaveBeenCalled(); + expect(hold.answer(true)).toBe(true); + expect(callback).toHaveBeenCalledExactlyOnceWith(true, ""); + + contents.emit("-run-dialog", { ...info, dialogType: "prompt" }, prompt); + expect(hold.current()).toBeNull(); + }); + + it("drops a dialog that CDP or a navigation already closed without answering twice", () => { + const { contents, changed, hold, callback } = setup(); + + contents.emit("-run-dialog", info, callback); + hold.closed(); + expect(changed).toHaveBeenLastCalledWith(null); + expect(hold.answer(true)).toBe(false); + + contents.emit("-run-dialog", info, callback); + contents.emit("-cancel-dialogs"); + expect(changed).toHaveBeenLastCalledWith(null); + expect(hold.answer(true)).toBe(false); + expect(callback).not.toHaveBeenCalled(); + }); + + it("dismisses a pending dialog when a main-frame navigation starts", () => { + const { contents, changed, callback } = setup(); + contents.emit("-run-dialog", info, callback); + + contents.emit("did-start-navigation", { isMainFrame: false, isSameDocument: false }); + contents.emit("did-start-navigation", { isMainFrame: true, isSameDocument: true }); + expect(callback).not.toHaveBeenCalled(); + + contents.emit("did-start-navigation", { isMainFrame: true, isSameDocument: false }); + expect(callback).toHaveBeenCalledExactlyOnceWith(false, ""); + expect(changed).toHaveBeenLastCalledWith(null); + }); +}); diff --git a/apps/desktop/src/preview/PageDialogs.ts b/apps/desktop/src/preview/PageDialogs.ts new file mode 100644 index 0000000000000..5612ed4925af9 --- /dev/null +++ b/apps/desktop/src/preview/PageDialogs.ts @@ -0,0 +1,78 @@ +import type { DesktopPreviewDialog } from "@t3tools/contracts"; + +type DialogCallback = (accept: boolean, userInput: string) => void; + +interface RunDialogInfo { + readonly dialogType: string; + readonly messageText: string; + readonly defaultPromptText: string; +} + +export interface PageDialogHold { + /** Answers the pending dialog; with `id`, only when it is still that dialog. */ + readonly answer: (accept: boolean, id?: number) => boolean; + readonly closed: () => void; + readonly current: () => DesktopPreviewDialog | null; +} + +// Electron shows page dialogs as a native app-modal box from the `-run-dialog` event and never +// closes it when CDP answers. Replacing that listener keeps the dialog pending for the tab's UI. +// Electron does not support `prompt()` and rejects it at once; we keep that. +export function holdPageDialogs( + contents: NodeJS.EventEmitter, + changed: (dialog: DesktopPreviewDialog | null) => void, +): PageDialogHold { + let pending: DialogCallback | null = null; + let nextId = 0; + let shown: DesktopPreviewDialog | null = null; + const clear = () => { + if (pending === null) return; + pending = null; + shown = null; + changed(null); + }; + const deliver = (callback: DialogCallback, accept: boolean, userInput: string) => { + try { + callback(accept, userInput); + return true; + } catch { + return false; + } + }; + const run = (info: RunDialogInfo, callback: DialogCallback) => { + if (info.dialogType === "prompt") { + deliver(callback, false, ""); + return; + } + const previous = pending; + if (previous !== null) deliver(previous, false, ""); + pending = callback; + nextId += 1; + shown = { + id: nextId, + type: info.dialogType, + message: info.messageText, + defaultValue: info.defaultPromptText, + }; + changed(shown); + }; + for (const listener of contents.listeners("-run-dialog")) { + contents.off("-run-dialog", listener as (...args: unknown[]) => void); + } + contents.on("-run-dialog", run); + const answer = (accept: boolean, id?: number) => { + const callback = pending; + if (callback === null || (id !== undefined && shown?.id !== id)) return false; + clear(); + return deliver(callback, accept, ""); + }; + contents.on("-cancel-dialogs", clear); + // Chrome dismisses page dialogs when a navigation starts; a held one would block the commit. + contents.on( + "did-start-navigation", + (event: { readonly isMainFrame: boolean; readonly isSameDocument: boolean }) => { + if (event.isMainFrame && !event.isSameDocument) answer(false); + }, + ); + return { answer, closed: clear, current: () => shown }; +} diff --git a/apps/web/src/browser/BrowserDialogCard.tsx b/apps/web/src/browser/BrowserDialogCard.tsx new file mode 100644 index 0000000000000..75daa1eab33c6 --- /dev/null +++ b/apps/web/src/browser/BrowserDialogCard.tsx @@ -0,0 +1,63 @@ +import { useState } from "react"; +import { T, useGT } from "gt-react"; + +import { Button } from "~/components/ui/button"; +import { Input } from "~/components/ui/input"; +import { cn } from "~/lib/utils"; + +export function BrowserDialogCard({ + dialog, + canAnswer, + onAnswer, + className, +}: { + readonly dialog: { + readonly type: string; + readonly message: string; + readonly defaultValue: string; + }; + readonly canAnswer: boolean; + readonly onAnswer: (accept: boolean, promptText?: string) => void; + readonly className?: string; +}) { + const gt = useGT(); + const [promptText, setPromptText] = useState(dialog.defaultValue); + return ( +
+

{dialog.message}

+ {canAnswer ? ( + <> + {dialog.type === "prompt" ? ( + setPromptText(event.target.value)} + /> + ) : null} +
+ + +
+ + ) : ( +

+ Take control to respond. +

+ )} +
+ ); +} diff --git a/apps/web/src/browser/ServerBrowserSurface.tsx b/apps/web/src/browser/ServerBrowserSurface.tsx index 868da347164ab..a0878705c18a0 100644 --- a/apps/web/src/browser/ServerBrowserSurface.tsx +++ b/apps/web/src/browser/ServerBrowserSurface.tsx @@ -34,10 +34,10 @@ import { } from "react"; import { msg, T, useGT, useMessages } from "gt-react"; +import { BrowserDialogCard } from "./BrowserDialogCard"; import { AgentCursorMark } from "~/components/preview/AgentBrowserCursor"; import { CommandBlock } from "~/components/CommandBlock"; import { Button } from "~/components/ui/button"; -import { Input } from "~/components/ui/input"; import { toastManager } from "~/components/ui/toast"; import { thrownErrorMessage } from "@t3tools/client-runtime/errors"; import { m } from "~/i18n/messages"; @@ -188,7 +188,6 @@ export function ServerBrowserSurface(props: { const hasFrameRef = useRef(false); const controlRef = useRef(null); const [control, setControl] = useState(null); - const [promptText, setPromptText] = useState(""); const [fileChooser, setFileChooser] = useState(null); const [agentCursor, setAgentCursor] = useState(null); const fileInputRef = useRef(null); @@ -429,11 +428,6 @@ export function ServerBrowserSurface(props: { controlRef.current = next; setControl(next); controlChanged(next); - if ( - next.dialog?.message !== previous?.dialog?.message || - next.dialog?.defaultValue !== previous?.dialog?.defaultValue - ) - setPromptText(next.dialog?.defaultValue ?? ""); if (next.controller !== "you") { clearInput(); } else if (previous?.controller !== "you") { @@ -897,49 +891,14 @@ export function ServerBrowserSurface(props: { ) : null} {control?.dialog ? ( -
-

{control.dialog.message}

- {control.controller === "you" ? ( - <> - {control.dialog.type === "prompt" ? ( - setPromptText(event.target.value)} - /> - ) : null} -
- - -
- - ) : ( -

- Take control to respond. -

- )} -
+ + send({ type: "dialog", accept, ...(promptText === undefined ? {} : { promptText }) }) + } + /> ) : null} {visible && hostSetup ? ( diff --git a/apps/web/src/components/preview/PreviewView.tsx b/apps/web/src/components/preview/PreviewView.tsx index cff12f74ebba6..bb24674092479 100644 --- a/apps/web/src/components/preview/PreviewView.tsx +++ b/apps/web/src/components/preview/PreviewView.tsx @@ -90,6 +90,7 @@ import { PreviewFileNotShown, PreviewUnreachable } from "./PreviewUnreachable"; import type { MessageResolver } from "~/i18n/messages"; import { revealInFileExplorerLabel } from "./fileExplorerLabel"; import { Badge } from "~/components/ui/badge"; +import { BrowserDialogCard } from "~/browser/BrowserDialogCard"; import { BrowserSurfaceSlot } from "~/browser/BrowserSurfaceSlot"; import { alternatePreviewRuntime, useRendersServerTabNatively } from "~/browser/previewRuntime"; import { ServerBrowserSurface, type ServerBrowserHandle } from "~/browser/ServerBrowserSurface"; @@ -262,6 +263,7 @@ export function PreviewView({ const serverStreamPending = isServerTab && !showEmptyState && !isUnreachable && serverStreamSettledTabId !== runtimeTabId; const controller = desktopOverlay?.controller ?? "none"; + const pageDialog = desktopOverlay?.dialog; const viewport = snapshot?.viewport ?? FILL_PREVIEW_VIEWPORT; const browserDefaults = useBrowserDefaults(); // IPC interprets undefined profile ids as all profiles. @@ -1147,6 +1149,19 @@ export function PreviewView({ onOpenUrl={(next) => void handleOpenServerUrl(next)} /> ) : null} + {pageDialog && runtimeTabId ? ( + + void previewBridge + ?.answerDialog(runtimeTabId, pageDialog.id, accept) + .catch(() => undefined) + } + /> + ) : null} {snapshot && desktopOverlay ? ( ) : null} diff --git a/apps/web/src/components/preview/ThreadPreviewMiniPlayer.tsx b/apps/web/src/components/preview/ThreadPreviewMiniPlayer.tsx index 378bcdd88408f..cf4a5d02e5d23 100644 --- a/apps/web/src/components/preview/ThreadPreviewMiniPlayer.tsx +++ b/apps/web/src/components/preview/ThreadPreviewMiniPlayer.tsx @@ -19,6 +19,7 @@ import { scopedThreadKey } from "@t3tools/client-runtime/environment"; import { useChatCanvas } from "../chat/ChatCanvasContext"; import type { ChatCanvasPreview } from "../chat/chatCanvasLayout"; +import { BrowserDialogCard } from "~/browser/BrowserDialogCard"; import { BrowserSurfaceSlot } from "~/browser/BrowserSurfaceSlot"; import { findActiveBrowserRecordingRuntimeTabId, @@ -276,6 +277,7 @@ function BrowserMiniPlayer({ threadRef, tabId, miniPlayer }: Props & { readonly : null; const loadFailed = snapshot.navStatus._tag === "LoadFailed" ? snapshot.navStatus : null; const poppedOut = serverTab ? serverPictureInPicture : Boolean(desktopOverlay?.pictureInPicture); + const pageDialog = desktopOverlay?.dialog; const canPopOut = serverTab ? poppedOut || (pdfUrl === null && supportsServerPictureInPicture()) : true; @@ -371,6 +373,19 @@ function BrowserMiniPlayer({ threadRef, tabId, miniPlayer }: Props & { readonly Reconnecting preview… ) : null} + {pageDialog ? ( + + void previewBridge + ?.answerDialog(runtimeTabId, pageDialog.id, accept) + .catch(() => undefined) + } + /> + ) : null} ) } diff --git a/apps/web/src/components/preview/usePreviewBridge.ts b/apps/web/src/components/preview/usePreviewBridge.ts index 294e93147a9c8..38c01e4f40234 100644 --- a/apps/web/src/components/preview/usePreviewBridge.ts +++ b/apps/web/src/components/preview/usePreviewBridge.ts @@ -155,6 +155,7 @@ export function projectDesktopState(state: DesktopPreviewTabState): DesktopPrevi audioMuted: state.audioMuted, audible: state.audible, controller: state.controller, + ...(state.dialog ? { dialog: state.dialog } : {}), favicon: state.favicon && originOf(state.favicon.pageUrl) === navOrigin ? state.favicon : null, }; } diff --git a/apps/web/src/previewStateStore.test.ts b/apps/web/src/previewStateStore.test.ts index 6554dde5f1c25..0686208aa307a 100644 --- a/apps/web/src/previewStateStore.test.ts +++ b/apps/web/src/previewStateStore.test.ts @@ -208,9 +208,13 @@ describe("previewStateStore (single-tab)", () => { ...loaded, navStatus: { ...loaded.navStatus, url: "https://example.com/next" }, }); + const dialog = { id: 1, type: "confirm", message: "Delete it?", defaultValue: "" }; + applyPreviewDesktopState(ref, snapshot.tabId, { ...loaded, dialog }); + applyPreviewDesktopState(ref, snapshot.tabId, { ...loaded, dialog: { ...dialog } }); + applyPreviewDesktopState(ref, snapshot.tabId, loaded); unsubscribe(); - expect(updateCount).toBe(3); + expect(updateCount).toBe(5); }); it("retains multiple tabs and switches active desktop state", () => { diff --git a/apps/web/src/previewStateStore.ts b/apps/web/src/previewStateStore.ts index 6e190e8069ee5..ced5c6289a6c3 100644 --- a/apps/web/src/previewStateStore.ts +++ b/apps/web/src/previewStateStore.ts @@ -2,6 +2,7 @@ import { useAtomValue } from "@effect/atom-react"; import { scopedThreadKey } from "@t3tools/client-runtime/environment"; import { type DesktopPreviewColorScheme, + type DesktopPreviewDialog, type DesktopPreviewFavicon, type PreviewEvent, type PreviewListResult, @@ -25,6 +26,7 @@ export interface DesktopPreviewOverlay { audioMuted: boolean; audible: boolean; controller: "human" | "agent" | "none"; + dialog?: DesktopPreviewDialog; favicon: DesktopPreviewFavicon | null; } @@ -410,6 +412,7 @@ function isPreviewStateEqual( previous.audioMuted === next.audioMuted && previous.audible === next.audible && previous.controller === next.controller && + previous.dialog?.id === next.dialog?.id && previous.favicon?.dataUrl === next.favicon?.dataUrl && previous.favicon?.pageUrl === next.favicon?.pageUrl && previous.favicon?.capturedAt === next.favicon?.capturedAt) diff --git a/packages/contracts/src/ipc.ts b/packages/contracts/src/ipc.ts index a9dbc8b81de98..0644f51969043 100644 --- a/packages/contracts/src/ipc.ts +++ b/packages/contracts/src/ipc.ts @@ -603,6 +603,13 @@ export interface DesktopPreviewFavicon { capturedAt: number; } +export interface DesktopPreviewDialog { + id: number; + type: string; + message: string; + defaultValue: string; +} + export interface DesktopPreviewTabState { tabId: string; webContentsId: number | null; @@ -618,6 +625,8 @@ export interface DesktopPreviewTabState { controller: "human" | "agent" | "none"; /** A screenshot or stream of the guest is pending, so the client keeps it painting while hidden. */ capturing: boolean; + /** A page dialog waiting for an answer; the guest stays blocked until the client or an agent answers. */ + dialog?: DesktopPreviewDialog; favicon?: DesktopPreviewFavicon; updatedAt: string; } @@ -1030,6 +1039,12 @@ export const DesktopPreviewSetAudioMutedInputSchema = Schema.Struct({ audioMuted: Schema.Boolean, }); +export const DesktopPreviewAnswerDialogInputSchema = Schema.Struct({ + tabId: DesktopPreviewTabIdSchema, + dialogId: Schema.Number, + accept: Schema.Boolean, +}); + export const DesktopPreviewSetShownInputSchema = Schema.Struct({ tabId: DesktopPreviewTabIdSchema, shown: Schema.Boolean, @@ -1301,6 +1316,7 @@ export interface DesktopPreviewBridge { hardReload: (tabId: string) => Promise; setColorScheme: (tabId: string, colorScheme: DesktopPreviewColorScheme) => Promise; setAudioMuted: (tabId: string, audioMuted: boolean) => Promise; + answerDialog: (tabId: string, dialogId: number, accept: boolean) => Promise; findInPage: ( tabId: string, text: string,