Addressing code review comments

Author: LokeshDogga13

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/LspUtils.kt

@@ -0,0 +1,22 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.artifacts
+
+import com.intellij.openapi.util.SystemInfo
+import java.nio.file.Path
+import java.nio.file.Paths
+
+fun getToolkitsCommonCachePath(): Path {
+    return when {
+        SystemInfo.isWindows -> {
+            Paths.get(System.getenv("APPDATA"))
+        }
+        SystemInfo.isMac -> {
+            Paths.get(System.getProperty("user.home"), "Library", "Caches")
+        }
+        else -> {
+            Paths.get(System.getProperty("user.home"), ".cache")
+        }
+    }
+}

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/artifacts/ManifestFetcher.kt

@@ -5,7 +5,6 @@ package software.aws.toolkits.jetbrains.services.amazonq.lsp.artifacts
 
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.util.io.DigestUtil
-import software.amazon.awssdk.utils.UserHomeDirectoryUtils
 import software.aws.toolkits.core.utils.exists
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.readText
@@ -14,13 +13,13 @@ import software.aws.toolkits.jetbrains.core.getTextFromUrl
 import software.aws.toolkits.jetbrains.core.saveFileFromUrl
 import software.aws.toolkits.jetbrains.services.amazonq.project.manifest.ManifestManager
 import java.nio.file.Path
-import java.nio.file.Paths
 
 class ManifestFetcher {
 
     private val lspManifestUrl = "https://aws-toolkit-language-servers.amazonaws.com/codewhisperer/0/manifest.json"
     private val manifestManager = ManifestManager()
-    private val lspManifestFilePath: Path = Paths.get(UserHomeDirectoryUtils.userHomeDirectory(), ".aws", "amazonq", "cache", "lspManifest.js")
+    private val lspManifestFilePath: Path = getToolkitsCommonCachePath().resolve("aws").resolve("toolkits").resolve("language-servers")
+        .resolve("lsp-manifest.json")
 
     companion object {
         private val logger = getLogger<ManifestFetcher>()

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/project/manifest/ManifestManager.kt

@@ -40,40 +40,11 @@ class ManifestManager {
         val contents: List<TargetContent>? = emptyList(),
     )
 
-    data class Runtime(
-        @JsonProperty("name")
-        val name: String? = null,
-        @JsonProperty("version")
-        val version: String? = null,
-    )
-
-    data class Capabilities(
-        @JsonProperty("name")
-        val name: String? = null,
-        @JsonProperty("version")
-        val version: String? = null,
-    )
-
-    data class Protocol(
-        @JsonProperty("name")
-        val name: String? = null,
-        @JsonProperty("version")
-        val version: String? = null,
-    )
-
     data class Version(
         @JsonProperty("serverVersion")
         val serverVersion: String? = null,
         @JsonProperty("isDelisted")
         val isDelisted: Boolean? = null,
-        @JsonProperty("runtime")
-        val runtime: Runtime? = null,
-        @JsonProperty("capabilities")
-        val capabilities: List<Capabilities>? = emptyList(),
-        @JsonProperty("protocol")
-        val protocol: List<Protocol>? = emptyList(),
-        @JsonProperty("thirdPartyLicenses")
-        val thirdPartyLicenses: String? = null,
         @JsonProperty("targets")
         val targets: List<VersionTarget>? = emptyList(),
     )

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/HttpUtils.kt

@@ -27,7 +27,7 @@ fun writeJsonToUrl(url: String, jsonString: String, indicator: ProgressIndicator
 
 fun getETagFromUrl(url: String): String =
     HttpRequests.head(url)
-        .userAgent("AWS Toolkit for JetBrains")
+        .userAgent(AwsClientManager.getUserAgent())
         .connect { request ->
             request.connection.headerFields["ETag"]?.firstOrNull().orEmpty()
         }