Skip to content

feat(amazonq): improve explain functionality #6014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 17, 2025
Merged

feat(amazonq): improve explain functionality #6014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f1f2a2e
feat(amazonq): improve explain functionality
blakelaz-amazon Sep 2, 2025
dbbbd70
fix(amazonq): fix detekt errors
blakelaz-amazon Sep 3, 2025
25fe681
fix(amazonq): add changelog
blakelaz-amazon Sep 3, 2025
2b14eec
Merge branch 'main' into ExplainEnhance
BlakeLazarine Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changes/next-release/feature-8e3cb633-c82d-4e35-ab8e-0ab0e1d41294.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "feature",
"description" : "Improve the explain and apply fix messages"
}
11 changes: 9 additions & 2 deletions ...aws/toolkits/jetbrains/services/cwc/commands/codescan/actions/HandleIssueCommandAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ class HandleIssueCommandAction : AnAction(), DumbAware {
val contextDataKey = DataKey.create<MutableMap<String, String>>("amazonq.codescan.handleIssueCommandContext")
val actionDataKey = DataKey.create<String>("amazonq.codescan.handleIssueCommandAction")

private val explainContextPrompt = "Provide a small description of the issue. You must not attempt to fix the issue. " +
"You should only give a small summary of it to the user. " +
"You must start with the information stored in the recommendation.text field if it is present."
private val applyFixContextPrompt = "Generate a fix for the following code issue." +
" You must not explain the issue, just generate and explain the fix. " +
"The user should have the option to accept or reject the fix before any code is changed."

override fun getActionUpdateThread() = ActionUpdateThread.BGT

override fun update(e: AnActionEvent) {
Expand Down Expand Up @@ -62,11 +69,11 @@ class HandleIssueCommandAction : AnAction(), DumbAware {
// https://github.com/aws/aws-toolkit-vscode/blob/master/packages/amazonq/src/lsp/chat/commands.ts#L30
val codeSelection = "\n```\n${context["code"]?.trimIndent()?.trim()}\n```\n"
val actionString = if (action == "explainIssue") "Explain" else "Fix"
val contextPrompt = if (action == "explainIssue") explainContextPrompt else applyFixContextPrompt

val prompt = "$actionString ${context["title"]} issue in ${context["fileName"]} at ${createLineRangeText(context)}"

val modelPrompt = "$actionString ${context["title"]} issue in ${context["fileName"]} at ${createLineRangeText(context)}" +
"Issue: \"${context}\" \n"
val modelPrompt = "$contextPrompt Issue: \"${context}\" \n"

val params = SendToPromptParams(
selection = codeSelection,
Expand Down
Loading