Merge main into feature/q-mega

Author: aws-toolkit-automation

.changes/next-release/feature-d2858ed1-62fc-461b-93b3-6edf82df2855.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Added inline chat support. Select some code and hit ⌘+I on Mac or Ctrl+I on Windows to start"
+}

gradle/libs.versions.toml

@@ -6,6 +6,7 @@ assertJ = "3.26.3"
 awsSdk = "2.26.25"
 commonmark = "0.22.0"
 detekt = "1.23.7"
+diff-util = "4.12"
 intellijExt = "1.1.8"
 # match with <root>/settings.gradle.kts
 intellijGradle = "2.1.0"
@@ -71,6 +72,7 @@ commons-collections = { module = "org.apache.commons:commons-collections4", vers
 commons-io = { module = "commons-io:commons-io", version.ref = "apache-commons-io" }
 detekt-api = { module = "io.gitlab.arturbosch.detekt:detekt-api", version.ref = "detekt" }
 detekt-formattingRules = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
+diff-util = { module = "io.github.java-diff-utils:java-diff-utils", version.ref = "diff-util" }
 detekt-test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version.ref = "detekt" }
 gradlePlugin-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
 gradlePlugin-ideaExt = { module = "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext", version.ref = "intellijExt" }

plugins/amazonq/chat/jetbrains-community/build.gradle.kts

@@ -19,6 +19,7 @@ dependencies {
     implementation(project(":plugin-amazonq:shared:jetbrains-community"))
     // everything references codewhisperer, which is not ideal
     implementation(project(":plugin-amazonq:codewhisperer:jetbrains-community"))
+    implementation(libs.diff.util)
 
     compileOnly(project(":plugin-core:jetbrains-community"))
 

plugins/amazonq/chat/jetbrains-community/resources/META-INF/plugin-chat.xml

@@ -79,6 +79,13 @@
                     class="software.aws.toolkits.jetbrains.services.cwc.commands.SendToPromptAction">
                 <keyboard-shortcut keymap="$default" first-keystroke="meta alt S" />
             </action>
+
+            <action id="aws.toolkit.jetbrains.core.services.cwc.inline.openChat"
+                    class="software.aws.toolkits.jetbrains.services.cwc.inline.OpenChatInputAction">
+                <keyboard-shortcut keymap="Mac OS X" first-keystroke="meta I"/>
+                <keyboard-shortcut keymap="Mac OS X 10.5+" first-keystroke="meta I"/>
+                <keyboard-shortcut keymap="$default" first-keystroke="control I"/>
+            </action>
         </group>
     </actions>
 </idea-plugin>

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/startup/AmazonQStartupActivity.kt

@@ -19,6 +19,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.project.ProjectContextCo
 import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindow
 import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindowFactory
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
+import software.aws.toolkits.jetbrains.services.cwc.inline.InlineChatController
 import java.lang.management.ManagementFactory
 import java.time.Duration
 import java.util.concurrent.atomic.AtomicBoolean
@@ -31,6 +32,7 @@ class AmazonQStartupActivity : ProjectActivity {
 
         // initialize html contents in BGT so users don't have to wait when they open the tool window
         AmazonQToolWindow.getInstance(project)
+        InlineChatController.getInstance(project)
 
         if (CodeWhispererExplorerActionManager.getInstance().getIsFirstRestartAfterQInstall()) {
             runInEdt {

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/model/Requests.kt

@@ -14,6 +14,7 @@ enum class TriggerType {
     ContextMenu,
     Hotkeys,
     CodeScanButton,
+    Inline,
 }
 
 data class ChatRequestData(

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/v1/ChatSessionV1.kt

@@ -51,6 +51,7 @@ import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.Recommend
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.Reference
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.SuggestedFollowUp
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.Suggestion
+import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.TriggerType
 import software.aws.toolkits.jetbrains.services.cwc.editor.context.ActiveFileContext
 
 class ChatSessionV1(
@@ -200,6 +201,7 @@ class ChatSessionV1(
         val userInputMessageContextBuilder = UserInputMessageContext.builder()
         userInputMessageContextBuilder.editorState(activeFileContext.toEditorState(relevantTextDocuments, useRelevantDocuments))
         val userInputMessageContext = userInputMessageContextBuilder.build()
+        val chatTriggerType = if (triggerType == TriggerType.Inline) ChatTriggerType.INLINE_CHAT else ChatTriggerType.MANUAL
 
         val userInput = UserInputMessage.builder()
             .content(message.take(ChatConstants.CUSTOMER_MESSAGE_SIZE_LIMIT))
@@ -209,7 +211,7 @@ class ChatSessionV1(
         val conversationState = ConversationState.builder()
             .conversationId(conversationId)
             .currentMessage(ChatMessage.fromUserInputMessage(userInput))
-            .chatTriggerType(ChatTriggerType.MANUAL)
+            .chatTriggerType(chatTriggerType)
             .customizationArn(customization?.arn)
             .build()
         return GenerateAssistantResponseRequest.builder()

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt

@@ -92,7 +92,7 @@ class ChatController private constructor(
 ) : InboundAppMessagesHandler {
 
     private val messagePublisher: MessagePublisher = context.messagesFromAppToUi
-    private val telemetryHelper = TelemetryHelper(context, chatSessionStorage)
+    private val telemetryHelper = TelemetryHelper(context.project, chatSessionStorage)
     constructor(
         context: AmazonQAppInitContext,
     ) : this(
@@ -217,7 +217,7 @@ class ChatController private constructor(
 
                     editor.document.insertString(offset, message.code)
 
-                    ReferenceLogController.addReferenceLog(message.code, message.codeReference, editor, context.project)
+                    ReferenceLogController.addReferenceLog(message.code, message.codeReference, editor, context.project, null)
 
                     CodeWhispererUserModificationTracker.getInstance(context.project).enqueue(
                         InsertedCodeModificationEntry(

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ReferenceLogController.kt

@@ -9,11 +9,12 @@ import software.amazon.awssdk.services.codewhispererruntime.model.Reference
 import software.amazon.awssdk.services.codewhispererruntime.model.Span
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.CodeReferenceGenerated
 import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorUtil
+import software.aws.toolkits.jetbrains.services.codewhisperer.model.CaretPosition
 import software.aws.toolkits.jetbrains.services.codewhisperer.toolwindow.CodeWhispererCodeReferenceManager
 import software.aws.toolkits.jetbrains.services.cwc.messages.CodeReference
 
 object ReferenceLogController {
-    fun addReferenceLog(originalCode: String, codeReferences: List<CodeReference>?, editor: Editor, project: Project) {
+    fun addReferenceLog(originalCode: String, codeReferences: List<CodeReference>?, editor: Editor, project: Project, inlineChatStartPosition: CaretPosition?) {
         codeReferences?.let { references ->
             val cwReferences = references.map { reference ->
                 Reference.builder()
@@ -36,7 +37,7 @@ object ReferenceLogController {
                 originalCode,
                 cwReferences,
                 editor,
-                CodeWhispererEditorUtil.getCaretPosition(editor),
+                inlineChatStartPosition ?: CodeWhispererEditorUtil.getCaretPosition(editor),
                 null,
             )
         }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt

@@ -7,6 +7,7 @@ import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.onStart
 import software.amazon.awssdk.awscore.exception.AwsServiceException
 import software.amazon.awssdk.services.codewhispererstreaming.model.CodeWhispererStreamingException
@@ -55,6 +56,7 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
         data: ChatRequestData,
         sessionInfo: ChatSessionInfo,
         shouldAddIndexInProgressMessage: Boolean,
+        isInlineChat: Boolean = false,
     ) = flow {
         val session = sessionInfo.session
         session.chat(data)
@@ -135,14 +137,19 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
                     )
                 }
             }
+            .onEach { responseEvent ->
+                if (isInlineChat) processChatEvent(tabId, triggerId, data, responseEvent, shouldAddIndexInProgressMessage)?.let { emit(it) }
+            }
             .collect { responseEvent ->
-                processChatEvent(
-                    tabId,
-                    triggerId,
-                    data,
-                    responseEvent,
-                    shouldAddIndexInProgressMessage
-                )?.let { emit(it) }
+                if (!isInlineChat) {
+                    processChatEvent(
+                        tabId,
+                        triggerId,
+                        data,
+                        responseEvent,
+                        shouldAddIndexInProgressMessage
+                    )?.let { emit(it) }
+                }
             }
     }