Sends PR/issue/autolink context to review mode input

Adds context to all review mode prompts. Gathers cached-only PR/issue/autolink context based on the review entrypoint, and passes into the prompt to help the agent understant intent behind changes. Goal is to improve review quality.

Author: ramin-t

packages/plus/ai/src/models/promptTemplates.ts

@@ -81,12 +81,14 @@ interface ReviewPullRequestPromptTemplateContext {
 interface ReviewChangesPromptTemplateContext {
 	diff: string;
 	message: string;
+	context?: string;
 	instructions?: string;
 }
 
 interface ReviewOverviewPromptTemplateContext {
 	files: string;
 	message: string;
+	context?: string;
 	instructions?: string;
 }
 
@@ -95,6 +97,7 @@ interface ReviewDetailPromptTemplateContext {
 	overview: string;
 	message: string;
 	focusArea: string;
+	context?: string;
 	instructions?: string;
 }
 

packages/plus/ai/src/prompts.ts

@@ -529,7 +529,7 @@ Now, proceed with your analysis and provide a comprehensive review of the PR. Re
 
 export const reviewChanges: PromptTemplate<'review-changes'> = {
 	id: 'review-changes',
-	variables: ['diff', 'message', 'instructions'],
+	variables: ['diff', 'message', 'context', 'instructions'],
 	template: `You are an expert code reviewer analyzing a set of code changes. Your goal is to identify meaningful issues — bugs, logic errors, security vulnerabilities, missing error handling, and potential regressions — while ignoring style preferences and linter-level concerns. Focus on problems a careful human reviewer would catch.
 
 Examine the following code changes in Git diff format. Each non-header line inside a hunk has been annotated with its 1-based new-file line number in a \`[NNNNN]\` block placed immediately after the line-type marker (\` \`, \`+\`, or \`-\`):
@@ -546,6 +546,9 @@ Author's description of the changes:
 \${message}
 </~~message~~>
 
+Related work items (known pull requests and issues for this change set). Use these for *intent*: what the change is trying to accomplish. They are not authoritative spec — if a finding contradicts the stated intent, flag it rather than defer to it. May be empty.
+\${context}
+
 Produce a structured review in the following XML format. Include ONLY the XML tags described — no other text:
 
 <overview>
@@ -580,7 +583,7 @@ Review the changes and produce the structured XML output above.`,
 
 export const reviewOverview: PromptTemplate<'review-overview'> = {
 	id: 'review-overview',
-	variables: ['files', 'message', 'instructions'],
+	variables: ['files', 'message', 'context', 'instructions'],
 	template: `You are an expert code reviewer performing an initial assessment of a set of code changes. You are given a file manifest (not full diffs) — use the file paths, change types, and line counts to identify which areas deserve closer inspection.
 
 File manifest (JSON array of changed files):
@@ -593,6 +596,9 @@ Author's description of the changes:
 \${message}
 </~~message~~>
 
+Related work items (known pull requests and issues for this change set). Use these for *intent* — what the change is trying to accomplish — when ranking which areas deserve closer review. May be empty.
+\${context}
+
 Produce a structured assessment in the following XML format. Include ONLY the XML tags described — no other text:
 
 <overview>
@@ -619,7 +625,7 @@ Assess the changes and produce the structured XML output above.`,
 
 export const reviewDetail: PromptTemplate<'review-detail'> = {
 	id: 'review-detail',
-	variables: ['diff', 'overview', 'message', 'focusArea', 'instructions'],
+	variables: ['diff', 'overview', 'message', 'focusArea', 'context', 'instructions'],
 	template: `You are an expert code reviewer performing a detailed inspection of specific files that were flagged for closer review. You have the context from an initial overview assessment.
 
 Initial overview of the full changeset:
@@ -634,6 +640,9 @@ Author's description of the changes:
 \${message}
 </~~message~~>
 
+Related work items (known pull requests and issues for this change set). Use these for *intent* — what the change is trying to accomplish. They are not authoritative spec; if a finding contradicts the stated intent, flag it. May be empty.
+\${context}
+
 Code changes for the files in this focus area (Git diff format). Each non-header line inside a hunk has been annotated with its 1-based new-file line number in a \`[NNNNN]\` block placed immediately after the line-type marker (\` \`, \`+\`, or \`-\`):
   \` [   42] context line\`     // context: exists in both old and new; number = new-file line
   \`+[   43] added line\`        // added: only in new file; number = new-file line

src/autolinks/autolinksProvider.ts

@@ -189,10 +189,12 @@ export class AutolinksProvider implements Disposable {
 	getEnrichedAutolinks(
 		message: string,
 		remote: GitRemote | undefined,
+		options?: { cached?: boolean },
 	): Promise<Map<string, EnrichedAutolink> | undefined>;
 	getEnrichedAutolinks(
 		autolinks: Map<string, Autolink>,
 		remote: GitRemote | undefined,
+		options?: { cached?: boolean },
 	): Promise<Map<string, EnrichedAutolink> | undefined>;
 	@trace({
 		args: (messageOrAutolinks, remote) => ({
@@ -204,12 +206,16 @@ export class AutolinksProvider implements Disposable {
 	getEnrichedAutolinks(
 		messageOrAutolinks: string | Map<string, Autolink>,
 		remote: GitRemote | undefined,
+		options?: { cached?: boolean },
 	): Promise<Map<string, EnrichedAutolink> | undefined> {
 		const remoteKey = remote?.remoteKey ?? '';
 		const key =
 			typeof messageOrAutolinks === 'string'
 				? `m:${remoteKey}:${messageOrAutolinks}`
 				: `a:${remoteKey}:${[...messageOrAutolinks.keys()].sort().join('|')}`;
+		if (options?.cached) {
+			return this._inflightEnrichmentCache.get(key) ?? Promise.resolve(undefined);
+		}
 		return this._inflightEnrichmentCache.getOrCreate(key, () =>
 			this.enrichAutolinksCore(messageOrAutolinks, remote),
 		);

src/cache.ts

@@ -250,6 +250,32 @@ export class CacheProvider implements Disposable {
 		return this.get('defaultBranch', `repo:${key}`, etag, cacheable, options);
 	}
 
+	peekPullRequestForBranch(
+		branch: string,
+		repo: ResourceDescriptor,
+		integration: GitHostIntegration | undefined,
+	): PullRequest | undefined {
+		const { key } = this.getResourceKeyAndEtag(repo, integration);
+		return this.peek('prByBranch', `branch:${branch}:${key}`);
+	}
+
+	peekPullRequestForSha(
+		sha: string,
+		repo: ResourceDescriptor,
+		integration: GitHostIntegration | undefined,
+	): PullRequest | undefined {
+		const { key } = this.getResourceKeyAndEtag(repo, integration);
+		return this.peek('prsBySha', `sha:${sha}:${key}`);
+	}
+
+	peekIssue(id: string, resource: ResourceDescriptor, integration: IntegrationBase | undefined): Issue | undefined {
+		const { key } = this.getResourceKeyAndEtag(resource, integration);
+		return this.peek(
+			'issuesByIdAndResource',
+			`id:${id}:${key}:${'issue' satisfies IssueOrPullRequestType}:${JSON.stringify(resource)}}`,
+		);
+	}
+
 	getRepositoryMetadata(
 		repo: ResourceDescriptor,
 		integration: GitHostIntegration | undefined,

src/git/utils/-webview/branch.issue.utils.ts

@@ -47,6 +47,8 @@ export async function getAssociatedIssuesForBranch(
 	options?: {
 		cancellation?: AbortSignal;
 		timeout?: number;
+		/** Only return issues already in the local cache. No remote fetch — uncached entries are skipped. */
+		cached?: boolean;
 	},
 ): Promise<MaybePausedResult<Issue[] | undefined>> {
 	const { encoded } = await getConfigKeyAndEncodedAssociatedIssuesForBranch(container, branch);
@@ -66,7 +68,9 @@ export async function getAssociatedIssuesForBranch(
 				(async () => {
 					return (
 						await Promise.allSettled(
-							(associatedIssues ?? []).map(i => getIssueFromGitConfigEntityIdentifier(container, i)),
+							(associatedIssues ?? []).map(i =>
+								getIssueFromGitConfigEntityIdentifier(container, i, { cached: options?.cached }),
+							),
 						)
 					)
 						.map(r => getSettledValue(r))

src/git/utils/-webview/branch.utils.ts

@@ -219,12 +219,27 @@ export async function getBranchAssociatedPullRequest(
 		avatarSize?: number;
 		include?: PullRequestState[];
 		expiryOverride?: boolean | number;
+		/** Only return a value already in the local cache. No remote fetch — returns undefined on cache miss. */
+		cached?: boolean;
 	},
 ): Promise<PullRequest | undefined> {
 	const remote = await getBranchRemote(container, branch);
 	if (remote?.provider == null) return undefined;
 
 	const integration = await getRemoteIntegration(remote);
+
+	if (options?.cached) {
+		if (branch.upstream?.missing) {
+			if (!branch.sha) return undefined;
+			return container.cache.peekPullRequestForSha(branch.sha, remote.provider.repoDesc, integration);
+		}
+		return container.cache.peekPullRequestForBranch(
+			branch.trackingWithoutRemote ?? branch.nameWithoutRemote,
+			remote.provider.repoDesc,
+			integration,
+		);
+	}
+
 	if (integration == null) return undefined;
 
 	if (branch.upstream?.missing) {