From cb8f9155a05d6a10ccd538f5808cd09755bc8b06 Mon Sep 17 00:00:00 2001
From: laileni <laileni@amazon.com>
Date: Fri, 7 Mar 2025 14:26:58 -0800
Subject: [PATCH 1/4] Adding status field to UTG telemetry events

---
 .../amazonqCodeTest/CodeWhispererUTGChatManager.kt     |  4 +++-
 .../controller/CodeTestChatController.kt               | 10 +++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
index 8b02c019c21..37cb29a65bf 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
@@ -55,6 +55,7 @@ import software.aws.toolkits.jetbrains.utils.isQConnected
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.MetricResult
+import software.aws.toolkits.telemetry.Status
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.File
@@ -583,7 +584,8 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
                     buildZipFileBytes = session.srcZipFileSize,
-                    requestId = session.startTestGenerationRequestId
+                    requestId = session.startTestGenerationRequestId,
+                    status = if (e.message == message("testgen.message.cancelled")) Status.CANCELLED else Status.FAILED,
                 )
                 session.isGeneratingTests = false
             } finally {
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
index 2807e2cf9c2..d380bbc368c 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
@@ -98,6 +98,7 @@ import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.FeatureId
 import software.aws.toolkits.telemetry.InteractionType
 import software.aws.toolkits.telemetry.MetricResult
+import software.aws.toolkits.telemetry.Status
 import software.aws.toolkits.telemetry.UiTelemetry
 import java.io.File
 import java.nio.file.Files
@@ -310,7 +311,8 @@ class CodeTestChatController(
                     credentialStartUrl = getStartUrl(project),
                     result = MetricResult.Succeeded,
                     perfClientLatency = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration),
-                    requestId = id
+                    requestId = id,
+                    status = Status.ACCEPTED,
                 )
             }
             session.isGeneratingTests = false
@@ -682,7 +684,8 @@ class CodeTestChatController(
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
                     buildZipFileBytes = session.srcZipFileSize,
-                    requestId = session.startTestGenerationRequestId
+                    requestId = session.startTestGenerationRequestId,
+                    status = Status.ACCEPTED,
                 )
                 codeTestChatHelper.addAnswer(
                     CodeTestChatMessageContent(
@@ -878,7 +881,8 @@ class CodeTestChatController(
                     artifactsUploadDuration = session.artifactUploadDuration,
                     buildPayloadBytes = session.srcPayloadSize,
                     buildZipFileBytes = session.srcZipFileSize,
-                    requestId = session.startTestGenerationRequestId
+                    requestId = session.startTestGenerationRequestId,
+                    status = Status.REJECTED,
                 )
                 sessionCleanUp(message.tabId)
             }

From 5b06b08f47a98d6834947a38e4b4793ff776e146 Mon Sep 17 00:00:00 2001
From: laileni <laileni@amazon.com>
Date: Mon, 10 Mar 2025 18:13:31 -0700
Subject: [PATCH 2/4] Adding Feedback mechanism V2 version

---
 .../CodeWhispererUTGChatManager.kt            | 15 +++++-
 .../controller/CodeTestChatController.kt      | 54 ++++++++++++++++---
 .../mynah-ui/ui/apps/codeTestChatConnector.ts | 17 +++++-
 .../src/mynah-ui/ui/forms/constants.ts        |  1 +
 .../ui/feedback/TestGenFeedbackDialog.kt      | 25 +++++++++
 .../resources/MessagesBundle.properties       |  3 ++
 6 files changed, 104 insertions(+), 11 deletions(-)
 create mode 100644 plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/TestGenFeedbackDialog.kt

diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
index 37cb29a65bf..89490b2c073 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
@@ -559,12 +559,23 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                     e is JsonParseException -> message("testgen.error.generic_technical_error_message")
                     else -> message("testgen.error.generic_error_message")
                 }
-
+                val buttonList = mutableListOf<Button>()
+                buttonList.add(
+                    Button(
+                        "utg_feedback",
+                        "How can we make /test better?",
+                        keepCardAfterClick = true,
+                        position = "outside",
+                        status = "info",
+                        icon = "comment"
+                    ),
+                )
                 codeTestChatHelper.addAnswer(
                     CodeTestChatMessageContent(
                         message = errorMessage,
                         type = ChatMessageType.Answer,
-                        canBeVoted = false
+                        canBeVoted = false,
+                        buttons = buttonList
                     )
                 )
 
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
index d380bbc368c..12b6d204f3d 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
@@ -9,6 +9,7 @@ import com.intellij.diff.DiffManagerEx
 import com.intellij.diff.requests.SimpleDiffRequest
 import com.intellij.ide.BrowserUtil
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.guessProjectDir
@@ -92,6 +93,7 @@ import software.aws.toolkits.jetbrains.services.cwc.editor.context.ExtractionTri
 import software.aws.toolkits.jetbrains.services.cwc.editor.context.file.FileContext
 import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType
 import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
+import software.aws.toolkits.jetbrains.ui.feedback.TestGenFeedbackDialog
 import software.aws.toolkits.jetbrains.utils.notifyError
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
@@ -168,13 +170,14 @@ class CodeTestChatController(
     override suspend fun processStartTestGen(message: IncomingCodeTestMessage.StartTestGen) {
         codeTestChatHelper.setActiveCodeTestTabId(message.tabId)
         val session = codeTestChatHelper.getActiveSession()
+        if (session.isGeneratingTests) {
+            return
+        }
+        sessionCleanUp(session.tabId)
         // check if IDE has active file open, yes return (fileName and filePath) else return null
         val project = context.project
         val fileInfo = checkActiveFileInIDE(project, message) ?: return
         session.programmingLanguage = fileInfo.fileLanguage
-        if (session.isGeneratingTests === true) {
-            return
-        }
         session.startTimeOfTestGeneration = Instant.now().toEpochMilli().toDouble()
         session.isGeneratingTests = true
 
@@ -687,14 +690,25 @@ class CodeTestChatController(
                     requestId = session.startTestGenerationRequestId,
                     status = Status.ACCEPTED,
                 )
+                val buttonList = mutableListOf<Button>()
+                buttonList.add(
+                    Button(
+                        "utg_feedback",
+                        "How can we make /test better?",
+                        keepCardAfterClick = true,
+                        position = "outside",
+                        status = "info",
+                        icon = "comment"
+                    ),
+                )
                 codeTestChatHelper.addAnswer(
                     CodeTestChatMessageContent(
                         message = message("testgen.message.success"),
                         type = ChatMessageType.Answer,
-                        canBeVoted = false
+                        canBeVoted = false,
+                        buttons = buttonList
                     )
                 )
-                sessionCleanUp(session.tabId)
                 codeTestChatHelper.updateUI(
                     promptInputDisabledState = false,
                     promptInputPlaceholder = message("testgen.placeholder.enter_slash_quick_actions"),
@@ -836,11 +850,24 @@ class CodeTestChatController(
                 ApplicationManager.getApplication().invokeLater {
                     session.openedDiffFile?.let { FileEditorManager.getInstance(context.project).closeFile(it) }
                 }
+                val buttonList = mutableListOf<Button>()
+                buttonList.add(
+                    Button(
+                        "utg_feedback",
+                        "How can we make /test better?",
+                        keepCardAfterClick = true,
+                        position = "outside",
+                        status = "info",
+                        disabled = true,
+                        icon = "comment"
+                    ),
+                )
                 codeTestChatHelper.addAnswer(
                     CodeTestChatMessageContent(
                         message = message("testgen.message.success"),
                         type = ChatMessageType.Answer,
-                        canBeVoted = false
+                        canBeVoted = false,
+                        buttons = buttonList
                     )
                 )
                 val testGenerationEventResponse = client.sendTestGenerationEvent(
@@ -884,7 +911,10 @@ class CodeTestChatController(
                     requestId = session.startTestGenerationRequestId,
                     status = Status.REJECTED,
                 )
-                sessionCleanUp(message.tabId)
+            }
+            "utg_feedback" -> {
+                sendFeedback()
+                UiTelemetry.click(context.project, "unitTestGeneration_provideFeedback")
             }
             "utg_skip_and_finish" -> {
                 codeTestChatHelper.addAnswer(
@@ -1373,6 +1403,16 @@ class CodeTestChatController(
         println(message)
     }
 
+    private fun sendFeedback() {
+        runInEdt {
+            TestGenFeedbackDialog(
+                context.project,
+                codeTestChatHelper.getActiveSession().startTestGenerationRequestId,
+                codeTestChatHelper.getActiveSession().testGenerationJob
+            ).show()
+        }
+    }
+
     companion object {
         private val LOG = getLogger<CodeTestChatController>()
 
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTestChatConnector.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTestChatConnector.ts
index 5f6806c5dfa..53b16539f00 100644
--- a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTestChatConnector.ts
+++ b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTestChatConnector.ts
@@ -151,7 +151,7 @@ export class CodeTestChatConnector {
                 text: '',
                 options: messageData.followUps,
             } : undefined,
-            canBeVoted: true,
+            canBeVoted: messageData.canBeVoted ?? false,
             fileList: messageData.fileList ? {
                 rootFolderTitle: messageData.projectRootName,
                 fileTreeTitle: 'READY FOR REVIEW',
@@ -477,7 +477,20 @@ export class CodeTestChatConnector {
                         disabled: true
                     }
                 ]
-                break;
+                break
+
+            case FormButtonIds.CodeTestProvideFeedback:
+                answer.buttons = [
+                    {
+                        keepCardAfterClick: true,
+                        text: 'Thanks for providing feedback.',
+                        id: 'utg_provided_feedback',
+                        status: 'success',
+                        position: 'outside',
+                        disabled: true
+                    }
+                ]
+                break
             default:
                 console.warn(`Unhandled action ID: ${action.id}`);
                 break;
diff --git a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/forms/constants.ts b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/forms/constants.ts
index f7276477298..e400e2a5541 100644
--- a/plugins/amazonq/mynah-ui/src/mynah-ui/ui/forms/constants.ts
+++ b/plugins/amazonq/mynah-ui/src/mynah-ui/ui/forms/constants.ts
@@ -27,6 +27,7 @@ export const enum FormButtonIds {
   CodeTestStartGeneration = "code_test_start_generation",
   CodeTestViewDiff = "utg_view_diff",
   CodeTestAccept = "utg_accept",
+  CodeTestProvideFeedback = "utg_feedback",
   CodeTestRegenerate = "utg_regenerate",
   CodeTestReject = "utg_reject",
   CodeTestBuildAndExecute = "utg_build_and_execute",
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/TestGenFeedbackDialog.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/TestGenFeedbackDialog.kt
new file mode 100644
index 00000000000..f0fef781897
--- /dev/null
+++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/TestGenFeedbackDialog.kt
@@ -0,0 +1,25 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.ui.feedback
+
+import com.intellij.openapi.project.Project
+import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
+import software.aws.toolkits.resources.message
+
+class TestGenFeedbackDialog(
+    project: Project,
+    private val requestId: String? = null,
+    private val jobId: String? = null,
+) : FeedbackDialog(project) {
+    override fun notificationTitle() = message("aws.notification.title.amazonq.test_generation")
+    override fun feedbackPrompt() = message("feedback.comment.textbox.title.amazonq.test_generation")
+    override fun productName() = "Amazon Q Test Generation"
+    override suspend fun sendFeedback() {
+        TelemetryService.getInstance().sendFeedback(sentiment, "UserComment: $commentText, RequestId: $requestId, TestGenerationJobId: $jobId")
+    }
+
+    init {
+        title = message("feedback.title.amazonq.feature_dev")
+    }
+}
diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
index 87c11fd21cb..68b0cf07d64 100644
--- a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
+++ b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -234,6 +234,7 @@ aws.notification.sam_cli_not_valid=Error: {0}. Click <a href="">here</a> to reco
 aws.notification.title=AWS Toolkit
 aws.notification.title.amazonq=Amazon Q
 aws.notification.title.amazonq.feature_dev=Amazon Q FeatureDev
+aws.notification.title.amazonq.test_generation=Amazon Q Test Generation
 aws.notification.title.codewhisperer=Amazon Q
 aws.onboarding.getstarted.panel.bottom_text=<a href="https://docs.aws.amazon.com/toolkit-for-jetbrains/latest/userguide/auth-access.html">Learn more about authenticating with the Toolkit</a>
 aws.onboarding.getstarted.panel.bottom_text_question=Why do these have different authentication requirements?
@@ -1308,6 +1309,7 @@ feedback.comment.textbox.initial.length=2000 characters remaining
 feedback.comment.textbox.title=What do you like about {0}? What can we improve?
 feedback.comment.textbox.title.amazonq=How was your experience with the upgrade of your Java application?
 feedback.comment.textbox.title.amazonq.feature_dev=How has your experience with Amazon Q been? What can we improve?
+feedback.comment.textbox.title.amazonq.test_generation=How has your experience with Amazon Q Test Generation been? What can we improve?
 feedback.connect.with.github.title=Join us on GitHub
 feedback.customer.alert.info=Please don't add personally identifiable information (PII), confidential or sensitive information in your feedback.<br>Remove any PII when sharing file paths, error messages, etc.
 feedback.description=Submit quick feedback about the AWS Toolkit for JetBrains
@@ -2069,6 +2071,7 @@ testgen.error.generic_technical_error_message=I am experiencing technical diffic
 testgen.error.maximum_generations_reach=You've reached the monthly quota for Amazon Q Developer's agent capabilities. You can try again next month. For more information on usage limits, see the <a href=\"https://aws.amazon.com/q/developer/pricing/\" target=\"_blank\">Amazon Q Developer pricing page</a>.
 testgen.message.cancelled=Unit test generation cancelled.
 testgen.message.failed=Test generation failed
+testgen.message.feedback=Thanks for providing feedback.
 testgen.message.regenerate_input=Sure thing. Please provide new instructions for me to generate the tests, and select the function(s) you would like to test.
 testgen.message.success=Unit test generation completed.
 testgen.no_file_found=Sorry, there isn't a source file open right now that I can generate a test for. Make sure you open a source file so I can generate tests.

From 6b719551fa373cfa4f4dee6bbd1142ee8676a563 Mon Sep 17 00:00:00 2001
From: laileni <laileni@amazon.com>
Date: Tue, 11 Mar 2025 10:35:35 -0700
Subject: [PATCH 3/4] Minor Text changes

---
 .../amazonqCodeTest/CodeWhispererUTGChatManager.kt        | 2 +-
 .../amazonqCodeTest/controller/CodeTestChatController.kt  | 8 ++++----
 .../jetbrains/ui/feedback/FeatureDevFeedbackDialog.kt     | 2 +-
 .../jetbrains/ui/feedback/TestGenFeedbackDialog.kt        | 2 +-
 .../aws/toolkits/resources/MessagesBundle.properties      | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
index 89490b2c073..2894514378c 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
@@ -563,7 +563,7 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                 buttonList.add(
                     Button(
                         "utg_feedback",
-                        "How can we make /test better?",
+                        message("testgen.button.feedback"),
                         keepCardAfterClick = true,
                         position = "outside",
                         status = "info",
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
index 12b6d204f3d..45d65c9272d 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
@@ -568,7 +568,7 @@ class CodeTestChatController(
                     session.linesOfCodeGenerated = lineDifference.coerceAtLeast(0)
                     session.charsOfCodeGenerated = charDifference.coerceAtLeast(0)
                     session.latencyOfTestGeneration = (Instant.now().toEpochMilli() - session.startTimeOfTestGeneration)
-                    UiTelemetry.click(null as Project?, "unitTestGeneration_viewDiff")
+                    UiTelemetry.click(context.project, "unitTestGeneration_viewDiff")
 
                     val buttonList = mutableListOf<Button>()
                     buttonList.add(
@@ -665,7 +665,7 @@ class CodeTestChatController(
                         testGenerationEventResponse.responseMetadata().requestId()}"
                 }
 
-                UiTelemetry.click(null as Project?, "unitTestGeneration_acceptDiff")
+                UiTelemetry.click(context.project, "unitTestGeneration_acceptDiff")
 
                 AmazonqTelemetry.utgGenerateTests(
                     cwsprChatProgrammingLanguage = session.programmingLanguage.languageId,
@@ -694,7 +694,7 @@ class CodeTestChatController(
                 buttonList.add(
                     Button(
                         "utg_feedback",
-                        "How can we make /test better?",
+                        message("testgen.button.feedback"),
                         keepCardAfterClick = true,
                         position = "outside",
                         status = "info",
@@ -854,7 +854,7 @@ class CodeTestChatController(
                 buttonList.add(
                     Button(
                         "utg_feedback",
-                        "How can we make /test better?",
+                        message("testgen.button.feedback"),
                         keepCardAfterClick = true,
                         position = "outside",
                         status = "info",
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/FeatureDevFeedbackDialog.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/FeatureDevFeedbackDialog.kt
index 3b712d1a3ef..d625ee64234 100644
--- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/FeatureDevFeedbackDialog.kt
+++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/FeatureDevFeedbackDialog.kt
@@ -16,6 +16,6 @@ class FeatureDevFeedbackDialog(project: Project) : FeedbackDialog(project) {
     }
 
     init {
-        title = message("feedback.title.amazonq.feature_dev")
+        title = message("feedback.title.amazonq.send_feedback")
     }
 }
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/TestGenFeedbackDialog.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/TestGenFeedbackDialog.kt
index f0fef781897..f4cd6ab7fdd 100644
--- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/TestGenFeedbackDialog.kt
+++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/feedback/TestGenFeedbackDialog.kt
@@ -20,6 +20,6 @@ class TestGenFeedbackDialog(
     }
 
     init {
-        title = message("feedback.title.amazonq.feature_dev")
+        title = message("feedback.title.amazonq.send_feedback")
     }
 }
diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
index 68b0cf07d64..92d25cbe901 100644
--- a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
+++ b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -1329,7 +1329,7 @@ feedback.submit_success=Thanks for the feedback!
 feedback.submitting=Sharing...
 feedback.title=Share Feedback for {0}...
 feedback.title.amazonq=Send feedback for Code Transformation by Amazon Q
-feedback.title.amazonq.feature_dev=Send feedback for Amazon Q
+feedback.title.amazonq.send_feedback=Send feedback for Amazon Q
 feedback.validation.comment_too_long=Comment is too long.
 feedback.validation.empty_comment=Please provide a comment.
 feedback.validation.no_sentiment=Please select how you're feeling.
@@ -2066,12 +2066,12 @@ sqs.subscribe.sns.validation.empty_topic=Topic must be specified.
 sqs.toolwindow=SQS
 sqs.url.parse_error=Error parsing SQS queue URL
 tags.title=Tags
+testgen.button.feedback=How can we make /test better?
 testgen.error.generic_error_message=Amazon Q encountered an error while generating tests. Try again later.
 testgen.error.generic_technical_error_message=I am experiencing technical difficulties at the moment. Please try again in a few minutes.
 testgen.error.maximum_generations_reach=You've reached the monthly quota for Amazon Q Developer's agent capabilities. You can try again next month. For more information on usage limits, see the <a href=\"https://aws.amazon.com/q/developer/pricing/\" target=\"_blank\">Amazon Q Developer pricing page</a>.
 testgen.message.cancelled=Unit test generation cancelled.
 testgen.message.failed=Test generation failed
-testgen.message.feedback=Thanks for providing feedback.
 testgen.message.regenerate_input=Sure thing. Please provide new instructions for me to generate the tests, and select the function(s) you would like to test.
 testgen.message.success=Unit test generation completed.
 testgen.no_file_found=Sorry, there isn't a source file open right now that I can generate a test for. Make sure you open a source file so I can generate tests.

From a75ad3ede3cac65a35da7ea5d768cf248eed7ff7 Mon Sep 17 00:00:00 2001
From: laileni <laileni@amazon.com>
Date: Tue, 11 Mar 2025 11:07:00 -0700
Subject: [PATCH 4/4] Adding f/b for internal amazon users only.

---
 .../CodeWhispererUTGChatManager.kt            | 23 +++++-----
 .../controller/CodeTestChatController.kt      | 45 +++++++++----------
 2 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
index 2894514378c..0cf614774ed 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/CodeWhispererUTGChatManager.kt
@@ -29,6 +29,7 @@ import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
+import software.aws.toolkits.jetbrains.core.credentials.sono.isInternalUser
 import software.aws.toolkits.jetbrains.services.amazonq.clients.AmazonQStreamingClient
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.controller.CodeTestChatHelper
 import software.aws.toolkits.jetbrains.services.amazonqCodeTest.messages.Button
@@ -560,16 +561,18 @@ class CodeWhispererUTGChatManager(val project: Project, private val cs: Coroutin
                     else -> message("testgen.error.generic_error_message")
                 }
                 val buttonList = mutableListOf<Button>()
-                buttonList.add(
-                    Button(
-                        "utg_feedback",
-                        message("testgen.button.feedback"),
-                        keepCardAfterClick = true,
-                        position = "outside",
-                        status = "info",
-                        icon = "comment"
-                    ),
-                )
+                if (isInternalUser(getStartUrl(project))) {
+                    buttonList.add(
+                        Button(
+                            "utg_feedback",
+                            message("testgen.button.feedback"),
+                            keepCardAfterClick = true,
+                            position = "outside",
+                            status = "info",
+                            icon = "comment"
+                        ),
+                    )
+                }
                 codeTestChatHelper.addAnswer(
                     CodeTestChatMessageContent(
                         message = errorMessage,
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
index 45d65c9272d..da39e0b1297 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
@@ -54,6 +54,7 @@ import software.aws.toolkits.jetbrains.core.AwsClientManager
 import software.aws.toolkits.jetbrains.core.coroutines.EDT
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
+import software.aws.toolkits.jetbrains.core.credentials.sono.isInternalUser
 import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
 import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthController
 import software.aws.toolkits.jetbrains.services.amazonq.project.RelevantDocument
@@ -690,23 +691,12 @@ class CodeTestChatController(
                     requestId = session.startTestGenerationRequestId,
                     status = Status.ACCEPTED,
                 )
-                val buttonList = mutableListOf<Button>()
-                buttonList.add(
-                    Button(
-                        "utg_feedback",
-                        message("testgen.button.feedback"),
-                        keepCardAfterClick = true,
-                        position = "outside",
-                        status = "info",
-                        icon = "comment"
-                    ),
-                )
                 codeTestChatHelper.addAnswer(
                     CodeTestChatMessageContent(
                         message = message("testgen.message.success"),
                         type = ChatMessageType.Answer,
                         canBeVoted = false,
-                        buttons = buttonList
+                        buttons = this.showFeedbackButton()
                     )
                 )
                 codeTestChatHelper.updateUI(
@@ -850,24 +840,12 @@ class CodeTestChatController(
                 ApplicationManager.getApplication().invokeLater {
                     session.openedDiffFile?.let { FileEditorManager.getInstance(context.project).closeFile(it) }
                 }
-                val buttonList = mutableListOf<Button>()
-                buttonList.add(
-                    Button(
-                        "utg_feedback",
-                        message("testgen.button.feedback"),
-                        keepCardAfterClick = true,
-                        position = "outside",
-                        status = "info",
-                        disabled = true,
-                        icon = "comment"
-                    ),
-                )
                 codeTestChatHelper.addAnswer(
                     CodeTestChatMessageContent(
                         message = message("testgen.message.success"),
                         type = ChatMessageType.Answer,
                         canBeVoted = false,
-                        buttons = buttonList
+                        buttons = this.showFeedbackButton()
                     )
                 )
                 val testGenerationEventResponse = client.sendTestGenerationEvent(
@@ -1413,6 +1391,23 @@ class CodeTestChatController(
         }
     }
 
+    private fun showFeedbackButton(): MutableList<Button> {
+        val buttonList = mutableListOf<Button>()
+        if (isInternalUser(getStartUrl(context.project))) {
+            buttonList.add(
+                Button(
+                    "utg_feedback",
+                    message("testgen.button.feedback"),
+                    keepCardAfterClick = true,
+                    position = "outside",
+                    status = "info",
+                    icon = "comment"
+                ),
+            )
+        }
+        return buttonList
+    }
+
     companion object {
         private val LOG = getLogger<CodeTestChatController>()