Merge branch 'main' into samgst/fixLog

Author: manodnyab

.changes/next-release/bugfix-8abe8650-ac4a-40ea-9243-071fd3104029.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /dev: Fix additional retry attempt required on entering a prompt"
+}

.changes/next-release/bugfix-bc45640b-9877-43e5-b6cd-8b7dc35c570b.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix inline chat shortcut hint breaking text selection on remote editors"
+}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevControllerExtensions.kt

@@ -50,7 +50,7 @@ suspend fun FeatureDevController.onCodeGeneration(
             message = message("amazonqFeatureDev.chat_message.requesting_changes"),
             messageType = FeatureDevMessageType.AnswerStream,
         )
-        val state = session.sessionState
+        var state = session.sessionState
 
         var remainingIterations: Int? = state.codeGenerationRemainingIterationCount
         var totalIterations: Int? = state.codeGenerationTotalIterationCount
@@ -64,6 +64,8 @@ suspend fun FeatureDevController.onCodeGeneration(
 
         session.send(message) // Trigger code generation
 
+        state = session.sessionState
+
         var filePaths: List<NewFileZipInfo> = emptyList()
         var deletedFiles: List<DeletedFileInfo> = emptyList()
         var references: List<CodeReferenceGenerated> = emptyList()

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/listeners/InlineChatSelectionListener.kt

@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.cwc.inline.listeners
 
+import com.intellij.idea.AppMode
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.editor.event.SelectionEvent
 import com.intellij.openapi.editor.event.SelectionListener
@@ -11,6 +12,7 @@ import software.aws.toolkits.jetbrains.services.cwc.inline.InlineChatEditorHint
 class InlineChatSelectionListener : SelectionListener, Disposable {
     private val inlineChatEditorHint = InlineChatEditorHint()
     override fun selectionChanged(e: SelectionEvent) {
+        if (AppMode.isRemoteDevHost()) return
         val editor = e.editor
         val selectionModel = editor.selectionModel