Merge main into feature/dev-execution

aws-toolkit-automation · web-flow · commit 3c5ac039886b · 2025-05-06T19:06:44.000-04:00
diff --git a/.changes/next-release/bugfix-7920ece4-99d6-4828-931e-29b66994dc10.json b/.changes/next-release/bugfix-7920ece4-99d6-4828-931e-29b66994dc10.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/dev: Fix missing Amazon Q feature dev auto build setting."
+}
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
@@ -544,7 +544,8 @@ class FeatureDevController(
     }
 
     private suspend fun handleDevCommandUserSetting(tabId: String, value: Boolean) {
-        CodeWhispererSettings.getInstance().toggleAutoBuildFeature(context.project.basePath, value)
+        val session = getSessionInfo(tabId)
+        CodeWhispererSettings.getInstance().toggleAutoBuildFeature(session.context.workspaceRoot.path, value)
         messenger.sendAnswer(
             tabId = tabId,
             message = message("amazonqFeatureDev.chat_message.setting_updated"),

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "/dev: Fix missing Amazon Q feature dev auto build setting."
 +}
Original file line number	Diff line number	Diff line change
`@@ -544,7 +544,8 @@ class FeatureDevController(`
`544`	`544`	`}`
`545`	`545`
`546`	`546`	`private suspend fun handleDevCommandUserSetting(tabId: String, value: Boolean) {`
`547`		`- CodeWhispererSettings.getInstance().toggleAutoBuildFeature(context.project.basePath, value)`
	`547`	`+ val session = getSessionInfo(tabId)`
	`548`	`+ CodeWhispererSettings.getInstance().toggleAutoBuildFeature(session.context.workspaceRoot.path, value)`
`548`	`549`	`messenger.sendAnswer(`
`549`	`550`	`tabId = tabId,`
`550`	`551`	`message = message("amazonqFeatureDev.chat_message.setting_updated"),`