Cancellation exception is not properly handled #17

Author: anna239

acp/src/commonMain/kotlin/com/agentclientprotocol/client/Client.kt

@@ -193,19 +193,18 @@ public class Client(
 
     private suspend fun createSession(sessionId: SessionId, sessionParameters: SessionCreationParameters, sessionResponse: AcpCreatedSessionResponse, factory: ClientOperationsFactory): ClientSession {
         val sessionDeferred = CompletableDeferred<ClientSessionImpl>()
-        try {
+        return runCatching {
             _sessions.update { it.put(sessionId, sessionDeferred) }
 
             val operations = factory.createClientOperations(sessionId, sessionResponse)
 
             val session = ClientSessionImpl(this, sessionId, sessionParameters, operations, sessionResponse, protocol)
             sessionDeferred.complete(session)
-            return session
-        }
-        catch (e: Exception) {
-            sessionDeferred.completeExceptionally(IllegalStateException("Failed to create session $sessionId", e))
+            session
+        }.getOrElse {
+            sessionDeferred.completeExceptionally(IllegalStateException("Failed to create session $sessionId", it))
             _sessions.update { it.remove(sessionId) }
-            throw e
+            throw it
         }
     }
 

acp/src/commonMain/kotlin/com/agentclientprotocol/protocol/Protocol.kt

@@ -7,6 +7,7 @@ import com.agentclientprotocol.model.CancelRequestNotification
 import com.agentclientprotocol.rpc.*
 import com.agentclientprotocol.transport.Transport
 import com.agentclientprotocol.transport.asMessageChannel
+import com.agentclientprotocol.util.catching
 import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.atomicfu.*
 import kotlinx.collections.immutable.PersistentMap
@@ -163,17 +164,14 @@ public class Protocol(
 
         // Start processing incoming messages
         scope.launch(CoroutineName("${Protocol::class.simpleName!!}.read-messages")) {
-            try {
+            catching {
                 for (message in transport.asMessageChannel()) {
-                    try {
-                        handleIncomingMessage(message)
-                    } catch (e: Exception) {
-                        logger.error(e) { "Error processing incoming message: $message" }
+                    catching { handleIncomingMessage(message) }.onFailure { logger.error(it) {
+                        "Error processing incoming message: $message" }
                     }
                 }
-            }
-            catch (e: Exception) {
-                logger.error(e) { "Error processing incoming messages" }
+            }.onFailure {
+                logger.error(it) { "Error processing incoming messages" }
             }
         }
         transport.start()
@@ -348,7 +346,7 @@ public class Protocol(
     }
 
     private suspend fun handleIncomingMessage(message: JsonRpcMessage) {
-        try {
+        runCatching {
             when (message) {
                 is JsonRpcNotification -> {
                     handleNotification(message)
@@ -367,8 +365,8 @@ public class Protocol(
                     handleResponse(message)
                 }
             }
-        } catch (e: Exception) {
-            logger.error(e) { "Failed to parse message: $message" }
+        }.onFailure {
+            logger.error(it) { "Failed to parse message: $message" }
         }
     }
 
@@ -427,10 +425,10 @@ public class Protocol(
     private suspend fun handleNotification(notification: JsonRpcNotification) {
         val handler = notificationHandlers.value[notification.method]
         if (handler != null) {
-            try {
+            runCatching {
                 handler(notification)
-            } catch (e: Exception) {
-                logger.error(e) { "Error handling notification ${notification.method}" }
+            }.onFailure {
+                logger.error(it) { "Error handling notification ${notification.method}" }
             }
         } else {
             logger.debug { "No handler for notification: ${notification.method}" }

acp/src/commonMain/kotlin/com/agentclientprotocol/util/CoroutinesUtil.kt

@@ -0,0 +1,13 @@
+package com.agentclientprotocol.util
+
+import kotlin.coroutines.cancellation.CancellationException
+
+/** Use instead of [runCatching] for KT-55480 fix. */
+public suspend fun <R> catching(body: suspend () -> R): Result<R> =
+    try {
+        Result.success(body())
+    } catch (c: CancellationException) {
+        throw c
+    } catch (t: Throwable) {
+        Result.failure(t)
+    }

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 private val buildNumber: String? = System.getenv("GITHUB_RUN_NUMBER")
 private val isReleasePublication = System.getenv("RELEASE_PUBLICATION")?.toBoolean() ?: false
 
-private val baseVersion = "0.6.0"
+private val baseVersion = "0.7.0"
 
 allprojects {
     group = "com.agentclientprotocol"