"Copilot started work" should not be the same message for CCA and CCR (#8427)

Fixes #8211

Author: alexr00

src/common/timelineEvent.ts

@@ -26,6 +26,7 @@ export enum EventType {
 	CopilotStarted,
 	CopilotFinished,
 	CopilotFinishedError,
+	CopilotReviewStarted,
 	Other,
 }
 
@@ -202,4 +203,10 @@ export interface CopilotFinishedErrorEvent {
 	sessionLink: SessionLinkInfo;
 }
 
-export type TimelineEvent = CommitEvent | ReviewEvent | CommentEvent | NewCommitsSinceReviewEvent | MergedEvent | AssignEvent | UnassignEvent | HeadRefDeleteEvent | CrossReferencedEvent | ClosedEvent | ReopenedEvent | BaseRefChangedEvent | CopilotStartedEvent | CopilotFinishedEvent | CopilotFinishedErrorEvent;
+export interface CopilotReviewStartedEvent {
+	id: string;
+	event: EventType.CopilotReviewStarted;
+	createdAt: string;
+}
+
+export type TimelineEvent = CommitEvent | ReviewEvent | CommentEvent | NewCommitsSinceReviewEvent | MergedEvent | AssignEvent | UnassignEvent | HeadRefDeleteEvent | CrossReferencedEvent | ClosedEvent | ReopenedEvent | BaseRefChangedEvent | CopilotStartedEvent | CopilotFinishedEvent | CopilotFinishedErrorEvent | CopilotReviewStartedEvent;

src/github/utils.ts

@@ -45,7 +45,7 @@ import { Repository } from '../api/api';
 import { GitApiImpl } from '../api/api1';
 import { AuthProvider, GitHubServerType } from '../common/authentication';
 import { COPILOT_ACCOUNTS, IComment, IReviewThread, SubjectType } from '../common/comment';
-import { COPILOT_SWE_AGENT } from '../common/copilot';
+import { COPILOT_REVIEWER, COPILOT_SWE_AGENT } from '../common/copilot';
 import { DiffHunk, parseDiffHunk } from '../common/diffHunk';
 import { emojify } from '../common/emoji';
 import { GitHubRef } from '../common/githubRef';
@@ -1060,9 +1060,9 @@ export function parseSelectRestTimelineEvents(
 
 	let sessionIndex = 0;
 	for (const event of events) {
-		const eventNode = event as { created_at?: string; node_id?: string; actor: RestAccount };
+		const eventNode = event as { created_at?: string; node_id?: string; actor: RestAccount, performed_via_github_app?: { slug: string } | null };
 		if (eventNode.created_at && eventNode.node_id) {
-			if (event.event === 'copilot_work_started') {
+			if (event.event === 'copilot_work_started' && eventNode.performed_via_github_app?.slug === COPILOT_SWE_AGENT) {
 				parsedEvents.push({
 					id: eventNode.node_id,
 					event: Common.EventType.CopilotStarted,
@@ -1073,7 +1073,7 @@ export function parseSelectRestTimelineEvents(
 						sessionIndex
 					}
 				});
-			} else if (event.event === 'copilot_work_finished') {
+			} else if (event.event === 'copilot_work_finished' && eventNode.performed_via_github_app?.slug === COPILOT_SWE_AGENT) {
 				parsedEvents.push({
 					id: eventNode.node_id,
 					event: Common.EventType.CopilotFinished,
@@ -1093,6 +1093,12 @@ export function parseSelectRestTimelineEvents(
 						sessionIndex
 					}
 				});
+			} else if (event.event === 'copilot_work_started' && eventNode.performed_via_github_app?.slug === COPILOT_REVIEWER) {
+				parsedEvents.push({
+					id: eventNode.node_id,
+					event: Common.EventType.CopilotReviewStarted,
+					createdAt: eventNode.created_at,
+				});
 			}
 		}
 	}
@@ -1114,6 +1120,7 @@ export function eventTime(event: Common.TimelineEvent): Date | undefined {
 		case Common.EventType.CopilotStarted:
 		case Common.EventType.CopilotFinished:
 		case Common.EventType.CopilotFinishedError:
+		case Common.EventType.CopilotReviewStarted:
 			return new Date(event.createdAt);
 		case Common.EventType.Reviewed:
 			return new Date(event.submittedAt);

webviews/components/timeline.tsx

@@ -6,7 +6,7 @@
 import React, { useContext, useRef, useState } from 'react';
 import { CommentView } from './comment';
 import Diff from './diff';
-import { addIcon, checkIcon, circleFilledIcon, closeIcon, errorIcon, gitCommitIcon, gitMergeIcon, loadingIcon, tasklistIcon, threeBars } from './icon';
+import { addIcon, checkIcon, circleFilledIcon, closeIcon, commentIcon, errorIcon, gitCommitIcon, gitMergeIcon, loadingIcon, tasklistIcon, threeBars } from './icon';
 import { nbsp } from './space';
 import { Timestamp } from './timestamp';
 import { AuthorLink, Avatar } from './user';
@@ -19,6 +19,7 @@ import {
 	CommitEvent,
 	CopilotFinishedErrorEvent,
 	CopilotFinishedEvent,
+	CopilotReviewStartedEvent,
 	CopilotStartedEvent,
 	CrossReferencedEvent,
 	EventType,
@@ -100,6 +101,8 @@ export const Timeline = ({ events, isIssue }: { events: TimelineEvent[], isIssue
 				return <CopilotFinishedEventView key={`copilotFinished${event.id}`} {...event} />;
 			case EventType.CopilotFinishedError:
 				return <CopilotFinishedErrorEventView key={`copilotFinishedError${event.id}`} {...event} />;
+			case EventType.CopilotReviewStarted:
+				return <CopilotReviewStartedEventView key={`copilotReviewStarted${event.id}`} {...event} />;
 			default:
 				throw new UnreachableCaseError(event);
 		}
@@ -610,4 +613,18 @@ const CopilotFinishedErrorEventView = (event: CopilotFinishedErrorEvent) => {
 			<Timestamp date={createdAt} />
 		</div>
 	);
+};
+
+const CopilotReviewStartedEventView = (event: CopilotReviewStartedEvent) => {
+	const { createdAt } = event;
+	return (
+		<div className="comment-container commit">
+			<div className="commit-message">
+				{commentIcon}
+				{nbsp}
+				<div className="message">Copilot started reviewing</div>
+			</div>
+			<Timestamp date={createdAt} />
+		</div>
+	);
 };