fix: Improve window selection from list view on Windows

Author: richiemcilroy

.claude/settings.local.json

@@ -0,0 +1,11 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(pnpm typecheck:*)",
+      "Bash(pnpm lint:*)",
+      "Bash(pnpm build:*)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

apps/desktop/src/routes/(window-chrome)/new-main/index.tsx

@@ -368,13 +368,11 @@ function Page() {
 			"captureTarget",
 			reconcile({ variant: "window", id: target.id }),
 		);
+		setOptions("targetMode", "window");
 		setWindowMenuOpen(false);
 		windowTriggerRef?.focus();
 
 		await commands.focusWindow(target.id);
-
-		await new Promise((resolve) => setTimeout(resolve, 100));
-		setOptions("targetMode", "window");
 	};
 
 	createEffect(() => {

apps/desktop/src/routes/target-select-overlay.tsx

@@ -64,16 +64,46 @@ function Inner() {
 	});
 	onCleanup(() => unsubTargetUnderCursor.then((unsub) => unsub()));
 
+	const selectedWindow = createQuery(() => ({
+		queryKey: ["selectedWindow", rawOptions.captureTarget],
+		queryFn: async () => {
+			if (rawOptions.captureTarget.variant !== "window") return null;
+			const windowId = rawOptions.captureTarget.id;
+
+			const windows = await commands.listCaptureWindows();
+			const window = windows.find(w => w.id === windowId);
+
+			if (!window) return null;
+
+			return {
+				id: window.id,
+				app_name: window.owner_name || window.name || "Unknown",
+				bounds: window.bounds,
+			};
+		},
+		enabled: rawOptions.captureTarget.variant === "window" && rawOptions.targetMode === "window",
+		staleTime: 5 * 1000,
+	}));
+
+	const windowToShow = () => {
+		if (rawOptions.captureTarget.variant === "window" && selectedWindow.data) {
+			return selectedWindow.data;
+		}
+		// Otherwise use what's under the cursor
+		return targetUnderCursor.window;
+	};
+
 	const windowIcon = createQuery(() => ({
-		queryKey: ["windowIcon", targetUnderCursor.window?.id],
+		queryKey: ["windowIcon", windowToShow()?.id],
 		queryFn: async () => {
-			if (!targetUnderCursor.window?.id) return null;
+			const window = windowToShow();
+			if (!window?.id) return null;
 			return await commands.getWindowIcon(
-				targetUnderCursor.window.id.toString(),
+				window.id.toString(),
 			);
 		},
-		enabled: !!targetUnderCursor.window?.id,
-		staleTime: 5 * 60 * 1000, // Cache for 5 minutes
+		enabled: !!windowToShow()?.id,
+		staleTime: 5 * 60 * 1000, 
 	}));
 
 	const displayInformation = createQuery(() => ({
@@ -184,10 +214,11 @@ function Inner() {
 			<Match
 				when={
 					rawOptions.targetMode === "window" &&
-					targetUnderCursor.display_id === params.displayId
+					(targetUnderCursor.display_id === params.displayId ||
+						(rawOptions.captureTarget.variant === "window" && selectedWindow.data))
 				}
 			>
-				<Show when={targetUnderCursor.window} keyed>
+				<Show when={windowToShow()} keyed>
 					{(windowUnderCursor) => (
 						<div
 							data-over={targetUnderCursor.display_id === params.displayId}