fix(e2e): pass resolved openshell binary to MCP bridge

Signed-off-by: Kris Hicks <khicks@nvidia.com>

Author: krishicks

e2e/mcp-conformance.sh

@@ -111,17 +111,21 @@ openshell_bin() {
 
 start_host_bridge() {
   local port=$1
-  local runner_ip
+  local openshell runner_ip
   HOST_BRIDGE_LOG="${ROOT}/.cache/mcp-conformance/host-bridge.log"
   mkdir -p "$(dirname "${HOST_BRIDGE_LOG}")"
 
+  if ! openshell="$(openshell_bin)"; then
+    return 1
+  fi
   if ! runner_ip="$(runner_container_ip)"; then
     return 1
   fi
 
   RUNNER_CONTAINER_IP="${runner_ip}"
   HOST_BRIDGE_TOKEN="$(python3 -c 'import secrets; print(secrets.token_urlsafe(32))')"
-  OPENSHELL_MCP_CONFORMANCE_RUNNER_IP="${runner_ip}" \
+  OPENSHELL_BIN="${openshell}" \
+    OPENSHELL_MCP_CONFORMANCE_RUNNER_IP="${runner_ip}" \
     OPENSHELL_MCP_CONFORMANCE_BRIDGE_TOKEN="${HOST_BRIDGE_TOKEN}" \
     python3 "${ROOT}/e2e/mcp-conformance/host-bridge.py" \
     "${port}" "${ROOT}" "${HOST_BRIDGE_LOG}" &

e2e/mcp-conformance/client-through-openshell.sh

@@ -27,8 +27,10 @@ ROOT="$(git rev-parse --show-toplevel 2>/dev/null || pwd)"
 
 # shellcheck source=e2e/support/gateway-common.sh disable=SC1091
 source "${ROOT}/e2e/support/gateway-common.sh"
-TARGET_DIR="$(e2e_cargo_target_dir "${ROOT}")"
-OPENSHELL_BIN="${OPENSHELL_BIN:-${TARGET_DIR}/debug/openshell}"
+if [ -z "${OPENSHELL_BIN:-}" ]; then
+  TARGET_DIR="$(e2e_cargo_target_dir "${ROOT}")"
+  OPENSHELL_BIN="${TARGET_DIR}/debug/openshell"
+fi
 
 require_active_gateway() {
   local status_output