Skip to content

Commit e5bbf5e

Browse files
anna239anna239
committed
remove duplicating classes
1 parent 4d5620c commit e5bbf5e

File tree

3 files changed

+8
-138
lines changed

3 files changed

+8
-138
lines changed

‎acp-model/api/acp-model.api‎

Lines changed: 6 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,18 +1789,18 @@ public final class com/agentclientprotocol/model/RequestPermissionOutcome$Select
17891789

17901790
public final class com/agentclientprotocol/model/RequestPermissionRequest : com/agentclientprotocol/model/AcpRequest {
17911791
public static final field Companion Lcom/agentclientprotocol/model/RequestPermissionRequest$Companion;
1792-
public synthetic fun <init> (Ljava/lang/String;Lcom/agentclientprotocol/model/ToolCallUpdate;Ljava/util/List;Lkotlinx/serialization/json/JsonElement;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
1793-
public synthetic fun <init> (Ljava/lang/String;Lcom/agentclientprotocol/model/ToolCallUpdate;Ljava/util/List;Lkotlinx/serialization/json/JsonElement;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
1792+
public synthetic fun <init> (Ljava/lang/String;Lcom/agentclientprotocol/model/SessionUpdate$ToolCallUpdate;Ljava/util/List;Lkotlinx/serialization/json/JsonElement;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
1793+
public synthetic fun <init> (Ljava/lang/String;Lcom/agentclientprotocol/model/SessionUpdate$ToolCallUpdate;Ljava/util/List;Lkotlinx/serialization/json/JsonElement;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
17941794
public final fun component1-7EW-EgU ()Ljava/lang/String;
1795-
public final fun component2 ()Lcom/agentclientprotocol/model/ToolCallUpdate;
1795+
public final fun component2 ()Lcom/agentclientprotocol/model/SessionUpdate$ToolCallUpdate;
17961796
public final fun component3 ()Ljava/util/List;
17971797
public final fun component4 ()Lkotlinx/serialization/json/JsonElement;
1798-
public final fun copy-wPMwmcM (Ljava/lang/String;Lcom/agentclientprotocol/model/ToolCallUpdate;Ljava/util/List;Lkotlinx/serialization/json/JsonElement;)Lcom/agentclientprotocol/model/RequestPermissionRequest;
1799-
public static synthetic fun copy-wPMwmcM$default (Lcom/agentclientprotocol/model/RequestPermissionRequest;Ljava/lang/String;Lcom/agentclientprotocol/model/ToolCallUpdate;Ljava/util/List;Lkotlinx/serialization/json/JsonElement;ILjava/lang/Object;)Lcom/agentclientprotocol/model/RequestPermissionRequest;
1798+
public final fun copy-wPMwmcM (Ljava/lang/String;Lcom/agentclientprotocol/model/SessionUpdate$ToolCallUpdate;Ljava/util/List;Lkotlinx/serialization/json/JsonElement;)Lcom/agentclientprotocol/model/RequestPermissionRequest;
1799+
public static synthetic fun copy-wPMwmcM$default (Lcom/agentclientprotocol/model/RequestPermissionRequest;Ljava/lang/String;Lcom/agentclientprotocol/model/SessionUpdate$ToolCallUpdate;Ljava/util/List;Lkotlinx/serialization/json/JsonElement;ILjava/lang/Object;)Lcom/agentclientprotocol/model/RequestPermissionRequest;
18001800
public fun equals (Ljava/lang/Object;)Z
18011801
public final fun getOptions ()Ljava/util/List;
18021802
public final fun getSessionId-7EW-EgU ()Ljava/lang/String;
1803-
public final fun getToolCall ()Lcom/agentclientprotocol/model/ToolCallUpdate;
1803+
public final fun getToolCall ()Lcom/agentclientprotocol/model/SessionUpdate$ToolCallUpdate;
18041804
public fun get_meta ()Lkotlinx/serialization/json/JsonElement;
18051805
public fun hashCode ()I
18061806
public fun toString ()Ljava/lang/String;
@@ -2595,50 +2595,6 @@ public final class com/agentclientprotocol/model/TerminalOutputResponse$Companio
25952595
public final fun serializer ()Lkotlinx/serialization/KSerializer;
25962596
}
25972597

2598-
public final class com/agentclientprotocol/model/ToolCall : com/agentclientprotocol/model/AcpWithMeta {
2599-
public static final field Companion Lcom/agentclientprotocol/model/ToolCall$Companion;
2600-
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Lcom/agentclientprotocol/model/ToolKind;Lcom/agentclientprotocol/model/ToolCallStatus;Ljava/util/List;Ljava/util/List;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/json/JsonElement;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
2601-
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Lcom/agentclientprotocol/model/ToolKind;Lcom/agentclientprotocol/model/ToolCallStatus;Ljava/util/List;Ljava/util/List;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/json/JsonElement;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
2602-
public final fun component1-DimCYko ()Ljava/lang/String;
2603-
public final fun component2 ()Ljava/lang/String;
2604-
public final fun component3 ()Lcom/agentclientprotocol/model/ToolKind;
2605-
public final fun component4 ()Lcom/agentclientprotocol/model/ToolCallStatus;
2606-
public final fun component5 ()Ljava/util/List;
2607-
public final fun component6 ()Ljava/util/List;
2608-
public final fun component7 ()Lkotlinx/serialization/json/JsonElement;
2609-
public final fun component8 ()Lkotlinx/serialization/json/JsonElement;
2610-
public final fun component9 ()Lkotlinx/serialization/json/JsonElement;
2611-
public final fun copy-IATGWB8 (Ljava/lang/String;Ljava/lang/String;Lcom/agentclientprotocol/model/ToolKind;Lcom/agentclientprotocol/model/ToolCallStatus;Ljava/util/List;Ljava/util/List;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/json/JsonElement;)Lcom/agentclientprotocol/model/ToolCall;
2612-
public static synthetic fun copy-IATGWB8$default (Lcom/agentclientprotocol/model/ToolCall;Ljava/lang/String;Ljava/lang/String;Lcom/agentclientprotocol/model/ToolKind;Lcom/agentclientprotocol/model/ToolCallStatus;Ljava/util/List;Ljava/util/List;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/json/JsonElement;ILjava/lang/Object;)Lcom/agentclientprotocol/model/ToolCall;
2613-
public fun equals (Ljava/lang/Object;)Z
2614-
public final fun getContent ()Ljava/util/List;
2615-
public final fun getKind ()Lcom/agentclientprotocol/model/ToolKind;
2616-
public final fun getLocations ()Ljava/util/List;
2617-
public final fun getRawInput ()Lkotlinx/serialization/json/JsonElement;
2618-
public final fun getRawOutput ()Lkotlinx/serialization/json/JsonElement;
2619-
public final fun getStatus ()Lcom/agentclientprotocol/model/ToolCallStatus;
2620-
public final fun getTitle ()Ljava/lang/String;
2621-
public final fun getToolCallId-DimCYko ()Ljava/lang/String;
2622-
public fun get_meta ()Lkotlinx/serialization/json/JsonElement;
2623-
public fun hashCode ()I
2624-
public fun toString ()Ljava/lang/String;
2625-
}
2626-
2627-
public final synthetic class com/agentclientprotocol/model/ToolCall$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
2628-
public static final field INSTANCE Lcom/agentclientprotocol/model/ToolCall$$serializer;
2629-
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
2630-
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/agentclientprotocol/model/ToolCall;
2631-
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
2632-
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
2633-
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/agentclientprotocol/model/ToolCall;)V
2634-
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
2635-
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
2636-
}
2637-
2638-
public final class com/agentclientprotocol/model/ToolCall$Companion {
2639-
public final fun serializer ()Lkotlinx/serialization/KSerializer;
2640-
}
2641-
26422598
public abstract class com/agentclientprotocol/model/ToolCallContent {
26432599
public static final field Companion Lcom/agentclientprotocol/model/ToolCallContent$Companion;
26442600
public synthetic fun <init> (ILkotlinx/serialization/internal/SerializationConstructorMarker;)V
@@ -2814,50 +2770,6 @@ public final class com/agentclientprotocol/model/ToolCallStatus$Companion {
28142770
public final fun serializer ()Lkotlinx/serialization/KSerializer;
28152771
}
28162772

2817-
public final class com/agentclientprotocol/model/ToolCallUpdate : com/agentclientprotocol/model/AcpWithMeta {
2818-
public static final field Companion Lcom/agentclientprotocol/model/ToolCallUpdate$Companion;
2819-
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Lcom/agentclientprotocol/model/ToolKind;Lcom/agentclientprotocol/model/ToolCallStatus;Ljava/util/List;Ljava/util/List;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/json/JsonElement;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
2820-
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Lcom/agentclientprotocol/model/ToolKind;Lcom/agentclientprotocol/model/ToolCallStatus;Ljava/util/List;Ljava/util/List;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/json/JsonElement;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
2821-
public final fun component1-DimCYko ()Ljava/lang/String;
2822-
public final fun component2 ()Ljava/lang/String;
2823-
public final fun component3 ()Lcom/agentclientprotocol/model/ToolKind;
2824-
public final fun component4 ()Lcom/agentclientprotocol/model/ToolCallStatus;
2825-
public final fun component5 ()Ljava/util/List;
2826-
public final fun component6 ()Ljava/util/List;
2827-
public final fun component7 ()Lkotlinx/serialization/json/JsonElement;
2828-
public final fun component8 ()Lkotlinx/serialization/json/JsonElement;
2829-
public final fun component9 ()Lkotlinx/serialization/json/JsonElement;
2830-
public final fun copy-IATGWB8 (Ljava/lang/String;Ljava/lang/String;Lcom/agentclientprotocol/model/ToolKind;Lcom/agentclientprotocol/model/ToolCallStatus;Ljava/util/List;Ljava/util/List;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/json/JsonElement;)Lcom/agentclientprotocol/model/ToolCallUpdate;
2831-
public static synthetic fun copy-IATGWB8$default (Lcom/agentclientprotocol/model/ToolCallUpdate;Ljava/lang/String;Ljava/lang/String;Lcom/agentclientprotocol/model/ToolKind;Lcom/agentclientprotocol/model/ToolCallStatus;Ljava/util/List;Ljava/util/List;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/json/JsonElement;Lkotlinx/serialization/json/JsonElement;ILjava/lang/Object;)Lcom/agentclientprotocol/model/ToolCallUpdate;
2832-
public fun equals (Ljava/lang/Object;)Z
2833-
public final fun getContent ()Ljava/util/List;
2834-
public final fun getKind ()Lcom/agentclientprotocol/model/ToolKind;
2835-
public final fun getLocations ()Ljava/util/List;
2836-
public final fun getRawInput ()Lkotlinx/serialization/json/JsonElement;
2837-
public final fun getRawOutput ()Lkotlinx/serialization/json/JsonElement;
2838-
public final fun getStatus ()Lcom/agentclientprotocol/model/ToolCallStatus;
2839-
public final fun getTitle ()Ljava/lang/String;
2840-
public final fun getToolCallId-DimCYko ()Ljava/lang/String;
2841-
public fun get_meta ()Lkotlinx/serialization/json/JsonElement;
2842-
public fun hashCode ()I
2843-
public fun toString ()Ljava/lang/String;
2844-
}
2845-
2846-
public final synthetic class com/agentclientprotocol/model/ToolCallUpdate$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
2847-
public static final field INSTANCE Lcom/agentclientprotocol/model/ToolCallUpdate$$serializer;
2848-
public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
2849-
public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/agentclientprotocol/model/ToolCallUpdate;
2850-
public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
2851-
public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
2852-
public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/agentclientprotocol/model/ToolCallUpdate;)V
2853-
public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
2854-
public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
2855-
}
2856-
2857-
public final class com/agentclientprotocol/model/ToolCallUpdate$Companion {
2858-
public final fun serializer ()Lkotlinx/serialization/KSerializer;
2859-
}
2860-
28612773
public final class com/agentclientprotocol/model/ToolKind : java/lang/Enum {
28622774
public static final field Companion Lcom/agentclientprotocol/model/ToolKind$Companion;
28632775
public static final field DELETE Lcom/agentclientprotocol/model/ToolKind;

‎acp-model/src/commonMain/kotlin/com/agentclientprotocol/model/Requests.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ public data class WriteTextFileRequest(
255255
@Serializable
256256
public data class RequestPermissionRequest(
257257
val sessionId: SessionId,
258-
val toolCall: ToolCallUpdate,
258+
val toolCall: SessionUpdate.ToolCallUpdate,
259259
val options: List<PermissionOption>,
260260
override val _meta: JsonElement? = null
261261
) : AcpRequest

‎acp-model/src/commonMain/kotlin/com/agentclientprotocol/model/ToolCall.kt‎

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -97,46 +97,4 @@ public sealed class ToolCallContent {
9797
public data class Terminal(
9898
val terminalId: String
9999
) : ToolCallContent()
100-
}
101-
102-
/**
103-
* Represents a tool call that the language model has requested.
104-
*
105-
* Tool calls are actions that the agent executes on behalf of the language model,
106-
* such as reading files, executing code, or fetching data from external sources.
107-
*
108-
* See protocol docs: [Tool Calls](https://agentclientprotocol.com/protocol/tool-calls)
109-
*/
110-
@Serializable
111-
public data class ToolCall(
112-
val toolCallId: ToolCallId,
113-
val title: String,
114-
val kind: ToolKind? = null,
115-
val status: ToolCallStatus? = null,
116-
val content: List<ToolCallContent> = emptyList(),
117-
val locations: List<ToolCallLocation> = emptyList(),
118-
val rawInput: JsonElement? = null,
119-
val rawOutput: JsonElement? = null,
120-
override val _meta: JsonElement? = null
121-
) : AcpWithMeta
122-
123-
/**
124-
* An update to an existing tool call.
125-
*
126-
* Used to report progress and results as tools execute. All fields except
127-
* the tool call ID are optional - only changed fields need to be included.
128-
*
129-
* See protocol docs: [Updating](https://agentclientprotocol.com/protocol/tool-calls#updating)
130-
*/
131-
@Serializable
132-
public data class ToolCallUpdate(
133-
val toolCallId: ToolCallId,
134-
val title: String? = null,
135-
val kind: ToolKind? = null,
136-
val status: ToolCallStatus? = null,
137-
val content: List<ToolCallContent>? = null,
138-
val locations: List<ToolCallLocation>? = null,
139-
val rawInput: JsonElement? = null,
140-
val rawOutput: JsonElement? = null,
141-
override val _meta: JsonElement? = null
142-
) : AcpWithMeta
100+
}

0 commit comments

Comments
 (0)