feat: add merge all windows

Author: sebastienfontaine

manifest.json

@@ -56,10 +56,10 @@
   "commands": {
     "merge-windows": {
       "suggested_key": {
-        "default": "Alt+Shift+M",
-        "linux": "Alt+Shift+M",
-        "mac": "Ctrl+Shift+M",
-        "windows": "Alt+Shift+M"
+        "default": "Alt+Shift+W",
+        "linux": "Alt+Shift+W",
+        "mac": "Command+Shift+W",
+        "windows": "Alt+Shift+W"
       },
       "description": "Merge windows"
     }

src/background.ts

@@ -210,11 +210,18 @@ chrome.contextMenus.create({
 	contexts: ['all'],
 });
 
-chrome.contextMenus.onClicked.addListener(async function (info, tab) {
-	if (!tab?.id) return;
+chrome.contextMenus.create({
+	id: 'merge-windows',
+	title: 'Merge All Windows',
+	contexts: ['all'],
+});
 
+chrome.contextMenus.onClicked.addListener(async function (info, tab) {
 	if (info.menuItemId === 'rename-tab') {
+		if (!tab?.id) return;
 		await chrome.tabs.sendMessage(tab.id, { action: 'openPrompt' });
+	} else if (info.menuItemId === 'merge-windows') {
+		await mergeAllWindows();
 	}
 });
 
@@ -341,4 +348,75 @@ async function updateTabGroup(groupId: number, tmGroup: Group) {
 	execute();
 }
 
+// Merge Windows Command Handler
+chrome.commands.onCommand.addListener(async (command) => {
+	if (command === 'merge-windows') {
+		await mergeAllWindows();
+	}
+});
+
+/**
+ * Merge all browser windows into the current window
+ */
+async function mergeAllWindows() {
+	try {
+		// Get all windows
+		const windows = await chrome.windows.getAll({ populate: true });
+
+		if (windows.length <= 1) {
+			console.log('[Tabee] Only one window open, nothing to merge');
+			return;
+		}
+
+		// Find the currently focused window or use the first normal window
+		let targetWindow = windows.find((w) => w.focused);
+		if (!targetWindow) {
+			targetWindow = windows.find((w) => w.type === 'normal');
+		}
+
+		if (!targetWindow || !targetWindow.id) {
+			console.error('[Tabee] Could not find target window for merging');
+			return;
+		}
+
+		console.log(`[Tabee] Merging ${windows.length - 1} windows into window ${targetWindow.id}`);
+
+		// Move all tabs from other windows to the target window
+		for (const window of windows) {
+			// Skip the target window itself
+			if (window.id === targetWindow.id) continue;
+
+			// Skip non-normal windows (popup, devtools, etc.)
+			if (window.type !== 'normal') continue;
+
+			if (window.tabs && window.tabs.length > 0) {
+				const tabIds = window.tabs
+					.map((tab) => tab.id)
+					.filter((id): id is number => id !== undefined);
+
+				if (tabIds.length > 0) {
+					try {
+						// Move tabs to target window
+						await chrome.tabs.move(tabIds, {
+							windowId: targetWindow.id,
+							index: -1, // Append at the end
+						});
+
+						console.log(`[Tabee] Moved ${tabIds.length} tabs from window ${window.id}`);
+					} catch (error) {
+						console.error(`[Tabee] Error moving tabs from window ${window.id}:`, error);
+					}
+				}
+			}
+		}
+
+		// Focus the target window
+		await chrome.windows.update(targetWindow.id, { focused: true });
+
+		console.log('[Tabee] Windows merged successfully');
+	} catch (error) {
+		console.error('[Tabee] Error merging windows:', error);
+	}
+}
+
 export {};

src/components/options/center/sections/HelpPane.vue

@@ -24,11 +24,32 @@
 					<li>You can protect some websites from accidental closure with a confirm box.</li>
 					<li>You can avoid duplicate tabs by setting up the unique property.</li>
 					<li>You can mute the sound of any website before it plays it.</li>
+					<li>You can merge all browser windows into one with a keyboard shortcut or context menu.</li>
 					<li>And the icing on the cake... Combine all of them!</li>
 				</ul>
 			</div>
 		</div>
 
+		<div class="card bg-base-200 mt-4">
+			<div class="card-body">
+				<h2 class="card-title">Keyboard Shortcuts</h2>
+
+				<h3 class="font-bold">Merge All Windows</h3>
+				<p>
+					Quickly merge all browser windows into the currently focused window using the keyboard
+					shortcut:
+				</p>
+				<ul class="list-disc ml-3">
+					<li><strong>Windows/Linux:</strong> <kbd class="kbd kbd-sm">Alt</kbd> + <kbd class="kbd kbd-sm">Shift</kbd> + <kbd class="kbd kbd-sm">W</kbd></li>
+					<li><strong>Mac:</strong> <kbd class="kbd kbd-sm">⌘ Command</kbd> + <kbd class="kbd kbd-sm">Shift</kbd> + <kbd class="kbd kbd-sm">W</kbd></li>
+				</ul>
+				<p class="mt-2">
+					You can also access this feature by right-clicking anywhere and selecting "Merge All
+					Windows" from the context menu.
+				</p>
+			</div>
+		</div>
+
 		<div class="card bg-base-200 mt-4">
 			<div class="card-body">
 				<h2 class="card-title">Tab Rules</h2>