feat(feature dev): Add setting to allow Q to run code and test commands

willyyhuang · willyyhuang · commit 37f05ce9bbdb · 2024-11-06T15:40:30.000-05:00
diff --git a/.changes/next-release/feature-53e027cd-9c7f-4b09-bc4e-8ab2a20aba2a.json b/.changes/next-release/feature-53e027cd-9c7f-4b09-bc4e-8ab2a20aba2a.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add setting to allow Q /dev to run code and test commands"
+}
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevConstants.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevConstants.kt
@@ -7,6 +7,9 @@ const val FEATURE_EVALUATION_PRODUCT_NAME = "FeatureDev"
 
 const val FEATURE_NAME = "Amazon Q Developer Agent for software development"
 
+@Suppress("MaxLineLength")
+const val GENERATE_DEV_FILE_PROMPT = "generate a devfile in my repository. Note that you should only use devfile version 2.0.0 and the only supported command is test, so you should bundle all install, build and test commands in “test”. also you can use “public.ecr.aws/aws-mde/universal-image:latest” as universal image if you aren’t sure which image to use. here is an example for a node repository (but don't assume it's always a node project. look at the existing repository structure before generating the devfile): schemaVersion: 2.0.0 components: - name: dev container: image: public.ecr.aws/aws-mde/universal-image:latest commands: - id: test exec: component: dev commandLine: “npm install && npm run build && npm run test”"
+
 // Max number of times a user can attempt to retry a code generation request if it fails
 const val CODE_GENERATION_RETRY_LIMIT = 3
 
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt
@@ -33,6 +33,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CodeIterationL
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.DEFAULT_RETRY_LIMIT
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FEATURE_NAME
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevException
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.GENERATE_DEV_FILE_PROMPT
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.InboundAppMessagesHandler
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ModifySourceFolderErrorReason
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MonthlyConversationLimitError
@@ -69,6 +70,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.selectFol
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.FeedbackComment
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
 import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
+import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 import software.aws.toolkits.jetbrains.ui.feedback.FeatureDevFeedbackDialog
 import software.aws.toolkits.jetbrains.utils.notifyError
 import software.aws.toolkits.resources.message
@@ -121,6 +123,9 @@ class FeatureDevController(
             FollowUpTypes.PROVIDE_FEEDBACK_AND_REGENERATE_CODE -> provideFeedbackAndRegenerateCode(message.tabId)
             FollowUpTypes.NEW_TASK -> newTask(message.tabId)
             FollowUpTypes.CLOSE_SESSION -> closeSession(message.tabId)
+            FollowUpTypes.ACCEPT_AUTO_BUILD -> handleDevCommandUserSetting(message.tabId, true)
+            FollowUpTypes.DENY_AUTO_BUILD -> handleDevCommandUserSetting(message.tabId, false)
+            FollowUpTypes.GENERATE_DEV_FILE -> newTask(tabId = message.tabId, prefilledPrompt = GENERATE_DEV_FILE_PROMPT)
         }
     }
 
@@ -345,20 +350,38 @@ class FeatureDevController(
                 canBeVoted = true
             )
 
-            messenger.sendSystemPrompt(
-                tabId = tabId,
-                followUp = listOf(
-                    FollowUp(
-                        pillText = message("amazonqFeatureDev.follow_up.new_task"),
-                        type = FollowUpTypes.NEW_TASK,
-                        status = FollowUpStatusType.Info
-                    ),
+            val followUps = mutableListOf(
+                FollowUp(
+                    pillText = message("amazonqFeatureDev.follow_up.new_task"),
+                    type = FollowUpTypes.NEW_TASK,
+                    status = FollowUpStatusType.Info
+                ),
+                FollowUp(
+                    pillText = message("amazonqFeatureDev.follow_up.close_session"),
+                    type = FollowUpTypes.CLOSE_SESSION,
+                    status = FollowUpStatusType.Info
+                ),
+            )
+
+            if (!session.context.checkForDevFile()) {
+                followUps.add(
                     FollowUp(
-                        pillText = message("amazonqFeatureDev.follow_up.close_session"),
-                        type = FollowUpTypes.CLOSE_SESSION,
+                        pillText = message("amazonqFeatureDev.follow_up.generate_dev_file"),
+                        type = FollowUpTypes.GENERATE_DEV_FILE,
                         status = FollowUpStatusType.Info
                     )
                 )
+
+                messenger.sendAnswer(
+                    tabId = tabId,
+                    message = message("amazonqFeatureDev.chat_message.generate_dev_file"),
+                    messageType = FeatureDevMessageType.Answer
+                )
+            }
+
+            messenger.sendSystemPrompt(
+                tabId = tabId,
+                followUp = followUps
             )
 
             messenger.sendUpdatePlaceholder(
@@ -376,7 +399,7 @@ class FeatureDevController(
         }
     }
 
-    private suspend fun newTask(tabId: String, isException: Boolean? = false) {
+    private suspend fun newTask(tabId: String, isException: Boolean? = false, prefilledPrompt: String? = null) {
         val session = getSessionInfo(tabId)
         val sessionLatency = System.currentTimeMillis() - session.sessionStartTime
         AmazonqTelemetry.endChat(
@@ -387,15 +410,35 @@ class FeatureDevController(
         chatSessionStorage.deleteSession(tabId)
 
         newTabOpened(tabId)
-        if (isException != null && !isException) {
+
+        if (prefilledPrompt != null && isException != null && !isException) {
             messenger.sendAnswer(
                 tabId = tabId,
-                messageType = FeatureDevMessageType.Answer,
-                message = message("amazonqFeatureDev.chat_message.ask_for_new_task")
+                messageType = FeatureDevMessageType.SystemPrompt,
+                message = message("amazonqFeatureDev.follow_up.generate_dev_file")
             )
+            handleChat(tabId = tabId, message = prefilledPrompt)
+        } else {
+            if (isException != null && !isException) {
+                messenger.sendAnswer(
+                    tabId = tabId,
+                    messageType = FeatureDevMessageType.Answer,
+                    message = message("amazonqFeatureDev.chat_message.ask_for_new_task")
+                )
+            }
+            messenger.sendUpdatePlaceholder(tabId = tabId, newPlaceholder = message("amazonqFeatureDev.placeholder.new_plan"))
+            messenger.sendChatInputEnabledMessage(tabId = tabId, enabled = true)
         }
-        messenger.sendUpdatePlaceholder(tabId = tabId, newPlaceholder = message("amazonqFeatureDev.placeholder.new_plan"))
-        messenger.sendChatInputEnabledMessage(tabId = tabId, enabled = true)
+    }
+
+    private suspend fun handleDevCommandUserSetting(tabId: String, value: Boolean) {
+        CodeWhispererSettings.getInstance().toggleAutoBuildFeature(context.project.basePath, value)
+        messenger.sendAnswer(
+            tabId = tabId,
+            message = message("amazonqFeatureDev.chat_message.setting_updated"),
+            messageType = FeatureDevMessageType.Answer,
+        )
+        this.retryRequests(tabId)
     }
 
     private suspend fun closeSession(tabId: String) {
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessage.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessage.kt
@@ -239,6 +239,9 @@ enum class FollowUpTypes(
     PROVIDE_FEEDBACK_AND_REGENERATE_CODE("ProvideFeedbackAndRegenerateCode"),
     NEW_TASK("NewTask"),
     CLOSE_SESSION("CloseSession"),
+    ACCEPT_AUTO_BUILD("AcceptAutoBuild"),
+    DENY_AUTO_BUILD("DenyAutoBuild"),
+    GENERATE_DEV_FILE("GenerateDevFile"),
 }
 
 // Util classes
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareCodeGenerationState.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareCodeGenerationState.kt
@@ -13,6 +13,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.Cancellat
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.deleteUploadArtifact
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.uploadArtifactToS3
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
+import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.AmazonqUploadIntent
@@ -47,7 +48,8 @@ class PrepareCodeGenerationState(
             messenger.sendAnswerPart(tabId = this.tabID, message = message("amazonqFeatureDev.chat_message.uploading_code"))
             messenger.sendUpdatePlaceholder(tabId = this.tabID, newPlaceholder = message("amazonqFeatureDev.chat_message.uploading_code"))
 
-            val repoZipResult = config.repoContext.getProjectZip()
+            val isAutoBuildFeatureEnabled = CodeWhispererSettings.getInstance().isAutoBuildFeatureEnabled(this.config.repoContext.projectRoot.path)
+            val repoZipResult = config.repoContext.getProjectZip(isAutoBuildFeatureEnabled = isAutoBuildFeatureEnabled)
             val zipFileChecksum = repoZipResult.checksum
             zipFileLength = repoZipResult.contentLength
             val fileToUpload = repoZipResult.payload
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/Session.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/Session.kt
@@ -13,12 +13,19 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ConversationId
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FEATURE_NAME
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MAX_PROJECT_SIZE_BYTES
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.clients.FeatureDevClient
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.FeatureDevMessageType
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.FollowUp
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.FollowUpStatusType
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.FollowUpTypes
+import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendAnswer
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendAsyncEventProgress
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.CancellationTokenSource
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.FeatureDevService
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.resolveAndCreateOrUpdateFile
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.resolveAndDeleteFile
 import software.aws.toolkits.jetbrains.services.cwc.controller.ReferenceLogController
+import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
+import software.aws.toolkits.resources.message
 
 class Session(val tabID: String, val project: Project) {
     var context: FeatureDevSessionContext
@@ -53,21 +60,49 @@ class Session(val tabID: String, val project: Project) {
      * Preload any events that have to run before a chat message can be sent
      */
     suspend fun preloader(msg: String, messenger: MessagePublisher) {
-        if (!preloaderFinished) {
-            setupConversation(msg, messenger)
+        // Store the initial message when setting up the conversation so that if it fails we can retry with this message
+        _latestMessage = msg
+
+        val codeWhispererSettings = CodeWhispererSettings.getInstance().getAutoBuildFeatureConfiguration()
+        val hasDevFile = context.checkForDevFile()
+        if (hasDevFile && !codeWhispererSettings.containsKey(context.projectRoot.path)) {
+            promptAllowQCommandsConsent(messenger)
+        } else if (!preloaderFinished) {
+            setupConversation(messenger)
             preloaderFinished = true
             messenger.sendAsyncEventProgress(tabId = this.tabID, inProgress = true)
             featureDevService.sendFeatureDevEvent(this.conversationId)
         }
     }
 
+    private suspend fun promptAllowQCommandsConsent(messenger: MessagePublisher) {
+        messenger.sendAnswer(
+            tabId = this.tabID,
+            message = message("amazonqFeatureDev.chat_message.devFileInRepository"),
+            messageType = FeatureDevMessageType.Answer
+        )
+        messenger.sendAnswer(
+            tabId = this.tabID,
+            messageType = FeatureDevMessageType.SystemPrompt,
+            followUp = listOf(
+                FollowUp(
+                    pillText = message("amazonqFeatureDev.follow_up.accept_for_project"),
+                    type = FollowUpTypes.ACCEPT_AUTO_BUILD,
+                    status = FollowUpStatusType.Success
+                ),
+                FollowUp(
+                    pillText = message("amazonqFeatureDev.follow_up.decline_for_project"),
+                    type = FollowUpTypes.DENY_AUTO_BUILD,
+                    status = FollowUpStatusType.Error
+                )
+            )
+        )
+    }
+
     /**
      * Starts a conversation with the backend and uploads the repo for the LLMs to be able to use it.
      */
-    private fun setupConversation(msg: String, messenger: MessagePublisher) {
-        // Store the initial message when setting up the conversation so that if it fails we can retry with this message
-        _latestMessage = msg
-
+    private fun setupConversation(messenger: MessagePublisher) {
         _conversationId = featureDevService.createConversation()
         logger<Session>().info(conversationIDLog(this.conversationId))
 
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt
@@ -113,6 +113,29 @@ class CodeWhispererConfigurable(private val project: Project) :
             }
         }
 
+        group("Amazon Q: Allow Q /dev to run code and test commands") {
+            row {
+                val settings = codeWhispererSettings.getAutoBuildFeatureConfiguration()
+                for ((key) in settings) {
+                    checkBox(key).apply {
+                        connect.subscribe(
+                            ToolkitConnectionManagerListener.TOPIC,
+                            object : ToolkitConnectionManagerListener {
+                                override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
+                                    enabled(isCodeWhispererEnabled(project))
+                                }
+                            }
+                        )
+
+                        bindSelected(
+                            getter = { codeWhispererSettings.isAutoBuildFeatureEnabled(key) },
+                            setter = { newValue -> codeWhispererSettings.toggleAutoBuildFeature(key, newValue) }
+                        )
+                    }
+                }
+            }
+        }
+
         group(message("aws.settings.codewhisperer.group.q_chat")) {
             row {
                 checkBox(message("aws.settings.codewhisperer.project_context")).apply {
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/settings/CodeWhispererSettings.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/settings/CodeWhispererSettings.kt
@@ -27,6 +27,16 @@ class CodeWhispererSettings : PersistentStateComponent<CodeWhispererConfiguratio
         false
     )
 
+    fun getAutoBuildFeatureConfiguration() = state.projectAutoBuildConfigurationMap
+
+    fun toggleAutoBuildFeature(project: String?, value: Boolean) {
+        if (project == null) return
+
+        state.projectAutoBuildConfigurationMap[project] = value
+    }
+
+    fun isAutoBuildFeatureEnabled(project: String?) = state.projectAutoBuildConfigurationMap.getOrDefault(project, false)
+
     fun toggleImportAdder(value: Boolean) {
         state.value[CodeWhispererConfigurationType.IsImportAdderEnabled] = value
     }
@@ -115,6 +125,7 @@ class CodeWhispererConfiguration : BaseState() {
     @get:Property
     val value by map<CodeWhispererConfigurationType, Boolean>()
     val intValue by map<CodeWhispererIntConfigurationType, Int>()
+    val projectAutoBuildConfigurationMap by map<String, Boolean>()
 }
 
 enum class CodeWhispererConfigurationType {
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt
@@ -46,8 +46,6 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
         "\\.svn",
         "\\.hg/?",
         "\\.rvm",
-        "\\.git/?",
-        "\\.gitignore",
         "\\.project",
         "\\.gem",
         "/\\.idea/?",
@@ -71,7 +69,7 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
     // projectRoot: is the directory where the project is located when selected to open a project.
     val projectRoot = project.guessProjectDir() ?: error("Cannot guess base directory for project ${project.name}")
 
-    // selectedSourceFolder": is the directory selected in replacement of the root, this happens when the project is too big to bundle for uploading.
+    // selectedSourceFolder: is the directory selected in replacement of the root, this happens when the project is too big to bundle for uploading.
     private var _selectedSourceFolder = projectRoot
     private var ignorePatternsWithGitIgnore = emptyList<Regex>()
     private val gitIgnoreFile = File(selectedSourceFolder.path, ".gitignore")
@@ -80,10 +78,15 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
         ignorePatternsWithGitIgnore = (ignorePatterns + parseGitIgnore().map { Regex(it) }).toList()
     }
 
-    fun getProjectZip(): ZipCreationResult {
+    fun checkForDevFile(): Boolean {
+        val devFile = File(projectRoot.path, "/devfile.yaml")
+        return devFile.exists()
+    }
+
+    fun getProjectZip(isAutoBuildFeatureEnabled: Boolean?): ZipCreationResult {
         val zippedProject = runBlocking {
             withBackgroundProgress(project, AwsCoreBundle.message("amazonqFeatureDev.placeholder.generating_code")) {
-                zipFiles(selectedSourceFolder)
+                zipFiles(selectedSourceFolder, isAutoBuildFeatureEnabled)
             }
         }
         val checkSum256: String = Base64.getEncoder().encodeToString(DigestUtils.sha256(FileInputStream(zippedProject)))
@@ -117,7 +120,7 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
         return deferredResults.any { it.await() }
     }
 
-    suspend fun zipFiles(projectRoot: VirtualFile): File = withContext(getCoroutineBgContext()) {
+    suspend fun zipFiles(projectRoot: VirtualFile, isAutoBuildFeatureEnabled: Boolean?): File = withContext(getCoroutineBgContext()) {
         val files = mutableListOf<VirtualFile>()
         val ignoredExtensionMap = mutableMapOf<String, Long>().withDefault { 0L }
         var totalSize: Long = 0
@@ -127,11 +130,17 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
             object : VirtualFileVisitor<Unit>() {
                 override fun visitFile(file: VirtualFile): Boolean {
                     val isFileIgnoredByExtension = runBlocking { ignoreFileByExtension(file) }
+                    val isDevFile = if (isAutoBuildFeatureEnabled == true) false else file.path.contains("devfile.yaml")
                     if (isFileIgnoredByExtension) {
                         val extension = file.extension.orEmpty()
                         ignoredExtensionMap[extension] = (ignoredExtensionMap[extension] ?: 0) + 1
                         return false
                     }
+
+                    if (isDevFile) {
+                        return false
+                    }
+
                     val isFileIgnoredByPattern = runBlocking { ignoreFile(file.name) }
                     if (isFileIgnoredByPattern) {
                         return false
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/TelemetryUtils.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/TelemetryUtils.kt
diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/telemetry/OpenedFileTypeMetricsTest.kt
diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "feature",
 +  "description" : "Add setting to allow Q /dev to run code and test commands"
 +}
Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,9 @@ enum class FollowUpTypes(`
`239`	`239`	`PROVIDE_FEEDBACK_AND_REGENERATE_CODE("ProvideFeedbackAndRegenerateCode"),`
`240`	`240`	`NEW_TASK("NewTask"),`
`241`	`241`	`CLOSE_SESSION("CloseSession"),`
	`242`	`+ ACCEPT_AUTO_BUILD("AcceptAutoBuild"),`
	`243`	`+ DENY_AUTO_BUILD("DenyAutoBuild"),`
	`244`	`+ GENERATE_DEV_FILE("GenerateDevFile"),`
`242`	`245`	`}`
`243`	`246`
`244`	`247`	`// Util classes`