Request is int

Author: anna239

acp-model/src/commonMain/kotlin/com/agentclientprotocol/rpc/JsonRpc.kt

@@ -19,8 +19,8 @@ public const val JSONRPC_VERSION: String = "2.0"
  */
 @JvmInline
 @Serializable
-public value class RequestId(public val value: String) {
-    override fun toString(): String = value
+public value class RequestId(public val value: Int) {
+    override fun toString(): String = value.toString()
 }
 
 @JvmInline

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

@@ -10,6 +10,7 @@ import com.agentclientprotocol.rpc.*
 import com.agentclientprotocol.transport.Transport
 import com.agentclientprotocol.transport.asMessageChannel
 import io.github.oshai.kotlinlogging.KotlinLogging
+import kotlinx.atomicfu.AtomicInt
 import kotlinx.atomicfu.AtomicLong
 import kotlinx.atomicfu.AtomicRef
 import kotlinx.atomicfu.atomic
@@ -73,7 +74,7 @@ public class Protocol(
 ) {
     private val scope = CoroutineScope(parentScope.coroutineContext + SupervisorJob(parentScope.coroutineContext[Job]))
     private val requestsScope = CoroutineScope(scope.coroutineContext + SupervisorJob(scope.coroutineContext[Job]))
-    private val requestIdCounter: AtomicLong = atomic(0L)
+    private val requestIdCounter: AtomicInt = atomic(0)
     private val pendingRequests: AtomicRef<PersistentMap<RequestId, CompletableDeferred<JsonElement>>> =
         atomic(persistentMapOf())
 
@@ -121,7 +122,7 @@ public class Protocol(
         params: JsonElement? = null,
         timeout: Duration = options.requestTimeout
     ): JsonElement {
-        val requestId = RequestId(requestIdCounter.incrementAndGet().toString())
+        val requestId = RequestId(requestIdCounter.incrementAndGet())
         val deferred = CompletableDeferred<JsonElement>()
 
         pendingRequests.update { it.put(requestId, deferred) }

acp/src/jvmTest/kotlin/com/agentclientprotocol/transport/StdioTransportTest.kt

@@ -84,13 +84,13 @@ class StdioTransportTest {
     @Test
     fun `should read JSON-RPC request from input`(): Unit = runBlocking {
         val testMethod = MethodName("test.method")
-        transport.send(JsonRpcRequest(RequestId("1"), testMethod, JsonPrimitive("value")))
+        transport.send(JsonRpcRequest(RequestId(1), testMethod, JsonPrimitive("value")))
 
         // Read the message from the transport
         val message = messages.receive()
 
         assertTrue(message is JsonRpcRequest)
-        assertEquals(RequestId("1"), message.id)
+        assertEquals(RequestId(1), message.id)
         assertEquals(testMethod, message.method)
         assertNotNull(message.params)
     }
@@ -109,13 +109,13 @@ class StdioTransportTest {
 
     @Test
     fun `should read JSON-RPC response from input`(): Unit = runBlocking {
-        transport.send(JsonRpcResponse(RequestId("42"), result = JsonPrimitive("success")))
+        transport.send(JsonRpcResponse(RequestId(42), result = JsonPrimitive("success")))
 
         // Read the message from the transport
         val message = messages.receive()
 
         assertTrue(message is JsonRpcResponse)
-        assertEquals(RequestId("42"), message.id)
+        assertEquals(RequestId(42), message.id)
         assertEquals(JsonPrimitive("success"), message.result)
     }
 
@@ -124,9 +124,9 @@ class StdioTransportTest {
         val method1 = MethodName("method1")
         val notification1 = MethodName("notification1")
 
-        transport.send(JsonRpcRequest(RequestId("1"), method1))
+        transport.send(JsonRpcRequest(RequestId(1), method1))
         transport.send(JsonRpcNotification(method = notification1))
-        transport.send(JsonRpcResponse(RequestId("2"), result = JsonPrimitive("ok")))
+        transport.send(JsonRpcResponse(RequestId(2), result = JsonPrimitive("ok")))
 
         val message1 = messages.receive()
         val message2 = messages.receive()
@@ -139,16 +139,16 @@ class StdioTransportTest {
         assertEquals(notification1, message2.method)
 
         assertTrue(message3 is JsonRpcResponse)
-        assertEquals(RequestId("2"), message3.id)
+        assertEquals(RequestId(2), message3.id)
     }
 
     @Test
     fun `should skip invalid JSON lines and continue processing`(): Unit = runBlocking {
         val firstMethod = MethodName("first")
         val secondMethod = MethodName("second")
 
-        transport.send(JsonRpcRequest(RequestId("1"), firstMethod))
-        transport.send(JsonRpcRequest(RequestId("2"), secondMethod))
+        transport.send(JsonRpcRequest(RequestId(1), firstMethod))
+        transport.send(JsonRpcRequest(RequestId(2), secondMethod))
 
         val message1 = messages.receive()
         assertTrue(message1 is JsonRpcRequest)
@@ -209,7 +209,7 @@ class StdioTransportTest {
         launch {
             var i = 0
             while (transport.state.value != Transport.State.CLOSED) {
-                transport.send(JsonRpcRequest(RequestId("${i++}"), testMethod))
+                transport.send(JsonRpcRequest(RequestId(i++), testMethod))
                 delay(10.milliseconds)
             }
         }
@@ -221,7 +221,7 @@ class StdioTransportTest {
     @Test
     fun `should handle end of stream gracefully`(): Unit = runBlocking {
         val testMethod = MethodName("test")
-        transport.send(JsonRpcRequest(RequestId("1"), testMethod))
+        transport.send(JsonRpcRequest(RequestId(1), testMethod))
 
         val message = messages.receive()
         assertTrue(message is JsonRpcRequest)

samples/kotlin-acp-client-sample/src/main/kotlin/com/agentclientprotocol/samples/agent/SimpleAgent.kt

@@ -74,10 +74,10 @@ class SimpleAgent : Agent {
         return InitializeResponse(
             protocolVersion = LATEST_PROTOCOL_VERSION,
             agentCapabilities = AgentCapabilities(
-                loadSession = true,
+                loadSession = false,
                 promptCapabilities = PromptCapabilities(
                     audio = false,
-                    image = true,
+                    image = false,
                     embeddedContext = true
                 )
             ),