fix(dev): add messageId to disable previous iterations

Author: tverney

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessage.kt

@@ -26,6 +26,7 @@ sealed interface IncomingFeatureDevMessage : FeatureDevBaseMessage {
 
     data class StoreMessageIdMessage(
         @JsonProperty("tabID") val tabId: String,
+        val command: String,
         val messageId: String?,
     ) : IncomingFeatureDevMessage
 
@@ -204,6 +205,7 @@ data class CodeResultMessage(
     val filePaths: List<NewFileZipInfo>,
     val deletedFiles: List<DeletedFileInfo>,
     val references: List<CodeReference>,
+    val messageId: String?
 ) : UiMessage(
     tabId = tabId,
     type = "codeResultMessage"

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessagePublisherExtensions.kt

@@ -222,6 +222,7 @@ suspend fun MessagePublisher.sendCodeResult(
     deletedFiles: List<DeletedFileInfo>,
     references: List<CodeReferenceGenerated>,
 ) {
+    val messageId = UUID.randomUUID()
     val refs =
         references.map { ref ->
             CodeReference(
@@ -244,6 +245,7 @@ suspend fun MessagePublisher.sendCodeResult(
             filePaths = filePaths,
             deletedFiles = deletedFiles,
             references = refs,
+            messageId = messageId.toString(),
         ),
     )
 }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/Session.kt

@@ -36,7 +36,7 @@ class Session(
     private var task: String = ""
     private val proxyClient: FeatureDevClient
     private val featureDevService: FeatureDevService
-    var _codeResultMessageId: String? = null
+    private var _codeResultMessageId: String? = null
 
     // retry session state vars
     private var codegenRetries: Int

plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/featureDevChatConnector.ts

@@ -140,7 +140,7 @@ export class Connector {
 
     private processCodeResultMessage = async (messageData: any): Promise<void> => {
         if (this.onChatAnswerReceived !== undefined) {
-            const messageId = messageData.messageID ?? messageData.triggerID ?? messageData.conversationID
+            const messageId = messageData.messageId ?? messageData.messageID ?? messageData.triggerID ?? messageData.conversationID ?? messageData.codeGenerationId
             this.sendMessageToExtension({ command: 'store-code-result-message-id', tabID: messageData.tabID, messageId, tabType: 'featuredev' })
             const actions = getActions([
                 ...messageData.filePaths,