mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-17 04:11:35 +00:00
A preview guest that HTML5-fullscreens itself owns all input: the host renderer can't see into the out-of-process webview, the macOS-only Close menu and HUD chords aren't reachable, and Wayland has no xdotool/wmctrl to break out from a terminal — so a page that swallows Esc locks the display (#97213). Three layers, all routed before the guest sees the key or fully outside it: - before-input-event on every webview guest: Esc exits the host window's fullscreen (gated on the fullscreen state so normal-mode panes keep Esc), Ctrl/Cmd+Shift+W closes the pane via the existing close-preview channel - hermes://close-preview deep link handled in the main process: restores and focuses the window, exits fullscreen, closes the pane - `hermes desktop --close-preview` CLI flag forwarded to the packaged exe, riding the single-instance argv so a second invocation unlocks the running app The permission handlers keep auto-allowing 'fullscreen' — the exit paths are the fix, and scoping the grant would just break video fullscreen. Refs #97213
67 lines
2.4 KiB
TypeScript
67 lines
2.4 KiB
TypeScript
/**
|
|
* The preview pane's escape hatch (#97213).
|
|
*
|
|
* A `<webview>` guest is its own out-of-process webContents: once a guest
|
|
* page takes HTML5 fullscreen it owns the input focus, and nothing in the
|
|
* host renderer — menus, HUD chords, the app's own keybinds — can reach
|
|
* the user while the guest holds the screen. On Wayland there is no
|
|
* xdotool/wmctrl to force a window change from outside either, so a page
|
|
* that swallows Esc (or simply never offers one) locks the whole display.
|
|
*
|
|
* Electron's `before-input-event` fires on the guest's webContents BEFORE
|
|
* the page sees the key, which is the one interception point the host
|
|
* always owns. This module holds the pure routing decision so the policy
|
|
* is unit-testable without a live guest.
|
|
*/
|
|
|
|
export type PreviewGuestInputAction = 'close-preview' | 'exit-fullscreen'
|
|
|
|
/** The subset of Electron's `Input` the decision needs. */
|
|
export interface PreviewGuestInput {
|
|
control?: boolean
|
|
isAutoRepeat?: boolean
|
|
key: string
|
|
meta?: boolean
|
|
shift?: boolean
|
|
type: string
|
|
}
|
|
|
|
/**
|
|
* Decide what a keypress inside a preview guest must trigger on the host.
|
|
*
|
|
* - Escape while the host window is fullscreen: exit fullscreen. Gated on
|
|
* the fullscreen state so a pane in normal mode keeps passing Esc through
|
|
* to the page (video players and web UIs use it for their own exits).
|
|
* - Ctrl/Cmd+Shift+W: close the preview pane. This mirrors the host's
|
|
* close-tab chord so muscle memory works no matter who has focus.
|
|
*
|
|
* Returns null when the page should see the key unchanged.
|
|
*/
|
|
export function previewGuestInputAction(
|
|
input: PreviewGuestInput,
|
|
hostIsFullscreen: boolean
|
|
): PreviewGuestInputAction | null {
|
|
if (input.type !== 'keyDown' || input.isAutoRepeat) {
|
|
return null
|
|
}
|
|
|
|
if (input.key === 'Escape') {
|
|
return hostIsFullscreen ? 'exit-fullscreen' : null
|
|
}
|
|
|
|
if ((input.control || input.meta) && input.shift && input.key.toLowerCase() === 'w') {
|
|
return 'close-preview'
|
|
}
|
|
|
|
return null
|
|
}
|
|
|
|
/**
|
|
* Recognize the `--close-preview` summon flag in an argv, accepting both
|
|
* the bare form and the `--close-preview=<value>` form Electron may pass
|
|
* through verbatim. Mirrors `hasQuickEntryFlag` so the CLI can forward the
|
|
* same flag shape (#82654's compositor-keybind path).
|
|
*/
|
|
export function hasClosePreviewFlag(argv: readonly string[]): boolean {
|
|
return argv.some(arg => arg === '--close-preview' || arg.startsWith('--close-preview='))
|
|
}
|