Skip to content

Indicate deletes in diffs #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KirillAlekhnovich wants to merge 1 commit into
base: master
Choose a base branch
from
+66 −6
Open

Indicate deletes in diffs #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions acp-model/api/acp-model.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3765,15 +3765,17 @@ public final class com/agentclientprotocol/model/ToolCallContent$Content$Compani

public final class com/agentclientprotocol/model/ToolCallContent$Diff : com/agentclientprotocol/model/ToolCallContent, com/agentclientprotocol/model/AcpWithMeta {
public static final field Companion Lcom/agentclientprotocol/model/ToolCallContent$Diff$Companion;
public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/json/JsonElement;)V
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/json/JsonElement;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLkotlinx/serialization/json/JsonElement;)V
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLkotlinx/serialization/json/JsonElement;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun component1 ()Ljava/lang/String;
public final fun component2 ()Ljava/lang/String;
public final fun component3 ()Ljava/lang/String;
public final fun component4 ()Lkotlinx/serialization/json/JsonElement;
public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/json/JsonElement;)Lcom/agentclientprotocol/model/ToolCallContent$Diff;
public static synthetic fun copy$default (Lcom/agentclientprotocol/model/ToolCallContent$Diff;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lkotlinx/serialization/json/JsonElement;ILjava/lang/Object;)Lcom/agentclientprotocol/model/ToolCallContent$Diff;
public final fun component4 ()Z
public final fun component5 ()Lkotlinx/serialization/json/JsonElement;
public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLkotlinx/serialization/json/JsonElement;)Lcom/agentclientprotocol/model/ToolCallContent$Diff;
public static synthetic fun copy$default (Lcom/agentclientprotocol/model/ToolCallContent$Diff;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLkotlinx/serialization/json/JsonElement;ILjava/lang/Object;)Lcom/agentclientprotocol/model/ToolCallContent$Diff;
public fun equals (Ljava/lang/Object;)Z
public final fun getDeleted ()Z
public final fun getNewText ()Ljava/lang/String;
public final fun getOldText ()Ljava/lang/String;
public final fun getPath ()Ljava/lang/String;
Expand Down
1 change: 1 addition & 0 deletions acp-model/src/commonMain/kotlin/com/agentclientprotocol/model/ToolCall.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ public sealed class ToolCallContent {
val path: String,
val newText: String,
val oldText: String? = null,
val deleted: Boolean = false,
override val _meta: JsonElement? = null
) : ToolCallContent(), AcpWithMeta

Expand Down
59 changes: 58 additions & 1 deletion acp-model/src/commonTest/kotlin/com/agentclientprotocol/model/SerializationTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.agentclientprotocol.model
import com.agentclientprotocol.rpc.ACPJson
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertFalse
import kotlin.test.assertTrue

class SerializationTests {
Expand Down Expand Up @@ -140,4 +141,60 @@ class SerializationTests {
assertEquals(500000L, update.size)
assertEquals(null, update.cost)
}
}

@Test
fun `decodes diff without deleted flag defaulting to false`() {
val payload = """
{
"type": "diff",
"path": "/home/user/project/src/main.kt",
"oldText": "fun main() {}",
"newText": ""
}
""".trimIndent()

val content = ACPJson.decodeFromString(ToolCallContent.serializer(), payload)

assertTrue(content is ToolCallContent.Diff)
assertEquals("/home/user/project/src/main.kt", content.path)
assertEquals("fun main() {}", content.oldText)
assertEquals("", content.newText)
assertFalse(content.deleted)
}

@Test
fun `decodes diff with deleted true`() {
val payload = """
{
"type": "diff",
"path": "/home/user/project/src/main.kt",
"oldText": "fun main() {}",
"newText": "",
"deleted": true
}
""".trimIndent()

val content = ACPJson.decodeFromString(ToolCallContent.serializer(), payload)

assertTrue(content is ToolCallContent.Diff)
assertTrue(content.deleted)
}

@Test
fun `decodes diff with deleted false`() {
val payload = """
{
"type": "diff",
"path": "/home/user/project/src/main.kt",
"oldText": "fun main() {}",
"newText": "",
"deleted": false
}
""".trimIndent()

val content = ACPJson.decodeFromString(ToolCallContent.serializer(), payload)

assertTrue(content is ToolCallContent.Diff)
assertFalse(content.deleted)
}
}