mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-17 04:11:35 +00:00
On Windows, BrowserWindow.show() and focus() both seize the OS foreground. focusWindow() did show() + unconditional focus(), and the sendOpenUpdatesRequested / deep-link handlers did the same — so any ambient IPC reaching those paths mid-stream dismissed other apps' native save and confirm dialogs (the reported Notepad repro). focusWindow() now reveals with showInactive() and guards focus() with isFocused() so a redundant call never pumps SetForegroundWindow; the updates-toast and deep-link call sites get the same guarded pattern. The policy lives in electron/window-focus-policy.ts (pure, unit-tested). User-intentional raises (pet overlay toggle/open clicks, HUD/Quick Entry reveals) keep show()+focus() — a click is consent. Supersedes #84026 (frizikk), which guarded only the renderer side and explicitly left the main-process focus paths unchanged. Fixes #83998 Co-authored-by: Jakub Wolniewicz <[email protected]>
45 lines
2 KiB
TypeScript
45 lines
2 KiB
TypeScript
/**
|
|
* Foreground-focus policy for the Windows focus-steal bug (#83998).
|
|
*
|
|
* On Windows, `BrowserWindow.show()` and `.focus()` both seize the OS
|
|
* foreground: any native dialog another app is showing (Notepad's save
|
|
* confirmation, a print dialog) is forcibly dismissed when Hermes calls
|
|
* either while streaming in the background. The report's repro is a
|
|
* `focusWindow()` call reaching the window mid-stream.
|
|
*
|
|
* The fix is at the call sites, not here — but the policy is pure so the
|
|
* invariants are unit-testable without booting Electron:
|
|
*
|
|
* - `revealWindow` (ambient reveal, e.g. `focusWindow`'s un-hide branch)
|
|
* uses `showInactive()`: raising Hermes must never steal foreground from
|
|
* the app the user is working in.
|
|
* - `focusWindow`'s keyboard hand-off only calls `.focus()` when the window
|
|
* is NOT already focused. On Windows a redundant `.focus()` on a focused
|
|
* window still pumps the OS SetForegroundWindow path, which is exactly
|
|
* the ambient steal. When the window already has focus, the call is a
|
|
* no-op in intent and must be a no-op in effect.
|
|
*/
|
|
|
|
export interface FocusPolicyWindow {
|
|
isFocused: () => boolean
|
|
}
|
|
|
|
/**
|
|
* The reveal half of `focusWindow`: a window that is hidden or minimized
|
|
* must come back, but never by stealing the OS foreground. Callers should
|
|
* do the restore/minimize-unminimize themselves, then call this to make the
|
|
* window visible; it returns the action to run on the window so the policy
|
|
* is testable without a real BrowserWindow.
|
|
*/
|
|
export function revealAction(windowVisible: boolean): 'showInactive' | 'none' {
|
|
return windowVisible ? 'none' : 'showInactive'
|
|
}
|
|
|
|
/**
|
|
* The keyboard half of `focusWindow`: focus only moves when the window
|
|
* doesn't already have it. A `.focus()` call on an already-focused window
|
|
* is a foreground pump on Windows and a no-op everywhere else — skip it.
|
|
*/
|
|
export function shouldFocusToTakeKeyboard({ isFocused }: FocusPolicyWindow): boolean {
|
|
return !isFocused()
|
|
}
|