diff --git a/extensions/copilot/src/extension/chatSessions/vscode-node/copilotChatSessionsProvider.ts b/extensions/copilot/src/extension/chatSessions/vscode-node/copilotChatSessionsProvider.ts
index 6e60bc6f1bc..e78621bcdc4 100644
--- a/extensions/copilot/src/extension/chatSessions/vscode-node/copilotChatSessionsProvider.ts
+++ b/extensions/copilot/src/extension/chatSessions/vscode-node/copilotChatSessionsProvider.ts
@@ -14,7 +14,7 @@ import { ILogService } from '../../../platform/log/common/logService';
 import { ITelemetryService } from '../../../platform/telemetry/common/telemetry';
 import { Disposable } from '../../../util/vs/base/common/lifecycle';
 import { UriHandlerPaths, UriHandlers } from '../vscode/chatSessionsUriHandler';
-import { body_suffix, CONTINUE_TRUNCATION, extractTitle, formatBodyPlaceholder, getRepoId, JOBS_API_VERSION, RemoteAgentResult, truncatePrompt } from '../vscode/copilotCodingAgentUtils';
+import { body_suffix, CONTINUE_TRUNCATION, extractTitle, formatBodyPlaceholder, getRepoId, JOBS_API_VERSION, RemoteAgentResult, SessionIdForPr, truncatePrompt } from '../vscode/copilotCodingAgentUtils';
 import { ChatSessionContentBuilder } from './copilotChatSessionContentBuilder';
 
 type ConfirmationResult = { step: string; accepted: boolean; metadata?: CreatePromptMetadata /* | SomeOtherMetadata */ };
@@ -111,9 +111,23 @@ export class CopilotChatSessionsProvider extends Disposable implements vscode.Ch
 	}
 
 	async provideChatSessionContent(sessionId: string, token: vscode.CancellationToken): Promise<vscode.ChatSession> {
-		const pr = await this.findPR(Number(sessionId));
+		const indexedSessionId = SessionIdForPr.parse(sessionId);
+		let pullRequestNumber: number | undefined;
+		if (indexedSessionId) {
+			pullRequestNumber = indexedSessionId.prNumber;
+		}
+		if (typeof pullRequestNumber === 'undefined') {
+			pullRequestNumber = parseInt(sessionId);
+			if (isNaN(pullRequestNumber)) {
+				this.logService.error(`Invalid pull request number: ${sessionId}`);
+				return this.createEmptySession();
+			}
+		}
+
+		const pr = await this.findPR(pullRequestNumber);
 		if (!pr) {
-			throw new Error(`Session not found for ID: ${sessionId}`);
+			this.logService.error(`Session not found for ID: ${sessionId}`);
+			return this.createEmptySession();
 		}
 		const sessions = await this._octoKitService.getCopilotSessionsForPR(pr.fullDatabaseId.toString());
 		const sessionContentBuilder = new ChatSessionContentBuilder(CopilotChatSessionsProvider.TYPE, this._gitService);
@@ -125,6 +139,13 @@ export class CopilotChatSessionsProvider extends Disposable implements vscode.Ch
 		};
 	}
 
+	private createEmptySession(): vscode.ChatSession {
+		return {
+			history: [],
+			requestHandler: undefined
+		};
+	}
+
 	private async findPR(prNumber: number) {
 		let pr = this.chatSessions.get(prNumber);
 		if (pr) {
diff --git a/extensions/copilot/src/extension/chatSessions/vscode/copilotCodingAgentUtils.ts b/extensions/copilot/src/extension/chatSessions/vscode/copilotCodingAgentUtils.ts
index 83a79f3dffd..787e1ff2ade 100644
--- a/extensions/copilot/src/extension/chatSessions/vscode/copilotCodingAgentUtils.ts
+++ b/extensions/copilot/src/extension/chatSessions/vscode/copilotCodingAgentUtils.ts
@@ -85,4 +85,24 @@ export async function getRepoId(gitService: IGitService): Promise<GithubRepoId |
 	if (repo && repo.remoteFetchUrls?.[0]) {
 		return getGithubRepoIdFromFetchUrl(repo.remoteFetchUrls[0]);
 	}
-}
\ No newline at end of file
+}
+
+export namespace SessionIdForPr {
+
+	const prefix = 'pull-session-by-index';
+
+	export function getId(prNumber: number, sessionIndex: number): string {
+		return `${prefix}-${prNumber}-${sessionIndex}`;
+	}
+
+	export function parse(id: string): { prNumber: number; sessionIndex: number } | undefined {
+		const match = id.match(new RegExp(`^${prefix}-(\\d+)-(\\d+)$`));
+		if (match) {
+			return {
+				prNumber: parseInt(match[1], 10),
+				sessionIndex: parseInt(match[2], 10)
+			};
+		}
+		return undefined;
+	}
+}
diff --git a/extensions/copilot/src/platform/github/common/githubAPI.ts b/extensions/copilot/src/platform/github/common/githubAPI.ts
index 88ec212adec..d1b61b1fa52 100644
--- a/extensions/copilot/src/platform/github/common/githubAPI.ts
+++ b/extensions/copilot/src/platform/github/common/githubAPI.ts
@@ -28,6 +28,7 @@ export interface PullRequestSearchItem {
 	deletions: number;
 	fullDatabaseId: number;
 	headRefOid: number;
+	bodyHTML: string;
 }
 
 export interface PullRequestSearchResult {
@@ -198,6 +199,7 @@ export async function makeSearchGraphQLRequest(
 							}
 							name
 						}
+						bodyHTML
 					}
 				}
 				pageInfo {