fix(amazonqFeatureDev): include defaults for empty string

Author: tverney

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/clients/FeatureDevClient.kt

@@ -107,7 +107,7 @@ class FeatureDevClient(private val project: Project) {
                 )
         }
 
-    fun startTaskAssistCodeGeneration(conversationId: String, uploadId: String, userMessage: String, codeGenerationId: UUID, currentCodeGenerationId: UUID?): StartTaskAssistCodeGenerationResponse = bearerClient()
+    fun startTaskAssistCodeGeneration(conversationId: String, uploadId: String, userMessage: String, codeGenerationId: UUID, currentCodeGenerationId: String?): StartTaskAssistCodeGenerationResponse = bearerClient()
         .startTaskAssistCodeGeneration {
                 request ->
             request
@@ -121,7 +121,7 @@ class FeatureDevClient(private val project: Project) {
                     it
                         .programmingLanguage { pl -> pl.languageName("javascript") } // This parameter is omitted by featureDev but required in the request
                         .uploadId(uploadId)
-                }.codeGenerationId(codeGenerationId.toString()).currentCodeGenerationId(currentCodeGenerationId.toString())
+                }.codeGenerationId(codeGenerationId.toString()).currentCodeGenerationId(currentCodeGenerationId)
         }
 
     fun getTaskAssistCodeGeneration(conversationId: String, codeGenerationId: String): GetTaskAssistCodeGenerationResponse = bearerClient()

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

@@ -53,6 +53,8 @@ class CodeGenerationState(
         var numberOfFilesGenerated: Int? = null
         try {
             val codeGenerationId = UUID.randomUUID()
+
+
             val response = config.featureDevService.startTaskAssistCodeGeneration(
                 conversationId = config.conversationId,
                 uploadId = uploadId,
@@ -61,6 +63,10 @@ class CodeGenerationState(
                 currentCodeGenerationId = currentCodeGenerationId
             )
 
+            if (action.token?.token()?.isCancellationRequested != true) {
+                this.currentCodeGenerationId = codeGenerationId
+            }
+
             messenger.sendAnswerPart(
                 tabId = tabID,
                 message = message("amazonqFeatureDev.code_generation.generating_code")

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/FeatureDevService.kt

@@ -122,7 +122,7 @@ class FeatureDevService(val proxyClient: FeatureDevClient, val project: Project)
                 uploadId,
                 message,
                 codeGenerationId,
-                currentCodeGenerationId
+                currentCodeGenerationId?.toString() ?: "EMPTY_CURRENT_CODE_GENERATION_ID"
             )
 
             logger.debug { "$FEATURE_NAME: Started code generation with requestId: ${startCodeGenerationResponse.responseMetadata().requestId()}" }

plugins/amazonq/mynah-ui/src/mynah-ui/ui/main.ts

@@ -130,6 +130,7 @@ export const createMynahUI = (ideApi: any, featureDevInitEnabled: boolean, codeT
                 mynahUI.updateStore(tabID, {
                     loadingChat: true,
                     promptInputDisabledState: true,
+                    cancelButtonWhenLoading: true,
                 })
                 if (message) {
                     mynahUI.updateLastChatAnswer(tabID, {
@@ -272,6 +273,7 @@ export const createMynahUI = (ideApi: any, featureDevInitEnabled: boolean, codeT
             ) {
                 mynahUI.updateStore(tabID, {
                     loadingChat: true,
+                    cancelButtonWhenLoading: false,
                     promptInputDisabledState: true,
                 })