Merge branch 'main' into ai_gen

Author: leigaol

.changes/next-release/bugfix-da16ce4d-acd5-41d1-8c2a-3ac1e5252642.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q Doc README diff will re-open when the README file is clicked after it has been closed"
+}s

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

@@ -74,6 +74,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmi
 import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
 import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
 import software.aws.toolkits.jetbrains.services.codewhisperer.toolwindow.CodeWhispererCodeReferenceManager
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.isWithin
 import software.aws.toolkits.jetbrains.services.cwc.ChatConstants
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatRequestData
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.TriggerType
@@ -1178,7 +1179,7 @@ class CodeTestChatController(
                 filePath = activeFile.path,
                 fileName = activeFile.name,
                 fileLanguage = programmingLanguage,
-                fileInWorkspace = activeFile.path.startsWith(projectRoot.path)
+                fileInWorkspace = activeFile.isWithin(projectRoot)
             )
         } catch (e: Exception) {
             LOG.debug { "Error checking active file: $e" }

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codetest/sessionconfig/CodeTestSessionConfig.kt

@@ -33,6 +33,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmi
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CODE_SCAN_CREATE_PAYLOAD_TIMEOUT_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_PAYLOAD_LIMIT_IN_BYTES
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.isWithin
 import software.aws.toolkits.resources.message
 import java.io.File
 import java.nio.file.Path
@@ -88,7 +89,10 @@ class CodeTestSessionConfig(
         LOG.debug { "Creating payload. File selected as root for the context truncation: ${projectRoot.path}" }
 
         val payloadMetadata: PayloadMetadata = try {
-            getProjectPayloadMetadata()
+            when {
+                !selectedFile.isWithin(projectRoot) -> cannotFindValidFile("Selected file is not within the project")
+                else -> getProjectPayloadMetadata()
+            }
         } catch (e: Exception) {
             val errorMessage = when {
                 e.message?.contains("Illegal repetition near index") == true -> "Illegal repetition near index"

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

@@ -519,6 +519,9 @@ export class Connector {
             case 'codetest':
                 this.codeTestChatConnector.onFormButtonClick(tabID, messageId ?? '', {id: "utg_view_diff"})
                 break
+            case 'doc':
+                this.docChatConnector.onOpenDiff(tabID, filePath, deleted)
+                break
         }
     }