Show setup stage progress in session logs (#7330)

* Initial plan

* Implement setup stage progress display in session logs

* Only show setup logs when there are no main session logs

Co-authored-by: rebornix <876920+rebornix@users.noreply.github.com>

* fix copilot setup steps fetching.

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: rebornix <876920+rebornix@users.noreply.github.com>
Co-authored-by: Peng Lyu <penn.lv@gmail.com>

Author: Copilot

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

@@ -66,10 +66,10 @@ declare module 'vscode' {
 
 	export class ChatResponseConfirmationPart {
 		title: string;
-		message: string;
+		message: string | MarkdownString;
 		data: any;
 		buttons?: string[];
-		constructor(title: string, message: string, data: any, buttons?: string[]);
+		constructor(title: string, message: string | MarkdownString, data: any, buttons?: string[]);
 	}
 
 	export class ChatResponseCodeCitationPart {
@@ -205,7 +205,7 @@ declare module 'vscode' {
 		 * TODO@API should this be MarkdownString?
 		 * TODO@API should actually be a more generic function that takes an array of buttons
 		 */
-		confirmation(title: string, message: string, data: any, buttons?: string[]): void;
+		confirmation(title: string, message: string | MarkdownString, data: any, buttons?: string[]): void;
 
 		/**
 		 * Push a warning to this stream. Short-hand for
@@ -265,6 +265,43 @@ declare module 'vscode' {
 		export const onDidChangeChatRequestTools: Event<ChatRequest>;
 	}
 
+	export class LanguageModelToolExtensionSource {
+		/**
+		 * ID of the extension that published the tool.
+		 */
+		readonly id: string;
+
+		/**
+		 * Label of the extension that published the tool.
+		 */
+		readonly label: string;
+
+		private constructor(id: string, label: string);
+	}
+
+	export class LanguageModelToolMCPSource {
+		/**
+		 * Editor-configured label of the MCP server that published the tool.
+		 */
+		readonly label: string;
+
+		/**
+		 * Server-defined name of the MCP server.
+		 */
+		readonly name: string;
+
+		/**
+		 * Server-defined instructions for MCP tool use.
+		 */
+		readonly instructions?: string;
+
+		private constructor(label: string, name: string, instructions?: string);
+	}
+
+	export interface LanguageModelToolInformation {
+		source: LanguageModelToolExtensionSource | LanguageModelToolMCPSource | undefined;
+	}
+
 	// TODO@API fit this into the stream
 	export interface ChatUsedContext {
 		documents: ChatDocumentContext[];

src/github/common.ts

@@ -72,8 +72,10 @@ export namespace OctokitCommon {
 	export type CommitFiles = CompareCommits['files']
 	export type Notification = Endpoints['GET /notifications']['response']['data'][0];
 	export type ListEventsForTimelineResponse = Endpoints['GET /repos/{owner}/{repo}/issues/{issue_number}/timeline']['response']['data'][0];
-	export type ListWorkflowRunsForRepo = Endpoints['GET /repos/{owner}/{repo}/actions/runs']['response']['data']['workflow_runs'];
+	export type ListWorkflowRunsForRepo = Endpoints['GET /repos/{owner}/{repo}/actions/runs']['response']['data'];
 	export type WorkflowRun = Endpoints['GET /repos/{owner}/{repo}/actions/runs']['response']['data']['workflow_runs'][0];
+	export type WorkflowJob = Endpoints['GET /repos/{owner}/{repo}/actions/jobs/{job_id}']['response']['data'];
+	export type WorkflowJobs = Endpoints['GET /repos/{owner}/{repo}/actions/runs/{run_id}/jobs']['response']['data'];
 }
 
 export type Schema = { [key: string]: any, definitions: any[]; };

src/github/copilotApi.ts

@@ -267,6 +267,11 @@ export interface SessionInfo {
 	error: string | null;
 }
 
+export interface SessionSetupStep {
+	name: string;
+	status: 'completed' | 'in_progress' | 'queued';
+}
+
 export async function getCopilotApi(credentialStore: CredentialStore, telemetry: ITelemetry, authProvider?: AuthProvider): Promise<CopilotApi | undefined> {
 	if (!authProvider) {
 		if (credentialStore.isAuthenticated(AuthProvider.githubEnterprise) && hasEnterpriseUri()) {

src/github/copilotRemoteAgent.ts

@@ -14,7 +14,7 @@ import { CODING_AGENT, CODING_AGENT_AUTO_COMMIT_AND_PUSH, CODING_AGENT_ENABLED }
 import { ITelemetry } from '../common/telemetry';
 import { toOpenPullRequestWebviewUri } from '../common/uri';
 import { OctokitCommon } from './common';
-import { ChatSessionWithPR, CopilotApi, getCopilotApi, RemoteAgentJobPayload, SessionInfo } from './copilotApi';
+import { ChatSessionWithPR, CopilotApi, getCopilotApi, RemoteAgentJobPayload, SessionInfo, SessionSetupStep } from './copilotApi';
 import { CopilotPRWatcher, CopilotStateModel } from './copilotPrWatcher';
 import { CredentialStore } from './credentials';
 import { FolderRepositoryManager } from './folderRepositoryManager';
@@ -29,6 +29,7 @@ type RemoteAgentResult = RemoteAgentSuccessResult | RemoteAgentErrorResult;
 export interface IAPISessionLogs {
 	readonly info: SessionInfo;
 	readonly logs: string;
+	readonly setupSteps: SessionSetupStep[] | undefined;
 }
 
 export interface ICopilotRemoteAgentCommandArgs {
@@ -604,13 +605,39 @@ export class CopilotRemoteAgentManager extends Disposable {
 		return await capi.getLogsFromZipUrl(lastRun.logs_url);
 	}
 
+	async getWorkflowStepsFromAction(pullRequest: PullRequestModel): Promise<SessionSetupStep[]> {
+		const lastRun = await this.getLatestCodingAgentFromAction(pullRequest, 0, false);
+		if (!lastRun) {
+			return [];
+		}
+
+		try {
+			const jobs = await pullRequest.githubRepository.getWorkflowJobs(lastRun.id);
+			const steps: SessionSetupStep[] = [];
+
+			for (const job of jobs) {
+				if (job.steps) {
+					for (const step of job.steps) {
+						steps.push({ name: step.name, status: step.status });
+					}
+				}
+			}
+
+			return steps;
+		} catch (error) {
+			Logger.error(`Failed to get workflow steps: ${error}`, CopilotRemoteAgentManager.ID);
+			return [];
+		}
+	}
+
 	async getLatestCodingAgentFromAction(pullRequest: PullRequestModel, sessionIndex = 0, completedOnly = true): Promise<OctokitCommon.WorkflowRun | undefined> {
 		const capi = await this.copilotApi;
 		if (!capi) {
 			return;
 		}
 		const runs = await pullRequest.githubRepository.getWorkflowRunsFromAction(pullRequest.createdAt);
-		const padawanRuns = runs
+		const workflowRuns = runs.flatMap(run => run.workflow_runs);
+		const padawanRuns = workflowRuns
 			.filter(run => run.path && run.path.startsWith('dynamic/copilot-swe-agent'))
 			.filter(run => run.pull_requests?.some(pr => pr.id === pullRequest.id));
 
@@ -622,20 +649,33 @@ export class CopilotRemoteAgentManager extends Disposable {
 		return this.getLatestRun(padawanRuns);
 	}
 
-	async getSessionLogFromPullRequest(pullRequestId: number, sessionIndex = 0, completedOnly = true): Promise<IAPISessionLogs | undefined> {
+	async getSessionLogFromPullRequest(pullRequest: PullRequestModel, sessionIndex = 0, completedOnly = true): Promise<IAPISessionLogs | undefined> {
 		const capi = await this.copilotApi;
 		if (!capi) {
 			return undefined;
 		}
 
-		const sessions = await capi.getAllSessions(pullRequestId);
+		const sessions = await capi.getAllSessions(pullRequest.id);
 		const session = sessions.filter(s => !completedOnly || s.state === 'completed').at(sessionIndex);
 		if (!session) {
 			return undefined;
 		}
 
 		const logs = await capi.getLogsFromSession(session.id);
-		return { info: session, logs };
+
+		// If session is in progress, try to fetch workflow steps to show setup progress
+		let setupSteps: SessionSetupStep[] | undefined;
+		if (session.state === 'in_progress' || logs.trim().length === 0 || true) {
+			try {
+				// Get workflow steps instead of logs
+				setupSteps = await this.getWorkflowStepsFromAction(pullRequest);
+			} catch (error) {
+				// If we can't fetch workflow steps, don't fail the entire request
+				Logger.warn(`Failed to fetch workflow steps for session ${session.id}: ${error}`, CopilotRemoteAgentManager.ID);
+			}
+		}
+
+		return { info: session, logs, setupSteps };
 	}
 
 	async getSessionUrlFromPullRequest(pullRequest: PullRequestModel): Promise<string | undefined> {

src/github/githubRepository.ts

@@ -872,11 +872,11 @@ export class GitHubRepository extends Disposable {
 		}
 	}
 
-	public async getWorkflowRunsFromAction(fromDate: string): Promise<OctokitCommon.ListWorkflowRunsForRepo> {
+	public async getWorkflowRunsFromAction(fromDate: string): Promise<OctokitCommon.ListWorkflowRunsForRepo[]> {
 		const { octokit, remote } = await this.ensure();
 		const createdDate = new Date(fromDate);
 		const created = `>=${createdDate.getFullYear()}-${String(createdDate.getMonth() + 1).padStart(2, '0')}-${String(createdDate.getDate()).padStart(2, '0')}`;
-		const allRuns = await restPaginate<typeof octokit.api.actions.listWorkflowRunsForRepo, OctokitCommon.ListWorkflowRunsForRepo[0]>(octokit.api.actions.listWorkflowRunsForRepo, {
+		const allRuns = await restPaginate<typeof octokit.api.actions.listWorkflowRunsForRepo, OctokitCommon.ListWorkflowRunsForRepo>(octokit.api.actions.listWorkflowRunsForRepo, {
 			owner: remote.owner,
 			repo: remote.repositoryName,
 			event: 'dynamic',
@@ -886,6 +886,16 @@ export class GitHubRepository extends Disposable {
 		return allRuns;
 	}
 
+	public async getWorkflowJobs(workflowRunId: number): Promise<OctokitCommon.WorkflowJob[]> {
+		const { octokit, remote } = await this.ensure();
+		const jobs = await octokit.call(octokit.api.actions.listJobsForWorkflowRun, {
+			owner: remote.owner,
+			repo: remote.repositoryName,
+			run_id: workflowRunId
+		});
+		return jobs.data.jobs;
+	}
+
 	async fork(): Promise<string | undefined> {
 		try {
 			Logger.debug(`Fork repository`, this.id);

src/lm/tools/activePullRequestTool.ts

@@ -90,7 +90,7 @@ export class ActivePullRequestTool implements vscode.LanguageModelTool<FetchIssu
 	): Promise<string | string[]> {
 		let copilotSteps: string | string[] = [];
 		try {
-			const logs = await this.copilotRemoteAgentManager.getSessionLogFromPullRequest(pullRequest.id);
+			const logs = await this.copilotRemoteAgentManager.getSessionLogFromPullRequest(pullRequest);
 			if (!logs) {
 				throw new Error('Could not get session logs');
 			}

src/view/sessionLogView.ts

@@ -357,9 +357,13 @@ class SessionLogView extends Disposable {
 					this.copilotApi.getSessionInfo(this._source.sessionId),
 					this.copilotApi.getLogsFromSession(this._source.sessionId)
 				]);
-				return { logs, info };
+				return { logs, info, setupSteps: undefined };
 			} else {
-				return this.copilotAgentManager.getSessionLogFromPullRequest(this._source.pullRequest.id, -1 - this._source.link.sessionIndex, false);
+				const pullRequest = await this.getPullRequestModel(this._source.pullRequest);
+				if (!pullRequest) {
+					return undefined;
+				}
+				return this.copilotAgentManager.getSessionLogFromPullRequest(pullRequest, -1 - this._source.link.sessionIndex, false);
 			}
 		};
 		if (this._source.type === 'session') {
@@ -409,7 +413,8 @@ class SessionLogView extends Disposable {
 			type: 'loaded',
 			pullInfo: this._source.type === 'pull' ? this._source.pullRequest : undefined,
 			info: apiResponse.info,
-			logs: apiResponse.logs
+			logs: apiResponse.logs,
+			setupSteps: apiResponse.setupSteps
 		} as messages.LoadedMessage);
 
 		if (apiResponse.info.state === 'in_progress') {
@@ -430,7 +435,8 @@ class SessionLogView extends Disposable {
 					type: 'update',
 					pullInfo: this._source.type === 'pull' ? this._source.pullRequest : undefined,
 					info: apiResult.info,
-					logs: apiResult.logs
+					logs: apiResult.logs,
+					setupSteps: apiResult.setupSteps
 				} as messages.UpdateMessage);
 
 				if (apiResult.info.state !== 'in_progress') {

webviews/sessionLogView/app.tsx

@@ -9,14 +9,14 @@ import * as React from 'react';
 import { createHighlighter } from 'shiki';
 import { vscode } from '../common/message';
 import type * as messages from './messages';
-import { parseSessionLogs, SessionInfo, SessionResponseLogChunk } from './sessionsApi';
+import { parseSessionLogs, SessionInfo, SessionResponseLogChunk, SessionSetupStepResponse } from './sessionsApi';
 import { SessionView } from './sessionView';
 
 const themeName = 'vscode-theme';
 
 type SessionViewState =
 	| { state: 'loading' }
-	| { state: 'ready'; readonly info: SessionInfo; readonly logs: readonly SessionResponseLogChunk[]; readonly pullInfo: messages.PullInfo | undefined }
+	| { state: 'ready'; readonly info: SessionInfo; readonly logs: readonly SessionResponseLogChunk[]; readonly pullInfo: messages.PullInfo | undefined; readonly setupSteps?: readonly SessionSetupStepResponse[] }
 	| { state: 'error'; readonly url: string | undefined }
 	;
 
@@ -49,7 +49,8 @@ export function App() {
 						state: 'ready',
 						info: message.info,
 						logs: parseSessionLogs(message.logs),
-						pullInfo: message.pullInfo
+						pullInfo: message.pullInfo,
+						setupSteps: message.setupSteps
 					});
 					break;
 				}
@@ -89,7 +90,7 @@ export function App() {
 			</div>
 		);
 	} else {
-		return <SessionView info={state.info} logs={state.logs} pullInfo={state.pullInfo} />;
+		return <SessionView info={state.info} logs={state.logs} pullInfo={state.pullInfo} setupSteps={state.setupSteps} />;
 	}
 }
 

webviews/sessionLogView/index.css

@@ -185,4 +185,70 @@ button.codeview-expand:hover {
 	to {
 		transform: rotate(360deg);
 	}
+}
+
+.setup-stage-log {
+	margin: 1em 0;
+	border: 1px solid var(--vscode-widget-border);
+	border-radius: 4px;
+	overflow: hidden;
+}
+
+.setup-stage-title {
+	display: flex;
+	align-items: center;
+	padding: 8px 12px;
+	background: var(--vscode-sideBarSectionHeader-background);
+	border-bottom: 1px solid var(--vscode-sideBarSectionHeader-border);
+	color: var(--vscode-sideBarSectionHeader-foreground);
+	font-size: 13px;
+	font-weight: 600;
+	margin: 0;
+	gap: 8px;
+}
+
+.setup-log-content {
+	padding: 8px 12px;
+	background: var(--vscode-notebook-cellEditorBackground);
+	max-height: 200px;
+	overflow-y: auto;
+}
+
+.setup-log-line {
+	display: flex;
+	align-items: center;
+	font-family: var(--vscode-editor-font-family);
+	font-size: var(--vscode-editor-font-size);
+	line-height: 1.4;
+	color: var(--vscode-foreground);
+	margin: 2px 0;
+	white-space: pre-wrap;
+	word-wrap: break-word;
+	gap: 8px;
+}
+
+.setup-step-icon {
+	flex-shrink: 0;
+	font-size: 14px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 16px;
+	height: 16px;
+}
+
+.setup-step-name {
+	flex: 1;
+}
+
+.setup-step-completed {
+	opacity: 0.8;
+}
+
+.setup-step-in-progress {
+	font-weight: 500;
+}
+
+.setup-step-queued {
+	opacity: 0.6;
 }

webviews/sessionLogView/messages.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { SessionLinkInfo } from '../../src/common/timelineEvent';
-import { SessionInfo } from './sessionsApi';
+import { SessionInfo, SessionSetupStepResponse } from './sessionsApi';
 
 export type PullInfo = SessionLinkInfo & {
 	title: string;
@@ -20,13 +20,15 @@ export interface LoadedMessage {
 	pullInfo: PullInfo | undefined;
 	info: SessionInfo;
 	logs: string;
+	setupSteps: SessionSetupStepResponse[] | undefined;
 }
 
 export interface UpdateMessage {
 	type: 'update';
 	pullInfo: PullInfo | undefined;
 	info: SessionInfo;
 	logs: string;
+	setupSteps: SessionSetupStepResponse[] | undefined;
 }
 
 export interface ResetMessage {