From 45a4e88adbde7c4c0107aec60d0a24e732b5088d Mon Sep 17 00:00:00 2001
From: eugene yokota <eed3si9n@gmail.com>
Date: Sat, 11 Jul 2026 12:51:47 -0400
Subject: [PATCH] [2.x] Tweak server startup message (#9429)

**Problem/Solution**
sbt 2.x uses client-server by default.
This makes the message a bit more obvious when the build is using a client.
---
 .../sbt/internal/client/NetworkClient.scala      | 16 ++++++++++------
 .../main/scala/sbt/internal/server/Server.scala  |  2 +-
 .../scala/sbt/internal/CommandExchange.scala     |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
index e917247b6..1e3cfb5a1 100644
--- a/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
+++ b/main-command/src/main/scala/sbt/internal/client/NetworkClient.scala
@@ -183,6 +183,11 @@ class NetworkClient(
     def log(level: Level.Value, message: => String): Unit = console.appendLog(level, message)
   }
   private val interactive = arguments.commandArguments.isEmpty
+  private val startupMessages: List[String] =
+    "entering thin client - BEEP WHIRR" ::
+      "starting sbt server in the background" ::
+      "use 'sbt shutdown' to shutdown the server" ::
+      " " :: Nil
 
   private[sbt] def connectOrStartServerAndConnect(
       promptCompleteUsers: Boolean,
@@ -359,8 +364,9 @@ class NetworkClient(
     var serverStderrFile: Option[File] = None
     val process = socket match {
       case None if startServer =>
-        if (log) console.appendLog(Level.Info, "server was not detected. starting an instance")
-
+        if log then
+          startupMessages.foreach: msg =>
+            console.appendLog(Level.Info, msg)
         val props =
           Seq(
             term.getWidth,
@@ -965,10 +971,8 @@ class NetworkClient(
           catch { case _: InterruptedException => }
           if (exitClean.get) 0 else 1
         }
-        if (interactive) {
-          console.appendLog(Level.Info, "terminate the server with `shutdown`")
-          block()
-        } else if (exit) 0
+        if interactive then block()
+        else if exit then 0
         else {
           batchMode.set(true)
           val res = batchExecute(userCommands.toList)
diff --git a/main-command/src/main/scala/sbt/internal/server/Server.scala b/main-command/src/main/scala/sbt/internal/server/Server.scala
index de0ebd4c4..d7ee44284 100644
--- a/main-command/src/main/scala/sbt/internal/server/Server.scala
+++ b/main-command/src/main/scala/sbt/internal/server/Server.scala
@@ -97,7 +97,7 @@ private[sbt] object Server {
                 case null =>
                 case s    => s.close()
               }
-              log.info(s"sbt server started at ${connection.shortName}")
+              log.debug(s"sbt server started at ${connection.shortName}")
               writePortfile()
               if (connection.bspEnabled) {
                 log.debug("Writing bsp connection file")
diff --git a/main/src/main/scala/sbt/internal/CommandExchange.scala b/main/src/main/scala/sbt/internal/CommandExchange.scala
index 8a542fb8c..3a5979e9f 100644
--- a/main/src/main/scala/sbt/internal/CommandExchange.scala
+++ b/main/src/main/scala/sbt/internal/CommandExchange.scala
@@ -255,7 +255,7 @@ private[sbt] final class CommandExchange {
         case Some(Success(())) =>
           // remember to shutdown only when the server comes up
           server = Some(serverInstance)
-          s.log.info("started sbt server")
+          s.log.debug("started sbt server")
           // register this server in the shared proc directory
           try {
             val procDir = SysProp.globalLocalCache / "proc"