Fix tests

Author: alexr00

src/@types/vscode.proposed.chatParticipantAdditions.d.ts

@@ -646,13 +646,7 @@ declare module 'vscode' {
 	}
 
 	export interface ChatRequest {
-		readonly modeInstructions?: string;
-		readonly modeInstructions2?: ChatRequestModeInstructions;
-	}
-
-	export interface ChatRequestModeInstructions {
-		readonly content: string;
-		readonly toolReferences?: readonly ChatLanguageModelToolReference[];
-		readonly metadata?: Record<string, boolean | string | number>;
+		modeInstructions?: string;
+		modeInstructionsToolReferences?: readonly ChatLanguageModelToolReference[];
 	}
 }

src/@types/vscode.proposed.chatParticipantPrivate.d.ts

@@ -187,8 +187,6 @@ declare module 'vscode' {
 
 		isQuotaExceeded?: boolean;
 
-		isRateLimited?: boolean;
-
 		level?: ChatErrorLevel;
 
 		code?: string;
@@ -241,7 +239,6 @@ declare module 'vscode' {
 	export class ExtendedLanguageModelToolResult extends LanguageModelToolResult {
 		toolResultMessage?: string | MarkdownString;
 		toolResultDetails?: Array<Uri | Location>;
-		toolMetadata?: unknown;
 	}
 
 	// #region Chat participant detection

src/github/pullRequestGitHelper.ts

@@ -103,10 +103,10 @@ export class PullRequestGitHelper {
 			branch = await repository.getBranch(localBranchName);
 			// Check if local branch is pointing to the same commit as the remote
 			if (branch.commit !== trackedBranch.commit) {
-				Logger.debug(`Local branch ${localBranchName} commit ${branch.commit} differs from remote commit ${trackedBranch.commit}. Creating new branch to avoid overwriting user's work.`, PullRequestGitHelper.ID);
+				Logger.appendLine(`Local branch ${localBranchName} commit ${branch.commit} differs from remote commit ${trackedBranch.commit}. Creating new branch to avoid overwriting user's work.`, PullRequestGitHelper.ID);
 				// Instead of deleting the user's branch, create a unique branch name to avoid conflicts
 				const uniqueBranchName = await PullRequestGitHelper.calculateUniqueBranchNameForPR(repository, pullRequest);
-				Logger.debug(`Creating branch ${uniqueBranchName} for PR checkout`, PullRequestGitHelper.ID);
+				Logger.appendLine(`Creating branch ${uniqueBranchName} for PR checkout`, PullRequestGitHelper.ID);
 				progress.report({ message: vscode.l10n.t('Creating branch {0} for pull request', uniqueBranchName) });
 				await repository.createBranch(uniqueBranchName, false, trackedBranch.commit);
 				await repository.setBranchUpstream(uniqueBranchName, trackedBranchName);

src/test/mocks/mockRepository.ts

@@ -149,8 +149,12 @@ export class MockRepository implements Repository {
 		return Promise.reject(new Error('Unexpected hashObject(...)'));
 	}
 
+	private _hasBranch(ref: string) {
+		return this._branches.some(b => b.name === ref);
+	}
+
 	async createBranch(name: string, checkout: boolean, ref?: string | undefined): Promise<void> {
-		if (this._branches.some(b => b.name === name)) {
+		if (this._hasBranch(name)) {
 			throw new Error(`A branch named ${name} already exists`);
 		}
 
@@ -275,7 +279,7 @@ export class MockRepository implements Repository {
 			throw new Error(`Unexpected fetch(${remoteName}, ${ref}, ${depth})`);
 		}
 
-		if (ref) {
+		if (ref && !this._hasBranch(ref)) {
 			const match = /^(?:\+?[^:]+\:)?(.*)$/.exec(ref);
 			if (match) {
 				const [, localRef] = match;