fix(amazonq): do not model types that are directly passthrough to chat ui

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClient.kt

@@ -9,13 +9,10 @@ import org.eclipse.lsp4j.services.LanguageClient
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.LSPAny
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_SEND_CONTEXT_COMMANDS
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_SEND_UPDATE
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatUpdateParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GET_SERIALIZED_CHAT_REQUEST_METHOD
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GetSerializedChatParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GetSerializedChatResult
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.OPEN_FILE_DIFF
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.OpenFileDiffParams
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.OpenTabParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.OpenTabResult
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SHOW_SAVE_FILE_DIALOG_REQUEST_METHOD
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ShowSaveFileDialogParams
@@ -32,16 +29,16 @@ interface AmazonQLanguageClient : LanguageClient {
     fun getConnectionMetadata(): CompletableFuture<ConnectionMetadata>
 
     @JsonRequest("aws/chat/openTab")
-    fun openTab(params: OpenTabParams): CompletableFuture<OpenTabResult>
+    fun openTab(params: LSPAny): CompletableFuture<OpenTabResult>
 
     @JsonRequest(SHOW_SAVE_FILE_DIALOG_REQUEST_METHOD)
     fun showSaveFileDialog(params: ShowSaveFileDialogParams): CompletableFuture<ShowSaveFileDialogResult>
 
     @JsonRequest(GET_SERIALIZED_CHAT_REQUEST_METHOD)
-    fun getSerializedChat(params: GetSerializedChatParams): CompletableFuture<GetSerializedChatResult>
+    fun getSerializedChat(params: LSPAny): CompletableFuture<GetSerializedChatResult>
 
     @JsonNotification(CHAT_SEND_UPDATE)
-    fun sendChatUpdate(params: ChatUpdateParams): CompletableFuture<Unit>
+    fun sendChatUpdate(params: LSPAny): CompletableFuture<Unit>
 
     @JsonNotification(OPEN_FILE_DIFF)
     fun openFileDiff(params: OpenFileDiffParams): CompletableFuture<Unit>

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt

@@ -38,12 +38,9 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.LSPAny
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_OPEN_TAB
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_SEND_CONTEXT_COMMANDS
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_SEND_UPDATE
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatUpdateParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GET_SERIALIZED_CHAT_REQUEST_METHOD
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GetSerializedChatParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GetSerializedChatResult
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.OpenFileDiffParams
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.OpenTabParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.OpenTabResult
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ShowSaveFileDialogParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ShowSaveFileDialogResult
@@ -134,7 +131,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
             }
         }
 
-    override fun openTab(params: OpenTabParams): CompletableFuture<OpenTabResult> {
+    override fun openTab(params: LSPAny): CompletableFuture<OpenTabResult> {
         val requestId = UUID.randomUUID().toString()
         val result = CompletableFuture<OpenTabResult>()
         val chatManager = ChatCommunicationManager.getInstance(project)
@@ -186,7 +183,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
         )
     }
 
-    override fun getSerializedChat(params: GetSerializedChatParams): CompletableFuture<GetSerializedChatResult> {
+    override fun getSerializedChat(params: LSPAny): CompletableFuture<GetSerializedChatResult> {
         val requestId = UUID.randomUUID().toString()
         val result = CompletableFuture<GetSerializedChatResult>()
         val chatManager = ChatCommunicationManager.getInstance(project)
@@ -261,7 +258,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
         }
     }
 
-    override fun sendChatUpdate(params: ChatUpdateParams): CompletableFuture<Unit> {
+    override fun sendChatUpdate(params: LSPAny): CompletableFuture<Unit> {
         AsyncChatUiListener.notifyPartialMessageUpdate(
             FlareUiMessage(
                 command = CHAT_SEND_UPDATE,
@@ -345,7 +342,7 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
         chatManager.notifyUi(
             FlareUiMessage(
                 command = CHAT_SEND_CONTEXT_COMMANDS,
-                params = params ?: error("received empty payload for $CHAT_SEND_CONTEXT_COMMANDS"),
+                params = params,
             )
         )
         return CompletableFuture.completedFuture(Unit)

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/ChatCommunicationManager.kt

@@ -149,14 +149,14 @@ class ChatCommunicationManager(private val cs: CoroutineScope) {
                 reauthConnectionIfNeeded(project, it, isReAuth = true)
             }
             when (incomingType) {
-                AuthFollowupType.USE_SUPPORTED_AUTH.value -> {
+                AuthFollowupType.USE_SUPPORTED_AUTH -> {
                     project.messageBus.syncPublisher(QRegionProfileSelectedListener.TOPIC)
                         .onProfileSelected(project, QRegionProfileManager.getInstance().activeProfile(project))
                     return
                 }
-                AuthFollowupType.RE_AUTH.value,
-                AuthFollowupType.MISSING_SCOPES.value,
-                AuthFollowupType.FULL_AUTH.value,
+                AuthFollowupType.RE_AUTH,
+                AuthFollowupType.MISSING_SCOPES,
+                AuthFollowupType.FULL_AUTH,
                 -> {
                     return
                 }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/EnumJsonValueAdapter.kt

@@ -0,0 +1,42 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.model
+
+import com.fasterxml.jackson.annotation.JsonValue
+import com.google.gson.Gson
+import com.google.gson.TypeAdapter
+import com.google.gson.TypeAdapterFactory
+import com.google.gson.reflect.TypeToken
+
+/**
+ * A [Gson] [TypeAdapterFactory] that uses Jackson @[JsonValue] instead of [Enum.name] for de/serialization
+ */
+class EnumJsonValueAdapter : TypeAdapterFactory {
+    override fun <T> create(
+        gson: Gson,
+        type: TypeToken<T>
+    ): TypeAdapter<T>? {
+        val rawType = type.getRawType()
+        if (!rawType.isEnum) {
+            return null
+        }
+
+        val jsonField = rawType.declaredFields.firstOrNull { it.isAnnotationPresent(JsonValue::class.java) }
+            ?: return null
+
+        jsonField.isAccessible = true
+
+        return object : TypeAdapter<T>() {
+            override fun write(out: com.google.gson.stream.JsonWriter, value: T) {
+                val result = jsonField.get(value) as Any
+                (gson.getAdapter(result::class.java) as TypeAdapter<Any>).write(out, result)
+            }
+
+            override fun read(`in`: com.google.gson.stream.JsonReader): T {
+                val jsonValue = `in`.nextString()
+                return rawType.enumConstants.first { jsonField.get(it).toString() == jsonValue } as T
+            }
+        } as TypeAdapter<T>
+    }
+}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/LspServerConfigurations.kt

@@ -14,4 +14,4 @@ data class UpdateConfigurationParams(
     val settings: LSPAny,
 )
 
-typealias LSPAny = Any?
+typealias LSPAny = Any

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/AuthFollowUpClicked.kt

@@ -3,6 +3,10 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
 
+import com.fasterxml.jackson.annotation.JsonValue
+import com.google.gson.annotations.JsonAdapter
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.EnumJsonValueAdapter
+
 data class AuthFollowUpClickNotification(
     override val command: String,
     override val params: AuthFollowUpClickedParams,
@@ -11,21 +15,14 @@
 data class AuthFollowUpClickedParams(
     val tabId: String,
     val messageId: String,
-    val authFollowupType: String,
-) {
-    companion object {
-        fun create(tabId: String, messageId: String, authType: AuthFollowupType): AuthFollowUpClickedParams =
-            AuthFollowUpClickedParams(tabId, messageId, authType.value)
-    }
-}
+    val authFollowupType: AuthFollowupType,
+)
 
-enum class AuthFollowupType(val value: String) {
+@JsonAdapter(EnumJsonValueAdapter::class)
+enum class AuthFollowupType(@JsonValue val repr: String) {
     FULL_AUTH("full-auth"),
     RE_AUTH("re-auth"),
     MISSING_SCOPES("missing_scopes"),
     USE_SUPPORTED_AUTH("use-supported-auth"),
     ;
-
-    override fun toString(): String =
-        name.lowercase()
 }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/ChatMessage.kt

@@ -3,7 +3,9 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
 
-import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonValue
+import com.google.gson.annotations.JsonAdapter
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.EnumJsonValueAdapter
 
 data class ChatMessage(
     val type: MessageType? = MessageType.ANSWER,
@@ -69,92 +71,51 @@
     val total: Int? = null,
 )
 
-enum class IconType {
-    @JsonProperty("file")
-    FILE,
-
-    @JsonProperty("folder")
-    FOLDER,
-
-    @JsonProperty("code-block")
-    CODE_BLOCK,
-
-    @JsonProperty("list-add")
-    LIST_ADD,
-
-    @JsonProperty("magic")
-    MAGIC,
-
-    @JsonProperty("help")
-    HELP,
-
-    @JsonProperty("trash")
-    TRASH,
-
-    @JsonProperty("search")
-    SEARCH,
-
-    @JsonProperty("calendar")
-    CALENDAR,
+@JsonAdapter(EnumJsonValueAdapter::class)
+enum class IconType(@JsonValue val repr: String) {
+    FILE("file"),
+    FOLDER("folder"),
+    CODE_BLOCK("code-block"),
+    LIST_ADD("list-add"),
+    MAGIC("magic"),
+    HELP("help"),
+    TRASH("trash"),
+    SEARCH("search"),
+    CALENDAR("calendar"),
     ;
 
-    companion object {
-        private val stringToEnum: Map<String, IconType> = entries.associateBy { it.name.lowercase() }
-
-        fun fromString(value: String): IconType = stringToEnum[value] ?: throw IllegalArgumentException("Unknown IconType: $value")
-    }
 }
 
-enum class Status {
-    @JsonProperty("info")
-    INFO,
-
-    @JsonProperty("success")
-    SUCCESS,
-
-    @JsonProperty("warning")
-    WARNING,
+@JsonAdapter(EnumJsonValueAdapter::class)
+enum class Status(@JsonValue val repr: String) {
+    INFO("info"),
+    SUCCESS("success"),
+    WARNING("warning"),
+    ERROR("error"),
+    ;
 
-    @JsonProperty("error")
-    ERROR,
 }
 
-enum class ButtonStatus {
-    @JsonProperty("main")
-    MAIN,
-
-    @JsonProperty("primary")
-    PRIMARY,
-
-    @JsonProperty("clear")
-    CLEAR,
-
-    @JsonProperty("info")
-    INFO,
-
-    @JsonProperty("success")
-    SUCCESS,
-
-    @JsonProperty("warning")
-    WARNING,
+@JsonAdapter(EnumJsonValueAdapter::class)
+enum class ButtonStatus(@JsonValue val repr: String) {
+    MAIN("main"),
+    PRIMARY("primary"),
+    CLEAR("clear"),
+    INFO("info"),
+    SUCCESS("success"),
+    WARNING("warning"),
+    ERROR("error"),
+    ;
 
-    @JsonProperty("error")
-    ERROR,
 }
 
-enum class MessageType {
-    @JsonProperty("answer")
-    ANSWER,
-
-    @JsonProperty("prompt")
-    PROMPT,
-
-    @JsonProperty("system-prompt")
-    SYSTEM_PROMPT,
-
-    @JsonProperty("directive")
-    DIRECTIVE,
-
-    @JsonProperty("tool")
-    TOOL,
+// https://github.com/aws/language-server-runtimes/blame/68319c975d29a8ba9b084c9fa780ebff75b286bb/types/chat.ts#L127
+@JsonAdapter(EnumJsonValueAdapter::class)
+enum class MessageType(@JsonValue val repr: String) {
+    ANSWER("answer"),
+    PROMPT("prompt"),
+    SYSTEM_PROMPT("system-prompt"),
+    DIRECTIVE("directive"),
+    TOOL("tool"),
+    ;
 }