Merge main into feature/prerelease-flare

Author: aws-toolkit-automation

plugins/toolkit/jetbrains-core/src-253+/software/aws/toolkits/jetbrains/services/cfnlsp/stacks/views/OpenStackViewAction.kt

@@ -11,7 +11,7 @@ import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.jetbrains.core.explorer.ExplorerTreeToolWindowDataKeys
 import software.aws.toolkits.jetbrains.services.cfnlsp.explorer.nodes.StackNode
-import software.aws.toolkits.resources.message
+import software.aws.toolkits.resources.AwsToolkitBundle.message
 
 internal class OpenStackViewAction : AnAction(), DumbAware {
 

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cfnlsp/server/CfnLspInstaller.kt

@@ -50,6 +50,8 @@ internal class CfnLspInstaller(
         val versionDir = storageDir.resolve(release.version)
         val serverPath = versionDir.resolve(CfnLspServerConfig.SERVER_FILE)
 
+        cleanupLegacyStorageDir()
+
         return if (Files.exists(serverPath)) {
             LOG.info { "Using cached CloudFormation LSP ${release.version}" }
             serverPath
@@ -144,6 +146,17 @@ internal class CfnLspInstaller(
         }
     }
 
+    private fun cleanupLegacyStorageDir() {
+        val legacyDir = getToolkitsCacheRoot().resolve("cloudformation-lsp")
+        if (!Files.exists(legacyDir)) return
+        try {
+            legacyDir.toFile().deleteRecursively()
+            LOG.info { "Removed legacy LSP directory: $legacyDir" }
+        } catch (e: Exception) {
+            LOG.warn(e) { "Failed to remove legacy LSP directory" }
+        }
+    }
+
     /**
      * Removes old versions, keeping the current version and one compatible fallback.
      */
@@ -211,7 +224,7 @@ internal class CfnLspInstaller(
         private val LOG = getLogger<CfnLspInstaller>()
         private const val MANIFEST_CACHE_KEY = "aws.cloudformation.lsp.manifest"
 
-        fun defaultStorageDir(): Path = getToolkitsCacheRoot().resolve("cloudformation-lsp")
+        fun defaultStorageDir(): Path = getToolkitsCacheRoot().resolve("language-servers").resolve("cloudformation-languageserver")
 
         internal fun parseHashString(hashString: String): Pair<String, String>? {
             // Format: "sha256:abc123..." or "sha384:abc123..."