Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(desktop): recycle the renderer after long background sessions

tianma-if92cfe6939b3f
diff --git a/apps/desktop/src/main/index.mjs b/apps/desktop/src/main/index.mjs
index f0b675b4..97275f24 100644
--- a/apps/desktop/src/main/index.mjs
+++ b/apps/desktop/src/main/index.mjs
@@ -44,6 +44,11 @@ import electronUpdater from "electron-updater";
import { createPluginPublicNetworkRuntime } from "./plugin-public-network.mjs";
import { createAiDirectRuntime } from "./ai-direct.mjs";
import { shouldQuitAfterAllWindowsClosed } from "./window-lifecycle.mjs";
+import {
+ RENDERER_HIBERNATE_PREPARE_TIMEOUT_MS,
+ createRendererHibernateController,
+ workingSetBytesFromProcessMemoryInfo,
+} from "./renderer-hibernate.mjs";
import {
DESKTOP_APP_ENTRY_URL,
DESKTOP_APP_ORIGIN,
@@ -513,6 +518,69 @@ const screenshotCaptureGuard = createScreenshotCaptureGuard();
const sentScreenshotCaptureIds = new Set();
let rendererReady = false;
+const getRendererHibernateBackgroundState = () => {
+ if (!mainWindow || mainWindow.isDestroyed()) {
+ return { focused: false, visible: false, quitting: isQuitting, loading: false };
+ }
+ return {
+ focused: mainWindow.isFocused(),
+ visible: mainWindow.isVisible() && !mainWindow.isMinimized(),
+ quitting: isQuitting,
+ loading: mainWindow.webContents.isLoading(),
+ };
+};
+
+const getRendererWorkingSetBytes = async () => {
+ if (!mainWindow || mainWindow.isDestroyed()) return 0;
+ try {
+ return workingSetBytesFromProcessMemoryInfo(await mainWindow.webContents.getProcessMemoryInfo());
+ } catch {
+ return 0;
+ }
+};
+
+const prepareRendererForHibernate = () => new Promise((resolve) => {
+ if (!mainWindow || mainWindow.isDestroyed() || mainWindow.webContents.isLoading()) {
+ resolve("unavailable");
+ return;
+ }
+ const timeout = setTimeout(() => {
+ ipcMain.removeListener("desktop:hibernate-prepared", onPrepared);
+ resolve("timeout");
+ }, RENDERER_HIBERNATE_PREPARE_TIMEOUT_MS);
+ const onPrepared = (event) => {
+ if (event.sender !== mainWindow?.webContents) return;
+ clearTimeout(timeout);
+ ipcMain.removeListener("desktop:hibernate-prepared", onPrepared);
+ resolve("ready");
+ };
+ ipcMain.on("desktop:hibernate-prepared", onPrepared);
+ mainWindow.webContents.send("desktop:hibernate-prepare");
+});
+
+const reloadHibernatedRenderer = () => {
+ if (!mainWindow || mainWindow.isDestroyed() || mainWindow.isFocused() || isQuitting) return;
+ rendererReady = false;
+ armRendererStartupGuard();
+ mainWindow.webContents.reload();
+};
+
+const rendererHibernate = createRendererHibernateController({
+ getBackgroundState: getRendererHibernateBackgroundState,
+ getMemoryBytes: getRendererWorkingSetBytes,
+ prepareRenderer: prepareRendererForHibernate,
+ reloadRenderer: reloadHibernatedRenderer,
+ onDiagnostic: (event, details) => { void writeDiagnostic(event, details); },
+});
+
+const syncRendererHibernate = () => {
+ if (isQuitting || !mainWindow || mainWindow.isDestroyed() || mainWindow.isFocused()) {
+ rendererHibernate.cancel();
+ return;
+ }
+ rendererHibernate.noteBackground();
+};
+
const flushPendingMarkdownImport = () => {
if (!pendingMarkdownImport || !rendererReady || !mainWindow || mainWindow.isDestroyed()) return;
const payload = pendingMarkdownImport;
@@ -1192,6 +1260,12 @@ const createWindow = async () => {
mainWindow.hide();
}
});
+ mainWindow.on("hide", syncRendererHibernate);
+ mainWindow.on("show", syncRendererHibernate);
+ mainWindow.on("minimize", syncRendererHibernate);
+ mainWindow.on("restore", syncRendererHibernate);
+ mainWindow.on("blur", syncRendererHibernate);
+ mainWindow.on("focus", syncRendererHibernate);
// Install startup diagnostics before navigation. A renderer exception can
// happen while loadFile/loadURL is still resolving, so listeners registered
diff --git a/apps/desktop/src/main/renderer-hibernate.mjs b/apps/desktop/src/main/renderer-hibernate.mjs
new file mode 100644
index 00000000..9a65e6fa
--- /dev/null
+++ b/apps/desktop/src/main/renderer-hibernate.mjs
@@ -0,0 +1,122 @@
+export const RENDERER_HIBERNATE_BACKGROUND_MS = 10 * 60 * 1000;
+export const RENDERER_HIBERNATE_MEMORY_BACKGROUND_MS = 45 * 1000;
+export const RENDERER_HIBERNATE_MEMORY_BYTES = 800 * 1024 * 1024;
+export const RENDERER_HIBERNATE_PREPARE_TIMEOUT_MS = 2_000;
+
+export const workingSetBytesFromProcessMemoryInfo = (info = {}) => {
+ const kilobytes = Number(info.private) || Number(info.residentSet) || 0;
+ return kilobytes > 0 ? kilobytes * 1024 : 0;
+};
+
+export const shouldHibernateRenderer = ({
+ focused = false,
+ visible = true,
+ quitting = false,
+ loading = false,
+ inFlight = false,
+ backgroundMs = 0,
+ workingSetBytes = 0,
+} = {}) => {
+ if (focused || quitting || loading || inFlight) return false;
+ if (backgroundMs >= RENDERER_HIBERNATE_MEMORY_BACKGROUND_MS && !visible && workingSetBytes >= RENDERER_HIBERNATE_MEMORY_BYTES) {
+ return true;
+ }
+ if (backgroundMs >= RENDERER_HIBERNATE_BACKGROUND_MS && (!visible || workingSetBytes >= RENDERER_HIBERNATE_MEMORY_BYTES)) {
+ return true;
+ }
+ return false;
+};
+
+export const nextHibernateCheckDelayMs = (backgroundMs = 0) => {
+ if (backgroundMs < RENDERER_HIBERNATE_MEMORY_BACKGROUND_MS) {
+ return RENDERER_HIBERNATE_MEMORY_BACKGROUND_MS - backgroundMs;
+ }
+ if (backgroundMs < RENDERER_HIBERNATE_BACKGROUND_MS) {
+ return RENDERER_HIBERNATE_BACKGROUND_MS - backgroundMs;
+ }
+ return RENDERER_HIBERNATE_BACKGROUND_MS;
+};
+
+export const createRendererHibernateController = ({
+ now = Date.now,
+ setTimer = setTimeout,
+ clearTimer = clearTimeout,
+ getBackgroundState,
+ getMemoryBytes,
+ prepareRenderer,
+ reloadRenderer,
+ onDiagnostic,
+} = {}) => {
+ let backgroundAt = null;
+ let timer = null;
+ let inFlight = false;
+
+ const clearScheduledCheck = () => {
+ if (timer === null) return;
+ clearTimer(timer);
+ timer = null;
+ };
+
+ const cancel = () => {
+ backgroundAt = null;
+ clearScheduledCheck();
+ };
+
+ const scheduleCheck = (delayMs) => {
+ clearScheduledCheck();
+ timer = setTimer(() => {
+ timer = null;
+ return tick();
+ }, Math.max(0, delayMs));
+ };
+
+ const tick = async () => {
+ const state = getBackgroundState?.() ?? {};
+ if (state.focused) {
+ cancel();
+ return;
+ }
+ if (backgroundAt === null) backgroundAt = now();
+ const backgroundMs = Math.max(0, now() - backgroundAt);
+ const workingSetBytes = await Promise.resolve(getMemoryBytes?.() ?? 0).catch(() => 0);
+ const shouldHibernate = shouldHibernateRenderer({
+ ...state,
+ inFlight,
+ backgroundMs,
+ workingSetBytes,
+ });
+ if (!shouldHibernate) {
+ if (!state.focused && !state.quitting) scheduleCheck(nextHibernateCheckDelayMs(backgroundMs));
+ return;
+ }
+
+ inFlight = true;
+ clearScheduledCheck();
+ onDiagnostic?.("renderer.hibernate-prepare", { backgroundMs, workingSetBytes, visible: state.visible });
+ try {
+ await Promise.resolve(prepareRenderer?.());
+ if (getBackgroundState?.().focused || getBackgroundState?.().quitting) return;
+ onDiagnostic?.("renderer.hibernate-reload", { backgroundMs, workingSetBytes });
+ await Promise.resolve(reloadRenderer?.());
+ } finally {
+ inFlight = false;
+ backgroundAt = null;
+ }
+ };
+
+ const noteBackground = () => {
+ const state = getBackgroundState?.() ?? {};
+ if (state.focused || state.quitting) {
+ cancel();
+ return;
+ }
+ if (backgroundAt === null) backgroundAt = now();
+ if (timer === null) scheduleCheck(nextHibernateCheckDelayMs(now() - backgroundAt));
+ };
+
+ return {
+ cancel,
+ noteBackground,
+ isInFlight: () => inFlight,
+ };
+};
diff --git a/apps/desktop/src/main/renderer-hibernate.test.mjs b/apps/desktop/src/main/renderer-hibernate.test.mjs
new file mode 100644
index 00000000..7e4ce9e5
--- /dev/null
+++ b/apps/desktop/src/main/renderer-hibernate.test.mjs
@@ -0,0 +1,161 @@
+import { describe, expect, test } from "bun:test";
+import { readFileSync } from "node:fs";
+import {
+ RENDERER_HIBERNATE_BACKGROUND_MS,
+ RENDERER_HIBERNATE_MEMORY_BACKGROUND_MS,
+ RENDERER_HIBERNATE_MEMORY_BYTES,
+ createRendererHibernateController,
+ nextHibernateCheckDelayMs,
+ shouldHibernateRenderer,
+ workingSetBytesFromProcessMemoryInfo,
+} from "./renderer-hibernate.mjs";
+
+describe("desktop renderer hibernate policy", () => {
+ test("never reloads a focused or loading renderer", () => {
+ expect(shouldHibernateRenderer({
+ focused: true,
+ visible: false,
+ backgroundMs: RENDERER_HIBERNATE_BACKGROUND_MS,
+ workingSetBytes: RENDERER_HIBERNATE_MEMORY_BYTES * 2,
+ })).toBe(false);
+ expect(shouldHibernateRenderer({
+ focused: false,
+ visible: false,
+ loading: true,
+ backgroundMs: RENDERER_HIBERNATE_BACKGROUND_MS,
+ })).toBe(false);
+ });
+
+ test("reloads a hidden renderer after the long background delay", () => {
+ expect(shouldHibernateRenderer({
+ focused: false,
+ visible: false,
+ backgroundMs: RENDERER_HIBERNATE_BACKGROUND_MS,
+ })).toBe(true);
+ });
+
+ test("reloads a hidden high-memory renderer after the short delay", () => {
+ expect(shouldHibernateRenderer({
+ focused: false,
+ visible: false,
+ backgroundMs: RENDERER_HIBERNATE_MEMORY_BACKGROUND_MS,
+ workingSetBytes: RENDERER_HIBERNATE_MEMORY_BYTES,
+ })).toBe(true);
+ expect(shouldHibernateRenderer({
+ focused: false,
+ visible: false,
+ backgroundMs: RENDERER_HIBERNATE_MEMORY_BACKGROUND_MS - 1,
+ workingSetBytes: RENDERER_HIBERNATE_MEMORY_BYTES,
+ })).toBe(false);
+ });
+
+ test("only reloads a visible unfocused renderer when memory is high", () => {
+ expect(shouldHibernateRenderer({
+ focused: false,
+ visible: true,
+ backgroundMs: RENDERER_HIBERNATE_BACKGROUND_MS,
+ workingSetBytes: RENDERER_HIBERNATE_MEMORY_BYTES - 1,
+ })).toBe(false);
+ expect(shouldHibernateRenderer({
+ focused: false,
+ visible: true,
+ backgroundMs: RENDERER_HIBERNATE_BACKGROUND_MS,
+ workingSetBytes: RENDERER_HIBERNATE_MEMORY_BYTES,
+ })).toBe(true);
+ });
+
+ test("converts Chromium process memory info to bytes", () => {
+ expect(workingSetBytesFromProcessMemoryInfo({ private: 800 * 1024 })).toBe(800 * 1024 * 1024);
+ expect(workingSetBytesFromProcessMemoryInfo({ residentSet: 12 })).toBe(12 * 1024);
+ expect(workingSetBytesFromProcessMemoryInfo({})).toBe(0);
+ });
+
+ test("checks memory shortly after backgrounding, then the long delay", () => {
+ expect(nextHibernateCheckDelayMs(0)).toBe(RENDERER_HIBERNATE_MEMORY_BACKGROUND_MS);
+ expect(nextHibernateCheckDelayMs(RENDERER_HIBERNATE_MEMORY_BACKGROUND_MS)).toBe(
+ RENDERER_HIBERNATE_BACKGROUND_MS - RENDERER_HIBERNATE_MEMORY_BACKGROUND_MS,
+ );
+ });
+});
+
+describe("desktop renderer hibernate controller", () => {
+ test("cancels a pending reload when the window is focused again", async () => {
+ const timers = [];
+ let now = 0;
+ let focused = false;
+ let reloaded = 0;
+ const controller = createRendererHibernateController({
+ now: () => now,
+ setTimer: (callback, delay) => {
+ const id = timers.length + 1;
+ timers.push({ id, callback, delay });
+ return id;
+ },
+ clearTimer: (id) => {
+ const index = timers.findIndex((timer) => timer.id === id);
+ if (index >= 0) timers.splice(index, 1);
+ },
+ getBackgroundState: () => ({ focused, visible: false, quitting: false, loading: false }),
+ getMemoryBytes: () => 0,
+ reloadRenderer: () => {
+ reloaded += 1;
+ },
+ });
+
+ controller.noteBackground();
+ expect(timers).toHaveLength(1);
+ focused = true;
+ const pending = timers.shift();
+ await pending.callback();
+ expect(reloaded).toBe(0);
+ expect(timers).toHaveLength(0);
+ });
+
+ test("reloads after the hidden delay and skips prepare if the user came back", async () => {
+ const timers = [];
+ let now = 0;
+ let focused = false;
+ const events = [];
+ const controller = createRendererHibernateController({
+ now: () => now,
+ setTimer: (callback, delay) => {
+ const id = timers.length + 1;
+ timers.push({ id, callback, delay });
+ return id;
+ },
+ clearTimer: (id) => {
+ const index = timers.findIndex((timer) => timer.id === id);
+ if (index >= 0) timers.splice(index, 1);
+ },
+ getBackgroundState: () => ({ focused, visible: false, quitting: false, loading: false }),
+ getMemoryBytes: () => 0,
+ prepareRenderer: async () => {
+ events.push("prepare");
+ },
+ reloadRenderer: () => {
+ events.push("reload");
+ },
+ });
+
+ controller.noteBackground();
+ now = RENDERER_HIBERNATE_MEMORY_BACKGROUND_MS;
+ await timers.shift().callback();
+ expect(events).toEqual([]);
+ now = RENDERER_HIBERNATE_BACKGROUND_MS;
+ await timers.shift().callback();
+ expect(events).toEqual(["prepare", "reload"]);
+ });
+});
+
+describe("desktop renderer hibernate wiring", () => {
+ test("reloads the existing webContents after a background persist handshake", () => {
+ const mainSource = readFileSync(new URL("./index.mjs", import.meta.url), "utf8");
+ const preloadSource = readFileSync(new URL("../preload/index.cjs", import.meta.url), "utf8");
+
+ expect(mainSource).toContain("createRendererHibernateController");
+ expect(mainSource).toContain('webContents.send("desktop:hibernate-prepare")');
+ expect(mainSource).toContain("webContents.reload()");
+ expect(preloadSource).toContain("onHibernatePrepare");
+ expect(preloadSource).toContain('ipcRenderer.send("desktop:hibernate-prepared")');
+ });
+});
diff --git a/apps/desktop/src/preload/index.cjs b/apps/desktop/src/preload/index.cjs
index f8136c0b..01e4b165 100644
--- a/apps/desktop/src/preload/index.cjs
+++ b/apps/desktop/src/preload/index.cjs
@@ -76,6 +76,17 @@ contextBridge.exposeInMainWorld("edgeeverDesktop", Object.freeze({
ipcRenderer.on("desktop:command", listener);
return () => ipcRenderer.removeListener("desktop:command", listener);
},
+ onHibernatePrepare: (callback) => {
+ const listener = async () => {
+ try {
+ await callback();
+ } finally {
+ ipcRenderer.send("desktop:hibernate-prepared");
+ }
+ };
+ ipcRenderer.on("desktop:hibernate-prepare", listener);
+ return () => ipcRenderer.removeListener("desktop:hibernate-prepare", listener);
+ },
syncScheduledTasks: (tasks) => ipcRenderer.invoke("desktop:sync-scheduled-tasks", tasks),
onScheduledTask: (callback) => {
const listener = (_event, payload) => callback(payload);
diff --git a/apps/web/src/components/EditorPane.tsx b/apps/web/src/components/EditorPane.tsx
index 10cf9c4c..75502e50 100644
--- a/apps/web/src/components/EditorPane.tsx
+++ b/apps/web/src/components/EditorPane.tsx
@@ -1753,10 +1753,10 @@ const RichEditorPane = ({
hydratedMemoIdRef.current !== currentMemo.id ||
(!useMobilePlainTextEditor && !isEditorReady(currentEditor))
) {
- return;
+ return Promise.resolve();
}
- void localDb.drafts.put({
+ return localDb.drafts.put({
memoId: currentMemo.id,
title: nextTitle,
tagsText: nextTagsText,
@@ -2496,13 +2496,9 @@ const RichEditorPane = ({
}, [memo]);
useEffect(() => {
- if (!useMobilePlainTextEditor) {
- return;
- }
-
const persistBeforeSuspend = () => {
if (hasUnsavedChangesRef.current) {
- persistCurrentDraft(title, tagsText, getMobilePlainTextValue());
+ void persistCurrentDraft(title, tagsText, getMobilePlainTextValue());
}
};
const persistWhenHidden = () => {
@@ -2513,12 +2509,16 @@ const RichEditorPane = ({
window.addEventListener("pagehide", persistBeforeSuspend);
document.addEventListener("visibilitychange", persistWhenHidden);
+ const stopHibernatePrepare = window.edgeeverDesktop?.onHibernatePrepare?.(async () => {
+ await persistCurrentDraft(title, tagsText, getMobilePlainTextValue());
+ });
return () => {
window.removeEventListener("pagehide", persistBeforeSuspend);
document.removeEventListener("visibilitychange", persistWhenHidden);
+ stopHibernatePrepare?.();
};
- }, [getMobilePlainTextValue, persistCurrentDraft, tagsText, title, useMobilePlainTextEditor]);
+ }, [getMobilePlainTextValue, persistCurrentDraft, tagsText, title]);
const saveMutation = useMutation({
mutationFn: async () => {
diff --git a/apps/web/src/components/WorkspaceApp.create-memo.test.mjs b/apps/web/src/components/WorkspaceApp.create-memo.test.mjs
index 77635ef4..212cfec2 100644
--- a/apps/web/src/components/WorkspaceApp.create-memo.test.mjs
+++ b/apps/web/src/components/WorkspaceApp.create-memo.test.mjs
@@ -37,6 +37,13 @@ describe("desktop create-note wiring", () => {
expect(workspaceSource).toContain("queryClient.prefetchQuery");
});
+ test("restores the last desktop memo after a renderer hibernate reload", () => {
+ expect(workspaceSource).toContain("readDesktopWorkspaceRestoreState");
+ expect(workspaceSource).toContain("writeDesktopWorkspaceRestoreState");
+ expect(workspaceSource).toContain("useWorkspaceSelection(desktopWorkspaceRestore)");
+ expect(editorSource).toContain("onHibernatePrepare");
+ });
+
test("keeps retrying create-note autofocus until the editor is editable and focused", () => {
expect(editorSource).toContain("shouldRetryCreatedMemoFocus");
expect(editorSource).toContain("isCreatedMemoEditorFocused");
diff --git a/apps/web/src/components/WorkspaceApp.tsx b/apps/web/src/components/WorkspaceApp.tsx
index b57b947d..94d6e44f 100644
--- a/apps/web/src/components/WorkspaceApp.tsx
+++ b/apps/web/src/components/WorkspaceApp.tsx
@@ -122,6 +122,11 @@ import { loadResolvedPluginMarketplace } from "@/lib/plugins/plugin-marketplace"
import { updateOfficialMarketplacePlugins } from "@/lib/plugins/plugin-updates";
import { createPublicNetworkAdapter } from "@/lib/plugins/public-network-adapter";
import { clearRendererRecoveryRequired, isRendererRecoveryRequired } from "@/lib/renderer-recovery";
+import {
+ readDesktopWorkspaceRestoreState,
+ shouldRestoreDesktopWorkspace,
+ writeDesktopWorkspaceRestoreState,
+} from "@/lib/desktop-workspace-restore";
import { EditorPaneErrorBoundary, EditorRecoveryPane } from "./EditorPaneErrorBoundary";
import { isMarkdownFile, readMarkdownFile } from "@/lib/markdown-file-import";
import { compressImageForUpload } from "@/lib/image-compression";
@@ -205,8 +210,15 @@ export const WorkspaceApp = ({
const [rendererRecoveryMode, setRendererRecoveryMode] = useState(() =>
Boolean(window.edgeeverDesktop?.recoveredAfterAbnormalExit) || isRendererRecoveryRequired()
);
+ const [desktopWorkspaceRestore] = useState(() => (
+ shouldRestoreDesktopWorkspace() && !isRendererRecoveryRequired()
+ ? readDesktopWorkspaceRestoreState()
+ : null
+ ));
const [activePane, setActivePane] = useState<Pane>(() => ((isInitialSettingsRoute || isInitialPluginsRoute || isInitialTemplatesRoute || isInitialAiPromptsRoute || isInitialExecutionCenterRoute) && !isInitialMobileEditorReturn ? "editor" : "memos"));
- const [memoView, setMemoView] = useState<MemoView>(() => (isTrashRoute ? "trash" : "notebook"));
+ const [memoView, setMemoView] = useState<MemoView>(() => (
+ isTrashRoute ? "trash" : desktopWorkspaceRestore?.memoView ?? "notebook"
+ ));
const {
beginMemoSelection,
clearMemoSelection,
@@ -222,12 +234,20 @@ export const WorkspaceApp = ({
setSelectedMemoIds,
setSelectedNotebookId,
setSelectionMoveTargetNotebookId,
- } = useWorkspaceSelection();
+ } = useWorkspaceSelection(desktopWorkspaceRestore);
const [selectedTag, setSelectedTag] = useState<string | null>(null);
const autoSelectedDemoNotebookRef = useRef(false);
const [createdMemoEditId, setCreatedMemoEditId] = useState<string | null>(null);
const pendingCreatedMemoIdRef = useRef<string | null>(null);
- const pendingQuickSwitcherMemoIdRef = useRef<string | null>(null); // also companion/plugin opens not yet in the list
+ const pendingQuickSwitcherMemoIdRef = useRef<string | null>(desktopWorkspaceRestore?.selectedMemoId ?? null); // also companion/plugin opens not yet in the list
+ useEffect(() => {
+ if (!window.edgeeverDesktop?.isAvailable) return;
+ writeDesktopWorkspaceRestoreState({
+ selectedMemoId,
+ selectedNotebookId,
+ memoView,
+ });
+ }, [memoView, selectedMemoId, selectedNotebookId]);
const creatingMemoSelectionRef = useRef(false);
const createMemoInFlightRef = useRef(false);
const memoDocumentActionIdRef = useRef(0);
diff --git a/apps/web/src/hooks/useWorkspaceSelection.ts b/apps/web/src/hooks/useWorkspaceSelection.ts
index 1b68fc89..77ded922 100644
--- a/apps/web/src/hooks/useWorkspaceSelection.ts
+++ b/apps/web/src/hooks/useWorkspaceSelection.ts
@@ -1,8 +1,11 @@
import { useCallback, useRef, useState } from "react";
-export const useWorkspaceSelection = () => {
- const [selectedNotebookId, setSelectedNotebookId] = useState<string | null>(null);
- const [selectedMemoId, setSelectedMemoId] = useState<string | null>(null);
+export const useWorkspaceSelection = (initial?: {
+ selectedMemoId?: string | null;
+ selectedNotebookId?: string | null;
+} | null) => {
+ const [selectedNotebookId, setSelectedNotebookId] = useState<string | null>(initial?.selectedNotebookId ?? null);
+ const [selectedMemoId, setSelectedMemoId] = useState<string | null>(initial?.selectedMemoId ?? null);
const selectedMemoIdRef = useRef(selectedMemoId);
selectedMemoIdRef.current = selectedMemoId;
const [selectedMemoIds, setSelectedMemoIds] = useState<Set<string>>(() => new Set());
diff --git a/apps/web/src/lib/desktop-workspace-restore.test.mjs b/apps/web/src/lib/desktop-workspace-restore.test.mjs
new file mode 100644
index 00000000..3bab686c
--- /dev/null
+++ b/apps/web/src/lib/desktop-workspace-restore.test.mjs
@@ -0,0 +1,52 @@
+import { describe, expect, test } from "bun:test";
+import {
+ DESKTOP_WORKSPACE_RESTORE_STORAGE_KEY,
+ readDesktopWorkspaceRestoreState,
+ shouldRestoreDesktopWorkspace,
+ writeDesktopWorkspaceRestoreState,
+} from "./desktop-workspace-restore.ts";
+
+const createStorage = (initial = {}) => {
+ const data = { ...initial };
+ return {
+ data,
+ getItem: (key) => data[key] ?? null,
+ setItem: (key, value) => {
+ data[key] = value;
+ },
+ };
+};
+
+describe("desktop workspace restore", () => {
+ test("round-trips the last notebook and memo", () => {
+ const storage = createStorage();
+
+ expect(writeDesktopWorkspaceRestoreState({
+ selectedMemoId: "memo_1",
+ selectedNotebookId: "nb_1",
+ memoView: "notebook",
+ }, storage)).toBe(true);
+ expect(readDesktopWorkspaceRestoreState(storage)).toEqual({
+ selectedMemoId: "memo_1",
+ selectedNotebookId: "nb_1",
+ memoView: "notebook",
+ });
+ expect(storage.data[DESKTOP_WORKSPACE_RESTORE_STORAGE_KEY]).toContain("memo_1");
+ });
+
+ test("ignores malformed session snapshots", () => {
+ expect(readDesktopWorkspaceRestoreState(createStorage({
+ [DESKTOP_WORKSPACE_RESTORE_STORAGE_KEY]: "{",
+ }))).toBeNull();
+ });
+
+ test("is only used in the desktop renderer", () => {
+ const previous = globalThis.window;
+ globalThis.window = { edgeeverDesktop: { isAvailable: true } };
+ try {
+ expect(shouldRestoreDesktopWorkspace()).toBe(true);
+ } finally {
+ globalThis.window = previous;
+ }
+ });
+});
diff --git a/apps/web/src/lib/desktop-workspace-restore.ts b/apps/web/src/lib/desktop-workspace-restore.ts
new file mode 100644
index 00000000..0b1d8493
--- /dev/null
+++ b/apps/web/src/lib/desktop-workspace-restore.ts
@@ -0,0 +1,50 @@
+import type { MemoView } from "@/lib/app-helpers";
+
+export const DESKTOP_WORKSPACE_RESTORE_STORAGE_KEY = "edgeever.desktop.workspace-restore";
+
+export type DesktopWorkspaceRestoreState = {
+ selectedMemoId: string | null;
+ selectedNotebookId: string | null;
+ memoView: MemoView;
+};
+
+const isMemoView = (value: unknown): value is MemoView => value === "notebook" || value === "trash";
+
+export const readDesktopWorkspaceRestoreState = (
+ storage: Pick<Storage, "getItem"> | null = typeof window === "undefined" ? null : window.sessionStorage,
+): DesktopWorkspaceRestoreState | null => {
+ if (!storage) return null;
+ try {
+ const raw = storage.getItem(DESKTOP_WORKSPACE_RESTORE_STORAGE_KEY);
+ if (!raw) return null;
+ const parsed = JSON.parse(raw) as Partial<DesktopWorkspaceRestoreState>;
+ return {
+ selectedMemoId: typeof parsed.selectedMemoId === "string" ? parsed.selectedMemoId : null,
+ selectedNotebookId: typeof parsed.selectedNotebookId === "string" ? parsed.selectedNotebookId : null,
+ memoView: isMemoView(parsed.memoView) ? parsed.memoView : "notebook",
+ };
+ } catch {
+ return null;
+ }
+};
+
+export const writeDesktopWorkspaceRestoreState = (
+ state: DesktopWorkspaceRestoreState,
+ storage: Pick<Storage, "setItem"> | null = typeof window === "undefined" ? null : window.sessionStorage,
+) => {
+ if (!storage) return false;
+ try {
+ storage.setItem(DESKTOP_WORKSPACE_RESTORE_STORAGE_KEY, JSON.stringify({
+ selectedMemoId: state.selectedMemoId,
+ selectedNotebookId: state.selectedNotebookId,
+ memoView: state.memoView,
+ }));
+ return true;
+ } catch {
+ return false;
+ }
+};
+
+export const shouldRestoreDesktopWorkspace = () =>
+ typeof window !== "undefined"
+ && window.edgeeverDesktop?.isAvailable === true;
diff --git a/apps/web/src/vite-env.d.ts b/apps/web/src/vite-env.d.ts
index 715d8e2c..aa46f5cf 100644
--- a/apps/web/src/vite-env.d.ts
+++ b/apps/web/src/vite-env.d.ts
@@ -76,6 +76,7 @@ interface EdgeEverDesktopBridge {
readResource(id: string): Promise<{ type: string; bytes: Uint8Array }>;
removeStagedResource(id: string): Promise<void>;
onCommand(callback: (command: string) => void): () => void;
+ onHibernatePrepare?(callback: () => void | Promise<void>): () => void;
syncScheduledTasks(tasks: import("@edgeever/shared").ScheduledTask[]): Promise<{ scheduled: number }>;
onScheduledTask(callback: (payload: {
task: import("@edgeever/shared").ScheduledTask;
diff --git a/package.json b/package.json
index 2a350954..cadfa84b 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
"release": "bun scripts/release.mjs",
"publish:stores": "bun scripts/store-delivery.mjs",
"test:desktop:sidecar": "bun scripts/test-desktop-sidecar.mjs",
- "test:desktop": "bun test apps/desktop/src/main/account-scope.test.mjs apps/desktop/src/main/app-protocol.test.mjs apps/desktop/src/main/child-process-start.test.mjs apps/desktop/src/main/clipboard-write.test.mjs apps/desktop/src/main/desktop-diagnostics.test.mjs apps/desktop/src/main/desktop-menu.test.mjs apps/desktop/src/main/desktop-update-flow.test.mjs apps/desktop/src/main/diagnostic-log.test.mjs apps/desktop/src/main/file-association.test.mjs apps/desktop/src/main/file-permissions.test.mjs apps/desktop/src/main/installation-location.test.mjs apps/desktop/src/main/local-data-reset.test.mjs apps/desktop/src/main/ai-direct.test.mjs apps/desktop/src/main/plugin-public-network.test.mjs apps/desktop/src/main/renderer-recovery.test.mjs apps/desktop/src/main/renderer-startup-guard.test.mjs apps/desktop/src/main/renderer-storage-migration.test.mjs apps/desktop/src/main/resource-request.test.mjs apps/desktop/src/main/resource-url.test.mjs apps/desktop/src/main/scheduled-task-scheduler.test.mjs apps/desktop/src/main/screenshot-capture.test.mjs apps/desktop/src/main/staged-resource.test.mjs apps/desktop/src/main/tray-icon.test.mjs apps/desktop/src/main/user-data-directory.test.mjs apps/desktop/src/main/window-open-policy.test.mjs apps/desktop/src/main/window-visibility.test.mjs apps/desktop/src/main/windows-update-trust.test.mjs apps/web/src/lib/api.test.mjs apps/web/src/lib/app-page-path.test.mjs apps/web/src/lib/clipboard.test.mjs apps/web/src/lib/desktop-renderer-ready.test.mjs apps/web/src/lib/desktop-repository.test.mjs apps/web/src/lib/desktop-resources.test.mjs apps/web/src/lib/desktop-sync.test.mjs apps/web/src/lib/local-mirror.test.mjs apps/web/src/lib/repository.test.mjs apps/web/src/lib/runtime.test.mjs apps/web/src/lib/screenshot-import.test.mjs apps/web/src/lib/sync-queue.test.mjs && bun run test:desktop:sidecar",
+ "test:desktop": "bun test apps/desktop/src/main/account-scope.test.mjs apps/desktop/src/main/app-protocol.test.mjs apps/desktop/src/main/child-process-start.test.mjs apps/desktop/src/main/clipboard-write.test.mjs apps/desktop/src/main/desktop-diagnostics.test.mjs apps/desktop/src/main/desktop-menu.test.mjs apps/desktop/src/main/desktop-update-flow.test.mjs apps/desktop/src/main/diagnostic-log.test.mjs apps/desktop/src/main/file-association.test.mjs apps/desktop/src/main/file-permissions.test.mjs apps/desktop/src/main/installation-location.test.mjs apps/desktop/src/main/local-data-reset.test.mjs apps/desktop/src/main/ai-direct.test.mjs apps/desktop/src/main/plugin-public-network.test.mjs apps/desktop/src/main/renderer-recovery.test.mjs apps/desktop/src/main/renderer-hibernate.test.mjs apps/desktop/src/main/renderer-startup-guard.test.mjs apps/desktop/src/main/renderer-storage-migration.test.mjs apps/desktop/src/main/resource-request.test.mjs apps/desktop/src/main/resource-url.test.mjs apps/desktop/src/main/scheduled-task-scheduler.test.mjs apps/desktop/src/main/screenshot-capture.test.mjs apps/desktop/src/main/staged-resource.test.mjs apps/desktop/src/main/tray-icon.test.mjs apps/desktop/src/main/user-data-directory.test.mjs apps/desktop/src/main/window-open-policy.test.mjs apps/desktop/src/main/window-visibility.test.mjs apps/desktop/src/main/windows-update-trust.test.mjs apps/web/src/lib/api.test.mjs apps/web/src/lib/app-page-path.test.mjs apps/web/src/lib/clipboard.test.mjs apps/web/src/lib/desktop-renderer-ready.test.mjs apps/web/src/lib/desktop-workspace-restore.test.mjs apps/web/src/lib/desktop-repository.test.mjs apps/web/src/lib/desktop-resources.test.mjs apps/web/src/lib/desktop-sync.test.mjs apps/web/src/lib/local-mirror.test.mjs apps/web/src/lib/repository.test.mjs apps/web/src/lib/runtime.test.mjs apps/web/src/lib/screenshot-import.test.mjs apps/web/src/lib/sync-queue.test.mjs && bun run test:desktop:sidecar",
"verify:desktop-renderer": "bun scripts/verify-desktop-renderer.mjs",
"verify:renderer-origin-migration": "bun run --cwd apps/desktop verify-origin-migration",
"verify:desktop-cross-version-startup": "bun scripts/verify-desktop-cross-version-startup.mjs",