fix: address code review comments

Author: goosewobbler

packages/tauri-plugin/src/commands.rs

@@ -171,6 +171,8 @@ pub(crate) async fn execute<R: Runtime>(
 }
 
 /// Get the label of the currently focused/active window
+/// Note: Tauri 2.x doesn't expose window focus state, so this returns
+/// the "main" window if it exists, or the first window in lexicographic order
 #[command]
 pub(crate) async fn get_active_window_label<R: Runtime>(
   app: tauri::AppHandle<R>,
@@ -179,14 +181,16 @@ pub(crate) async fn get_active_window_label<R: Runtime>(
   if windows.is_empty() {
     return Err(Error::WindowError("No windows available".to_string()));
   }
-  // In Tauri 2.x, we can't easily detect which window is focused
-  // Return the main window if it exists, otherwise the first window
+  // Return the "main" window if it exists for predictable behavior
   if let Some(main) = windows.get("main") {
     return Ok(main.label().to_string());
   }
-  let first = windows.values().next()
+  // Otherwise, return the first window in lexicographic order for consistency
+  let mut labels: Vec<_> = windows.keys().collect();
+  labels.sort();
+  let first_label = labels.first()
     .ok_or_else(|| Error::WindowError("No windows available".to_string()))?;
-  Ok(first.label().to_string())
+  Ok(first_label.to_string())
 }
 
 /// List all window labels in the application

packages/tauri-service/src/window.ts

@@ -50,19 +50,18 @@ export async function getWindowPort(browser: WebdriverIO.Browser, label: string)
     return windowPortMap.get(label);
   }
 
-  const windows = await listWindowLabels(browser);
   const endpoints = await pollDevtoolsEndpoints();
 
   if (endpoints.length === 0) {
     return undefined;
   }
 
-  for (let i = 0; i < Math.min(windows.length, endpoints.length); i++) {
-    const windowLabel = windows[i];
-    const endpoint = endpoints[i];
+  // Map endpoints by their ID (which corresponds to window label in Tauri)
+  for (const endpoint of endpoints) {
     const port = extractPortFromWebSocketUrl(endpoint.webSocketDebuggerUrl);
-    windowPortMap.set(windowLabel, port);
-    log.debug(`Mapped window "${windowLabel}" to port ${port}`);
+    // The endpoint id typically matches the window label (e.g., "main", "secondary")
+    windowPortMap.set(endpoint.id, port);
+    log.debug(`Mapped window "${endpoint.id}" to port ${port}`);
   }
 
   return windowPortMap.get(label);