I introduce a novel general equilibrium framework for agricultural trade policy analysis with heterogeneous producers in which agro-ecological characteristics in uence patterns of specialization within the sector and trade costs are product-specific. This induces substantial variation in market share elasticities with respect to trade costs, with the largest magnitude elasticities between countries most likely to compete head-to-head in the same products. The model is thus able to generate more nuanced predictions for how bilateral agricultural trade and production patterns shift in response to changes in policy than existing models. I draw on techniques pioneered in the discrete choice literature to estimate parameters that describe the distribution of productivity and trade costs across products. This approach has the considerable advantage of allowing me to solve a product-level conceptual model with little data beyond what is used in a standard gravity model. This framework promises to allow researchers to make more informed predictions for how global agricultural trade and production patterns shift in response to policy change.