From 5368aa4bcf69df22918cc84de09e932e1e4cf4f2 Mon Sep 17 00:00:00 2001
From: Anatolii Kmetiuk <anatoliikmt@proton.me>
Date: Mon, 13 Jul 2026 10:58:01 +0900
Subject: [PATCH] Extend metabuild exclusion to all sbt-provided deps

---
 main/src/main/scala/sbt/Defaults.scala        |  7 +-
 .../i8207-sjson-new-downgrade/build.sbt       | 67 +++++++++++++++++++
 .../project/i8207-sjson-new-downgrade/test    |  3 +
 3 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index dabb64d8e..3e5d19bc7 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -3625,7 +3625,12 @@ object Classpaths {
         o %% "util-logging",
         o %% "util-position",
         o %% "io",
-        "com.eed3si9n" %% "sjson-new-core"
+        "com.eed3si9n" %% "sjson-new-core",
+        "com.eed3si9n" %% "gigahorse-core",
+        "com.typesafe" %% "ssl-config-core",
+        "org.reactivestreams" % "reactive-streams",
+        "org.slf4j" % "slf4j-api",
+        "com.typesafe" % "config",
       )
       if (isMeta && !force) excludes.toVector ++ sbtModulesExcludes
       else excludes
diff --git a/sbt-app/src/sbt-test/project/i8207-sjson-new-downgrade/build.sbt b/sbt-app/src/sbt-test/project/i8207-sjson-new-downgrade/build.sbt
index 6674abc54..e2734d0de 100644
--- a/sbt-app/src/sbt-test/project/i8207-sjson-new-downgrade/build.sbt
+++ b/sbt-app/src/sbt-test/project/i8207-sjson-new-downgrade/build.sbt
@@ -1,2 +1,69 @@
 ThisBuild / scalaVersion := "3.8.4"
 ThisBuild / organization := "com.example"
+
+libraryDependencies += "com.typesafe" % "config" % "1.4.5"
+
+val checkMetabuildClasspath = taskKey[Unit]("Checks the effective metabuild classpath")
+val checkProjectClasspath = taskKey[Unit]("Checks the project classpath")
+
+checkMetabuildClasspath := Def.uncached {
+  val buildUnit = loadedBuild.value.units(thisProjectRef.value.build).unit
+  val classpath = buildUnit.plugins.pluginData.dependencyClasspath
+  val managedModules = classpath
+    .flatMap(_.get(Keys.moduleIDStr))
+    .map(Classpaths.moduleIdJsonKeyFormat.read)
+    .map(module => module.organization -> module.name)
+    .toSet
+  val launcherOwnedModules = Set(
+    "com.eed3si9n" -> "sjson-new-core_3",
+    "com.eed3si9n" -> "gigahorse-core_3",
+    "com.typesafe" -> "ssl-config-core_3",
+    "org.reactivestreams" -> "reactive-streams",
+    "org.slf4j" -> "slf4j-api",
+    "com.typesafe" -> "config",
+  )
+  val pluginModules = Set(
+    "ch.epfl.scala" -> "sbt-github-dependency-submission_sbt2_3",
+    "com.eed3si9n" -> "gigahorse-asynchttpclient_3",
+    "com.eed3si9n" -> "shaded-asynchttpclient",
+  )
+  val converter = buildUnit.converter
+  val launcherJars = classpath
+    .filter(_.get(Keys.moduleIDStr).isEmpty)
+    .map(entry => converter.toPath(entry.data).getFileName.toString)
+  val launcherJarNames = Set(
+    "sjson-new-core_3",
+    "gigahorse-core_3",
+    "ssl-config-core_3",
+    "reactive-streams",
+    "slf4j-api",
+    "config",
+  )
+
+  assert(
+    managedModules.intersect(launcherOwnedModules).isEmpty,
+    s"found plugin-managed sbt modules: ${managedModules.intersect(launcherOwnedModules)}",
+  )
+  assert(
+    pluginModules.subsetOf(managedModules),
+    s"missing plugin modules: ${pluginModules.diff(managedModules)}",
+  )
+  assert(
+    launcherJarNames.forall(name => launcherJars.count(_.startsWith(s"$name-")) == 1),
+    s"expected one launcher jar for each sbt module: $launcherJars",
+  )
+}
+
+checkProjectClasspath := Def.uncached {
+  val modules = (Compile / externalDependencyClasspath).value
+    .flatMap(_.get(Keys.moduleIDStr))
+    .map(Classpaths.moduleIdJsonKeyFormat.read)
+  assert(
+    modules.exists(module =>
+      module.organization == "com.typesafe" &&
+        module.name == "config" &&
+        module.revision == "1.4.5"
+    ),
+    s"missing project dependency: $modules",
+  )
+}
diff --git a/sbt-app/src/sbt-test/project/i8207-sjson-new-downgrade/test b/sbt-app/src/sbt-test/project/i8207-sjson-new-downgrade/test
index d726044b8..0fcd00471 100644
--- a/sbt-app/src/sbt-test/project/i8207-sjson-new-downgrade/test
+++ b/sbt-app/src/sbt-test/project/i8207-sjson-new-downgrade/test
@@ -5,3 +5,6 @@
 # classpath, project load fails with a missing given. A successful
 # load is the regression assertion.
 > projects
+> checkMetabuildClasspath
+> checkProjectClasspath
+> githubGenerateSnapshot {}