Merge master into 2026-07-28-protocol-support

.claude/skills/commit/SKILL.md

@@ -0,0 +1,23 @@
+---
+name: commit
+description: Write commit messages for the chimp project. Use when drafting or suggesting a git commit message.
+---
+
+# Commit Message Structure
+
+Use Conventional Commits prefixes:
+
+- `feat:` - a new feature
+- `fix:` - a bug fix
+- `docs:` - documentation only
+- `test:` - test changes only
+- `refactor:` - code change with no behaviour change
+- `chore:` - build, tooling, or dependency changes
+- `perf:` - a performance improvement
+
+Rules:
+
+- Subject line: prefix + short description. Max 40 characters.
+- Describe what the change does, not why.
+- Body lines: max 70 characters each. Wrap long lines.
+- Keep the body short. Add it only if the subject is not enough.

.devcontainer/Dockerfile

@@ -7,10 +7,10 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # Install sbt
-RUN curl -fL "https://github.com/sbt/sbt/releases/download/v1.12.0/sbt-1.12.0.tgz" | tar xz -C /tmp && \
+RUN curl -fL "https://github.com/sbt/sbt/releases/download/v2.0.10/sbt-2.0.10.tgz" | tar xz -C /tmp && \
     mv /tmp/sbt/bin/sbt /usr/local/bin/ && \
     mv /tmp/sbt/bin/sbt-launch.jar /usr/local/bin/ && \
     chmod +x /usr/local/bin/sbt && \
     rm -rf /tmp/sbt
 
-ENV DEVCONTAINER=true
+ENV DEVCONTAINER=true

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
           distribution: 'temurin'
           java-version: 21
           cache: 'sbt'
-      - uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1, specifically v1.1.14
+      - uses: sbt/setup-sbt@ce95da69b39609ea153bad087708da5f37366897 # v1, specifically v1.5.10
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
@@ -45,7 +45,7 @@ jobs:
       - name: Compile documentation
         run: sbt -v compileDocs
       - name: Unit tests
-        run: sbt -v test
+        run: sbt -v testFull
       - name: Client conformance tests (2025-11-25)
         run: sbt -v "clientConformance/conformance client --requirements 2025-11-25"
       - name: Client conformance tests (2026-07-28)
@@ -55,7 +55,7 @@ jobs:
       - name: Server conformance tests (2026-07-28)
         run: sbt -v "serverConformance/conformance server --requirements 2026-07-28"
       - name: Integration tests
-        run: sbt -v "testOnly -- -n Integration"
+        run: sbt -v "testOnly * -- -n Integration"
       - uses: actions/upload-artifact@v5
         if: success() || failure()
         with:
@@ -80,4 +80,4 @@ jobs:
     if: github.event.pull_request.user.login == 'softwaremill-ci'
     needs: [ build, label ]
     uses: softwaremill/github-actions-workflows/.github/workflows/auto-merge.yml@main
-    secrets: inherit
+    secrets: inherit

.scala-steward.conf

@@ -1,3 +1,3 @@
 updates.pin = [
-  { groupId = "org.scala-lang", artifactId = "scala3-library", version = "3.3." }
+  { groupId = "org.scala-lang", artifactId = "scala3-library", version = "3.9." }
 ]

.scalafmt.conf

@@ -1,4 +1,9 @@
 version        = 3.11.5
 maxColumn      = 140
 rewrite.rules  = [RedundantBraces, RedundantParens, SortImports]
-runner.dialect = scala3
+runner.dialect = scala3
+fileOverride {
+  "glob:**/*.sbt" {
+    runner.dialect = scala3
+  }
+}

AGENTS.md

@@ -43,3 +43,7 @@ ALWAYS use ASD-STE100 Simplified Technical English for documentation, responses
 ### 6 - Code comments
 
 NEVER add any comments in the code, unless you're asked to do so.
+
+### 7 - Commits
+
+Use `/commit` skill to keep the common style of commit messages.

README.md

@@ -19,7 +19,7 @@ the MCP protocol with bidirectional communication between server and client. Cur
 Run a basic MCP server with Netty exposing a simple adder tool:
 
 ```scala
-//> using dep com.softwaremill.chimp::chimp-server:0.5.2
+//> using dep com.softwaremill.chimp::chimp-server:0.6.0
 //> using dep com.softwaremill.sttp.tapir::tapir-netty-server-sync:1.13.19
 
 import chimp.server.*
@@ -39,7 +39,7 @@ case class AdderInput(a: Int, b: Int) derives Codec, Schema
 Connect and invoke the tool as an MCP client:
 
 ```scala
-//> using dep com.softwaremill.chimp::chimp-client:0.5.2
+//> using dep com.softwaremill.chimp::chimp-client:0.6.0
 //> using dep com.softwaremill.sttp.client4::core:4.0.24
 
 import chimp.client.*
@@ -65,7 +65,7 @@ import io.circe.Json
 Run a basic MCP server using stdio transport:
 
 ```scala
-//> using dep com.softwaremill.chimp::chimp-server:0.5.2
+//> using dep com.softwaremill.chimp::chimp-server:0.6.0
 
 import chimp.server.*
 import chimp.server.transport.ServerStdioTransport
@@ -84,7 +84,7 @@ case class EchoInput(message: String) derives Codec, Schema
 Start the server as a subprocess and invoke the tool as an MCP client:
 
 ```scala
-//> using dep com.softwaremill.chimp::chimp-client:0.5.2
+//> using dep com.softwaremill.chimp::chimp-client:0.6.0
 
 import chimp.client.*
 import chimp.client.transport.ClientStdioTransport
@@ -107,7 +107,7 @@ With the integration modules (like `chimp-server-ox` and `chimp-client-ox` for o
 For example, run a basic streaming MCP server using Netty and ox:
 
 ```scala
-//> using dep com.softwaremill.chimp::chimp-server-ox:0.5.2
+//> using dep com.softwaremill.chimp::chimp-server-ox:0.6.0
 
 import chimp.protocol.LoggingLevel
 import chimp.server.*
@@ -136,7 +136,7 @@ case class WorkInput(steps: Int) derives Codec, Schema
 Connect and invoke the tool as an MCP client, receiving server's notifications while the tool call is in flight:
 
 ```scala
-//> using dep com.softwaremill.chimp::chimp-client-ox:0.5.2
+//> using dep com.softwaremill.chimp::chimp-client-ox:0.6.0
 
 import chimp.client.McpClient
 import chimp.client.notifications.ServerNotification

build.sbt

@@ -3,39 +3,40 @@ import com.softwaremill.SbtSoftwareMillCommon.commonSmlBuildSettings
 import com.softwaremill.UpdateVersionInDocs
 
 val scalaTestV = "3.2.20"
-val circeV = "0.14.16"
-val slf4jV = "2.0.18"
-val logbackV = "1.6.3"
-val tapirV = "1.13.31"
-val sttpClientV = "4.0.26"
+val circeV = "0.14.17"
+val slf4jV = "2.0.20"
+val logbackV = "1.6.5"
+val tapirV = "1.13.33"
+val sttpClientV = "4.0.27"
 val zioV = "2.1.26"
-val zioProcessV = "0.8.0"
-val zioHttpV = "3.11.4"
-val oxV = "1.0.6"
+val zioProcessV = "0.8.1"
+val zioHttpV = "3.11.6"
+val oxV = "1.0.9"
 val testcontainersScalaV = "0.41.8"
-val pekkoV = "1.7.0"
+val pekkoV = "1.7.1"
 val conformanceHarnessV = "0.2.0-alpha.11"
 
-lazy val verifyExamplesCompileUsingScalaCli = taskKey[Unit]("Verify that each example compiles using Scala CLI")
+lazy val verifyExamplesCompileUsingScalaCli: TaskKey[Unit] = taskKey[Unit]("Verify that each example compiles using Scala CLI")
+lazy val compileDocs: TaskKey[Unit] = taskKey[Unit]("Compiles docs module throwing away its output")
 
-lazy val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
-  organization := "com.softwaremill.chimp",
-  scalaVersion := "3.3.7",
-  Test / scalacOptions += "-Wconf:msg=unused value of type org.scalatest.Assertion:s",
-  Test / scalacOptions += "-Wconf:msg=unused value of type org.scalatest.compatible.Assertion:s",
-  Test / test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-l", "Integration"),
-  Test / parallelExecution := false,
-  scalacOptions ++= Seq("-Wunused:all", "-Werror")
-)
+commonSmlBuildSettings
+ossPublishSettings
+
+organization := "com.softwaremill.chimp"
+scalaVersion := "3.9.0"
+Test / scalacOptions += "-Wconf:msg=unused value of type org.scalatest.Assertion:s"
+Test / scalacOptions += "-Wconf:msg=unused value of type org.scalatest.compatible.Assertion:s"
+Test / test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-l", "Integration")
+Test / parallelExecution := false
+scalacOptions ++= Seq("-Wunused:all", "-Werror", "-java-output-version", "17")
 
 val scalaTest = "org.scalatest" %% "scalatest" % scalaTestV % Test
 
 lazy val root = (project in file("."))
-  .settings(commonSettings: _*)
   .settings(
     publishArtifact := false,
     name := "chimp",
-    updateDocs := Def.taskDyn {
+    updateDocs := Def.uncached(Def.taskDyn {
       val log = sLog.value
       val org = organization.value
       val releaseVersion = version.value
@@ -46,7 +47,8 @@ lazy val root = (project in file("."))
         (docs / mdoc).toTask("").value
         files ++ Seq(file("generated-docs/out"))
       }
-    }.value
+    }.value),
+    compileDocs := (docs / mdoc).toTask(" --out target/chimp-docs").value
   )
   .aggregate(
     core,
@@ -66,7 +68,6 @@ lazy val root = (project in file("."))
 val conformance = inputKey[Unit]("Run the MCP conformance harness via npx, extra args are passed through")
 
 lazy val core: Project = (project in file("core"))
-  .settings(commonSettings: _*)
   .settings(
     name := "chimp-core",
     libraryDependencies ++= Seq(
@@ -80,7 +81,6 @@ lazy val core: Project = (project in file("core"))
   )
 
 lazy val server: Project = (project in file("server"))
-  .settings(commonSettings: _*)
   .settings(
     name := "chimp-server",
     libraryDependencies ++= Seq(
@@ -96,7 +96,6 @@ lazy val server: Project = (project in file("server"))
   .dependsOn(core, client % "test->compile")
 
 lazy val serverZio: Project = (project in file("server-streaming/server-zio"))
-  .settings(commonSettings: _*)
   .settings(
     name := "chimp-server-zio",
     libraryDependencies ++= Seq(
@@ -111,7 +110,6 @@ lazy val serverZio: Project = (project in file("server-streaming/server-zio"))
   .dependsOn(server % "compile->compile;test->test", clientZio % "test->compile")
 
 lazy val serverOx: Project = (project in file("server-streaming/server-ox"))
-  .settings(commonSettings: _*)
   .settings(
     name := "chimp-server-ox",
     libraryDependencies ++= Seq(
@@ -123,7 +121,6 @@ lazy val serverOx: Project = (project in file("server-streaming/server-ox"))
   .dependsOn(server % "compile->compile;test->test", clientOx % "test->compile")
 
 lazy val serverPekko: Project = (project in file("server-streaming/server-pekko"))
-  .settings(commonSettings: _*)
   .settings(
     name := "chimp-server-pekko",
     libraryDependencies ++= Seq(
@@ -135,7 +132,6 @@ lazy val serverPekko: Project = (project in file("server-streaming/server-pekko"
   .dependsOn(server % "compile->compile;test->test", clientPekko % "test->compile")
 
 lazy val client: Project = (project in file("client"))
-  .settings(commonSettings: _*)
   .settings(
     name := "chimp-client",
     libraryDependencies ++= Seq(
@@ -149,7 +145,6 @@ lazy val client: Project = (project in file("client"))
   .dependsOn(core)
 
 lazy val clientZio: Project = (project in file("client-streaming/client-zio"))
-  .settings(commonSettings: _*)
   .settings(
     name := "chimp-client-zio",
     libraryDependencies ++= Seq(
@@ -163,7 +158,6 @@ lazy val clientZio: Project = (project in file("client-streaming/client-zio"))
   .dependsOn(client % "compile->compile;test->test")
 
 lazy val clientOx: Project = (project in file("client-streaming/client-ox"))
-  .settings(commonSettings: _*)
   .settings(
     name := "chimp-client-ox",
     libraryDependencies ++= Seq(
@@ -175,7 +169,6 @@ lazy val clientOx: Project = (project in file("client-streaming/client-ox"))
   .dependsOn(client % "compile->compile;test->test")
 
 lazy val clientPekko: Project = (project in file("client-streaming/client-pekko"))
-  .settings(commonSettings: _*)
   .settings(
     name := "chimp-client-pekko",
     libraryDependencies ++= Seq(
@@ -188,7 +181,6 @@ lazy val clientPekko: Project = (project in file("client-streaming/client-pekko"
   .dependsOn(client % "compile->compile;test->test")
 
 lazy val examples = (project in file("examples"))
-  .settings(commonSettings: _*)
   .settings(
     publishArtifact := false,
     name := "examples",
@@ -198,30 +190,29 @@ lazy val examples = (project in file("examples"))
       "com.softwaremill.sttp.tapir" %% "tapir-zio-http-server" % tapirV,
       "ch.qos.logback" % "logback-classic" % logbackV
     ),
-    verifyExamplesCompileUsingScalaCli := VerifyExamplesCompileUsingScalaCli(sLog.value, sourceDirectory.value)
+    verifyExamplesCompileUsingScalaCli := Def.uncached(VerifyExamplesCompileUsingScalaCli(sLog.value, sourceDirectory.value))
   )
   .dependsOn(server, serverOx, client, clientOx)
 
 import sbtassembly.AssemblyPlugin.autoImport.*
 
 lazy val assemblySettings = Seq(
   assembly / assemblyMergeStrategy := {
-    case PathList("META-INF", "MANIFEST.MF")     => MergeStrategy.discard
-    case PathList("META-INF", "INDEX.LIST")      => MergeStrategy.discard
-    case PathList("META-INF", "DEPENDENCIES")    => MergeStrategy.discard
-    case PathList("META-INF", "services", _ @_*) => MergeStrategy.concat
-    case PathList("META-INF", xs @ _*) if xs.lastOption.exists(s => s.endsWith(".SF") || s.endsWith(".DSA") || s.endsWith(".RSA")) =>
+    case PathList("META-INF", "MANIFEST.MF")  => MergeStrategy.discard
+    case PathList("META-INF", "INDEX.LIST")   => MergeStrategy.discard
+    case PathList("META-INF", "DEPENDENCIES") => MergeStrategy.discard
+    case PathList("META-INF", "services", _*) => MergeStrategy.concat
+    case PathList("META-INF", xs*) if xs.lastOption.exists(s => s.endsWith(".SF") || s.endsWith(".DSA") || s.endsWith(".RSA")) =>
       MergeStrategy.discard
-    case PathList("META-INF", _ @_*)   => MergeStrategy.first
+    case PathList("META-INF", _*)      => MergeStrategy.first
     case PathList("module-info.class") => MergeStrategy.discard
     case _                             => MergeStrategy.first
   }
 )
 
 lazy val serverConformance = (project in file("server-conformance"))
   .enablePlugins(AssemblyPlugin)
-  .settings(commonSettings: _*)
-  .settings(assemblySettings: _*)
+  .settings(assemblySettings*)
   .settings(
     publishArtifact := false,
     name := "server-conformance",
@@ -236,7 +227,7 @@ lazy val serverConformance = (project in file("server-conformance"))
 
       import scala.sys.process.*
       val args = spaceDelimited("<args>").parsed.toList
-      val jar = assembly.value
+      val jar = fileConverter.value.toPath(assembly.value).toFile
       val rootDir = (LocalRootProject / baseDirectory).value
       val specVersion = args
         .sliding(2)
@@ -270,7 +261,7 @@ lazy val serverConformance = (project in file("server-conformance"))
             more = reader.readLine()
           }
         } catch {
-          case t: Throwable => urlPromise.tryFailure(t)
+          case t: Throwable => urlPromise.tryFailure(t): Unit
         }
       })
       readerThread.setDaemon(true)
@@ -308,8 +299,7 @@ lazy val serverConformance = (project in file("server-conformance"))
 
 lazy val clientConformance = (project in file("client-conformance"))
   .enablePlugins(AssemblyPlugin)
-  .settings(commonSettings: _*)
-  .settings(assemblySettings: _*)
+  .settings(assemblySettings*)
   .settings(
     publishArtifact := false,
     name := "client-conformance",
@@ -323,7 +313,7 @@ lazy val clientConformance = (project in file("client-conformance"))
 
       import scala.sys.process.*
       val args = spaceDelimited("<args>").parsed.toList
-      val jar = assembly.value
+      val jar = fileConverter.value.toPath(assembly.value).toFile
       val baseDir = baseDirectory.value
       val rootDir = (LocalRootProject / baseDirectory).value
       val wrapper = (baseDir / "bin" / "chimp-conformance-client").getAbsolutePath
@@ -350,13 +340,8 @@ lazy val clientConformance = (project in file("client-conformance"))
   )
   .dependsOn(clientOx)
 
-val compileDocs: TaskKey[Unit] = taskKey[Unit]("Compiles docs module throwing away its output")
-compileDocs :=
-  (docs / mdoc).toTask(" --out target/chimp-docs").value
-
 lazy val docs: Project = (project in file("generated-docs"))
   .enablePlugins(MdocPlugin)
-  .settings(commonSettings)
   .settings(
     mdocIn := file("docs"),
     moduleName := "chimp-docs",