Merge main into feature/agent-refactor

Author: aws-toolkit-automation

plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/lsp/NodeRuntimeResolverTest.kt

@@ -68,10 +68,9 @@ class NodeRuntimeResolverTest {
 
     @Test
     fun `nvm glob respects NVM_DIR env var`() {
-        val customDir = "custom/nvm"
         val env: (String) -> String? = { if (it == "NVM_DIR") "/custom/nvm" else null }
         val patterns = buildGlobPatterns(Platform.LINUX, home, env)
-        assertThat(patterns).anyMatch { it.contains(customDir) }
+        assertThat(patterns).anyMatch { "custom" in it && "nvm" in it && "versions" in it }
     }
 
     @Test