Remove lossy resolution-to-requirements conversion in install plan

crates/distribution-types/src/resolved.rs

@@ -195,14 +195,8 @@ impl From<Dist> for ResolvedDist {
     }
 }
 
-impl From<InstalledDist> for ResolvedDist {
-    fn from(value: InstalledDist) -> Self {
-        ResolvedDist::Installed(value)
-    }
-}
-
 impl Display for ResolvedDist {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {
             Self::Installed(dist) => dist.fmt(f),
             Self::Installable(dist) => dist.fmt(f),

crates/uv-dispatch/src/lib.rs

@@ -213,19 +213,16 @@ impl<'a> BuildContext for BuildDispatch<'a> {
 
         // Determine the current environment markers.
         let tags = self.interpreter.tags()?;
-        let markers = self.interpreter.resolver_markers();
 
         // Determine the set of installed packages.
         let site_packages = SitePackages::from_environment(venv)?;
 
-        let requirements = resolution.requirements().collect::<Vec<_>>();
-
         let Plan {
             cached,
             remote,
             reinstalls,
             extraneous: _,
-        } = Planner::new(&requirements).build(
+        } = Planner::new(resolution).build(
             site_packages,
             &Reinstall::default(),
             &BuildOptions::default(),
@@ -234,7 +231,6 @@ impl<'a> BuildContext for BuildDispatch<'a> {
             self.config_settings,
             self.cache(),
             venv,
-            &markers,
             tags,
         )?;
 
@@ -244,17 +240,6 @@ impl<'a> BuildContext for BuildDispatch<'a> {
             return Ok(vec![]);
         }
 
-        // Resolve any registry-based requirements.
-        let remote = remote
-            .iter()
-            .map(|dist| {
-                resolution
-                    .get_remote(&dist.name)
-                    .cloned()
-                    .expect("Resolution should contain all packages")
-            })
-            .collect::<Vec<_>>();
-
         // Download any missing distributions.
         let wheels = if remote.is_empty() {
             vec![]

crates/uv-installer/src/site_packages.rs

@@ -154,6 +154,14 @@ impl SitePackages {
             .collect()
     }
 
+    pub fn remove_distribution(&mut self, dist: &InstalledDist) -> Option<InstalledDist> {
+        let index = self
+            .distributions
+            .iter()
+            .position(|distribution| distribution.as_ref() == Some(dist));
+        index.and_then(|index| self.distributions[index].take())
+    }
+
     /// Remove the given packages from the index, returning all installed versions, if any.
     pub fn remove_packages(&mut self, name: &PackageName) -> Vec<InstalledDist> {
         let Some(indexes) = self.by_name.get(name) else {

crates/uv-resolver/src/resolver/mod.rs

@@ -865,6 +865,7 @@ impl<InstalledPackages: InstalledPackagesProvider> ResolverState<InstalledPackag
             url.verbatim
         );
 
+        // STOPSHIP(charlie): We should actually grab the installed distribution here, probably?
         let dist = PubGrubDistribution::from_url(name, url);
         let response = self
             .index

crates/uv/src/commands/pip/install.rs

@@ -413,7 +413,6 @@ pub(crate) async fn pip_install(
         &index_locations,
         config_settings,
         &hasher,
-        &markers,
         &tags,
         &client,
         &state.in_flight,

crates/uv/src/commands/pip/operations.rs

@@ -391,7 +391,6 @@ pub(crate) async fn install(
     index_urls: &IndexLocations,
     config_settings: &ConfigSettings,
     hasher: &HashStrategy,
-    markers: &ResolverMarkerEnvironment,
     tags: &Tags,
     client: &RegistryClient,
     in_flight: &InFlight,
@@ -405,12 +404,9 @@ pub(crate) async fn install(
 ) -> Result<Changelog, Error> {
     let start = std::time::Instant::now();
 
-    // Extract the requirements from the resolution.
-    let requirements = resolution.requirements().collect::<Vec<_>>();
-
     // Partition into those that should be linked from the cache (`local`), those that need to be
     // downloaded (`remote`), and those that should be removed (`extraneous`).
-    let plan = Planner::new(&requirements)
+    let plan = Planner::new(resolution)
         .build(
             site_packages,
             reinstall,
@@ -420,7 +416,6 @@ pub(crate) async fn install(
             config_settings,
             cache,
             venv,
-            markers,
             tags,
         )
         .context("Failed to determine installation plan")?;
@@ -449,17 +444,6 @@ pub(crate) async fn install(
         return Ok(Changelog::default());
     }
 
-    // Map any registry-based requirements back to those returned by the resolver.
-    let remote = remote
-        .iter()
-        .map(|dist| {
-            resolution
-                .get_remote(&dist.name)
-                .cloned()
-                .expect("Resolution should contain all packages")
-        })
-        .collect::<Vec<_>>();
-
     // Download, build, and unzip any missing distributions.
     let wheels = if remote.is_empty() {
         vec![]
@@ -582,17 +566,6 @@ fn report_dry_run(
         return Ok(());
     }
 
-    // Map any registry-based requirements back to those returned by the resolver.
-    let remote = remote
-        .iter()
-        .map(|dist| {
-            resolution
-                .get_remote(&dist.name)
-                .cloned()
-                .expect("Resolution should contain all packages")
-        })
-        .collect::<Vec<_>>();
-
     // Download, build, and unzip any missing distributions.
     let wheels = if remote.is_empty() {
         vec![]

crates/uv/src/commands/pip/sync.rs

@@ -364,7 +364,6 @@ pub(crate) async fn pip_sync(
         &index_locations,
         config_settings,
         &hasher,
-        &markers,
         &tags,
         &client,
         &state.in_flight,

crates/uv/src/commands/project/mod.rs

@@ -928,7 +928,6 @@ pub(crate) async fn sync_environment(
     // Determine the markers tags to use for resolution.
     let interpreter = venv.interpreter();
     let tags = venv.interpreter().tags()?;
-    let markers = interpreter.resolver_markers();
 
     // Add all authenticated sources to the cache.
     for url in index_locations.urls() {
@@ -1006,7 +1005,6 @@ pub(crate) async fn sync_environment(
         index_locations,
         config_setting,
         &hasher,
-        &markers,
         tags,
         &client,
         &state.in_flight,
@@ -1242,7 +1240,6 @@ pub(crate) async fn update_environment(
         index_locations,
         config_setting,
         &hasher,
-        &markers,
         tags,
         &client,
         &state.in_flight,

crates/uv/src/commands/project/sync.rs

@@ -336,7 +336,6 @@ pub(super) async fn do_sync(
         index_locations,
         config_setting,
         &hasher,
-        &markers,
         tags,
         &client,
         &state.in_flight,