fix(amazonq): /doc fix prompt to change folder in chat

.changes/next-release/bugfix-b204e9b7-e11e-46c7-bfb2-4704db861dd8.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /doc: fix for user prompt to change folder in chat"
+}

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

@@ -55,6 +55,7 @@
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendError
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendFolderConfirmationMessage
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendMonthlyLimitError
+import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendRetryChangeFolderMessage
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendSystemPrompt
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendUpdatePlaceholder
 import software.aws.toolkits.jetbrains.services.amazonqDoc.messages.sendUpdatePromptProgress
@@ -259,7 +260,7 @@
     private suspend fun makeChanges(tabId: String) {
         messenger.sendAnswer(
             tabId = tabId,
             message = message("amazonqDoc.edit.message"),
             messageType = DocMessageType.Answer
         )
 
@@ -337,6 +338,31 @@
         }
     }
 
+    private suspend fun promptForRetryFolderSelection(tabId: String, message: String) {
+        messenger.sendRetryChangeFolderMessage(
+            tabId = tabId,
+            message = message,
+            followUps = listOf(
+                FollowUp(
+                    icon = FollowUpIcons.Refresh,
+                    pillText = message("amazonqDoc.prompt.folder.change"),
+                    prompt = message("amazonqDoc.prompt.folder.change"),
+                    status = FollowUpStatusType.Info,
+                    type = FollowUpTypes.MODIFY_DEFAULT_SOURCE_FOLDER
+                ),
+                FollowUp(
+                    icon = FollowUpIcons.Cancel,
+                    pillText = message("general.cancel"),
+                    prompt = message("general.cancel"),
+                    status = FollowUpStatusType.Error,
+                    type = FollowUpTypes.CANCEL_FOLDER_SELECTION
+                ),
+            )
+        )
+
+        messenger.sendChatInputEnabledMessage(tabId, false)
+    }
+
     override suspend fun processLinkClick(message: IncomingDocMessage.ClickedLink) {
         BrowserUtil.browse(message.link)
     }
@@ -480,7 +506,7 @@
             val message = createUserFacingErrorMessage("Failed to insert code changes: ${err.message}")
             messenger.sendError(
                 tabId = tabId,
                 errMessage = message ?: message("amazonqFeatureDev.exception.insert_code_failed"),
                 retries = retriesRemaining(session),
                 conversationId = session?.conversationIdUnsafe
             )
@@ -511,7 +537,7 @@
             followUp = listOf(
                 FollowUp(
                     pillText = message("amazonqDoc.prompt.create"),
                     prompt = message("amazonqDoc.prompt.create"),
                     type = FollowUpTypes.CREATE_DOCUMENTATION,
                 ),
                 FollowUp(
@@ -646,7 +672,7 @@
                         ),
                         FollowUp(
                             pillText = message("general.reject"),
                             prompt = message("general.reject"),
                             status = FollowUpStatusType.Error,
                             type = FollowUpTypes.REJECT_CHANGES,
                             icon = FollowUpIcons.Cancel,
@@ -886,7 +912,7 @@
             val message = createUserFacingErrorMessage("Failed to retry request: ${err.message}")
             messenger.sendError(
                 tabId = tabId,
                 errMessage = message ?: message("amazonqFeatureDev.exception.retry_request_failed"),
                 retries = retriesRemaining(session),
                 conversationId = session?.conversationIdUnsafe,
             )
@@ -914,11 +940,22 @@
         val projectRoot = session.context.projectRoot
 
         withContext(EDT) {
+            messenger.sendAnswer(
+                tabId = tabId,
+                messageType = DocMessageType.Answer,
+                message = message("amazonqDoc.prompt.choose_folder_to_continue")
+            )
+
             val selectedFolder = selectFolder(context.project, currentSourceFolder)
 
             // No folder was selected
             if (selectedFolder == null) {
                 logger.info { "Cancelled dialog and not selected any folder" }
+                promptForRetryFolderSelection(
+                    tabId,
+                    message("amazonqDoc.prompt.canceled_source_folder_selection")
+                )
+
                 return@withContext
             }
 
@@ -960,7 +997,7 @@
 
             messenger.sendChatInputEnabledMessage(tabId, enabled = false)
 
             messenger.sendUpdatePlaceholder(tabId = tabId, newPlaceholder = message("amazonqDoc.prompt.placeholder"))
         }
     }
 

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

@@ -179,6 +179,15 @@ data class FolderConfirmationMessage(
     type = "folderConfirmationMessage"
 )
 
+data class RetryChangeFolderMessage(
+    @JsonProperty("tabID") override val tabId: String,
+    val message: String,
+    val followUps: List<FollowUp>?,
+) : UiMessage(
+    tabId = tabId,
+    type = "retryChangeFolderMessage"
+)
+
 // this should come from mynah?
 data class ChatItemButton(
     val id: String,

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

@@ -208,6 +208,16 @@ suspend fun MessagePublisher.sendFolderConfirmationMessage(
     )
 }
 
+suspend fun MessagePublisher.sendRetryChangeFolderMessage(
+    tabId: String,
+    message: String,
+    followUps: List<FollowUp>,
+) {
+    this.publish(
+        RetryChangeFolderMessage(tabId = tabId, message = message, followUps = followUps)
+    )
+}
+
 suspend fun MessagePublisher.sendUpdatePromptProgress(tabId: String, progressField: ProgressField?) {
     this.publish(
         PromptProgressMessage(tabId, progressField)

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

@@ -170,6 +170,21 @@ export class Connector {
         }
     }
 
+    private processRetryChangeFolderMessage = async (messageData: any): Promise<void> => {
+        if (this.onChatAnswerReceived !== undefined) {
+            const answer: ChatItem = {
+                type: ChatItemType.ANSWER,
+                body: messageData.message ?? undefined,
+                messageId: messageData.messageID ?? messageData.triggerID ?? '',
+                followUp: {
+                    text: '',
+                    options: messageData.followUps,
+                },
+            }
+            this.onChatAnswerReceived(messageData.tabID, answer)
+        }
+    }
+
     private processChatMessage = async (messageData: any): Promise<void> => {
         if (this.onChatAnswerReceived !== undefined) {
             const answer: ChatItem = {
@@ -263,6 +278,11 @@ export class Connector {
             return
         }
 
+        if (messageData.type === 'retryChangeFolderMessage') {
+            await this.processRetryChangeFolderMessage(messageData)
+            return
+        }
+
         if (messageData.type === 'chatMessage') {
             await this.processChatMessage(messageData)
             return

plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

@@ -59,6 +59,8 @@ amazonqDoc.progress_message.generating=Generating documentation
 amazonqDoc.progress_message.scanning=Scanning source files
 amazonqDoc.progress_message.summarizing=Summarizing source files
 amazonqDoc.progress_message.updating=Okay, I'm updating the README.
+amazonqDoc.prompt.canceled_source_folder_selection=It looks like you didn't choose a folder. Choose a folder to continue.
+amazonqDoc.prompt.choose_folder_to_continue=Choose a folder to continue
 amazonqDoc.prompt.create=Create a README
 amazonqDoc.prompt.create.confirmation=Create a README for this project?
 amazonqDoc.prompt.folder.change=Change folder