Merge branch 'main' into feat/extra-window

apps/client/src/components/app_context.ts

@@ -154,7 +154,6 @@ export type CommandMappings = {
     };
     openInTab: ContextMenuCommandData;
     openNoteInSplit: ContextMenuCommandData;
-    openNoteInWindow: ContextMenuCommandData;
     openNoteInPopup: ContextMenuCommandData;
     toggleNoteHoisting: ContextMenuCommandData;
     insertNoteAfter: ContextMenuCommandData;
@@ -542,6 +541,7 @@ export type FilteredCommandNames<T extends CommandData> = keyof Pick<CommandMapp
 
 export class AppContext extends Component {
     isMainWindow: boolean;
+    windowId: string;
     components: Component[];
     beforeUnloadListeners: (WeakRef<BeforeUploadListener> | (() => boolean))[];
     tabManager!: TabManager;
@@ -550,10 +550,11 @@ export class AppContext extends Component {
 
     lastSearchString?: string;
 
-    constructor(isMainWindow: boolean) {
+    constructor(isMainWindow: boolean, windowId: string) {
         super();
 
         this.isMainWindow = isMainWindow;
+        this.windowId = windowId;
         // non-widget/layout components needed for the application
         this.components = [];
         this.beforeUnloadListeners = [];
@@ -683,8 +684,7 @@ export class AppContext extends Component {
         this.beforeUnloadListeners = this.beforeUnloadListeners.filter(l => l !== listener);
     }
 }
-
-const appContext = new AppContext(window.glob.isMainWindow);
+const appContext = new AppContext(window.glob.isMainWindow, window.glob.windowId);
 
 // we should save all outstanding changes before the page/app is closed
 $(window).on("beforeunload", () => {

apps/client/src/components/entrypoints.ts

@@ -142,14 +142,15 @@ export default class Entrypoints extends Component {
     }
 
     async openInWindowCommand({ notePath, hoistedNoteId, viewScope }: NoteCommandData) {
+        const extraWindowId = utils.randomString(4);
         const extraWindowHash = linkService.calculateHash({ notePath, hoistedNoteId, viewScope });
 
         if (utils.isElectron()) {
             const { ipcRenderer } = utils.dynamicRequire("electron");
 
-            ipcRenderer.send("create-extra-window", { extraWindowHash });
+            ipcRenderer.send("create-extra-window", { extraWindowId, extraWindowHash });
         } else {
-            const url = `${window.location.protocol}//${window.location.host}${window.location.pathname}?extraWindow=1${extraWindowHash}`;
+            const url = `${window.location.protocol}//${window.location.host}${window.location.pathname}?extraWindow=${extraWindowId}${extraWindowHash}`;
 
             window.open(url, "", "width=1000,height=800");
         }

apps/client/src/components/tab_manager.ts

@@ -11,6 +11,8 @@ import linkService from "../services/link.js";
 import type { EventData } from "./app_context.js";
 import type FNote from "../entities/fnote.js";
 
+const MAX_SAVED_WINDOWS = 10;
+
 interface TabState {
     contexts: NoteContext[];
     position: number;
@@ -25,6 +27,13 @@ interface NoteContextState {
     viewScope: Record<string, any>;
 }
 
+interface WindowState {
+    windowId: string;
+    createdAt: number;
+    closedAt: number;
+    contexts: NoteContextState[];
+}
+
 export default class TabManager extends Component {
     public children: NoteContext[];
     public mutex: Mutex;
@@ -41,9 +50,6 @@ export default class TabManager extends Component {
         this.recentlyClosedTabs = [];
 
         this.tabsUpdate = new SpacedUpdate(async () => {
-            if (!appContext.isMainWindow) {
-                return;
-            }
             if (options.is("databaseReadonly")) {
                 return;
             }
@@ -52,9 +58,21 @@ export default class TabManager extends Component {
                 .map((nc) => nc.getPojoState())
                 .filter((t) => !!t);
 
-            await server.put("options", {
-                openNoteContexts: JSON.stringify(openNoteContexts)
-            });
+            // Update the current window’s openNoteContexts in options    
+            const savedWindows = options.getJson("openNoteContexts") || [];
+            const win = savedWindows.find((w: WindowState) => w.windowId === appContext.windowId);
+            if (win) {
+                win.contexts = openNoteContexts;
+            } else {
+                savedWindows.push({
+                    windowId: appContext.windowId,
+                    createdAt: Date.now(),
+                    closedAt: 0,
+                    contexts: openNoteContexts
+                } as WindowState);
+            }
+
+            await options.save("openNoteContexts", JSON.stringify(savedWindows));
         });
 
         appContext.addBeforeUnloadListener(this);
@@ -69,8 +87,13 @@ export default class TabManager extends Component {
     }
 
     async loadTabs() {
+        // Get the current window’s openNoteContexts
+        const savedWindows = options.getJson("openNoteContexts") || [];
+        const currentWin = savedWindows.find(w => w.windowId === appContext.windowId);
+        const openNoteContexts = currentWin ? currentWin.contexts : undefined;
+
         try {
-            const noteContextsToOpen = (appContext.isMainWindow && options.getJson("openNoteContexts")) || [];
+            const noteContextsToOpen = openNoteContexts || [];
 
             // preload all notes at once
             await froca.getNotes([...noteContextsToOpen.flatMap((tab: NoteContextState) =>
@@ -119,6 +142,51 @@ export default class TabManager extends Component {
                 }
             });
 
+            // Save window contents
+            if (currentWin as WindowState) {
+                currentWin.createdAt = Date.now();
+                currentWin.closedAt = 0;
+                currentWin.contexts = filteredNoteContexts;
+            } else {
+                if (savedWindows?.length >= MAX_SAVED_WINDOWS) {
+                    // Filter out the oldest entry
+                    // 1) Never remove the "main" window
+                    // 2) Prefer removing the oldest closed window (closedAt !== 0)
+                    // 3) If no closed window exists, remove the window with the oldest created window
+                    let oldestClosedIndex = -1;
+                    let oldestClosedTime = Infinity;
+                    let oldestCreatedIndex = -1;
+                    let oldestCreatedTime = Infinity;
+                    savedWindows.forEach((w: WindowState, i: number) => {
+                        if (w.windowId === "main") return;
+                        if (w.closedAt !== 0) {
+                            if (w.closedAt < oldestClosedTime) {
+                                oldestClosedTime = w.closedAt;
+                                oldestClosedIndex = i;
+                            }
+                        } else {
+                            if (w.createdAt < oldestCreatedTime) {
+                                oldestCreatedTime = w.createdAt;
+                                oldestCreatedIndex = i;
+                            }
+                        }
+                    });
+                    const indexToRemove = oldestClosedIndex !== -1 ? oldestClosedIndex : oldestCreatedIndex;
+                    if (indexToRemove !== -1) {
+                        savedWindows.splice(indexToRemove, 1);
+                    }
+                }
+
+                savedWindows.push({
+                    windowId: appContext.windowId,
+                    createdAt: Date.now(),
+                    closedAt: 0,
+                    contexts: filteredNoteContexts
+                } as WindowState);
+            }
+
+            await options.save("openNoteContexts", JSON.stringify(savedWindows));
+
             // if there's a notePath in the URL, make sure it's open and active
             // (useful, for e.g., opening clipped notes from clipper or opening link in an extra window)
             if (parsedFromUrl.notePath) {

apps/client/src/menus/tree_context_menu.ts

@@ -79,7 +79,6 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
         const items: (MenuItem<TreeCommandNames> | null)[] = [
             { title: t("tree-context-menu.open-in-a-new-tab"), command: "openInTab", shortcut: "Ctrl+Click", uiIcon: "bx bx-link-external", enabled: noSelectedNotes },
             { title: t("tree-context-menu.open-in-a-new-split"), command: "openNoteInSplit", uiIcon: "bx bx-dock-right", enabled: noSelectedNotes },
-            { title: t("tree-context-menu.open-in-a-new-window"), command: "openNoteInWindow", uiIcon: "bx bx-window-open", enabled: noSelectedNotes },
             { title: t("tree-context-menu.open-in-popup"), command: "openNoteInPopup", uiIcon: "bx bx-edit", enabled: noSelectedNotes },
 
             isHoisted
@@ -310,11 +309,6 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
             const { ntxId } = subContexts?.[subContexts.length - 1] ?? {};
 
             this.treeWidget.triggerCommand("openNewNoteSplit", { ntxId, notePath });
-        } else if (command === "openNoteInWindow") {
-            appContext.triggerCommand("openInWindow", {
-                notePath,
-                hoistedNoteId: appContext.tabManager.getActiveContext()?.hoistedNoteId
-            });
         } else if (command === "openNoteInPopup") {
             appContext.triggerCommand("openInPopup", { noteIdOrPath: notePath })
         } else if (command === "convertNoteToAttachment") {

apps/client/src/services/froca_updater.ts

@@ -27,10 +27,6 @@ async function processEntityChanges(entityChanges: EntityChange[]) {
                 loadResults.addRevision(ec.entityId, ec.noteId, ec.componentId);
             } else if (ec.entityName === "options") {
                 const attributeEntity = ec.entity as FAttributeRow;
-                if (attributeEntity.name === "openNoteContexts") {
-                    continue; // only noise
-                }
-
                 options.set(attributeEntity.name as OptionNames, attributeEntity.value);
                 loadResults.addOption(attributeEntity.name as OptionNames);
             } else if (ec.entityName === "attachments") {

apps/client/src/test/setup.ts

@@ -13,7 +13,8 @@ function injectGlobals() {
     uncheckedWindow.$ = $;
     uncheckedWindow.WebSocket = () => {};
     uncheckedWindow.glob = {
-        isMainWindow: true
+        isMainWindow: true,
+        windowId: "main"
     };
 }
 

apps/client/src/translations/en/translation.json

@@ -1643,7 +1643,6 @@
   "tree-context-menu": {
     "open-in-a-new-tab": "Open in a new tab",
     "open-in-a-new-split": "Open in a new split",
-    "open-in-a-new-window": "Open in a new window",
     "insert-note-after": "Insert note after",
     "insert-child-note": "Insert child note",
     "archive": "Archive",

apps/client/src/types.d.ts

@@ -36,6 +36,7 @@ interface CustomGlobals {
     isProtectedSessionAvailable: boolean;
     isDev: boolean;
     isMainWindow: boolean;
+    windowId: string;
     maxEntityChangeIdAtLoad: number;
     maxEntityChangeSyncIdAtLoad: number;
     assetPath: string;

apps/desktop/src/main.ts

@@ -6,6 +6,7 @@ import sqlInit from "@triliumnext/server/src/services/sql_init.js";
 import windowService from "@triliumnext/server/src/services/window.js";
 import tray from "@triliumnext/server/src/services/tray.js";
 import options from "@triliumnext/server/src/services/options.js";
+
 import electronDebug from "electron-debug";
 import electronDl from "electron-dl";
 import { PRODUCT_NAME } from "./app-info";
@@ -69,10 +70,12 @@ async function main() {
         globalShortcut.unregisterAll();
     });
 
-    app.on("second-instance", (event, commandLine) => {
+    app.on("second-instance", async (event, commandLine) => {
         const lastFocusedWindow = windowService.getLastFocusedWindow();
         if (commandLine.includes("--new-window")) {
-            windowService.createExtraWindow("");
+            const randomString = (await import("@triliumnext/server/src/services/utils.js")).randomString;
+            const extraWindowId = randomString(4);
+            windowService.createExtraWindow(extraWindowId, "");
         } else if (lastFocusedWindow) {
             if (lastFocusedWindow.isMinimized()) {
                 lastFocusedWindow.restore();
@@ -124,7 +127,8 @@ async function onReady() {
                 }
             });
         }
-
+        
+        await normalizeOpenNoteContexts();
         tray.createTray();
     } else {
         await windowService.createSetupWindow();
@@ -133,6 +137,30 @@ async function onReady() {
     await windowService.registerGlobalShortcuts();
 }
 
+/**
+ * Some windows may have closed abnormally, leaving closedAt as 0 in openNoteContexts.
+ * This function normalizes those timestamps to the current time for correct sorting/filtering.
+ */
+async function normalizeOpenNoteContexts() {
+    const savedWindows = options.getOptionJson("openNoteContexts") || [];
+    const now = Date.now();
+
+    let changed = false;
+    for (const win of savedWindows) {
+        if (win.windowId !== "main" && win.closedAt === 0) {
+            win.closedAt = now;
+            changed = true;
+        }
+    }
+    
+    if (changed) {
+        const { default: cls } = (await import("@triliumnext/server/src/services/cls.js"));
+        cls.wrap(() => {
+            options.setOption("openNoteContexts", JSON.stringify(savedWindows));
+        })();
+    }
+}
+
 function getElectronLocale() {
     const uiLocale = options.getOptionOrNull("locale");
     const formattingLocale = options.getOptionOrNull("formattingLocale");

apps/server-e2e/src/note_types/text.spec.ts

@@ -42,7 +42,7 @@ test("Highlights list is displayed", async ({ page, context }) => {
     await app.closeAllTabs();
     await app.goToNoteInNewTab("Highlights list");
 
-    await expect(app.sidebar).toContainText("Highlights List");
+    await expect(app.sidebar).toContainText(/highlights/i);
     const rootList = app.sidebar.locator(".highlights-list ol");
     let index = 0;
     for (const highlightedEl of ["Bold 1", "Italic 1", "Underline 1", "Colored text 1", "Background text 1", "Bold 2", "Italic 2", "Underline 2", "Colored text 2", "Background text 2"]) {

apps/server-e2e/src/support/app.ts

@@ -59,7 +59,7 @@ export default class App {
 
         // Wait for the page to load.
         if (url === "/") {
-            await expect(this.page.locator(".tree")).toContainText("Trilium Integration Test");
+            await expect(this.noteTree).toContainText("Trilium Integration Test");
             if (!preserveTabs) {
                 await this.closeAllTabs();
             }

apps/server/src/assets/translations/en/server.json

@@ -382,6 +382,8 @@
     "tooltip": "Trilium Notes",
     "close": "Quit Trilium",
     "recents": "Recent notes",
+    "recently-closed-windows": "Recently closed windows",
+    "tabs-total": "{{number}} tabs total",
     "bookmarks": "Bookmarks",
     "today": "Open today's journal note",
     "new-note": "New note",

apps/server/src/assets/views/desktop.ejs

@@ -15,7 +15,7 @@
 </head>
 <body
   id="trilium-app"
-  class="desktop heading-style-<%= headingStyle %> layout-<%= layoutOrientation %> platform-<%= platform %> <%= isElectron ? 'electron' : '' %> <%= hasNativeTitleBar ? 'native-titlebar' : '' %> <%= hasBackgroundEffects ? 'background-effects' : '' %>"
+  class="desktop heading-style-<%= headingStyle %> layout-<%= layoutOrientation %> platform-<%= platform %> <%= isElectron ? 'electron' : '' %> <%= hasNativeTitleBar ? 'native-titlebar' : '' %> <%= hasBackgroundEffects ? 'background-effects' : '' %> <%= isMainWindow ? '' : 'extra-window' %>"
   lang="<%= currentLocale.id %>" dir="<%= currentLocale.rtl ? 'rtl' : 'ltr' %>"
 >
 <noscript><%= t("javascript-required") %></noscript>

apps/server/src/assets/views/partials/windowGlobal.ejs

@@ -12,6 +12,7 @@
         isDev: <%= isDev %>,
         appCssNoteIds: <%- JSON.stringify(appCssNoteIds) %>,
         isMainWindow: <%= isMainWindow %>,
+        windowId: "<%= windowId %>",
         isProtectedSessionAvailable: <%= isProtectedSessionAvailable %>,
         triliumVersion: "<%= triliumVersion %>",
         assetPath: "<%= assetPath %>",

apps/server/src/migrations/0234__migrate_open_note_contexts_format.ts

@@ -0,0 +1,48 @@
+import cls from "../services/cls.js";
+import sql from "../services/sql.js";
+
+export default () => {
+    cls.init(() => {
+        const row = sql.getRow<{ value: string }>(
+            `SELECT value FROM options WHERE name = 'openNoteContexts'`
+        );
+
+        if (!row || !row.value) {
+            return;
+        }
+
+        let parsed: any;
+        try {
+            parsed = JSON.parse(row.value);
+        } catch {
+            return;
+        }
+
+        // Already in new format (array + windowId), skip
+        if (
+            Array.isArray(parsed) &&
+            parsed.length > 0 &&
+            parsed[0] &&
+            typeof parsed[0] === "object" &&
+            parsed[0].windowId
+        ) {
+            return;
+        }
+
+        // Old format: just contexts
+        const migrated = [
+            {
+                windowId: "main",
+                createdAt: 0,
+                closedAt: 0,
+                contexts: parsed
+            }
+        ];
+
+        sql.execute(
+            `UPDATE options SET value = ? WHERE name = 'openNoteContexts'`,
+            [JSON.stringify(migrated)]
+        );
+
+    });
+};

apps/server/src/migrations/migrations.ts

@@ -6,6 +6,11 @@
 
 // Migrations should be kept in descending order, so the latest migration is first.
 const MIGRATIONS: (SqlMigration | JsMigration)[] = [
+    // Migrate openNoteContexts option to the new structured format with window metadata
+    {
+        version: 234,
+        module: async () => import("./0234__migrate_open_note_contexts_format")
+    },
     // Migrate geo map to collection
     {
         version: 233,

apps/server/src/routes/index.ts

@@ -56,6 +56,7 @@ function index(req: Request, res: Response) {
         appCssNoteIds: getAppCssNoteIds(),
         isDev,
         isMainWindow: view === "mobile" ? true : !req.query.extraWindow,
+        windowId: view !== "mobile" && req.query.extraWindow ? req.query.extraWindow : "main",
         isProtectedSessionAvailable: protectedSessionService.isProtectedSessionAvailable(),
         triliumVersion: packageJson.version,
         assetPath,

apps/server/src/services/app_info.ts

@@ -4,7 +4,7 @@ import packageJson from "../../package.json" with { type: "json" };
 import dataDir from "./data_dir.js";
 import { AppInfo } from "@triliumnext/commons";
 
-const APP_DB_VERSION = 233;
+const APP_DB_VERSION = 234;
 const SYNC_VERSION = 36;
 const CLIPPER_PROTOCOL_VERSION = "1.0";
 

apps/server/src/services/options.ts

@@ -72,6 +72,19 @@ function getOptionBool(name: FilterOptionsByType<boolean>): boolean {
     return val === "true";
 }
 
+function getOptionJson(name: OptionNames) {
+    const val = getOptionOrNull(name);
+
+    if (typeof val !== "string") {
+        return null;
+    }
+    try {
+        return JSON.parse(val);
+    } catch (e) {
+        return null;
+    }
+}
+
 function setOption<T extends OptionNames>(name: T, value: string | OptionDefinitions[T]) {
     const option = becca.getOption(name);
 
@@ -137,6 +150,7 @@ export default {
     getOption,
     getOptionInt,
     getOptionBool,
+    getOptionJson,
     setOption,
     createOption,
     getOptions,

apps/server/src/services/options_init.ts

@@ -45,8 +45,15 @@ async function initNotSyncedOptions(initialized: boolean, opts: NotSyncedOpts =
         "openNoteContexts",
         JSON.stringify([
             {
-                notePath: "root",
-                active: true
+                windowId: "main",
+                createdAt: 0,
+                closedAt: 0,
+                contexts: [
+                    {
+                        notePath: "root",
+                        active: true
+                    }
+                ]
             }
         ]),
         false
@@ -257,8 +264,15 @@ function initStartupOptions() {
             "openNoteContexts",
             JSON.stringify([
                 {
-                    notePath: process.env.TRILIUM_START_NOTE_ID || "root",
-                    active: true
+                    windowId: "main",
+                    createdAt: 0,
+                    closedAt: 0,
+                    contexts: [
+                        {
+                            notePath: process.env.TRILIUM_START_NOTE_ID || "root",
+                            active: true
+                        }
+                    ]
                 }
             ])
         );

apps/server/src/services/sql_init.ts

@@ -147,8 +147,15 @@ async function createInitialDatabase(skipDemoDb?: boolean) {
             "openNoteContexts",
             JSON.stringify([
                 {
-                    notePath: startNoteId,
-                    active: true
+                    windowId: "main",
+                    createdAt: 0,
+                    closedAt: 0,
+                    contexts: [
+                        {
+                            notePath: startNoteId,
+                            active: true
+                        }
+                    ]
                 }
             ])
         );

apps/server/src/services/tray.ts

@@ -196,6 +196,39 @@ function updateTrayMenu() {
         return menuItems;
     }
 
+    function buildClosedWindowsMenu() {
+        const savedWindows = optionService.getOptionJson("openNoteContexts") || [];
+        const openedWindowIds = windowService.getAllWindowIds();
+        const closedWindows = savedWindows
+            .filter(win => !openedWindowIds.includes(win.windowId))
+            .sort((a, b) => { return a.closedAt - b.closedAt; });  // sort by time in ascending order
+        const menuItems: Electron.MenuItemConstructorOptions[] = [];
+        
+        for (let i = closedWindows.length - 1; i >= 0; i--) {
+            const win = closedWindows[i];
+            const activeCtx = win.contexts.find(c => c.active === true);
+            const activateNotePath = (activeCtx ?? win.contexts[0])?.notePath;
+            const activateNoteId = activateNotePath?.split("/").pop() ?? null;
+            if (!activateNoteId) continue;
+            
+            // Get the title of the closed window
+            const winTitle = (() => {
+                const raw = becca_service.getNoteTitle(activateNoteId);
+                const truncated = raw.length > 20 ? `${raw.slice(0, 17)}…` : raw;
+                const tabCount = win.contexts.filter(ctx => ctx.mainNtxId === null).length;
+                return tabCount > 1 ? `${truncated} (${t("tray.tabs-total", { number: tabCount })})` : truncated;
+            })();
+
+            menuItems.push({
+                label: winTitle,
+                type: "normal",
+                click: () => win.windowId !== "main" ? windowService.createExtraWindow(win.windowId, "") : windowService.createMainWindow()
+            });
+        }
+
+        return menuItems;
+    }
+
     const windowVisibilityMenuItems: Electron.MenuItemConstructorOptions[] = [];
 
     // Only call getWindowTitle if windowVisibilityMap has more than one window
@@ -258,6 +291,12 @@ function updateTrayMenu() {
             icon: getIconPath("recents"),
             submenu: buildRecentNotesMenu()
         },
+        {
+            label: t("tray.recently-closed-windows"),
+            type: "submenu",
+            icon: getIconPath("closed-windows"),
+            submenu: buildClosedWindowsMenu()
+        },
         { type: "separator" },
         {
             label: t("tray.close"),

apps/server/src/services/window.ts

@@ -16,28 +16,45 @@ import { formatDownloadTitle, isMac, isWindows } from "./utils.js";
 // Prevent the window being garbage collected
 let mainWindow: BrowserWindow | null;
 let setupWindow: BrowserWindow | null;
-let allWindows: BrowserWindow[] = []; // // Used to store all windows, sorted by the order of focus.
 
-function trackWindowFocus(win: BrowserWindow) {
+interface WindowEntry {
+    window: BrowserWindow;
+    windowId: string; // custom window ID
+}
+let allWindowEntries: WindowEntry[] = [];
+
+function trackWindowFocus(win: BrowserWindow, windowId: string) {
     // We need to get the last focused window from allWindows. If the last window is closed, we return the previous window.
     // Therefore, we need to push the window into the allWindows array every time it gets focused.
     win.on("focus", () => {
-        allWindows = allWindows.filter(w => !w.isDestroyed() && w !== win);
-        allWindows.push(win);
+        allWindowEntries = allWindowEntries.filter(w => !w.window.isDestroyed() && w.window !== win);
+        allWindowEntries.push({ window: win, windowId: windowId });
+
         if (!optionService.getOptionBool("disableTray")) {
             electron.ipcMain.emit("reload-tray");
         }
     });
 
     win.on("closed", () => {
-        allWindows = allWindows.filter(w => !w.isDestroyed());
+        cls.wrap(() => {
+            const savedWindows = optionService.getOptionJson("openNoteContexts") || [];
+
+            const win = savedWindows.find(w => w.windowId === windowId);
+            if (win) {
+                win.closedAt = Date.now();
+            }
+
+            optionService.setOption("openNoteContexts", JSON.stringify(savedWindows));
+        })();
+        
+        allWindowEntries = allWindowEntries.filter(w => !w.window.isDestroyed());
         if (!optionService.getOptionBool("disableTray")) {
             electron.ipcMain.emit("reload-tray");
         }
     });
 }
 
-async function createExtraWindow(extraWindowHash: string) {
+async function createExtraWindow(extraWindowId: string, extraWindowHash: string) {
     const spellcheckEnabled = optionService.getOptionBool("spellCheckEnabled");
 
     const { BrowserWindow } = await import("electron");
@@ -56,15 +73,15 @@ async function createExtraWindow(extraWindowHash: string) {
     });
 
     win.setMenuBarVisibility(false);
-    win.loadURL(`http://127.0.0.1:${port}/?extraWindow=1${extraWindowHash}`);
+    win.loadURL(`http://127.0.0.1:${port}/?extraWindow=${extraWindowId}${extraWindowHash}`);
 
     configureWebContents(win.webContents, spellcheckEnabled);
 
-    trackWindowFocus(win);
+    trackWindowFocus(win, extraWindowId);
 }
 
 electron.ipcMain.on("create-extra-window", (event, arg) => {
-    createExtraWindow(arg.extraWindowHash);
+    createExtraWindow(arg.extraWindowId, arg.extraWindowHash);
 });
 
 interface PrintOpts {
@@ -168,8 +185,8 @@ async function getBrowserWindowForPrinting(e: IpcMainEvent, notePath: string, ac
     return { browserWindow, printReport };
 }
 
-async function createMainWindow(app: App) {
-    if ("setUserTasks" in app) {
+async function createMainWindow(app?: App) {
+    if (app && "setUserTasks" in app) {
         app.setUserTasks([
             {
                 program: process.execPath,
@@ -219,7 +236,7 @@ async function createMainWindow(app: App) {
     mainWindow.on("closed", () => (mainWindow = null));
 
     configureWebContents(mainWindow.webContents, spellcheckEnabled);
-    trackWindowFocus(mainWindow);
+    trackWindowFocus(mainWindow, "main");
 }
 
 function getWindowExtraOpts() {
@@ -381,11 +398,15 @@ function getMainWindow() {
 }
 
 function getLastFocusedWindow() {
-    return allWindows.length > 0 ? allWindows[allWindows.length - 1] : null;
+    return allWindowEntries.length > 0 ? allWindowEntries[allWindowEntries.length - 1]?.window : null;
 }
 
 function getAllWindows() {
-    return allWindows;
+    return allWindowEntries.map(e => e.window);
+}
+
+function getAllWindowIds(): string[] {
+    return allWindowEntries.map(e => e.windowId);
 }
 
 export default {
@@ -396,5 +417,6 @@ export default {
     registerGlobalShortcuts,
     getMainWindow,
     getLastFocusedWindow,
-    getAllWindows
+    getAllWindows,
+    getAllWindowIds
 };