From 77eb17a4f0aa2d8049753100236a1ab282b1da15 Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Sat, 27 Jun 2026 15:58:13 +0900
Subject: [PATCH] Delete sona-staging and sona-bundle in cleanFull

---
 main/src/main/scala/sbt/Defaults.scala       | 3 ++-
 main/src/main/scala/sbt/Keys.scala           | 2 ++
 main/src/main/scala/sbt/internal/Clean.scala | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 07e22218f..8f9f8efc2 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -286,11 +286,12 @@ object Defaults extends BuildCommon with DefExtra {
       csrCacheDirectory := LMCoursier.defaultCacheLocation,
       csrSameVersions :== Nil,
       stagingDirectory := (ThisBuild / baseDirectory).value / "target" / "sona-staging",
+      sonaBundleDirectory := (ThisBuild / baseDirectory).value / "target" / "sona-bundle",
       localStaging := Some(Resolver.file("local-staging", stagingDirectory.value)),
       sonaBundle := Publishing
         .makeBundle(
           stagingDirectory.value.toPath(),
-          ((ThisBuild / baseDirectory).value / "target" / "sona-bundle" / "bundle.zip").toPath()
+          (sonaBundleDirectory.value / "bundle.zip").toPath()
         )
         .toFile(),
       sonaBundle / aggregate :== false,
diff --git a/main/src/main/scala/sbt/Keys.scala b/main/src/main/scala/sbt/Keys.scala
index aba00c4b2..060941f0e 100644
--- a/main/src/main/scala/sbt/Keys.scala
+++ b/main/src/main/scala/sbt/Keys.scala
@@ -673,6 +673,8 @@ object Keys {
   @transient
   val stagingDirectory = settingKey[File]("Local staging directory for Sonatype publishing").withRank(CSetting)
   @transient
+  private[sbt] val sonaBundleDirectory = settingKey[File]("Local bundle directory for Sonatype publishing").withRank(DSetting)
+  @transient
   val sonaBundle = taskKey[File]("Local bundle for Sonatype publishing").withRank(DTask)
   val localStaging = settingKey[Option[Resolver]]("Local staging resolver for Sonatype publishing").withRank(CSetting)
   val sonaDeploymentName = settingKey[String]("The name used for deployment").withRank(DSetting)
diff --git a/main/src/main/scala/sbt/internal/Clean.scala b/main/src/main/scala/sbt/internal/Clean.scala
index 9d836c5bb..9fc8ac2ec 100644
--- a/main/src/main/scala/sbt/internal/Clean.scala
+++ b/main/src/main/scala/sbt/internal/Clean.scala
@@ -226,6 +226,9 @@ private[sbt] object Clean {
           case d: DiskActionCacheStore => d.clear()
           case _                       => ()
         IO.delete(outputDirectory.toFile())
+        val extracted = Project.extract(s)
+        IO.delete(extracted.get(Keys.stagingDirectory))
+        IO.delete(extracted.get(Keys.sonaBundleDirectory))
         IO.delete(
           s.configuration
             .provider()