Merge branch 'main' into rli/delete-awscaps-provider

Author: rli

.changes/next-release/bugfix-e00dc253-3047-4309-a9ee-edc955db3327.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix UriError when project is on WSL or a UNC path"
+}

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt

@@ -25,8 +25,12 @@ import com.intellij.util.concurrency.EdtExecutorService
 import com.intellij.util.execution.ParametersListUtil
 import kotlinx.coroutines.launch
 import org.eclipse.lsp4j.DidChangeConfigurationParams
+import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
+import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManagerListener
+import software.aws.toolkits.jetbrains.core.credentials.pinning.QConnection
+import software.aws.toolkits.jetbrains.core.credentials.sono.isInternalUser
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererLoginType
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
@@ -47,6 +51,12 @@ class CodeWhispererConfigurable(private val project: Project) :
     private val isSso: Boolean
         get() = CodeWhispererExplorerActionManager.getInstance().checkActiveCodeWhispererConnectionType(project) == CodeWhispererLoginType.SSO
 
+    private val isInternalUser: Boolean
+        get() {
+            val conn = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance()) as? AwsBearerTokenConnection
+            return conn?.let { isInternalUser(it.startUrl) } ?: false
+        }
+
     override fun getId() = "aws.codewhisperer"
 
     override fun createPanel() = panel {
@@ -123,6 +133,21 @@ class CodeWhispererConfigurable(private val project: Project) :
                     }.enabled(false)
                 }
             }
+
+            row {
+                checkBox(message("aws.settings.codewhisperer.workspace_context")).apply {
+                    connect.subscribe(
+                        ToolkitConnectionManagerListener.TOPIC,
+                        object : ToolkitConnectionManagerListener {
+                            override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
+                                enabled(isCodeWhispererEnabled(project))
+                            }
+                        }
+                    )
+                    enabled(invoke)
+                    bindSelected(codeWhispererSettings::isWorkspaceContextEnabled, codeWhispererSettings::toggleWorkspaceContextEnabled)
+                }.comment(message("aws.settings.codewhisperer.workspace_context.tooltip"))
+            }.visible(isInternalUser)
         }
 
         group(message("aws.settings.codewhisperer.group.inline_suggestions")) {
@@ -158,20 +183,6 @@ class CodeWhispererConfigurable(private val project: Project) :
         }
 
         group(message("aws.settings.codewhisperer.group.q_chat")) {
-            row {
-                checkBox(message("aws.settings.codewhisperer.workspace_context")).apply {
-                    connect.subscribe(
-                        ToolkitConnectionManagerListener.TOPIC,
-                        object : ToolkitConnectionManagerListener {
-                            override fun activeConnectionChanged(newConnection: ToolkitConnection?) {
-                                enabled(isCodeWhispererEnabled(project))
-                            }
-                        }
-                    )
-                    enabled(invoke)
-                    bindSelected(codeWhispererSettings::isWorkspaceContextEnabled, codeWhispererSettings::toggleWorkspaceContextEnabled)
-                }.comment(message("aws.settings.codewhisperer.workspace_context.tooltip"))
-            }.visible(false)
             row {
                 checkBox(message("aws.settings.codewhisperer.project_context")).apply {
                     connect.subscribe(

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererConfigurableTest.kt

@@ -40,7 +40,7 @@ class CodeWhispererConfigurableTest : CodeWhispererTestBase() {
             message("aws.settings.codewhisperer.include_code_with_reference"),
             message("aws.settings.codewhisperer.configurable.opt_out.title"),
             message("aws.settings.codewhisperer.automatic_import_adder"),
-            "Workspace context",
+            "Server-side context",
             message("aws.settings.codewhisperer.project_context"),
             message("aws.settings.codewhisperer.project_context_gpu")
         )

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt

@@ -47,13 +47,25 @@ object LspEditorUtil {
     private fun toUri(file: File): URI {
         try {
             // URI scheme specified by language server protocol
-            return URI("file", "", file.absoluteFile.toURI().path, null)
+            val uri = URI("file", "", file.absoluteFile.toURI().path, null)
+            val fallback = file.toPath().toAbsolutePath().normalize().toUri()
+            return if (uri.isCompliant()) uri else fallback
         } catch (e: URISyntaxException) {
             LOG.warn { "${e.localizedMessage}: $e" }
             return file.absoluteFile.toURI()
         }
     }
 
+    private fun URI.isCompliant(): Boolean {
+        if (!"file".equals(this.scheme, ignoreCase = true)) return true
+
+        val path = this.rawPath ?: this.path.orEmpty()
+        val noAuthority = this.authority.isNullOrEmpty()
+
+        // If the authority component is empty, the path cannot begin with two slash characters ("//")
+        return !(noAuthority && path.startsWith("//"))
+    }
+
     /**
      * Works but is divergent from [FocusAreaContextExtrator]
      */

plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/FileUriUtilTest.kt

@@ -8,6 +8,8 @@ import io.mockk.every
 import io.mockk.mockk
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.condition.EnabledOnOs
+import org.junit.jupiter.api.condition.OS
 import org.junit.jupiter.api.extension.ExtendWith
 
 @ExtendWith(ApplicationExtension::class)
@@ -96,6 +98,24 @@ class FileUriUtilTest {
         }
     }
 
+    @Test
+    @EnabledOnOs(OS.WINDOWS)
+    fun `test wsl-like path`() {
+        val virtualFile = createMockVirtualFile("//wsl.localhost/Ubuntu/home/user/file.sh")
+        val result = LspEditorUtil.toUriString(virtualFile)
+        val expected = normalizeFileUri("file://wsl.localhost/Ubuntu/home/user/file.sh")
+        assertThat(result).isEqualTo(expected)
+    }
+
+    @Test
+    @EnabledOnOs(OS.WINDOWS)
+    fun `test UNC path`() {
+        val virtualFile = createMockVirtualFile("//server/share/path/to/file.txt")
+        val result = LspEditorUtil.toUriString(virtualFile)
+        val expected = normalizeFileUri("file://server/share/path/to/file.txt")
+        assertThat(result).isEqualTo(expected)
+    }
+
     @Test
     fun `test jar protocol conversion`() {
         val virtualFile = createMockVirtualFile(

plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

@@ -301,8 +301,8 @@ aws.settings.codewhisperer.project_context_index_max_size.tooltip=The maximum si
 aws.settings.codewhisperer.project_context_index_thread=Workspace index worker threads
 aws.settings.codewhisperer.project_context_index_thread.tooltip=Number of worker threads of Amazon Q local index process. Set to 0 to use system default worker threads for balanced performance. Please restart or reload IntelliJ after changing worker threads.
 aws.settings.codewhisperer.warning=To use Amazon Q, login with AWS Builder ID or AWS IAM Identity Center.
-aws.settings.codewhisperer.workspace_context=Workspace context
-aws.settings.codewhisperer.workspace_context.tooltip=When checked, Amazon Q will enable server side project context.
+aws.settings.codewhisperer.workspace_context=Server-side context
+aws.settings.codewhisperer.workspace_context.tooltip=Index project files on the server and use as context for higher-quality responses. This feature will activate only if your administrator has opted you in.
 aws.settings.dynamic_resources_configurable.clear_all=Clear All
 aws.settings.dynamic_resources_configurable.select_all=Select All
 aws.settings.dynamic_resources_configurable.suggest_types.dialog.message=Please suggest additional AWS resource types (e.g. AWS::S3::Bucket)\nyou would like to see supported in future releases.\n\n(max length: 2000 chars)