Cody Ignore: remove git CLI repo-name resolver (#4132)

Removes the git CLI repo-name resolver because it performs worse than other existing alternatives (VS Code Git extension and file system tree-walk). There are no cases where it is preferred over alternatives, so we can simplify the codebase by deleting it.

lib/shared/src/sourcegraph-api/graphql/queries.ts

@@ -103,7 +103,6 @@ query Repositories($first: Int!, $after: String) {
         nodes {
             id
             name
-            url
         }
         pageInfo {
             endCursor

vscode/src/context/workspace-repo-mapper.ts

@@ -14,10 +14,10 @@ const GIT_REFRESH_DELAY = 2000
 // IDs. This depends on the vscode.git extension for mapping git repositories
 // to their remotes.
 export class WorkspaceRepoMapper implements vscode.Disposable, CodebaseRepoIdMapper {
-    private changeEmitter = new vscode.EventEmitter<{ name: string; id: string }[]>()
+    private changeEmitter = new vscode.EventEmitter<Repo[]>()
     private disposables: vscode.Disposable[] = [this.changeEmitter]
     // The workspace repos.
-    private repos: { name: string; id: string }[] = []
+    private repos: Repo[] = []
     // A cache of results for non-workspace repos. This caches repos that are
     // not found, as well as repo IDs.
     private nonWorkspaceRepos = new Map<string, string | undefined>()
@@ -108,11 +108,11 @@ export class WorkspaceRepoMapper implements vscode.Disposable, CodebaseRepoIdMap
         return this.started
     }
 
-    public get workspaceRepos(): { name: string; id: string }[] {
+    public get workspaceRepos(): Repo[] {
         return [...this.repos]
     }
 
-    public get onChange(): vscode.Event<{ name: string; id: string }[]> {
+    public get onChange(): vscode.Event<Repo[]> {
         return this.changeEmitter.event
     }
 
@@ -126,7 +126,7 @@ export class WorkspaceRepoMapper implements vscode.Disposable, CodebaseRepoIdMap
                     .map(f => f.uri.toString())
                     .join()}`
             )
-            this.repos = await this.findRepoIds(folders)
+            this.repos = await this.findRepos(folders)
         } catch (error) {
             logDebug('WorkspaceRepoMapper', `Error mapping workspace folders to repo IDs: ${error}`)
             throw error
@@ -136,9 +136,7 @@ export class WorkspaceRepoMapper implements vscode.Disposable, CodebaseRepoIdMap
 
     // Given a set of workspace folders, looks up their git remotes and finds the related repo IDs,
     // if any.
-    private async findRepoIds(
-        folders: readonly vscode.WorkspaceFolder[]
-    ): Promise<{ name: string; id: string }[]> {
+    private async findRepos(folders: readonly vscode.WorkspaceFolder[]): Promise<Repo[]> {
         const repoNames = new Set(
             folders.flatMap(folder => {
                 const codebase = getCodebaseFromWorkspaceUri(folder.uri)
@@ -149,10 +147,14 @@ export class WorkspaceRepoMapper implements vscode.Disposable, CodebaseRepoIdMap
             // Otherwise we fetch the first 10 repos from the Sourcegraph instance
             return []
         }
-        const ids = await graphqlClient.getRepoIds([...repoNames.values()], RemoteSearch.MAX_REPO_COUNT)
-        if (isError(ids)) {
-            throw ids
+        const repos = await graphqlClient.getRepoIds(
+            [...repoNames.values()],
+            RemoteSearch.MAX_REPO_COUNT
+        )
+        if (isError(repos)) {
+            throw repos
         }
-        return ids
+
+        return repos
     }
 }

vscode/src/extension.common.ts

@@ -21,7 +21,6 @@ import type { ContextRankerConfig, ContextRankingController } from './local-cont
 import type { LocalEmbeddingsConfig, LocalEmbeddingsController } from './local-context/local-embeddings'
 import type { SymfRunner } from './local-context/symf'
 import { start } from './main'
-import type { RemoteUrlGetter } from './repository/enterprise-repo-name-resolver'
 import type {
     OpenTelemetryService,
     OpenTelemetryServiceConfig,
@@ -48,7 +47,6 @@ export interface PlatformContext {
     ) => SourcegraphCompletionsClient
     createSentryService?: (config: Pick<ConfigurationWithAccessToken, 'serverEndpoint'>) => SentryService
     createOpenTelemetryService?: (config: OpenTelemetryServiceConfig) => OpenTelemetryService
-    getRemoteUrlGetters?: () => RemoteUrlGetter[]
     startTokenReceiver?: typeof startTokenReceiver
     onConfigurationChange?: (configuration: Configuration) => void
     extensionClient: ExtensionClient

vscode/src/extension.node.ts

@@ -21,7 +21,6 @@ import {
     createLocalEmbeddingsController,
 } from './local-context/local-embeddings'
 import { SymfRunner } from './local-context/symf'
-import { gitRemoteUrlsFromGitCli } from './repository/repo-name-getter.node'
 import { OpenTelemetryService } from './services/open-telemetry/OpenTelemetryService.node'
 
 /**
@@ -58,7 +57,6 @@ export function activate(
         createBfgRetriever: () => new BfgRetriever(context),
         createSentryService: (...args) => new NodeSentryService(...args),
         createOpenTelemetryService: (...args) => new OpenTelemetryService(...args),
-        getRemoteUrlGetters: () => [gitRemoteUrlsFromGitCli],
         startTokenReceiver: (...args) => startTokenReceiver(...args),
 
         onConfigurationChange: setCustomAgent,

vscode/src/main.ts

@@ -351,7 +351,6 @@ const register = async (
 
     const commandsManager = platform.createCommandsProvider?.()
     setCommandController(commandsManager)
-    enterpriseRepoNameResolver.init(platform.getRemoteUrlGetters?.())
 
     // Execute Cody Commands and Cody Custom Commands
     const executeCommand = (

vscode/src/repository/enterprise-repo-name-resolver.ts

@@ -14,17 +14,9 @@ type RemoteUrl = string
 type UriFsPath = string
 
 export class EnterpriseRepoNameResolver {
-    private platformSpecificGitRemoteGetters: RemoteUrlGetter[] = []
     private fsPathToRepoNameCache = new LRUCache<UriFsPath, RepoName[]>({ max: 1000 })
     private remoteUrlToRepoNameCache = new LRUCache<RemoteUrl, Promise<RepoName | null>>({ max: 1000 })
 
-    /**
-     * Currently is used to set node specific remote url getters on the extension init.
-     */
-    public init(platformSpecificGitRemoteGetters: RemoteUrlGetter[] = []) {
-        this.platformSpecificGitRemoteGetters = platformSpecificGitRemoteGetters
-    }
-
     /**
      * Gets the repo names for a file URI.
      *
@@ -50,16 +42,6 @@ export class EnterpriseRepoNameResolver {
                 remoteUrls = await gitRemoteUrlsFromTreeWalk(uri)
             }
 
-            if (remoteUrls === undefined || remoteUrls.length === 0) {
-                for (const getter of this.platformSpecificGitRemoteGetters) {
-                    remoteUrls = await getter(uri)
-
-                    if (remoteUrls?.length !== 0) {
-                        break
-                    }
-                }
-            }
-
             if (remoteUrls) {
                 const uniqueRemoteUrls = Array.from(new Set(remoteUrls))
                 const repoNames = await Promise.all(

vscode/src/repository/repo-name-resolver.test.ts

@@ -6,6 +6,7 @@ import { URI } from 'vscode-uri'
 import { graphqlClient } from '@sourcegraph/cody-shared'
 import dedent from 'dedent'
 import { EnterpriseRepoNameResolver, gitRemoteUrlsFromTreeWalk } from './enterprise-repo-name-resolver'
+import * as gitExtensionAPI from './git-extension-api'
 
 interface MockFsCallsParams {
     filePath: string
@@ -258,7 +259,9 @@ describe('gitRemoteUrlFromTreeWalk', () => {
 describe('getRepoNamesFromWorkspaceUri', () => {
     it('resolves the repo name using graphql', async () => {
         const resolver = new EnterpriseRepoNameResolver()
-        resolver.init([() => Promise.resolve(['git@github.com:sourcegraph/cody.git'])])
+        vi.spyOn(gitExtensionAPI, 'gitRemoteUrlsFromGitExtension').mockReturnValue([
+            'git@github.com:sourcegraph/cody.git',
+        ])
 
         const { fileUri } = mockFsCalls({
             filePath: '/repo/submodule/foo.ts',