@@ -32,11 +32,11 @@ import kotlinx.coroutines.job
3232import kotlinx.coroutines.withContext
3333import migration.software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
3434import software.amazon.awssdk.services.codewhispererstreaming.model.UserIntent
35+ import software.aws.toolkits.core.utils.debug
3536import software.aws.toolkits.core.utils.getLogger
3637import software.aws.toolkits.core.utils.info
3738import software.aws.toolkits.core.utils.warn
3839import software.aws.toolkits.jetbrains.core.coroutines.EDT
39- import software.aws.toolkits.jetbrains.core.credentials.sono.isInternalUser
4040import software.aws.toolkits.jetbrains.services.amazonq.CHAT_IMPLICIT_PROJECT_CONTEXT_TIMEOUT
4141import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
4242import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthController
@@ -132,7 +132,6 @@ class ChatController private constructor(
132132 var shouldAddIndexInProgressMessage: Boolean = false
133133 var shouldUseWorkspaceContext: Boolean = false
134134 val startUrl = getStartUrl(context.project)
135- val isInternalUser = isInternalUser(startUrl)
136135
137136 if (prompt.contains(" @workspace" )) {
138137 if (CodeWhispererSettings .getInstance().isProjectContextEnabled()) {
@@ -145,15 +144,13 @@ class ChatController private constructor(
145144 } else {
146145 sendOpenSettingsMessage(message.tabId)
147146 }
148- } else if (
149- CodeWhispererSettings .getInstance().isProjectContextEnabled() &&
150- isInternalUser &&
151- ProjectContextController .getInstance(context.project).getProjectContextIndexComplete()
152- ) {
153- // if user does not have @workspace in the prompt, but user is Amazon internal
154- // add project context by default
155- val projectContextController = ProjectContextController .getInstance(context.project)
156- queryResult = projectContextController.query(prompt, timeout = CHAT_IMPLICIT_PROJECT_CONTEXT_TIMEOUT )
147+ } else if (CodeWhispererSettings .getInstance().isProjectContextEnabled()) {
148+ if (ProjectContextController .getInstance(context.project).getProjectContextIndexComplete()) {
149+ val projectContextController = ProjectContextController .getInstance(context.project)
150+ queryResult = projectContextController.query(prompt, timeout = CHAT_IMPLICIT_PROJECT_CONTEXT_TIMEOUT )
151+ } else {
152+ logger.debug { " skipping implicit workspace context as index is not ready" }
153+ }
157154 }
158155
159156 handleChat(
0 commit comments