feat(amazonq): surface profile selection step requried in statusbar

rli · rli · commit f30d0350c53e · 2025-04-22T13:24:11.000-07:00
diff --git a/.changes/next-release/feature-b8767b53-e30f-4c76-afa3-26d16a35f937.json b/.changes/next-release/feature-b8767b53-e30f-4c76-afa3-26d16a35f937.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Amazon Q: Show visual indicator in status bar if profile selection is needed to continue with Q Inline / Q Chat"
+}
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/status/CodeWhispererStatusBarWidget.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/status/CodeWhispererStatusBarWidget.kt
@@ -23,6 +23,7 @@ import software.aws.toolkits.jetbrains.core.credentials.profiles.ProfileWatcher
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProviderListener
 import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
 import software.aws.toolkits.jetbrains.services.amazonq.gettingstarted.QActionGroups.Q_SIGNED_OUT_ACTION_GROUP
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererCustomizationListener
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.QStatusBarLoggedInActionGroup
@@ -121,7 +122,7 @@ class CodeWhispererStatusBarWidget(project: Project) :
     }
 
     override fun getIcon(): Icon =
-        if (isQExpired(project)) {
+        if (isQExpired(project) || QRegionProfileManager.getInstance().isPendingProfileSelection(project)) {
             AllIcons.General.BalloonWarning
         } else if (!isQConnected(project)) {
             AllIcons.RunConfigurations.TestState.Run
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/actions/QSwitchProfilesAction.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/actions/QSwitchProfilesAction.kt
@@ -8,8 +8,10 @@ import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.project.DumbAware
+import com.intellij.ui.JBColor
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileDialog
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.getHexString
 import software.aws.toolkits.resources.AmazonQBundle.message
 
 class QSwitchProfilesAction : AnAction(message("action.q.switchProfiles.text")), DumbAware {
@@ -18,6 +20,12 @@ class QSwitchProfilesAction : AnAction(message("action.q.switchProfiles.text")),
 
     override fun update(e: AnActionEvent) {
         e.presentation.icon = AllIcons.Actions.SwapPanels
+        val project = e.project ?: return
+        if (QRegionProfileManager.getInstance().isPendingProfileSelection(project)) {
+            e.presentation.text = """
+                <html><body>Change profile <font color="${JBColor.GRAY.getHexString()}">(Select a profile to proceed)</font></body></html>
+            """.trimIndent()
+        }
     }
 
     override fun actionPerformed(e: AnActionEvent) {
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererColorUtil.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererColorUtil.kt
@@ -21,6 +21,6 @@ object CodeWhispererColorUtil {
     val EDITOR_CODE_REFERENCE_HOVER = JBColor(0x4B4D4D, 0x4B4D4D)
     val INACTIVE_TEXT_COLOR = UIUtil.getInactiveTextColor().getHexString()
     val TRY_EXAMPLE_EVEN_ROW_COLOR = JBColor(0xCACACA, 0x252525)
-
-    fun Color.getHexString() = String.format("#%02x%02x%02x", this.red, this.green, this.blue)
 }
+
+fun Color.getHexString() = String.format(null, "#%02x%02x%02x", this.red, this.green, this.blue)

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "feature",
 +  "description" : "Amazon Q: Show visual indicator in status bar if profile selection is needed to continue with Q Inline / Q Chat"
 +}
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,6 @@ object CodeWhispererColorUtil {`
`21`	`21`	`val EDITOR_CODE_REFERENCE_HOVER = JBColor(0x4B4D4D, 0x4B4D4D)`
`22`	`22`	`val INACTIVE_TEXT_COLOR = UIUtil.getInactiveTextColor().getHexString()`
`23`	`23`	`val TRY_EXAMPLE_EVEN_ROW_COLOR = JBColor(0xCACACA, 0x252525)`
`24`		`-`
`25`		`- fun Color.getHexString() = String.format("#%02x%02x%02x", this.red, this.green, this.blue)`
`26`	`24`	`}`
	`25`	`+`
	`26`	`+fun Color.getHexString() = String.format(null, "#%02x%02x%02x", this.red, this.green, this.blue)`