Fix extension handling of git URL aliasing in config (#8245)

* Initial plan

* Changes before error encountered

Co-authored-by: alexr00 <[email protected]>

* Implement git URL alias resolution for remote parsing

- Add resolveGitUrl function to resolve git URL aliases (e.g., "gh:" -> "[email protected]:")
- Add parseRepositoryRemotesAsync function to parse remotes with alias resolution
- Update computeAllUnknownRemotes and computeAllGitHubRemotes to use async parsing
- Fixes issue where extension mistakenly thinks user is using GH Enterprise with git URL aliasing

Co-authored-by: alexr00 <[email protected]>

* Fix extension handling of git URL aliasing in config

Co-authored-by: alexr00 <[email protected]>

* Increase log visibility

---------

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: alexr00 <[email protected]>

Author: Copilot

src/common/remote.ts

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { AuthProvider, GitHubServerType } from './authentication';
+import Logger from './logger';
 import { Protocol } from './protocol';
 import { Repository } from '../api/api';
 import { getEnterpriseUri, isEnterprise } from '../github/utils';
@@ -74,6 +75,54 @@ export function parseRemote(remoteName: string, url: string, originalProtocol?:
 	return null;
 }
 
+/**
+ * Resolves git URL aliases by applying insteadOf substitutions from git config.
+ * For example, if git config has:
+ *   [url "[email protected]:"]
+ *     insteadOf = "gh:"
+ * Then "gh:user/repo" will be resolved to "[email protected]:user/repo"
+ *
+ * @param url The URL to resolve
+ * @param repository The repository to get config from
+ * @returns The resolved URL, or the original URL if no substitution found
+ */
+async function resolveGitUrl(url: string, repository: Repository): Promise<string> {
+	try {
+		// Get all git config entries
+		const configs = await repository.getConfigs();
+
+		// Find all url.*.insteadOf entries
+		const urlSubstitutions: { prefix: string; replacement: string }[] = [];
+
+		for (const config of configs) {
+			// Match patterns like "url.https://github.com/.insteadOf" or "[email protected]:.insteadOf"
+			const match = config.key.match(/^url\.(.+)\.insteadof$/i);
+			if (match) {
+				const replacement = match[1];
+				const prefix = config.value;
+				urlSubstitutions.push({ prefix, replacement });
+			}
+		}
+
+		// Sort by prefix length (longest first) to handle overlapping prefixes correctly
+		urlSubstitutions.sort((a, b) => b.prefix.length - a.prefix.length);
+
+		// Apply the first matching substitution
+		for (const { prefix, replacement } of urlSubstitutions) {
+			if (url.startsWith(prefix)) {
+				const resolvedUrl = replacement + url.substring(prefix.length);
+				Logger.appendLine(`Resolved git URL alias: "${url}" -> "${resolvedUrl}"`, 'Remote');
+				return resolvedUrl;
+			}
+		}
+	} catch (error) {
+		Logger.error(`Failed to resolve git URL aliases for "${url}": ${error}`, 'Remote');
+	}
+
+	// No substitution found or error occurred, return original URL
+	return url;
+}
+
 export function parseRepositoryRemotes(repository: Repository): Remote[] {
 	const remotes: Remote[] = [];
 	for (const r of repository.state.remotes) {
@@ -94,6 +143,38 @@ export function parseRepositoryRemotes(repository: Repository): Remote[] {
 	return remotes;
 }
 
+/**
+ * Asynchronously parses repository remotes with git URL alias resolution.
+ * This version resolves git URL aliases (e.g., "gh:" -> "[email protected]:") before parsing.
+ * Use this version when you need accurate remote parsing with alias resolution.
+ *
+ * @param repository The repository to parse remotes from
+ * @returns Promise resolving to array of Remote objects
+ */
+export async function parseRepositoryRemotesAsync(repository: Repository): Promise<Remote[]> {
+	const remotes: Remote[] = [];
+	for (const r of repository.state.remotes) {
+		const urls: string[] = [];
+		if (r.fetchUrl) {
+			// Resolve git URL aliases before parsing
+			const resolvedUrl = await resolveGitUrl(r.fetchUrl, repository);
+			urls.push(resolvedUrl);
+		}
+		if (r.pushUrl && r.pushUrl !== r.fetchUrl) {
+			// Resolve git URL aliases before parsing
+			const resolvedUrl = await resolveGitUrl(r.pushUrl, repository);
+			urls.push(resolvedUrl);
+		}
+		urls.forEach(url => {
+			const remote = parseRemote(r.name, url);
+			if (remote) {
+				remotes.push(remote);
+			}
+		});
+	}
+	return remotes;
+}
+
 export class GitHubRemote extends Remote {
 	static remoteAsGitHub(remote: Remote, githubServerType: GitHubServerType): GitHubRemote {
 		return new GitHubRemote(remote.remoteName, remote.url, remote.gitProtocol, githubServerType);

src/github/folderRepositoryManager.ts

@@ -37,7 +37,7 @@ import { findLocalRepoRemoteFromGitHubRef } from '../common/githubRef';
 import { Disposable, disposeAll } from '../common/lifecycle';
 import Logger from '../common/logger';
 import { Protocol, ProtocolType } from '../common/protocol';
-import { GitHubRemote, parseRemote, parseRepositoryRemotes, Remote } from '../common/remote';
+import { GitHubRemote, parseRemote, parseRepositoryRemotes, parseRepositoryRemotesAsync, Remote } from '../common/remote';
 import {
 	ALLOW_FETCH,
 	AUTO_STASH,
@@ -276,7 +276,7 @@ export class FolderRepositoryManager extends Disposable {
 	}
 
 	public async computeAllUnknownRemotes(): Promise<Remote[]> {
-		const remotes = parseRepositoryRemotes(this.repository);
+		const remotes = await parseRepositoryRemotesAsync(this.repository);
 		const potentialRemotes = remotes.filter(remote => remote.host);
 		const serverTypes = await Promise.all(
 			potentialRemotes.map(remote => this._githubManager.isGitHub(remote.gitProtocol.normalizeUri()!)),
@@ -297,7 +297,7 @@ export class FolderRepositoryManager extends Disposable {
 	}
 
 	public async computeAllGitHubRemotes(): Promise<GitHubRemote[]> {
-		const remotes = parseRepositoryRemotes(this.repository);
+		const remotes = await parseRepositoryRemotesAsync(this.repository);
 		const potentialRemotes = remotes.filter(remote => remote.host);
 		const serverTypes = await Promise.all(
 			potentialRemotes.map(remote => this._githubManager.isGitHub(remote.gitProtocol.normalizeUri()!)),