fix(amazonq): /doc enable text input in edit mode for retries and use it instead of retry button

Author: Viktor Shesternyak

.changes/next-release/bugfix-9a5972a0-db20-47a8-8b0d-b8ae31506e7e.json

@@ -1,4 +1,4 @@
 {
   "type" : "bugfix",
-  "description" : "AmazonQ doc agent: Enable text input in edit mode for retries and use it instead of retry button"
+  "description" : "Amazon Q /doc: Ask for user prompt if error occurs while updating documentation"
 }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/DocConstants.kt

@@ -3,6 +3,11 @@
 
 package software.aws.toolkits.jetbrains.services.amazonqDoc
 
+import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.FollowUp
+import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.FollowUpStatusType
+import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.FollowUpTypes
+import software.aws.toolkits.resources.message
+
 const val FEATURE_EVALUATION_PRODUCT_NAME = "DocGeneration"
 
 const val FEATURE_NAME = "Amazon Q Documentation Generation"
@@ -25,3 +30,17 @@ enum class ModifySourceFolderErrorReason(
 
     override fun toString(): String = reasonText
 }
+
+
+val NEW_SESSION_FOLLOWUPS: List<FollowUp> = listOf(
+    FollowUp(
+        pillText = message("amazonqDoc.prompt.reject.new_task"),
+        type = FollowUpTypes.NEW_TASK,
+        status = FollowUpStatusType.Info
+    ),
+    FollowUp(
+        pillText = message("amazonqDoc.prompt.reject.close_session"),
+        type = FollowUpTypes.CLOSE_SESSION,
+        status = FollowUpStatusType.Info
+    ))
+

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocController.kt

@@ -380,7 +380,7 @@ class DocController(
                     tabId = message.tabId,
                     errMessage = message("amazonqFeatureDev.exception.open_diff_failed"),
                     retries = 0,
-                    conversationId = session.conversationIdUnsafe,
+                    conversationId = session.conversationIdUnsafe
                 )
             }
         }
@@ -428,10 +428,9 @@ class DocController(
             messenger.sendUpdatePlaceholder(tabId, message("amazonqDoc.prompt.placeholder"))
         } catch (err: Exception) {
             val message = createUserFacingErrorMessage(err.message)
-            messenger.sendError(
+            messenger.sendErrorToUser(
                 tabId = tabId,
                 errMessage = message ?: message("amazonqFeatureDev.exception.request_failed"),
-                retries = retriesRemaining(session),
                 conversationId = session?.conversationIdUnsafe,
             )
         }
@@ -887,7 +886,7 @@ class DocController(
                 tabId = tabId,
                 errMessage = message ?: message("amazonqFeatureDev.exception.retry_request_failed"),
                 retries = retriesRemaining(session),
-                conversationId = session?.conversationIdUnsafe
+                conversationId = session?.conversationIdUnsafe,
             )
         } finally {
             // Finish processing the event

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/messages/DocMessagePublisherExtensions.kt

@@ -7,6 +7,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthNeededState
 import software.aws.toolkits.jetbrains.services.amazonq.messages.MessagePublisher
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.ProgressField
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.PromptProgressMessage
+import software.aws.toolkits.jetbrains.services.amazonqDoc.NEW_SESSION_FOLLOWUPS
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.CodeReferenceGenerated
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.DeletedFileInfo
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.NewFileZipInfo
@@ -160,36 +161,29 @@ suspend fun MessagePublisher.sendErrorToUser(
 ) {
     val conversationIdText = if (conversationId == null) "" else "\n\nConversation ID: **$conversationId**"
 
-    var followUps = listOf(
-        FollowUp(
-            pillText = message("amazonqDoc.prompt.reject.new_task"),
-            type = FollowUpTypes.NEW_TASK,
-            status = FollowUpStatusType.Info
-        ),
-        FollowUp(
-            pillText = message("amazonqDoc.prompt.reject.close_session"),
-            type = FollowUpTypes.CLOSE_SESSION,
-            status = FollowUpStatusType.Info
-        )
-    );
-
-    this.sendChatInputEnabledMessage(tabId, enabled = isEnableChatInput)
-    if (isEnableChatInput) {
-        this.sendUpdatePlaceholder(tabId, message("amazonqDoc.edit.placeholder"))
-        followUps = Collections.emptyList()
-    }
-
     this.sendAnswer(
         tabId = tabId,
         messageType = DocMessageType.Answer,
         message = errMessage + conversationIdText,
     )
 
-    this.sendAnswer(
-        tabId = tabId,
-        messageType = DocMessageType.SystemPrompt,
-        followUp = followUps
-    )
+    if (isEnableChatInput) {
+        this.sendAnswer(
+            tabId = tabId,
+            messageType = DocMessageType.SystemPrompt,
+            followUp = Collections.emptyList()
+        )
+        this.sendUpdatePlaceholder(tabId, message("amazonqDoc.edit.placeholder"))
+    } else {
+        this.sendAnswer(
+            tabId = tabId,
+            messageType = DocMessageType.SystemPrompt,
+            followUp = NEW_SESSION_FOLLOWUPS
+        )
+        this.sendUpdatePlaceholder(tabId, message("amazonqDoc.prompt.placeholder"))
+    }
+
+    this.sendChatInputEnabledMessage(tabId, enabled = isEnableChatInput)
 }
 
 suspend fun MessagePublisher.sendMonthlyLimitError(tabId: String) {