mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-28 11:32:22 +00:00
The desktop window opened at a hardcoded 1220×800 every launch, discarding whatever size and position the user left it at (#39101) — on macOS the dock reopen was the most visible case, but every restart reset it. A small window-state.json under userData (same pattern as connection.json / updates.json) records the window's normal bounds plus its maximized flag, written debounced on resize/move/maximize and flushed on close, applied on the next createWindow(). getNormalBounds() captures the pre-maximize size so an un-maximize next session lands where the user actually sized it. Restore is defensive: sanitize rejects garbage, drops off-screen positions (window falls back to Electron centering), and caps a size saved on a since-disconnected larger monitor to the largest current display. The geometry math lives in a side-effect-free window-state.cjs so it unit-tests with node --test, no Electron boot. No new dependency. Salvages #39154 by @jeffrobodie-glitch — same userData approach and validation intent, reimplemented tighter and folded into one module. Co-authored-by: jeffrobodie-glitch <jeffrobodie@gmail.com>
117 lines
3.9 KiB
JavaScript
117 lines
3.9 KiB
JavaScript
/**
|
|
* Pure geometry helpers for window-state.json — restoring the main window's
|
|
* size, position, and maximized flag across launches. Side-effect-free so the
|
|
* part that actually matters (rejecting garbage + off-screen bounds) is
|
|
* unit-testable without booting Electron; main.cjs owns the file I/O and the
|
|
* live `screen` displays.
|
|
*/
|
|
|
|
// Defaults mirror the historical hardcoded BrowserWindow size; MIN_* mirror its
|
|
// minWidth/minHeight so a restored size never undershoots what the live window
|
|
// allows. A fresh install (no saved state) is byte-identical to before.
|
|
const DEFAULT_WIDTH = 1220
|
|
const DEFAULT_HEIGHT = 800
|
|
const MIN_WIDTH = 400
|
|
const MIN_HEIGHT = 620
|
|
|
|
// Keep at least this much of the window over a display work area before we trust
|
|
// a saved position, so the title bar stays grabbable after a monitor unplugs.
|
|
const MIN_VISIBLE = 48
|
|
|
|
const finite = v => typeof v === 'number' && Number.isFinite(v)
|
|
const clamp = (v, lo, hi) => Math.max(lo, Math.min(v, hi))
|
|
|
|
// Parse raw JSON → clean state, or null if garbage. width/height are required
|
|
// and floored; x/y survive only as a finite pair; isMaximized is strict.
|
|
function sanitizeWindowState(raw) {
|
|
if (!raw || typeof raw !== 'object' || !finite(raw.width) || !finite(raw.height)) return null
|
|
|
|
const state = {
|
|
width: Math.max(MIN_WIDTH, Math.round(raw.width)),
|
|
height: Math.max(MIN_HEIGHT, Math.round(raw.height)),
|
|
isMaximized: raw.isMaximized === true
|
|
}
|
|
if (finite(raw.x) && finite(raw.y)) {
|
|
state.x = Math.round(raw.x)
|
|
state.y = Math.round(raw.y)
|
|
}
|
|
return state
|
|
}
|
|
|
|
// True when `bounds` overlaps some display's work area by ≥ MIN_VISIBLE on both
|
|
// axes. `displays` is Electron's screen.getAllDisplays() shape.
|
|
function onScreen(bounds, displays) {
|
|
if (!Array.isArray(displays)) return false
|
|
return displays.some(({ workArea: a } = {}) => {
|
|
if (!a) return false
|
|
const x = Math.min(bounds.x + bounds.width, a.x + a.width) - Math.max(bounds.x, a.x)
|
|
const y = Math.min(bounds.y + bounds.height, a.y + a.height) - Math.max(bounds.y, a.y)
|
|
return x >= MIN_VISIBLE && y >= MIN_VISIBLE
|
|
})
|
|
}
|
|
|
|
// Sanitized state (or null) → BrowserWindow size/position options. Always sets
|
|
// width/height, capped to the largest current display so a size saved on a
|
|
// since-disconnected bigger monitor can't exceed any screen the user now has.
|
|
// Sets x/y only when still on-screen; otherwise Electron centers the window.
|
|
function computeWindowOptions(state, displays) {
|
|
const opts = {
|
|
width: finite(state?.width) ? state.width : DEFAULT_WIDTH,
|
|
height: finite(state?.height) ? state.height : DEFAULT_HEIGHT
|
|
}
|
|
|
|
const cap = (Array.isArray(displays) ? displays : []).reduce(
|
|
(m, { workArea: a } = {}) =>
|
|
a && finite(a.width) && finite(a.height)
|
|
? { width: Math.max(m.width, a.width), height: Math.max(m.height, a.height) }
|
|
: m,
|
|
{ width: 0, height: 0 }
|
|
)
|
|
if (cap.width && cap.height) {
|
|
opts.width = clamp(opts.width, MIN_WIDTH, cap.width)
|
|
opts.height = clamp(opts.height, MIN_HEIGHT, cap.height)
|
|
}
|
|
|
|
if (
|
|
state &&
|
|
finite(state.x) &&
|
|
finite(state.y) &&
|
|
onScreen({ x: state.x, y: state.y, width: opts.width, height: opts.height }, displays)
|
|
) {
|
|
opts.x = state.x
|
|
opts.y = state.y
|
|
}
|
|
return opts
|
|
}
|
|
|
|
// Trailing debounce: collapse a burst of resize/move events (Linux fires many
|
|
// mid-drag) into a single run `delayMs` after the last. `.flush()` runs now and
|
|
// cancels the pending timer — used on close, before the window is gone.
|
|
function debounce(fn, delayMs) {
|
|
let timer = null
|
|
const debounced = () => {
|
|
clearTimeout(timer)
|
|
timer = setTimeout(() => {
|
|
timer = null
|
|
fn()
|
|
}, delayMs)
|
|
}
|
|
debounced.flush = () => {
|
|
clearTimeout(timer)
|
|
timer = null
|
|
fn()
|
|
}
|
|
return debounced
|
|
}
|
|
|
|
module.exports = {
|
|
DEFAULT_WIDTH,
|
|
DEFAULT_HEIGHT,
|
|
MIN_WIDTH,
|
|
MIN_HEIGHT,
|
|
MIN_VISIBLE,
|
|
sanitizeWindowState,
|
|
onScreen,
|
|
computeWindowOptions,
|
|
debounce
|
|
}
|