From 15d773b28ea7f7d65ba85dee142a7ea86301b430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=B7=E7=94=B5=E8=8A=BD=E8=A1=A3?=
 <zhangyanghaha0407@outlook.com>
Date: Wed, 13 May 2026 00:25:48 -0400
Subject: [PATCH] Prefer Cargo hardware sidecar only for workspace builds

---
 crates/ely_app/src/services/servo_sidecar_command.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crates/ely_app/src/services/servo_sidecar_command.rs b/crates/ely_app/src/services/servo_sidecar_command.rs
index 547641c..b3ecd23 100644
--- a/crates/ely_app/src/services/servo_sidecar_command.rs
+++ b/crates/ely_app/src/services/servo_sidecar_command.rs
@@ -90,15 +90,20 @@ pub(super) fn default_sidecar_command() -> Result<SidecarCommandTarget, SidecarC
     })?;
     let adjacent_sidecar = exe_dir.join(sidecar_binary_name());
     let workspace_manifest = workspace_manifest_path();
+    let workspace_target_sidecar =
+        workspace_manifest.as_ref().and_then(|path| workspace_target_sidecar_path(path));
+    let adjacent_is_workspace_target =
+        workspace_target_sidecar.as_ref().is_some_and(|path| path == &adjacent_sidecar);
     let prefer_cargo_hardware_sidecar = rendering_context_from_env()
         == SidecarRenderingContext::Hardware
+        && adjacent_is_workspace_target
         && workspace_manifest.as_ref().is_some_and(|path| path.is_file());
     if adjacent_sidecar.is_file() && !prefer_cargo_hardware_sidecar {
         return Ok(SidecarCommandTarget::Binary(adjacent_sidecar));
     }
 
     if let Some(manifest_path) = workspace_manifest {
-        if let Some(target_sidecar) = workspace_target_sidecar_path(&manifest_path)
+        if let Some(target_sidecar) = workspace_target_sidecar
             && target_sidecar.is_file()
             && !prefer_cargo_hardware_sidecar
         {