Merge remote-tracking branch 'origin/feature/q-lsp-chat' into samgst/q-lsp-chat-queue-SendContextCommand

 Conflicts:
	plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
	plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageClientImpl.kt
	plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/ChatCommunicationManager.kt

Author: rli

.changes/3.70.json

@@ -0,0 +1,20 @@
+{
+  "date" : "2025-05-08",
+  "version" : "3.70",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q: Support selecting customizations across all Q profiles with automatic profile switching for enterprise users"
+  }, {
+    "type" : "bugfix",
+    "description" : "Do not always show 'Amazon Q Code Issues' tab when switching to the 'Problems' tool window"
+  }, {
+    "type" : "bugfix",
+    "description" : "/dev: Fix missing Amazon Q feature dev auto build setting."
+  }, {
+    "type" : "bugfix",
+    "description" : "increase /review timeout"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix JavascriptLanguage not found on 2025.1+"
+  } ]
+}

.changes/next-release/bugfix-54c0cf8a-9df5-4673-bf16-61a650434abc.json

@@ -1,3 +1,10 @@
+# _3.70_ (2025-05-08)
+- **(Feature)** Amazon Q: Support selecting customizations across all Q profiles with automatic profile switching for enterprise users
+- **(Bug Fix)** Do not always show 'Amazon Q Code Issues' tab when switching to the 'Problems' tool window
+- **(Bug Fix)** /dev: Fix missing Amazon Q feature dev auto build setting.
+- **(Bug Fix)** increase /review timeout
+- **(Bug Fix)** Fix JavascriptLanguage not found on 2025.1+
+
 # _3.69_ (2025-04-28)
 - **(Bug Fix)** Amazon Q: Fix issue where context menu items are not available after re-opening projects or restarting the IDE
 - **(Bug Fix)** Fix LinkageError while attempting to do Amazon Q inline suggestions in certain environments

.changes/next-release/bugfix-7920ece4-99d6-4828-931e-29b66994dc10.json

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.70-SNAPSHOT
+toolkitVersion=3.71-SNAPSHOT
 
 # Publish Settings
 publishToken=

.changes/next-release/bugfix-7e09465d-6cb8-4180-9131-7ec6543db20c.json

@@ -48,7 +48,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocume
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionListWithReferences
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionTriggerKind
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionWithReferencesParams
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.FileUriUtil.toUriString
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.toUriString
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorUtil.getCaretPosition

.changes/next-release/bugfix-814bffb3-03aa-44ad-b639-008cf2929063.json

@@ -46,7 +46,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocume
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionListWithReferences
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionTriggerKind
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionWithReferencesParams
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.FileUriUtil.toUriString
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.toUriString
 import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorManagerNew
 import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorUtil.getCaretPosition
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager