Fix cody web file/symbol mention search (make it respect initial repo…

…sitory context)
sourcegraph · Aug 22, 2024 · fb13009 · fb13009
1 parent aa6d660
commit fb13009
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 56 deletions.
diff --git a/vscode/src/chat/chat-view/ChatController.ts b/vscode/src/chat/chat-view/ChatController.ts
@@ -1129,6 +1129,7 @@ export class ChatController implements vscode.Disposable, vscode.WebviewViewProv
         const repos =
             explicitRepos ??
             (await this.repoPicker?.show(this.remoteSearch.getRepos(RepoInclusion.Manual)))
+
         if (repos) {
             this.chatModel.setSelectedRepos(repos)
             this.remoteSearch.setRepos(repos, RepoInclusion.Manual)

diff --git a/vscode/src/editor/utils/editor-context.ts b/vscode/src/editor/utils/editor-context.ts
@@ -86,7 +86,7 @@ export async function getFileContextFiles(options: FileContextItemsOptions): Pro
             source: ContextItemSource.User,
             remoteRepositoryName: item.repository.name,
             isIgnored: contextFiltersProvider.isRepoNameIgnored(item.repository.name),
-            uri: URI.file(item.repository.name + item.file.path),
+            uri: URI.file(`${item.repository.name}/${item.file.path}`),
         }))
     }
 
@@ -192,7 +192,7 @@ export async function getSymbolContextFiles(
             item.symbols.map(symbol => ({
                 type: 'symbol',
                 remoteRepositoryName: item.repository.name,
-                uri: URI.file(item.repository.name + symbol.location.resource.path),
+                uri: URI.file(`${item.repository.name}/${symbol.location.resource.path}`),
                 isIgnored: contextFiltersProvider.isRepoNameIgnored(item.repository.name),
                 source: ContextItemSource.User,
                 symbolName: symbol.name,
@@ -461,7 +461,7 @@ async function resolveFileOrSymbolContextItem(
             return {
                 ...contextItem,
                 title: path,
-                uri: URI.parse(`${graphqlClient.endpoint}${repository}/-/blob/${path}`),
+                uri: URI.parse(`${graphqlClient.endpoint}${repository}/-/blob${path}`),
                 content: resultOrError,
                 repoName: repository,
                 source: ContextItemSource.Unified,

diff --git a/web/CHANGELOG.md b/web/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.0
+- Changes API for initial context (now it supports only one repository as an initial context mention)
+- Fixes problem with file and symbol mention search don't respect initial repository as a context
+
 ## 0.5.2 
 - Improves repository mention result ordering (for repositories, files and directories mentions)
 

diff --git a/web/demo/App.tsx b/web/demo/App.tsx
@@ -1,6 +1,6 @@
 import type { FC } from 'react'
 
-import { CodyWebPanel, CodyWebPanelProvider, type Repository } from '../lib'
+import { CodyWebPanel, CodyWebPanelProvider, type InitialContext } from '../lib'
 
 // @ts-ignore
 import AgentWorker from '../lib/agent/agent.worker.ts?worker'
@@ -22,25 +22,13 @@ const serverEndpoint = localStorage.getItem('serverEndpoint') || DOTCOM_SERVER_E
 const accessTokenStorageKey = `accessToken:${serverEndpoint}`
 let accessToken = localStorage.getItem(accessTokenStorageKey)
 
-// Only for testing/demo purpose, in real-life usage consumer
-// should provide context repo information for Cody chat component
-const MOCK_DOT_COM_SOURCEGRAPH_REPOSITORY: Repository[] =
-    serverEndpoint === DOTCOM_SERVER_ENDPOINT
-        ? [
-              {
-                  id: 'UmVwb3NpdG9yeTozNjgwOTI1MA==',
-                  name: 'github.com/sourcegraph/sourcegraph',
-              },
-          ]
-        : []
-
-const MOCK_INITIAL_DOT_COM_CONTEXT =
-    serverEndpoint === DOTCOM_SERVER_ENDPOINT
-        ? {
-              fileURL: 'internal/codeintel/ranking/internal/background/mapper/config.go',
-              repositories: MOCK_DOT_COM_SOURCEGRAPH_REPOSITORY,
-          }
-        : undefined
+const MOCK_INITIAL_DOT_COM_CONTEXT: InitialContext = {
+    fileURL: 'web/demo/App.tsx',
+    repository: {
+        id: 'UmVwb3NpdG9yeTo2MTMyNTMyOA==',
+        name: 'github.com/sourcegraph/cody',
+    },
+}
 
 if (!accessToken) {
     accessToken = window.prompt(`Enter an access token for ${serverEndpoint}:`)

diff --git a/web/lib/components/CodyWebPanel.tsx b/web/lib/components/CodyWebPanel.tsx
@@ -137,25 +137,27 @@ export const CodyWebPanel: FC<CodyWebPanelProps> = props => {
     )
 
     const clientState: ClientStateForWebview = useMemo<ClientStateForWebview>(() => {
-        const { repositories = [], fileURL } = initialContext ?? {}
+        const { repository, fileURL } = initialContext ?? {}
 
-        if (repositories.length === 0) {
+        if (!repository) {
             return { initialContext: [] }
         }
 
-        const mentions: ContextItem[] = repositories.map<ContextItemRepository>(repo => ({
-            type: 'repository',
-            id: repo.id,
-            name: repo.name,
-            repoID: repo.id,
-            repoName: repo.name,
-            description: repo.name,
-            uri: URI.parse(`repo:${repo.name}`),
-            content: null,
-            source: ContextItemSource.Initial,
-            icon: 'folder',
-            title: 'Current Repository',
-        }))
+        const mentions: ContextItem[] = [
+            {
+                type: 'repository',
+                id: repository.id,
+                name: repository.name,
+                repoID: repository.id,
+                repoName: repository.name,
+                description: repository.name,
+                uri: URI.parse(`repo:${repository.name}`),
+                content: null,
+                source: ContextItemSource.Initial,
+                icon: 'folder',
+                title: 'Current Repository',
+            } as ContextItemRepository,
+        ]
 
         if (fileURL) {
             mentions.push({
@@ -168,8 +170,8 @@ export const CodyWebPanel: FC<CodyWebPanelProps> = props => {
                           end: { line: initialContext.fileRange.endLine + 1, character: 0 },
                       }
                     : undefined,
-                remoteRepositoryName: repositories[0].name,
-                uri: URI.file(repositories[0].name + fileURL),
+                remoteRepositoryName: repository.name,
+                uri: URI.file(repository.name + fileURL),
                 source: ContextItemSource.Initial,
             })
         }

diff --git a/web/lib/components/CodyWebPanelProvider.tsx b/web/lib/components/CodyWebPanelProvider.tsx
@@ -103,7 +103,7 @@ export const CodyWebPanelProvider: FunctionComponent<PropsWithChildren<CodyWebPa
                     accessToken: accessToken ?? '',
                 })
 
-                // Create an new chat each time.
+                // Create a new chat each time
                 await createChat(client)
 
                 setClient(client)
@@ -114,6 +114,24 @@ export const CodyWebPanelProvider: FunctionComponent<PropsWithChildren<CodyWebPa
         })()
     }, [accessToken, serverEndpoint, createAgentWorker, customHeaders, telemetryClientName])
 
+    useEffect(() => {
+        if (!client || isErrorLike(client)) {
+            return
+        }
+
+        // Set initial context after we restore history so context won't be
+        // overridden by the previous chat session context
+        if (initialContext?.repository) {
+            void client.rpc.sendRequest('webview/receiveMessage', {
+                id: activeWebviewPanelID,
+                message: {
+                    command: 'context/choose-remote-search-repo',
+                    explicitRepos: [initialContext?.repository],
+                },
+            })
+        }
+    }, [client, initialContext, activeWebviewPanelID])
+
     const createChat = useCallback(
         async (agent = client) => {
             if (!agent || isErrorLike(agent)) {
@@ -133,20 +151,8 @@ export const CodyWebPanelProvider: FunctionComponent<PropsWithChildren<CodyWebPa
                 id: activeWebviewPanelIDRef.current,
                 message: { chatID: chatId, command: 'restoreHistory' },
             })
-
-            // Set initial context after we restore history so context won't be
-            // overridden by the previous chat session context
-            if (initialContext?.repositories.length) {
-                await agent.rpc.sendRequest('webview/receiveMessage', {
-                    id: activeWebviewPanelIDRef.current,
-                    message: {
-                        command: 'context/choose-remote-search-repo',
-                        explicitRepos: initialContext?.repositories ?? [],
-                    },
-                })
-            }
         },
-        [client, initialContext]
+        [client]
     )
 
     const vscodeAPI = useMemo<VSCodeWrapper | null>(() => {

diff --git a/web/lib/types.ts b/web/lib/types.ts
@@ -4,7 +4,7 @@ export interface Repository {
 }
 
 export type InitialContext = {
-    repositories: Repository[]
+    repository: Repository
     fileURL?: string
     fileRange?: { startLine: number; endLine: number }
 }
diff --git a/web/package.json b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sourcegraph/cody-web",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "Cody standalone web app",
   "license": "Apache-2.0",
   "repository": {