Merge main into feature/remote-chat

Author: aws-toolkit-automation

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt

@@ -100,10 +100,6 @@ object IdeVersions {
         ),
         Profile(
             name = "2024.2",
-            gateway = ProductProfile(
-                sdkVersion = "242.23726-EAP-CANDIDATE-SNAPSHOT",
-                bundledPlugins = listOf("org.jetbrains.plugins.terminal")
-            ),
             community = ProductProfile(
                 sdkVersion = "2024.2",
                 bundledPlugins = commonPlugins + listOf(

plugins/toolkit/jetbrains-gateway/src-243/compat/com/jetbrains/gateway/thinClientLink/StartNewClient.kt

@@ -0,0 +1,10 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+package compat.com.jetbrains.gateway.thinClientLink
+
+import com.jetbrains.gateway.thinClientLink.LinkedClientManager
+import com.jetbrains.rd.util.lifetime.Lifetime
+import java.net.URI
+
+fun startNewClient(lifetime: Lifetime, initialLink: URI, remoteIdentity: String?, onStarted: () -> Unit) =
+    LinkedClientManager.getInstance().startNewClient(lifetime, initialLink, remoteIdentity, onStarted)

plugins/toolkit/jetbrains-gateway/src-251+/src-243/compat/com/jetbrains/gateway/thinClientLink/StartNewClient.kt

@@ -0,0 +1,10 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+package compat.com.jetbrains.gateway.thinClientLink
+
+import com.jetbrains.gateway.thinClientLink.LinkedClientManager
+import com.jetbrains.rd.util.lifetime.Lifetime
+import java.net.URI
+
+fun startNewClient(lifetime: Lifetime, initialLink: URI, remoteIdentity: String?, onStarted: () -> Unit) =
+    LinkedClientManager.getInstance().startNewClient(lifetime, initialLink, remoteIdentity, null, onStarted)

plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/StartBackend.kt

@@ -4,10 +4,9 @@
 package software.aws.toolkits.jetbrains.gateway.connection.workflow
 
 import com.jetbrains.gateway.api.GatewayConnectionHandle
-import com.jetbrains.gateway.thinClientLink.LinkedClientManager
 import com.jetbrains.rd.util.lifetime.LifetimeDefinition
-import com.jetbrains.rd.util.lifetime.onTermination
 import com.jetbrains.rd.util.reactive.adviseEternal
+import compat.com.jetbrains.gateway.thinClientLink.startNewClient
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import software.aws.toolkits.core.utils.getLogger
@@ -50,16 +49,15 @@ class StartBackend(
         val clientHandle = ThinClientTrackerService.getInstance().associate(envId) {
             val start = System.currentTimeMillis()
             val thinClientHandle = try {
-                LinkedClientManager.getInstance()
-                    .startNewClient(lifetime, localLink, URLEncoder.encode(message("caws.workspace.backend.title"), Charsets.UTF_8)) {
-                        CodecatalystTelemetry.devEnvironmentWorkflowStatistic(
-                            project = null,
-                            userId = lazilyGetUserId(),
-                            result = TelemetryResult.Succeeded,
-                            duration = System.currentTimeMillis() - start.toDouble(),
-                            codecatalystDevEnvironmentWorkflowStep = "startThinClient",
-                        )
-                    }
+                startNewClient(lifetime, localLink, URLEncoder.encode(message("caws.workspace.backend.title"), Charsets.UTF_8)) {
+                    CodecatalystTelemetry.devEnvironmentWorkflowStatistic(
+                        project = null,
+                        userId = lazilyGetUserId(),
+                        result = TelemetryResult.Succeeded,
+                        duration = System.currentTimeMillis() - start.toDouble(),
+                        codecatalystDevEnvironmentWorkflowStep = "startThinClient",
+                    )
+                }
             } catch (e: Throwable) {
                 CodecatalystTelemetry.devEnvironmentWorkflowStatistic(
                     project = null,

settings.gradle.kts

@@ -163,7 +163,7 @@ file("plugins").listFiles()?.forEach root@ {
             if (it.name == "jetbrains-gateway") {
                 when (providers.gradleProperty("ideProfileName").get()) {
                     // buildSrc is evaluated after settings so we can't key off of IdeVersions.kt
-                    "2023.3", "2024.1" -> {
+                    "2023.3", "2024.1", "2024.2" -> {
                         return@forEach
                     }
                 }