Merge branch 'feature/ideNotifs' into manodnyb/updateAndRestartAction

Author: rli

.changes/next-release/bugfix-9e0be536-a758-466e-8b65-ab2f50331ecd.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Correct search text for Amazon Q inline suggestion keybindings"
+}

.changes/next-release/bugfix-f486f12a-cb1a-4986-949f-939d600789ae.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix(Amazon Q Code Transformation): always show user latest/correct transformation results"
+}

.changes/next-release/bugfix-fd7f4f61-241e-40a6-b92a-3e4fe7e832db.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /dev: Fix error when accepting changes if leading slash is present."
+}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt

@@ -258,7 +258,8 @@ private suspend fun CodeGenerationState.generateCode(
 fun registerNewFiles(newFileContents: Map<String, String>): List<NewFileZipInfo> =
     newFileContents.map {
         NewFileZipInfo(
-            zipFilePath = it.key,
+            // Note: When managing file state, we normalize file paths returned from the agent in order to ensure they are handled as relative paths.
+            zipFilePath = it.key.removePrefix("/"),
             fileContent = it.value,
             rejected = false,
             changeApplied = false
@@ -268,7 +269,8 @@ fun registerNewFiles(newFileContents: Map<String, String>): List<NewFileZipInfo>
 fun registerDeletedFiles(deletedFiles: List<String>): List<DeletedFileInfo> =
     deletedFiles.map {
         DeletedFileInfo(
-            zipFilePath = it,
+            // Note: When managing file state, we normalize file paths returned from the agent in order to ensure they are handled as relative paths.
+            zipFilePath = it.removePrefix("/"),
             rejected = false,
             changeApplied = false
         )

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

@@ -32,11 +32,11 @@ import kotlinx.coroutines.job
 import kotlinx.coroutines.withContext
 import migration.software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.amazon.awssdk.services.codewhispererstreaming.model.UserIntent
+import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.coroutines.EDT
-import software.aws.toolkits.jetbrains.core.credentials.sono.isInternalUser
 import software.aws.toolkits.jetbrains.services.amazonq.CHAT_IMPLICIT_PROJECT_CONTEXT_TIMEOUT
 import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
 import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthController
@@ -132,7 +132,6 @@ class ChatController private constructor(
         var shouldAddIndexInProgressMessage: Boolean = false
         var shouldUseWorkspaceContext: Boolean = false
         val startUrl = getStartUrl(context.project)
-        val isInternalUser = isInternalUser(startUrl)
 
         if (prompt.contains("@workspace")) {
             if (CodeWhispererSettings.getInstance().isProjectContextEnabled()) {
@@ -145,15 +144,13 @@ class ChatController private constructor(
             } else {
                 sendOpenSettingsMessage(message.tabId)
             }
-        } else if (
-            CodeWhispererSettings.getInstance().isProjectContextEnabled() &&
-            isInternalUser &&
-            ProjectContextController.getInstance(context.project).getProjectContextIndexComplete()
-        ) {
-            // if user does not have @workspace in the prompt, but user is Amazon internal
-            // add project context by default
-            val projectContextController = ProjectContextController.getInstance(context.project)
-            queryResult = projectContextController.query(prompt, timeout = CHAT_IMPLICIT_PROJECT_CONTEXT_TIMEOUT)
+        } else if (CodeWhispererSettings.getInstance().isProjectContextEnabled()) {
+            if (ProjectContextController.getInstance(context.project).getProjectContextIndexComplete()) {
+                val projectContextController = ProjectContextController.getInstance(context.project)
+                queryResult = projectContextController.query(prompt, timeout = CHAT_IMPLICIT_PROJECT_CONTEXT_TIMEOUT)
+            } else {
+                logger.debug { "skipping implicit workspace context as index is not ready" }
+            }
         }
 
         handleChat(

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerArtifact.kt

@@ -19,6 +19,7 @@ import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.services.codemodernizer.TransformationSummary
 import software.aws.toolkits.jetbrains.services.codemodernizer.utils.unzipFile
 import java.io.File
+import java.util.UUID
 import kotlin.io.path.ExperimentalPathApi
 import kotlin.io.path.Path
 import kotlin.io.path.isDirectory
@@ -39,7 +40,7 @@ open class CodeModernizerArtifact(
 
     companion object {
         private const val MAX_SUPPORTED_VERSION = 1.0
-        private val tempDir = createTempDirectory("codeTransformArtifacts", null)
+        private var tempDir = createTempDirectory("codeTransformArtifacts", null)
         private const val MANIFEST_FILE_NAME = "manifest.json"
         private const val SUMMARY_FILE_NAME = "summary.md"
         private const val METRICS_FILE_NAME = "metrics.json"
@@ -52,6 +53,7 @@ open class CodeModernizerArtifact(
          * If anything goes wrong during this process an exception is thrown.
          */
         fun create(zipPath: String): CodeModernizerArtifact {
+            tempDir = createTempDirectory("codeTransformArtifacts-", UUID.randomUUID().toString())
             val path = Path(zipPath)
             if (path.exists()) {
                 if (!unzipFile(path, tempDir.toPath())) {

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt

@@ -209,6 +209,6 @@ class CodeWhispererConfigurable(private val project: Project) :
     }
 
     companion object {
-        private const val Q_INLINE_KEYBINDING_SEARCH_TEXT = "inline suggestion"
+        private const val Q_INLINE_KEYBINDING_SEARCH_TEXT = "Amazon Q inline suggestion"
     }
 }