Merge branch 'main' into fix/empty-patch

Author: tverney

.changes/next-release/bugfix-e76aa3d8-3d9a-4887-8ce6-018ed4c7c443.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Raise max `@workspace` indexing size to 4GB"
+}

.changes/next-release/feature-ac28b77d-4b47-4312-afe7-ece71de355ed.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Automatically pause and resume `@workspace` indexing when OS CPU load is high"
+}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/auth/AuthController.kt

@@ -88,7 +88,7 @@ class AuthController {
             AuthFollowUpType.FullAuth,
             -> runInEdt {
                 UiTelemetry.click(project, "amazonq_chatAuthenticate")
-                requestCredentialsForQ(project, connectionInitiatedFromQChatPanel = true)
+                requestCredentialsForQ(project, connectionInitiatedFromQChatPanel = true, isReauth = false)
             }
 
             AuthFollowUpType.ReAuth,

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/explorerActions/SignInToQAction.kt

@@ -24,7 +24,7 @@ class SignInToQAction : SignInToQActionBase(message("q.sign.in")) {
         UiTelemetry.click(project, "auth_start_Q")
 
         if (!isQWebviewsAvailable()) {
-            requestCredentialsForQ(project)
+            requestCredentialsForQ(project, isReauth = false)
         } else {
             ToolWindowManager.getInstance(project).getToolWindow(AmazonQToolWindowFactory.WINDOW_ID)?.show()
         }
@@ -42,7 +42,7 @@ abstract class SignInToQActionBase(actionName: String) : DumbAwareAction(actionN
             reauthConnectionIfNeeded(project, it, isReAuth = true)
         } ?: run {
             runInEdt {
-                if (requestCredentialsForQ(project)) {
+                if (requestCredentialsForQ(project, isReauth = false)) {
                     if (!openMeetQPage(project)) {
                         return@runInEdt
                     }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project/manifest/ManifestManager.kt

@@ -15,7 +15,7 @@ import software.aws.toolkits.jetbrains.core.getTextFromUrl
 
 class ManifestManager {
     private val cloudFrontUrl = "https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json"
-    val currentVersion = "0.1.10"
+    val currentVersion = "0.1.13"
     val currentOs = getOs()
     private val arch = CpuArch.CURRENT
     private val mapper = jacksonObjectMapper()

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt

@@ -124,7 +124,7 @@ class CodeWhispererConfigurable(private val project: Project) :
 
             row(message("aws.settings.codewhisperer.project_context_index_max_size")) {
                 intTextField(
-                    range = IntRange(1, 250)
+                    range = IntRange(1, 4096)
                 ).bindIntText(codeWhispererSettings::getProjectContextIndexMaxSize, codeWhispererSettings::setProjectContextIndexMaxSize)
                     .align(AlignX.FILL).apply {
                         connect.subscribe(

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererSettings.kt

@@ -87,7 +87,7 @@ class CodeWhispererSettings : PersistentStateComponent<CodeWhispererConfiguratio
 
     fun getProjectContextIndexMaxSize(): Int = state.intValue.getOrDefault(
         CodeWhispererIntConfigurationType.ProjectContextIndexMaxSize,
-        200
+        250
     )
 
     fun setProjectContextIndexMaxSize(value: Int) {

plugins/core/jetbrains-community/resources/telemetryOverride.json

@@ -810,50 +810,6 @@
                     "type": "authType"
                 }
             ]
-        },
-        {
-            "name": "auth_addConnection",
-            "description": "Captures the result of adding a new connection in the 'Add New Connection' workflow",
-            "metadata": [
-                {
-                    "type": "attempts",
-                    "required": false
-                },
-                {
-                    "type": "credentialSourceId"
-                },
-                {
-                    "type": "featureId",
-                    "required": false
-                },
-                {
-                    "type": "invalidInputFields",
-                    "required": false
-                },
-                {
-                    "type": "isAggregated",
-                    "required": false
-                },
-                {
-                    "type": "reason",
-                    "required": false
-                },
-                {
-                    "type": "result"
-                },
-                {
-                    "type": "source",
-                    "required": false
-                },
-                {
-                    "type": "credentialStartUrl",
-                    "required": false
-                },
-                {
-                    "type": "isReAuth",
-                    "required": false
-                }
-            ]
         }
     ]
 }

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/GettingStartedAuthUtils.kt

@@ -36,6 +36,7 @@ fun requestCredentialsForCodeWhisperer(
     ),
     isFirstInstance: Boolean = false,
     connectionInitiatedFromExplorer: Boolean = false,
+    isReauth: Boolean = false,
 ): Boolean {
     val authenticationDialog = SetupAuthenticationDialog(
         project,
@@ -87,7 +88,8 @@ fun requestCredentialsForCodeWhisperer(
             credentialSourceId = authenticationDialog.authType,
             isAggregated = true,
             attempts = authenticationDialog.attempts + 1,
-            result = Result.Succeeded
+            result = Result.Succeeded,
+            isReAuth = isReauth
         )
         AuthTelemetry.addedConnections(
             project,
@@ -108,6 +110,7 @@ fun requestCredentialsForCodeWhisperer(
             isAggregated = false,
             attempts = authenticationDialog.attempts + 1,
             result = Result.Cancelled,
+            isReAuth = isReauth
         )
     }
     return isAuthenticationSuccessful
@@ -123,6 +126,7 @@ fun requestCredentialsForQ(
     isFirstInstance: Boolean = false,
     connectionInitiatedFromExplorer: Boolean = false,
     connectionInitiatedFromQChatPanel: Boolean = false,
+    isReauth: Boolean,
 ): Boolean {
     // try to scope upgrade if we have a codewhisperer connection
     val codeWhispererConnection = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(CodeWhispererConnection.getInstance())
@@ -194,7 +198,8 @@ fun requestCredentialsForQ(
             credentialSourceId = authenticationDialog.authType,
             isAggregated = true,
             attempts = authenticationDialog.attempts + 1,
-            result = Result.Succeeded
+            result = Result.Succeeded,
+            isReAuth = isReauth
         )
         AuthTelemetry.addedConnections(
             project,
@@ -215,6 +220,7 @@ fun requestCredentialsForQ(
             isAggregated = false,
             attempts = authenticationDialog.attempts + 1,
             result = Result.Cancelled,
+            isReAuth = isReauth
         )
     }
     return isAuthenticationSuccessful

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/SetupAuthenticationDialog.kt

@@ -287,7 +287,8 @@ class SetupAuthenticationDialog(
                         isAggregated = false,
                         attempts = ++attempts,
                         result = Result.Failed,
-                        reason = "ConnectionUnsuccessful"
+                        reason = "ConnectionUnsuccessful",
+                        isReAuth = false
                     )
                 } ?: return
 
@@ -339,7 +340,8 @@ class SetupAuthenticationDialog(
                         isAggregated = false,
                         attempts = ++attempts,
                         result = Result.Failed,
-                        reason = "DuplicateProfileName"
+                        reason = "DuplicateProfileName",
+                        isReAuth = false
                     )
                     return
                 }
@@ -365,7 +367,8 @@ class SetupAuthenticationDialog(
                         isAggregated = false,
                         attempts = ++attempts,
                         result = Result.Failed,
-                        reason = "InvalidCredentials"
+                        reason = "InvalidCredentials",
+                        isReAuth = false
                     )
                     return
                 }
@@ -438,7 +441,8 @@ class SetupAuthenticationDialog(
             isAggregated = false,
             attempts = ++attempts,
             result = Result.Failed,
-            reason = errorType
+            reason = errorType,
+            isReAuth = false
         )
 
         LOG.error(e) { errorMessage }