feat(amazonq): add q config to lsp/configuration

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt

@@ -22,7 +22,7 @@
 import software.amazon.awssdk.services.codewhispererruntime.model.GetTestGenerationResponse
 import software.amazon.awssdk.services.codewhispererruntime.model.IdeCategory
 import software.amazon.awssdk.services.codewhispererruntime.model.InlineChatUserDecision
 import software.amazon.awssdk.services.codewhispererruntime.model.ListAvailableCustomizationsRequest
 import software.amazon.awssdk.services.codewhispererruntime.model.ListCodeAnalysisFindingsRequest
 import software.amazon.awssdk.services.codewhispererruntime.model.ListCodeAnalysisFindingsResponse
 import software.amazon.awssdk.services.codewhispererruntime.model.ListFeatureEvaluationsResponse
@@ -35,7 +35,7 @@
 import software.amazon.awssdk.services.codewhispererruntime.model.SuggestionState
 import software.amazon.awssdk.services.codewhispererruntime.model.TargetCode
 import software.amazon.awssdk.services.codewhispererruntime.model.UserIntent
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.jetbrains.services.amazonq.codeWhispererUserContext
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
@@ -78,8 +78,6 @@
 
     fun getCodeFixJob(request: GetCodeFixJobRequest): GetCodeFixJobResponse
 
-    fun listAvailableCustomizations(): List<CodeWhispererCustomization>
-
     fun startTestGeneration(uploadId: String, targetCode: List<TargetCode>, userInput: String): StartTestGenerationResponse
 
     fun getTestGeneration(jobId: String, jobGroupName: String): GetTestGenerationResponse
@@ -281,28 +279,6 @@
 
     override fun getCodeFixJob(request: GetCodeFixJobRequest): GetCodeFixJobResponse = bearerClient().getCodeFixJob(request)
 
-    // DO NOT directly use this method to fetch customizations, use wrapper [CodeWhispererModelConfigurator.listCustomization()] instead
-    override fun listAvailableCustomizations(): List<CodeWhispererCustomization> =
-        bearerClient().listAvailableCustomizationsPaginator(
-            ListAvailableCustomizationsRequest.builder().profileArn(QRegionProfileManager.getInstance().activeProfile(project)?.arn).build()
-        )
-            .stream()
-            .toList()
-            .flatMap { resp ->
-                LOG.debug {
-                    "listAvailableCustomizations: requestId: ${resp.responseMetadata().requestId()}, customizations: ${
-                        resp.customizations().map { it.name() }
-                    }"
-                }
-                resp.customizations().map {
-                    CodeWhispererCustomization(
-                        arn = it.arn(),
-                        name = it.name(),
-                        description = it.description()
-                    )
-                }
-            }
-
     override fun startTestGeneration(uploadId: String, targetCode: List<TargetCode>, userInput: String): StartTestGenerationResponse =
         bearerClient().startTestGeneration { builder ->
             builder.uploadId(uploadId)
@@ -801,7 +777,7 @@
     }
 
     companion object {
         private val LOG = getLogger<CodeWhispererClientAdaptorImpl>()
     }
 }
 

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt

@@ -86,6 +86,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getTelemetryOptOutPreference
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.notifyErrorCodeWhispererUsageLimit
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.promptReAuth
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CustomizationConstants
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.FileContextProvider
 import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 import software.aws.toolkits.jetbrains.utils.isInjectedText
@@ -333,7 +334,7 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
                 val displayMessage: String
 
                 if (
-                    CodeWhispererConstants.Customization.invalidCustomizationExceptionPredicate(e) ||
+                    CustomizationConstants.invalidCustomizationExceptionPredicate(e) ||
                     e is ResourceNotFoundException
                 ) {
                     (e as CodeWhispererRuntimeException)

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererServiceNew.kt

@@ -83,6 +83,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getTelemetryOptOutPreference
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.notifyErrorCodeWhispererUsageLimit
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.promptReAuth
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CustomizationConstants
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.FileContextProvider
 import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 import software.aws.toolkits.jetbrains.utils.isInjectedText
@@ -360,7 +361,7 @@ class CodeWhispererServiceNew(private val cs: CoroutineScope) : Disposable {
             val displayMessage: String
 
             if (
-                CodeWhispererConstants.Customization.invalidCustomizationExceptionPredicate(e) ||
+                CustomizationConstants.invalidCustomizationExceptionPredicate(e) ||
                 e is ResourceNotFoundException
             ) {
                 (e as CodeWhispererRuntimeException)

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt

@@ -8,8 +8,8 @@
 import com.intellij.openapi.editor.markup.TextAttributes
 import com.intellij.ui.JBColor
 import software.amazon.awssdk.regions.Region
 import software.amazon.awssdk.services.codewhispererruntime.model.AccessDeniedException
 import software.amazon.awssdk.services.codewhispererruntime.model.CodeWhispererRuntimeException
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.CodeScanResponse
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererJava
 import software.aws.toolkits.telemetry.CodewhispererGettingStartedTask
@@ -59,7 +59,6 @@
     val scanResultsKey = DataKey.create<CodeScanResponse>("amazonq.codescan.result")
     val scanScopeKey = DataKey.create<CodeAnalysisScope>("amazonq.codescan.scope")
 
-    const val Q_CUSTOM_LEARN_MORE_URI = "https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/customizations.html"
     const val Q_SUPPORTED_LANG_URI = "https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/q-language-ide-support.html"
     const val CODEWHISPERER_CODE_SCAN_LEARN_MORE_URI = "https://docs.aws.amazon.com/codewhisperer/latest/userguide/security-scans.html"
     const val CODEWHISPERER_ONBOARDING_DOCUMENTATION_URI = "https://docs.aws.amazon.com/codewhisperer/latest/userguide/features.html"
@@ -157,27 +156,6 @@
         val Sigv4ClientRegion = Region.US_EAST_1
     }
 
-    object Customization {
-        private const val noAccessToCustomizationMessage = "Your account is not authorized to use CodeWhisperer Enterprise."
-        private const val invalidCustomizationMessage = "You are not authorized to access"
-
-        val noAccessToCustomizationExceptionPredicate: (e: Exception) -> Boolean = { e ->
-            if (e !is CodeWhispererRuntimeException) {
-                false
-            } else {
-                e is AccessDeniedException && (e.message?.contains(noAccessToCustomizationMessage, ignoreCase = true) ?: false)
-            }
-        }
-
-        val invalidCustomizationExceptionPredicate: (e: Exception) -> Boolean = { e ->
-            if (e !is CodeWhispererRuntimeException) {
-                false
-            } else {
-                e is AccessDeniedException && (e.message?.contains(invalidCustomizationMessage, ignoreCase = true) ?: false)
-            }
-        }
-    }
-
     object CrossFile {
         const val CHUNK_SIZE = 60
         const val NUMBER_OF_LINE_IN_CHUNK = 50

plugins/amazonq/codewhisperer/jetbrains-community/src/migration/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt → plugins/amazonq/shared/jetbrains-community/src/migration/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt

@@ -1,4 +1,4 @@
-// Copyright 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package migration.software.aws.toolkits.jetbrains.services.codewhisperer.customization

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt

@@ -5,6 +5,7 @@ package software.aws.toolkits.jetbrains.services.amazonq.lsp
 
 import com.intellij.notification.NotificationType
 import com.intellij.openapi.project.Project
+import migration.software.aws.toolkits.jetbrains.settings.AwsSettings
 import org.eclipse.lsp4j.ConfigurationParams
 import org.eclipse.lsp4j.MessageActionItem
 import org.eclipse.lsp4j.MessageParams
@@ -20,6 +21,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credential
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.credentials.SsoProfileData
 import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 import java.util.concurrent.CompletableFuture
+import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 
 /**
  * Concrete implementation of [AmazonQLanguageClient] to handle messages sent from server
@@ -79,14 +81,31 @@ class AmazonQLanguageClientImpl(private val project: Project) : AmazonQLanguageC
 
         return CompletableFuture.completedFuture(
             buildList {
+                val qSettings = CodeWhispererSettings.getInstance()
                 params.items.forEach {
                     when (it.section) {
                         AmazonQLspConstants.LSP_CW_CONFIGURATION_KEY -> {
                             add(
                                 CodeWhispererLspConfiguration(
-                                    shouldShareData = CodeWhispererSettings.getInstance().isMetricOptIn(),
-                                    shouldShareCodeReferences = CodeWhispererSettings.getInstance().isIncludeCodeWithReference(),
-                                    shouldEnableWorkspaceContext = CodeWhispererSettings.getInstance().isWorkspaceContextEnabled()
+                                    shouldShareData = qSettings.isMetricOptIn(),
+                                    shouldShareCodeReferences = qSettings.isIncludeCodeWithReference(),
+                                    // server context
+                                    shouldEnableWorkspaceContext = qSettings.isWorkspaceContextEnabled()
+                                )
+                            )
+                        }
+                        AmazonQLspConstants.LSP_Q_CONFIGURATION_KEY -> {
+                            add(
+                                AmazonQLspConfiguration(
+                                    optOutTelemetry = AwsSettings.getInstance().isTelemetryEnabled,
+                                    customization = CodeWhispererModelConfigurator.getInstance().activeCustomization(project)?.arn,
+                                    // local context
+                                    enableLocalIndexing = qSettings.isProjectContextEnabled(),
+                                    indexWorkerThreads = qSettings.getProjectContextIndexThreadCount(),
+                                    enableGpuAcceleration = qSettings.isProjectContextGpu(),
+                                    localIndexing = LocalIndexingConfiguration(
+                                        maxIndexSizeMB = qSettings.getProjectContextIndexMaxSize()
+                                    )
                                 )
                             )
                         }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspConfiguration.kt

@@ -0,0 +1,32 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp
+
+import com.google.gson.annotations.SerializedName
+
+data class AmazonQLspConfiguration(
+    @SerializedName(AmazonQLspConstants.LSP_OPT_OUT_TELEMETRY_CONFIGURATION_KEY)
+    val optOutTelemetry: Boolean? = null,
+
+    @SerializedName(AmazonQLspConstants.LSP_ENABLE_TELEMETRY_EVENTS_CONFIGURATION_KEY)
+    val enableTelemetryEvents: Boolean? = null,
+
+    @SerializedName(AmazonQLspConstants.LSP_CUSTOMIZATION_CONFIGURATION_KEY)
+    val customization: String? = null,
+
+    val enableLocalIndexing: Boolean? = null,
+
+    val enableGpuAcceleration: Boolean? = null,
+
+    val indexWorkerThreads: Int? = null,
+
+    val localIndexing: LocalIndexingConfiguration? = null,
+)
+
+data class LocalIndexingConfiguration(
+    val ignoreFilePatterns:  List<String>? = null,
+    val maxFileSizeMB: Int? = null,
+    val maxIndexSizeMB: Int? = null,
+    val indexCacheDirPath: String? = null,
+)

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLspConstants.kt

@@ -8,5 +8,9 @@ object AmazonQLspConstants {
     const val LSP_CW_CONFIGURATION_KEY = "aws.codeWhisperer"
     const val LSP_CW_OPT_OUT_KEY = "shareCodeWhispererContentWithAWS"
     const val LSP_CODE_REFERENCES_OPT_OUT_KEY = "includeSuggestionsWithCodeReferences"
+    const val LSP_Q_CONFIGURATION_KEY = "aws.q"
+    const val LSP_OPT_OUT_TELEMETRY_CONFIGURATION_KEY = "optOutTelemetry"
+    const val LSP_ENABLE_TELEMETRY_EVENTS_CONFIGURATION_KEY = "enableTelemetryEventsToDestination"
+    const val LSP_CUSTOMIZATION_CONFIGURATION_KEY = "customization"
     const val LSP_WORKSPACE_CONTEXT_ENABLED_KEY = "workspaceContext"
 }

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererCustomizationDialog.kt → plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererCustomizationDialog.kt

@@ -26,32 +26,31 @@
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.tryOrNull
-import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.Q_CUSTOM_LEARN_MORE_URI
 import software.aws.toolkits.jetbrains.ui.AsyncComboBox
 import software.aws.toolkits.jetbrains.utils.notifyInfo
 import software.aws.toolkits.resources.message
 import javax.swing.JComponent
 import javax.swing.JList
 
 private val NoDataToDisplay = CustomizationUiItem(
     CodeWhispererCustomization("", message("codewhisperer.custom.dialog.option.no_data"), ""),
     false,
     false
 )
 
 private fun notifyCustomizationIsSelected(project: Project, customizationUiItem: CustomizationUiItem?) {
     // TODO: localize
     val content = customizationUiItem?.let {
         "Amazon Q inline suggestions are now coming from the ${it.customization.name} customization"
     } ?: "Amazon Q inline suggestions are now coming from the ${message("codewhisperer.custom.dialog.option.default")}"
 
     notifyInfo(
         title = message("codewhisperer.custom.dialog.title"),
         content = content,
         project = project,
         notificationActions = listOf(
             NotificationAction.create(
                 message("codewhisperer.notification.custom.simple.button.got_it")
             ) { _, notification -> notification.expire() }
         )
     )
@@ -81,8 +80,8 @@
     private val panel: DialogPanel by lazy { drawPanel() }
 
     init {
         title = message("codewhisperer.custom.dialog.title")
         setOKButtonText(message("codewhisperer.custom.dialog.ok_button.text"))
 
         val selectedOption = CodeWhispererModelConfigurator.getInstance().activeCustomization(project)?.let {
             RadioButtonOption.Customization
@@ -128,7 +127,7 @@
     // TODO: check if we can render a multi-line combo box
     private fun drawPanel() = panel {
         row {
             label(message("codewhisperer.custom.dialog.panel.title")).bold()
         }
 
         lateinit var customizationButton: Cell<JBRadioButton>
@@ -137,8 +136,8 @@
 
         buttonsGroup {
             row {
                 defaultButton = radioButton(message("codewhisperer.custom.dialog.option.default"), RadioButtonOption.Default)
                     .comment(message("codewhisperer.custom.dialog.model.default.comment"))
                     .actionListener { _, component ->
                         if (component.isSelected) {
                             isOKActionEnabled = CodeWhispererModelConfigurator.getInstance().activeCustomization(project) != null
@@ -147,7 +146,7 @@
             }.topGap(TopGap.MEDIUM)
 
             row {
                 customizationButton = radioButton(message("codewhisperer.custom.dialog.option.customization"), RadioButtonOption.Customization)
                     .actionListener { _, component ->
                         if (component.isSelected) {
                             isOKActionEnabled =
@@ -162,11 +161,11 @@
             lateinit var customizationComment: Row
             indent {
                 noCustomizationComment = row("") {
-                    rowComment(message("codewhisperer.custom.dialog.option.customization.description.no_customization", Q_CUSTOM_LEARN_MORE_URI))
+                    rowComment(message("codewhisperer.custom.dialog.option.customization.description.no_customization", "https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/customizations.html"))
                 }.visible(false)
 
                 customizationComment = row("") {
                     rowComment(message("codewhisperer.custom.dialog.option.customization.description"))
                 }.visible(false)
             }
 
@@ -242,7 +241,7 @@
     }
 }
 
 private object CustomizationRenderer : ColoredListCellRenderer<CustomizationUiItem>() {
     override fun customizeCellRenderer(
         list: JList<out CustomizationUiItem>,
         value: CustomizationUiItem?,
@@ -265,7 +264,7 @@
 
             if (it != NoDataToDisplay) {
                 val description = if (it.customization.description.isNullOrBlank()) {
                     message("codewhisperer.custom.dialog.customization.no_description")
                 } else {
                     it.customization.description
                 }

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt → plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt

@@ -17,19 +17,23 @@
 import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
 import com.intellij.util.xmlb.annotations.MapAnnotation
 import com.intellij.util.xmlb.annotations.Property
+import software.amazon.awssdk.services.codewhispererruntime.CodeWhispererRuntimeClient
 import software.amazon.awssdk.services.codewhispererruntime.model.CodeWhispererRuntimeException
+import software.amazon.awssdk.services.codewhispererruntime.model.ListAvailableCustomizationsRequest
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
 import software.aws.toolkits.jetbrains.services.amazonq.calculateIfIamIdentityCenterConnection
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfile
+import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
 import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileSelectedListener
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CustomizationConstants
 import software.aws.toolkits.jetbrains.utils.notifyInfo
 import software.aws.toolkits.jetbrains.utils.notifyWarn
 import software.aws.toolkits.jetbrains.utils.pluginAwareExecuteOnPooledThread
 import software.aws.toolkits.resources.message
 import java.util.Collections
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -37,11 +41,11 @@
 
 private fun notifyInvalidSelectedCustomization(project: Project) {
     notifyWarn(
         title = message("codewhisperer.custom.dialog.title"),
         content = message("codewhisperer.notification.custom.not_available"),
         project = project,
         notificationActions = listOf(
             NotificationAction.create(message("codewhisperer.notification.custom.simple.button.select_another_customization")) { _, notification ->
                 CodeWhispererModelConfigurator.getInstance().showConfigDialog(project)
                 notification.expire()
             }
@@ -52,11 +56,11 @@
 private fun notifyNewCustomization(project: Project) {
     if (ApplicationManager.getApplication().isUnitTestMode) return
     notifyInfo(
         title = message("codewhisperer.custom.dialog.title"),
         content = message("codewhisperer.notification.custom.new_customization"),
         project = project,
         notificationActions = listOf(
             NotificationAction.createSimpleExpiring(message("codewhisperer.notification.custom.simple.button.select_customization")) {
                 CodeWhispererModelConfigurator.getInstance().showConfigDialog(project)
             }
         )
@@ -65,7 +69,7 @@
 
 @Service(Service.Level.APP)
 @State(name = "codewhispererCustomizationStates", storages = [Storage("aws.xml")])
 class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, PersistentStateComponent<CodeWhispererCustomizationState>, Disposable {
     // TODO: refactor and clean these states, probably not need all the follwing and it's hard to maintain
     // Map to store connectionId to its active customization
     private val connectionIdToActiveCustomizationArn = Collections.synchronizedMap<String, CodeWhispererCustomization>(mutableMapOf())
@@ -105,15 +109,36 @@
         }
     }
 
+    /**
+     * DO NOT directly use this method to fetch customizations, use wrapper [listCustomizations] instead
+     */
+    private fun listAvailableCustomizations(project: Project): List<CodeWhispererCustomization> =
+        QRegionProfileManager.getInstance().getQClient<CodeWhispererRuntimeClient>(project)
+            .listAvailableCustomizationsPaginator {}
+            .flatMap { resp ->
+                LOG.debug {
+                    "listAvailableCustomizations: requestId: ${resp.responseMetadata().requestId()}, customizations: ${
+                        resp.customizations().map { it.name() }
+                    }"
+                }
+                resp.customizations().map {
+                    CodeWhispererCustomization(
+                            arn = it.arn(),
+                            name = it.name(),
+                            description = it.description()
+                    )
+                }
+            }
+
     @RequiresBackgroundThread
     override fun listCustomizations(project: Project, passive: Boolean): List<CustomizationUiItem>? =
         calculateIfIamIdentityCenterConnection(project) {
             // 1. invoke API and get result
             val listAvailableCustomizationsResult = try {
-                CodeWhispererClientAdaptor.getInstance(project).listAvailableCustomizations()
+                listAvailableCustomizations(project)
             } catch (e: Exception) {
                 val requestId = (e as? CodeWhispererRuntimeException)?.requestId()
-                val logMessage = if (CodeWhispererConstants.Customization.noAccessToCustomizationExceptionPredicate(e)) {
+                val logMessage = if (CustomizationConstants.noAccessToCustomizationExceptionPredicate(e)) {
                     // TODO: not required for non GP users
                     "ListAvailableCustomizations: connection ${it.id} is not allowlisted, requestId: ${requestId.orEmpty()}"
                 } else {
@@ -235,7 +260,7 @@
         false
     } else {
         calculateIfIamIdentityCenterConnection(project) {
             val cachedValue = connectionIdToIsAllowlisted[it.id]
             when (cachedValue) {
                 true -> true
 

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CustomizationConstants.kt

@@ -0,0 +1,28 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.codewhisperer.util
+
+import software.amazon.awssdk.services.codewhispererruntime.model.AccessDeniedException
+import software.amazon.awssdk.services.codewhispererruntime.model.CodeWhispererRuntimeException
+
+object CustomizationConstants {
+    private const val noAccessToCustomizationMessage = "Your account is not authorized to use CodeWhisperer Enterprise."
+    private const val invalidCustomizationMessage = "You are not authorized to access"
+
+    val noAccessToCustomizationExceptionPredicate: (e: Exception) -> Boolean = { e ->
+        if (e !is CodeWhispererRuntimeException) {
+            false
+        } else {
+            e is software.amazon.awssdk.services.codewhispererruntime.model.AccessDeniedException && (e.message?.contains(noAccessToCustomizationMessage, ignoreCase = true) ?: false)
+        }
+    }
+
+    val invalidCustomizationExceptionPredicate: (e: Exception) -> Boolean = { e ->
+        if (e !is CodeWhispererRuntimeException) {
+            false
+        } else {
+            e is AccessDeniedException && (e.message?.contains(invalidCustomizationMessage, ignoreCase = true) ?: false)
+        }
+    }
+}