Add BaseRefChanged timeline event and include in ChangeBaseReply

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

src/common/timelineEvent.ts

@@ -22,6 +22,7 @@ export enum EventType {
 	CrossReferenced,
 	Closed,
 	Reopened,
+	BaseRefChanged,
 	CopilotStarted,
 	CopilotFinished,
 	CopilotFinishedError,
@@ -156,6 +157,15 @@ export interface ReopenedEvent {
 	createdAt: string;
 }
 
+export interface BaseRefChangedEvent {
+	id: string;
+	event: EventType.BaseRefChanged;
+	actor: IActor;
+	createdAt: string;
+	currentRefName: string;
+	previousRefName: string;
+}
+
 export interface SessionPullInfo {
 	id: number;
 	host: string;
@@ -192,4 +202,4 @@ export interface CopilotFinishedErrorEvent {
 	sessionLink: SessionLinkInfo;
 }
 
-export type TimelineEvent = CommitEvent | ReviewEvent | CommentEvent | NewCommitsSinceReviewEvent | MergedEvent | AssignEvent | UnassignEvent | HeadRefDeleteEvent | CrossReferencedEvent | ClosedEvent | ReopenedEvent | CopilotStartedEvent | CopilotFinishedEvent | CopilotFinishedErrorEvent;
+export type TimelineEvent = CommitEvent | ReviewEvent | CommentEvent | NewCommitsSinceReviewEvent | MergedEvent | AssignEvent | UnassignEvent | HeadRefDeleteEvent | CrossReferencedEvent | ClosedEvent | ReopenedEvent | BaseRefChangedEvent | CopilotStartedEvent | CopilotFinishedEvent | CopilotFinishedErrorEvent;

src/github/graphql.ts

@@ -68,6 +68,15 @@ export interface ReopenedEvent {
 	createdAt: string;
 }
 
+export interface BaseRefChangedEvent {
+	__typename: string;
+	id: string;
+	actor: Actor;
+	createdAt: string;
+	currentRefName: string;
+	previousRefName: string;
+}
+
 export interface AbbreviatedIssueComment {
 	author: Account;
 	body: string;
@@ -265,7 +274,7 @@ export interface TimelineEventsResponse {
 	repository: {
 		pullRequest: {
 			timelineItems: {
-				nodes: (MergedEvent | Review | IssueComment | Commit | AssignedEvent | HeadRefDeletedEvent | null)[];
+				nodes: (MergedEvent | Review | IssueComment | Commit | AssignedEvent | HeadRefDeletedEvent | BaseRefChangedEvent | null)[];
 			};
 		};
 	} | null;
@@ -1051,7 +1060,7 @@ export interface MergePullRequestResponse {
 	mergePullRequest: {
 		pullRequest: PullRequest & {
 			timelineItems: {
-				nodes: (MergedEvent | Review | IssueComment | Commit | AssignedEvent | HeadRefDeletedEvent)[]
+				nodes: (MergedEvent | Review | IssueComment | Commit | AssignedEvent | HeadRefDeletedEvent | BaseRefChangedEvent)[]
 			}
 		};
 	}

src/github/pullRequestOverview.ts

@@ -830,8 +830,10 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 			if (selectedBranch) {
 				try {
 					await this._item.updateBaseBranch(selectedBranch);
+					const events = await this._getTimeline();
 					const reply: ChangeBaseReply = {
-						base: selectedBranch
+						base: selectedBranch,
+						events
 					};
 					await this._replyMessage(message, reply);
 				} catch (e) {

src/github/queriesShared.gql

@@ -210,6 +210,17 @@ fragment ReopenedEvent on ReopenedEvent {
 	createdAt
 }
 
+fragment BaseRefChangedEvent on BaseRefChangedEvent {
+	id
+	actor {
+		...Node
+		...Actor
+	}
+	createdAt
+	currentRefName
+	previousRefName
+}
+
 fragment Review on PullRequestReview {
 	id
 	databaseId
@@ -312,6 +323,7 @@ query TimelineEvents($owner: String!, $name: String!, $number: Int!, $last: Int
 					...CrossReferencedEvent
 					...ClosedEvent
 					...ReopenedEvent
+					...BaseRefChangedEvent
 				}
 			}
 		}
@@ -1230,6 +1242,7 @@ mutation MergePullRequest($input: MergePullRequestInput!, $last: Int = 150) {
 					...CrossReferencedEvent
 					...ClosedEvent
 					...ReopenedEvent
+					...BaseRefChangedEvent
 				}
 			}
 		}

src/github/utils.ts

@@ -490,6 +490,8 @@ export function convertGraphQLEventType(text: string) {
 			return Common.EventType.Closed;
 		case 'ReopenedEvent':
 			return Common.EventType.Reopened;
+		case 'BaseRefChangedEvent':
+			return Common.EventType.BaseRefChanged;
 		default:
 			return Common.EventType.Other;
 	}
@@ -1120,6 +1122,7 @@ export async function parseCombinedTimelineEvents(
 		| GraphQL.AssignedEvent
 		| GraphQL.HeadRefDeletedEvent
 		| GraphQL.CrossReferencedEvent
+		| GraphQL.BaseRefChangedEvent
 		| null
 	)[],
 	restEvents: Common.TimelineEvent[],
@@ -1294,6 +1297,18 @@ export async function parseCombinedTimelineEvents(
 					createdAt: reopenedEv.createdAt,
 				});
 				break;
+			case Common.EventType.BaseRefChanged:
+				const baseRefChangedEv = event as GraphQL.BaseRefChangedEvent;
+
+				addTimelineEvent({
+					id: baseRefChangedEv.id,
+					event: type,
+					actor: parseAccount(baseRefChangedEv.actor, githubRepository),
+					createdAt: baseRefChangedEv.createdAt,
+					currentRefName: baseRefChangedEv.currentRefName,
+					previousRefName: baseRefChangedEv.previousRefName,
+				});
+				break;
 			default:
 				break;
 		}

src/github/views.ts

@@ -177,4 +177,5 @@ export interface CodingAgentContext extends SessionLinkInfo {
 
 export interface ChangeBaseReply {
 	base: string;
+	events: TimelineEvent[];
 }

webviews/common/context.tsx

@@ -95,7 +95,7 @@ export class PRContext {
 	public changeBaseBranch = async () => {
 		const result: ChangeBaseReply = await this.postMessage({ command: 'pr.change-base-branch' });
 		if (result?.base) {
-			this.updatePR({ base: result.base });
+			this.updatePR({ base: result.base, events: result.events });
 		}
 	};
 	public changeProjects = (): Promise<ProjectItemsReply> => this.postMessage({ command: 'pr.change-projects' });

webviews/components/timeline.tsx

@@ -13,6 +13,7 @@ import { AuthorLink, Avatar } from './user';
 import { IComment } from '../../src/common/comment';
 import {
 	AssignEvent,
+	BaseRefChangedEvent,
 	ClosedEvent,
 	CommentEvent,
 	CommitEvent,
@@ -89,6 +90,8 @@ export const Timeline = ({ events, isIssue }: { events: TimelineEvent[], isIssue
 				return <ClosedEventView key={`closed${event.id}`} event={event} isIssue={isIssue} />;
 			case EventType.Reopened:
 				return <ReopenedEventView key={`reopened${event.id}`} event={event} isIssue={isIssue} />;
+			case EventType.BaseRefChanged:
+				return <BaseRefChangedEventView key={`baseref${event.id}`} event={event} />;
 			case EventType.NewCommitsSinceReview:
 				return <NewCommitsSinceReviewEventView key={`newCommits${event.id}`} />;
 			case EventType.CopilotStarted:
@@ -516,6 +519,24 @@ const ReopenedEventView = ({ event, isIssue }: { event: ReopenedEvent, isIssue:
 	);
 };
 
+const BaseRefChangedEventView = ({ event }: { event: BaseRefChangedEvent }) => {
+	const { actor, createdAt, currentRefName, previousRefName } = event;
+	return (
+		<div className="comment-container commit">
+			<div className="commit-message">
+				<div className="avatar-container">
+					<Avatar for={actor} />
+				</div>
+				<AuthorLink for={actor} />
+				<div className="message">
+					changed the base branch from <code className="branch-tag">{previousRefName}</code> to <code className="branch-tag">{currentRefName}</code>
+				</div>
+			</div>
+			<Timestamp date={createdAt} />
+		</div>
+	);
+};
+
 const CopilotStartedEventView = (event: CopilotStartedEvent) => {
 	const { createdAt, onBehalfOf, sessionLink } = event;
 	const { openSessionLog } = useContext(PullRequestContext);