openctx: use the exact mention.uri for items (#4228)

sourcegraph · May 22, 2024 · 9e083b4 · 9e083b4
1 parent d744c61
commit 9e083b4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/...indings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/ContextItem.kt b/...indings/kotlin/lib/src/main/kotlin/com/sourcegraph/cody/protocol_generated/ContextItem.kt
@@ -147,6 +147,7 @@ data class ContextItemOpenCtx(
   val isTooLarge: Boolean? = null,
   val provider: String? = null,
   val type: TypeEnum, // Oneof: openctx
+  val originalUri: String,
   val providerUri: String,
   val description: String? = null,
   val data: Any? = null,

diff --git a/lib/shared/src/codebase-context/messages.ts b/lib/shared/src/codebase-context/messages.ts
@@ -174,6 +174,10 @@ export interface ContextItemOpenCtx extends ContextItemCommon {
     provider: 'openctx'
     title: string
     uri: URI
+    /**
+     * originalUri is stored since vscode-uri will incorrectly escape query parameters in toString.
+     */
+    originalUri: string
     providerUri: string
     description?: string
     data?: any

diff --git a/vscode/src/chat/context/chatContext.ts b/vscode/src/chat/context/chatContext.ts
@@ -71,6 +71,7 @@ export async function getChatContextItemsForMention(
                     ...item,
                     type: 'openctx',
                     uri: URI.parse(item.uri),
+                    originalUri: item.uri,
                     provider: 'openctx',
                 })
             )

diff --git a/vscode/src/editor/utils/editor-context.ts b/vscode/src/editor/utils/editor-context.ts
@@ -332,7 +332,7 @@ async function resolveContextMentionProviderContextItem(
 
     const mention = {
         ...item,
-        uri: item.uri.toString(),
+        uri: item.originalUri,
     }
 
     const items = await openCtxClient.items({ message: input.toString(), mention }, item.providerUri)
@@ -344,6 +344,7 @@ async function resolveContextMentionProviderContextItem(
                       type: 'openctx',
                       title: item.title,
                       uri: URI.parse(item.url || item.providerUri),
+                      originalUri: item.url || item.providerUri,
                       providerUri: item.providerUri,
                       content: item.ai.content,
                       provider: 'openctx',