+30

backend/electron/ipc.ts

reviewed

··· 2163 2163 winOptions.y = parseInt(options.y); 2164 2164 } 2165 2165 2166 2166 + // Off-screen bounds validation: if explicit x/y were provided, verify the 2167 2167 + // center point falls on an active display. If not (e.g. monitor disconnected), 2168 2168 + // drop x/y so the window centers on the current display instead. 2169 2169 + if (winOptions.x !== undefined && winOptions.y !== undefined) { 2170 2170 + const centerX = winOptions.x + Math.round(((winOptions.width as number) || 800) / 2); 2171 2171 + const centerY = winOptions.y + Math.round(((winOptions.height as number) || 600) / 2); 2172 2172 + const displays = screen.getAllDisplays(); 2173 2173 + const onScreen = displays.some(d => { 2174 2174 + const { x: dx, y: dy, width: dw, height: dh } = d.bounds; 2175 2175 + return centerX >= dx && centerX < dx + dw && centerY >= dy && centerY < dy + dh; 2176 2176 + }); 2177 2177 + if (!onScreen) { 2178 2178 + DEBUG && console.log(`[window-open] Dropping off-screen position (${winOptions.x},${winOptions.y}) center=(${centerX},${centerY})`); 2179 2179 + delete winOptions.x; 2180 2180 + delete winOptions.y; 2181 2181 + } 2182 2182 + } 2183 2183 + 2166 2184 // Determine opener window and whether it's a real content parent 2167 2185 // Background/infrastructure windows (background.html, extension-host.html) are 2168 2186 // not real parents — they're just the IPC sender. Only content windows count ··· 4832 4850 cancelled: false, 4833 4851 ...result, 4834 4852 }; 4853 4853 + } catch (error) { 4854 4854 + const message = error instanceof Error ? error.message : String(error); 4855 4855 + return { success: false, error: message }; 4856 4856 + } 4857 4857 + }); 4858 4858 + 4859 4859 + // Save group workspace layouts on demand (called from groups extension) 4860 4860 + ipcMain.handle('save-group-workspaces', async () => { 4861 4861 + try { 4862 4862 + const { saveGroupWorkspaces } = await import('./session.js'); 4863 4863 + saveGroupWorkspaces(); 4864 4864 + return { success: true }; 4835 4865 } catch (error) { 4836 4866 const message = error instanceof Error ? error.message : String(error); 4837 4867 return { success: false, error: message };

+87

backend/electron/session.ts

reviewed

··· 271 271 `).run('session-metadata', JSON.stringify(metadata), Date.now()); 272 272 273 273 DEBUG && console.log(`[session] Session snapshot saved successfully`); 274 274 + 275 275 + // Also save per-group workspace snapshots (for group layout restore) 276 276 + saveGroupWorkspaces(); 274 277 } catch (error) { 275 278 console.error('[session] Failed to save session snapshot:', error); 276 279 } ··· 747 750 DEBUG && console.log(`[session] Autosave interval changed: ${_autosaveIntervalMinutes} -> ${intervalMinutes}`); 748 751 startAutosaveTimer(intervalMinutes); 749 752 } 753 753 + } 754 754 + 755 755 + /** 756 756 + * Save per-group workspace snapshots to extension_settings. 757 757 + * 758 758 + * Groups windows by their group mode context and writes a layout snapshot 759 759 + * for each group. Used by openGroup() to restore window positions. 760 760 + * Synchronous (safe for before-quit handler). 761 761 + */ 762 762 + export function saveGroupWorkspaces(): void { 763 763 + let db; 764 764 + try { 765 765 + db = getDb(); 766 766 + } catch { 767 767 + return; 768 768 + } 769 769 + 770 770 + const registeredWindows = getAllWindows(); 771 771 + 772 772 + // Use BrowserWindow.getAllWindows() order for z-order approximation 773 773 + const allBrowserWindows = BrowserWindow.getAllWindows(); 774 774 + const zOrderMap = new Map<number, number>(); 775 775 + allBrowserWindows.forEach((win, index) => { 776 776 + zOrderMap.set(win.id, index); 777 777 + }); 778 778 + 779 779 + // Collect windows grouped by groupId 780 780 + const groupWindows = new Map<string, { groupName: string; windows: Array<{ url: string; bounds: Electron.Rectangle; zOrder: number; focused: boolean }> }>(); 781 781 + 782 782 + for (const [id] of registeredWindows) { 783 783 + const win = BrowserWindow.fromId(id); 784 784 + if (!win || win.isDestroyed() || !win.isVisible()) continue; 785 785 + 786 786 + const rawUrl = win.webContents.getURL(); 787 787 + if (rawUrl.includes('peek://app/background.html') || rawUrl.includes('peek://app/extension-host.html')) continue; 788 788 + 789 789 + // Check if this window is in group mode 790 790 + let modeEntry; 791 791 + try { 792 792 + modeEntry = getContextEntry('mode', id); 793 793 + } catch { 794 794 + continue; 795 795 + } 796 796 + if (!modeEntry || modeEntry.value !== 'group') continue; 797 797 + 798 798 + const metadata = modeEntry.metadata as Record<string, unknown> | null; 799 799 + const groupId = metadata?.groupId as string | undefined; 800 800 + const groupName = metadata?.groupName as string | undefined; 801 801 + if (!groupId) continue; 802 802 + 803 803 + const realUrl = extractRealUrl(rawUrl); 804 804 + const canvasBounds = extractCanvasBounds(rawUrl); 805 805 + const bounds = canvasBounds || win.getBounds(); 806 806 + 807 807 + if (!groupWindows.has(groupId)) { 808 808 + groupWindows.set(groupId, { groupName: groupName || '', windows: [] }); 809 809 + } 810 810 + groupWindows.get(groupId)!.windows.push({ 811 811 + url: realUrl, 812 812 + bounds, 813 813 + zOrder: zOrderMap.get(id) ?? 0, 814 814 + focused: win.isFocused(), 815 815 + }); 816 816 + } 817 817 + 818 818 + // Write each group's workspace snapshot 819 819 + const upsert = db.prepare(` 820 820 + INSERT OR REPLACE INTO extension_settings (id, extensionId, key, value, updatedAt) 821 821 + VALUES (?, 'group-workspaces', ?, ?, ?) 822 822 + `); 823 823 + 824 824 + for (const [groupId, group] of groupWindows) { 825 825 + const snapshot = { 826 826 + version: 1, 827 827 + groupId, 828 828 + groupName: group.groupName, 829 829 + createdAt: Date.now(), 830 830 + windows: group.windows, 831 831 + }; 832 832 + const key = `workspace:${groupId}`; 833 833 + upsert.run(`group-workspaces:${key}`, key, JSON.stringify(snapshot), Date.now()); 834 834 + } 835 835 + 836 836 + DEBUG && console.log(`[session] Saved workspace snapshots for ${groupWindows.size} group(s)`); 750 837 } 751 838 752 839 /**

+51 -2

extensions/groups/background.js

reviewed

··· 231 231 } 232 232 233 233 console.log(`[ext:groups] Saved ${savedCount} URLs to group "${groupName}"`); 234 234 + 235 235 + // Persist current window layouts for this group 236 236 + try { 237 237 + if (api.session?.saveGroupWorkspaces) { 238 238 + await api.session.saveGroupWorkspaces(); 239 239 + debug && console.log('[ext:groups] Group workspace layouts saved'); 240 240 + } 241 241 + } catch (err) { 242 242 + debug && console.log('[ext:groups] Failed to save workspace layouts:', err); 243 243 + } 244 244 + 234 245 return { success: true, count: savedCount, total: listResult.windows.length }; 235 246 }; 236 247 ··· 290 301 activeGroupId = tag.id; 291 302 activeGroupName = tag.name; 292 303 304 304 + // Load saved workspace snapshot for this group (if any) 305 305 + let savedBoundsMap = null; 306 306 + let sortedUrlItems = urlItems; 307 307 + try { 308 308 + const wsResult = await api.settings.getExtKey('group-workspaces', 'workspace:' + tag.id); 309 309 + if (wsResult.success && wsResult.data) { 310 310 + const snapshot = typeof wsResult.data === 'string' ? JSON.parse(wsResult.data) : wsResult.data; 311 311 + if (snapshot.version === 1 && Array.isArray(snapshot.windows)) { 312 312 + // Build URL → bounds map 313 313 + savedBoundsMap = new Map(); 314 314 + for (const w of snapshot.windows) { 315 315 + if (w.url && w.bounds) { 316 316 + savedBoundsMap.set(normalizeUrlForCompare(w.url), { bounds: w.bounds, zOrder: w.zOrder ?? 0 }); 317 317 + } 318 318 + } 319 319 + // Sort items by saved z-order (highest zOrder = opened later = on top) 320 320 + sortedUrlItems = [...urlItems].sort((a, b) => { 321 321 + const aZ = savedBoundsMap.get(normalizeUrlForCompare(a._openUrl))?.zOrder ?? 0; 322 322 + const bZ = savedBoundsMap.get(normalizeUrlForCompare(b._openUrl))?.zOrder ?? 0; 323 323 + return bZ - aZ; 324 324 + }); 325 325 + debug && console.log(`[ext:groups] Loaded workspace snapshot with ${snapshot.windows.length} saved positions`); 326 326 + } 327 327 + } 328 328 + } catch (err) { 329 329 + debug && console.log('[ext:groups] No saved workspace layout, using defaults:', err); 330 330 + } 331 331 + 293 332 // Open windows and set group mode 294 333 const openedWindows = []; 295 295 - for (const item of urlItems) { 334 334 + for (const item of sortedUrlItems) { 335 335 + // Look up saved bounds for this URL 336 336 + const savedEntry = savedBoundsMap?.get(normalizeUrlForCompare(item._openUrl)); 337 337 + const boundsOpts = savedEntry?.bounds ? { 338 338 + x: savedEntry.bounds.x, 339 339 + y: savedEntry.bounds.y, 340 340 + width: savedEntry.bounds.width, 341 341 + height: savedEntry.bounds.height, 342 342 + } : {}; 343 343 + 296 344 const result = await api.window.open(item._openUrl, { 297 345 role: 'content', 298 346 trackingSource: 'cmd', ··· 302 350 groupId: tag.id, 303 351 groupName: tag.name, 304 352 color: tag.color 305 305 - } 353 353 + }, 354 354 + ...boundsOpts 306 355 }); 307 356 if (result?.id) { 308 357 openedWindows.push(result.id);

+11

preload.js

reviewed

··· 1731 1731 } 1732 1732 }; 1733 1733 1734 1734 + // Session API — allows extensions to trigger session-level operations 1735 1735 + api.session = { 1736 1736 + /** 1737 1737 + * Save group workspace layouts (window positions per group) 1738 1738 + * @returns {Promise<{success: boolean, error?: string}>} 1739 1739 + */ 1740 1740 + saveGroupWorkspaces: () => { 1741 1741 + return ipcRenderer.invoke('save-group-workspaces'); 1742 1742 + } 1743 1743 + }; 1744 1744 + 1734 1745 // Net fetch API - proxies HTTP requests through main process to bypass CORS 1735 1746 // Useful for extensions that need to fetch from external APIs 1736 1747 api.net = {