Make JetBrains backend plugin compatible with 2025.1

.github/workflows/jetbrains-update-plugin-platform-template.yml

@@ -90,7 +90,7 @@ jobs:
                       - [x] /werft with-large-vm
                       - [x] /werft with-gce-vm
                       - [x] with-integration-tests=jetbrains
-                      - [x] latest-ide-version=${{ contains(inputs.pluginId, 'latest') }}
+                      - [x] latest-ide-version=${{ contains(inputs.pluginId, 'true') }}
 
                       _This PR was created automatically with GitHub Actions using [this](https://github.com/gitpod-io/gitpod/blob/main/.github/workflows/jetbrains-update-plugin-platform-template.yml) template._
                   commit-message: "Update Platform Version of ${{ inputs.pluginName }} to ${{ steps.latest-version.outputs.result }}"
@@ -134,7 +134,7 @@ jobs:
                       - [x] /werft with-large-vm
                       - [x] /werft with-gce-vm
                       - [x] with-integration-tests=jetbrains
-                      - [x] latest-ide-version=${{ contains(inputs.pluginId, 'latest') }}
+                      - [x] latest-ide-version=${{ contains(inputs.pluginId, 'true') }}
 
                       _This PR was created automatically with GitHub Actions using [this](https://github.com/gitpod-io/gitpod/blob/main/.github/workflows/jetbrains-update-plugin-platform-template.yml) template._
                   commit-message: "Update Platform Version of ${{ inputs.pluginName }} to ${{ steps.latest-version.outputs.result }}"

components/ide/jetbrains/backend-plugin/gradle-latest.properties

@@ -2,10 +2,10 @@
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 # revert pluginSinceBuild if it's unnecessary
-pluginSinceBuild=243.15521
-pluginUntilBuild=243.*
+pluginSinceBuild=251.17181
+pluginUntilBuild=251.*
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions.
-pluginVerifierIdeVersions=2024.3
-# Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
-platformVersion=243.15521.24
+pluginVerifierIdeVersions=2025.1
+# Version from "com.jetbrains.intellij.idea" which can be found at https://www.jetbrains.com/updates/updates.xml or exec `./gradlew printProductsReleases`
+platformVersion=251.17181.16

components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/GitpodClientProjectSessionTracker.kt

@@ -9,7 +9,7 @@ import com.intellij.ide.BrowserUtil
 import com.intellij.notification.NotificationAction
 import com.intellij.notification.NotificationType
 import com.intellij.openapi.Disposable
-import com.intellij.openapi.client.ClientSessionsManager
+import com.intellij.openapi.client.ClientProjectSession
 import com.intellij.openapi.components.service
 import com.intellij.openapi.components.serviceOrNull
 import com.intellij.openapi.diagnostic.thisLogger
@@ -35,10 +35,10 @@ import java.util.concurrent.CancellationException
 import java.util.concurrent.CompletableFuture
 
 @Suppress("UnstableApiUsage", "OPT_IN_USAGE")
-class GitpodClientProjectSessionTracker(private val project: Project) : Disposable {
+abstract class AbstractGitpodClientProjectSessionTracker(private val project: Project) : Disposable {
 
     private val manager = service<GitpodManager>()
-    private val session = ClientSessionsManager.getProjectSession(project)
+    abstract val session: ClientProjectSession?
 
     private lateinit var info: Info.WorkspaceInfoResponse
     private val lifetime = Lifetime.Eternal.createNested()
@@ -226,7 +226,7 @@ class GitpodClientProjectSessionTracker(private val project: Project) : Disposab
     private fun trackEvent(eventName: String, props: Map<String, Any?>) {
         if (session == null) return
         manager.trackEvent(eventName, mapOf(
-                "sessionId" to session.clientId.value
+                "sessionId" to session?.clientId?.value
         ).plus(props))
     }
 }

components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/latest/GitpodClientProjectSessionTracker.kt

@@ -0,0 +1,16 @@
+// Copyright (c) 2025 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License.AGPL.txt in the project root for license information.
+
+package io.gitpod.jetbrains.remote.latest
+
+import com.intellij.codeWithMe.ClientId
+import com.intellij.openapi.client.ClientProjectSession
+import com.intellij.openapi.client.ClientSessionsManager
+import com.intellij.openapi.project.Project
+import io.gitpod.jetbrains.remote.AbstractGitpodClientProjectSessionTracker
+
+@Suppress("UnstableApiUsage")
+class GitpodClientProjectSessionTracker(val project: Project) : AbstractGitpodClientProjectSessionTracker(project) {
+    override val session: ClientProjectSession? = ClientSessionsManager.getProjectSession(project, ClientId.current)
+}

components/ide/jetbrains/backend-plugin/src/main/kotlin/io/gitpod/jetbrains/remote/stable/GitpodClientProjectSessionTracker.kt

@@ -0,0 +1,15 @@
+// Copyright (c) 2025 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License.AGPL.txt in the project root for license information.
+
+package io.gitpod.jetbrains.remote.stable
+
+import com.intellij.openapi.client.ClientProjectSession
+import com.intellij.openapi.client.ClientSessionsManager
+import com.intellij.openapi.project.Project
+import io.gitpod.jetbrains.remote.AbstractGitpodClientProjectSessionTracker
+
+@Suppress("UnstableApiUsage")
+class GitpodClientProjectSessionTracker(val project: Project) : AbstractGitpodClientProjectSessionTracker(project) {
+    override val session: ClientProjectSession? = ClientSessionsManager.getProjectSession(project)
+}

components/ide/jetbrains/backend-plugin/src/main/resources-latest/META-INF/extensions.xml

@@ -6,5 +6,7 @@
 <!--suppress PluginXmlValidity -->
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
+        <projectService serviceImplementation="io.gitpod.jetbrains.remote.latest.GitpodClientProjectSessionTracker"
+                        client="controller" preload="true"/>
     </extensions>
 </idea-plugin>

components/ide/jetbrains/backend-plugin/src/main/resources-stable/META-INF/extensions.xml

@@ -6,5 +6,7 @@
 <!--suppress PluginXmlValidity -->
 <idea-plugin>
     <extensions defaultExtensionNs="com.intellij">
+        <projectService serviceImplementation="io.gitpod.jetbrains.remote.stable.GitpodClientProjectSessionTracker"
+                        client="controller" preload="true"/>
     </extensions>
 </idea-plugin>

components/ide/jetbrains/backend-plugin/src/main/resources/META-INF/plugin.xml

@@ -38,9 +38,6 @@
 
         <httpRequestHandler implementation="io.gitpod.jetbrains.remote.GitpodCLIService"/>
 
-        <projectService serviceImplementation="io.gitpod.jetbrains.remote.GitpodClientProjectSessionTracker"
-                        client="controller" preload="true"/>
-
         <gateway.customization.name
                 implementation="io.gitpod.jetbrains.remote.GitpodGatewayClientCustomizationProvider"/>
         <gateway.customization.metrics id="gitpodMetricsProvider"