Merge branch 'main' into rli/config-caching

rli · web-flow · commit 0bdeb9df3d1d · 2025-08-25T10:17:16.000-07:00
diff --git a/.changes/3.90.json b/.changes/3.90.json
@@ -0,0 +1,14 @@
+{
+  "date" : "2025-08-22",
+  "version" : "3.90",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q supports admin control for MCP servers to restrict MCP server usage"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix incompatible version warning for AWS Toolkit in 2025.2"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix UriError when project is on WSL or a UNC path"
+  } ]
+}
diff --git a/.changes/next-release/bugfix-e00dc253-3047-4309-a9ee-edc955db3327.json b/.changes/next-release/bugfix-e00dc253-3047-4309-a9ee-edc955db3327.json
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         build_target: [ ':plugin-core:buildPlugin', ':plugin-toolkit:intellij-standalone:buildPlugin', ':plugin-amazonq:buildPlugin' ]
-        version: [ '2024.2', '2024.3', '2025.1' ]
+        version: [ '2024.2', '2024.3', '2025.1', '2025.2' ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/releaseNotification.yml b/.github/workflows/releaseNotification.yml
@@ -0,0 +1,32 @@
+permissions:
+  contents: read
+name: Release Notification
+
+on:
+  release:
+    types: [published] # Trigger on new releases being published
+
+jobs:
+  slack_notification:
+    runs-on: ubuntu-latest
+    if: ${{ !github.event.release.prerelease }}
+    steps:
+      - name: Print payload
+        run: |
+          echo '{
+            "version": "${{ github.event.release.tag_name }}",
+            "releaseLink": "${{ github.event.release.html_url }}",
+            "changelog": ${{ toJSON(github.event.release.body) }}
+          }'
+
+      - name: Send Release Details to Slack
+        uses: slackapi/slack-github-action@v1.23.0
+        with:
+          payload: |
+            {
+              "version": "${{ github.event.release.tag_name }}",
+              "releaseLink": "${{ github.event.release.html_url }}",
+              "changelog": ${{ toJSON(github.event.release.body) }}
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# _3.90_ (2025-08-22)
+- **(Feature)** Amazon Q supports admin control for MCP servers to restrict MCP server usage
+- **(Bug Fix)** Fix incompatible version warning for AWS Toolkit in 2025.2
+- **(Bug Fix)** Fix UriError when project is on WSL or a UNC path
+
 # _3.89_ (2025-08-07)
 - **(Bug Fix)** /transform: validate YAML dependency file for required fields
 
diff --git a/buildSrc/src/main/kotlin/temp-toolkit-intellij-root-conventions.gradle.kts b/buildSrc/src/main/kotlin/temp-toolkit-intellij-root-conventions.gradle.kts
@@ -75,6 +75,7 @@ dependencies {
 //        create(type, version, useInstaller = false)
 //    }
 
+    implementation(project(":plugin-toolkit:jetbrains-core"))
     implementation(project(":plugin-toolkit:jetbrains-ultimate"))
     project.findProject(":plugin-toolkit:jetbrains-gateway")?.let {
         // does this need to be the instrumented variant?
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.90-SNAPSHOT
+toolkitVersion=3.91-SNAPSHOT
 
 # Publish Settings
 publishToken=
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src-242/software/aws/toolkits/jetbrains/services/codewhisperer/popup/QManualCall.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src-242/software/aws/toolkits/jetbrains/services/codewhisperer/popup/QManualCall.kt
@@ -10,6 +10,9 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.popup.QInlineCompl
 fun InlineCompletionEvent.isManualCall(): Boolean =
     this is InlineCompletionEvent.DirectCall && this.context?.getData(DATA_KEY_Q_AUTO_TRIGGER_INTELLISENSE) == false
 
+fun InlineCompletionEvent.isIntelliSense(): Boolean =
+    this is InlineCompletionEvent.DirectCall && this.context?.getData(DATA_KEY_Q_AUTO_TRIGGER_INTELLISENSE) == true
+
 fun getManualCallEvent(editor: Editor, isIntelliSenseAccept: Boolean): InlineCompletionEvent {
     val dataContext = DataContext { dataId ->
         when (dataId) {
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src-243+/software/aws/toolkits/jetbrains/services/codewhisperer/popup/QManualCall.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src-243+/software/aws/toolkits/jetbrains/services/codewhisperer/popup/QManualCall.kt
@@ -11,6 +11,9 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.popup.QInlineCompl
 fun InlineCompletionEvent.isManualCall(): Boolean =
     this is InlineCompletionEvent.ManualCall && this.additionalData.getUserData(KEY_Q_AUTO_TRIGGER_INTELLISENSE) == false
 
+fun InlineCompletionEvent.isIntelliSense(): Boolean =
+    this is InlineCompletionEvent.ManualCall && this.additionalData.getUserData(KEY_Q_AUTO_TRIGGER_INTELLISENSE) == true
+
 fun getManualCallEvent(editor: Editor, isIntelliSenseAccept: Boolean): InlineCompletionEvent {
     val data = UserDataHolderBase().apply { this.putUserData(KEY_Q_AUTO_TRIGGER_INTELLISENSE, isIntelliSenseAccept) }
     return InlineCompletionEvent.ManualCall(editor, Q_INLINE_PROVIDER_ID, data)
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/QInlineCompletionProvider.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/QInlineCompletionProvider.kt
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt
@@ -91,7 +91,7 @@ class CodeWhispererTelemetryService(private val cs: CoroutineScope) {
             return
         }
         QInlineCompletionProvider.logInline(triggerSessionId) {
-            "Sending UserTriggerDecision for ${sessionContext.sessionId}:"
+            "Sending UserTriggerDecision for trigger session: $triggerSessionId, ${sessionContext.sessionId}:"
         }
         sessionContext.itemContexts.forEachIndexed { i, itemContext ->
             QInlineCompletionProvider.logInline(triggerSessionId) {
@@ -128,8 +128,7 @@ class CodeWhispererTelemetryService(private val cs: CoroutineScope) {
             firstCompletionDisplayLatency = latencyContext.perceivedLatency,
             totalSessionDisplayTime = CodeWhispererInvocationStatus.getInstance().completionShownTime?.let { Duration.between(it, Instant.now()) }
                 ?.toMillis()?.toDouble(),
-            // no userInput in JB inline completion API, every new char input will discard the previous trigger so
-            // user input is always 0
+            // TODO: yuxqiang fix userInputLength/typeaheadLength, need to confirm which one this is but non-P0
             typeaheadLength = 0,
             addedDiagnostics = diffDiagnostics.added,
             removedDiagnostics = diffDiagnostics.removed,
diff --git a/plugins/toolkit/intellij-standalone/build.gradle.kts b/plugins/toolkit/intellij-standalone/build.gradle.kts
@@ -21,9 +21,6 @@ intellijPlatform {
 dependencies {
     intellijPlatform {
         localPlugin(project(":plugin-core"))
-        pluginModule(project(":plugin-toolkit:jetbrains-core"))
-
-        plugin("PythonCore:243.18137.10")
     }
 }
 
diff --git a/plugins/toolkit/jetbrains-core/build.gradle.kts b/plugins/toolkit/jetbrains-core/build.gradle.kts
@@ -57,6 +57,9 @@ val patchPluginXml = tasks.named<PatchPluginXmlTask>("patchPluginXml")
 patchPluginXml.configure {
     val buildSuffix = buildMetadata().map { if (!project.isCi()) "+${it}" else "" }
     pluginVersion.set(buildSuffix.map { "$toolkitVersion.${ideProfile.shortName}$it" })
+    
+    sinceBuild.set(ideProfile.sinceVersion)
+    untilBuild.set(ideProfile.untilVersion)
 }
 
 tasks.jar {
@@ -79,6 +82,8 @@ tasks.integrationTest {
 val gatewayPluginXml = tasks.register<PatchPluginXmlTask>("pluginXmlForGateway") {
     val buildSuffix = buildMetadata().map { if (!project.isCi()) "+${it}" else "" }
     pluginVersion.set(buildSuffix.map { "GW-$toolkitVersion-${ideProfile.shortName}$it" })
+    sinceBuild.set(ideProfile.sinceVersion)
+    untilBuild.set(ideProfile.untilVersion)
 }
 
 val patchGatewayPluginXml by tasks.registering {
