Merge branch 'refs/heads/master' into feature/SLCORE-1647-gessie-integration

Author: Krosovok

.github/workflows/build.yml

@@ -10,7 +10,10 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  group: >-
+    ${{ github.workflow }}-
+    ${{ github.event.pull_request.base.ref || 'push' }}-
+    ${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -188,6 +191,8 @@ jobs:
         with:
           version: 2025.9.12
       - name: Compute month key
+        #Avoid caching for DEV since it is frequently changing
+        if: ${{ matrix.sc != true && matrix.sq_version != 'DEV' }}
         id: month
         shell: bash
         run: |
@@ -198,11 +203,10 @@ jobs:
           echo "Create dir ${ORCHESTRATOR_HOME} if needed"
           mkdir -p "${ORCHESTRATOR_HOME}"
       - uses: SonarSource/ci-github-actions/cache@v1
+        if: ${{ matrix.sc != true && matrix.sq_version != 'DEV' }}
         with:
           path: ${{ github.workspace }}/orchestrator/${{ steps.month.outputs.month }}
-          key: cache-${{ runner.os }}-${{ steps.month.outputs.month }}
-          restore-keys: |
-            cache-${{ runner.os }}
+          key: cache-${{ runner.os }}-${{ steps.month.outputs.month }}-${{ matrix.name }} # Use matrix name to differentiate caches
       - name: Vault (SonarCloud IT token)
         if: ${{ matrix.sc == true }}
         id: secrets-sc
@@ -256,7 +260,7 @@ jobs:
           find ./its/tests/target/surefire-reports -type f || true
           echo "=== Checking if directory is empty ==="
           [ -d ./its/tests/target/surefire-reports ] && ls -la ./its/tests/target/surefire-reports/ || echo "Directory doesn't exist"
-      - name: Debug orchestrator cache
+      - name: Inspect Orchestrator Cache
         if: always()
         shell: bash
         run: |
@@ -272,38 +276,6 @@ jobs:
             echo "Directory does not exist: ${CACHE_DIR}"
           fi
 
-  inspect-orchestrator-cache:
-    needs: [ build, qa ]
-    runs-on: github-ubuntu-latest-s
-    name: Inspect Orchestrator Cache
-    permissions:
-      contents: read
-    steps:
-      - name: Compute month key
-        id: month
-        shell: bash
-        run: |
-          THIS_MONTH="$(date +%Y-%m)"
-          echo "month=${THIS_MONTH}" >> "$GITHUB_OUTPUT"
-          ORCHESTRATOR_HOME="${GITHUB_WORKSPACE}/orchestrator/${THIS_MONTH}"
-          echo "ORCHESTRATOR_HOME=${ORCHESTRATOR_HOME}" >> "$GITHUB_ENV"
-          echo "Create dir ${ORCHESTRATOR_HOME} if needed"
-          mkdir -p "${ORCHESTRATOR_HOME}"
-      - uses: SonarSource/ci-github-actions/cache@v1
-        with:
-          path: ${{ github.workspace }}/orchestrator/${{ steps.month.outputs.month }}
-          key: cache-${{ runner.os }}-${{ steps.month.outputs.month }}
-          restore-keys: |
-            cache-${{ runner.os }}
-      - name: Inspect cache directory
-        shell: bash
-        run: |
-          echo "Inspecting cache ${ORCHESTRATOR_HOME}..."
-          cd "${ORCHESTRATOR_HOME}"
-          ls -l
-          find .
-          echo "Inspecting cache done."
-
   promote:
     needs: [ build, qa, test-linux, test-windows ]
     runs-on: github-ubuntu-latest-s

API_CHANGES.md

@@ -1,5 +1,13 @@
 # 10.36
 
+## Breaking Changes
+
+* `org.sonarsource.sonarlint.core.rpc.protocol.backend.ai.AiAssistedIdeRpcService` has been renamed to `org.sonarsource.sonarlint.core.rpc.protocol.backend.ai.AiAgentService`.
+* `org.sonarsource.sonarlint.core.rpc.protocol.backend.ai.AiAssitedIde` has been renamed to `org.sonarsource.sonarlint.core.rpc.protocol.backend.ai.AiAgent`.
+* `org.sonarsource.sonarlint.core.rpc.protocol.SonarLintRpcServer#getAiAssistedIdeRpcService` has been renamed to `org.sonarsource.sonarlint.core.rpc.protocol.SonarLintRpcServer#getAiAgentService`.
+* Replace `VSCODE` and `VSCODE_INSIDERS` with `GITHUB_COPILOT` in `org.sonarsource.sonarlint.core.rpc.protocol.backend.ai.AiAgent` enum.
+    * This better reflects that the distinction is about the AI agent (GitHub Copilot), not the IDE
+
 ## New features
 
 * Introduce a new `org.sonarsource.sonarlint.core.rpc.protocol.backend.labs.IdeLabsRpcService` service and a `joinIdeLabsProgram` method.

NOTICE.txt

@@ -1,5 +1,5 @@
 SonarLint Core
-Copyright (C) 2016-2025 SonarSource SA
+Copyright (C) 2016-2025 SonarSource Sàrl
 mailto:info AT sonarsource DOT com
 
 This product includes software developed at

backend/analysis-engine/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.sonarsource.sonarlint.core</groupId>
     <artifactId>sonarlint-core-parent</artifactId>
-    <version>10.36-SNAPSHOT</version>
+    <version>10.37-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>sonarlint-analysis-engine</artifactId>

backend/analysis-engine/src/main/java/org/sonarsource/sonarlint/core/analysis/AnalysisQueue.java

@@ -1,6 +1,6 @@
 /*
  * SonarLint Core - Analysis Engine
- * Copyright (C) 2016-2025 SonarSource SA
+ * Copyright (C) 2016-2025 SonarSource Sàrl
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or

backend/analysis-engine/src/main/java/org/sonarsource/sonarlint/core/analysis/AnalysisScheduler.java

@@ -1,6 +1,6 @@
 /*
  * SonarLint Core - Analysis Engine
- * Copyright (C) 2016-2025 SonarSource SA
+ * Copyright (C) 2016-2025 SonarSource Sàrl
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or

backend/analysis-engine/src/main/java/org/sonarsource/sonarlint/core/analysis/api/AnalysisConfiguration.java

@@ -1,6 +1,6 @@
 /*
  * SonarLint Core - Analysis Engine
- * Copyright (C) 2016-2025 SonarSource SA
+ * Copyright (C) 2016-2025 SonarSource Sàrl
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or

backend/analysis-engine/src/main/java/org/sonarsource/sonarlint/core/analysis/api/AnalysisResults.java

@@ -1,6 +1,6 @@
 /*
  * SonarLint Core - Analysis Engine
- * Copyright (C) 2016-2025 SonarSource SA
+ * Copyright (C) 2016-2025 SonarSource Sàrl
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or

backend/analysis-engine/src/main/java/org/sonarsource/sonarlint/core/analysis/api/AnalysisSchedulerConfiguration.java

@@ -1,6 +1,6 @@
 /*
  * SonarLint Core - Analysis Engine
- * Copyright (C) 2016-2025 SonarSource SA
+ * Copyright (C) 2016-2025 SonarSource Sàrl
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or

backend/analysis-engine/src/main/java/org/sonarsource/sonarlint/core/analysis/api/ClientInputFile.java

@@ -1,6 +1,6 @@
 /*
  * SonarLint Core - Analysis Engine
- * Copyright (C) 2016-2025 SonarSource SA
+ * Copyright (C) 2016-2025 SonarSource Sàrl
  * mailto:info AT sonarsource DOT com
  *
  * This program is free software; you can redistribute it and/or