Adds comparison range picker to search UI

Adds @me choice to author: filter
Adds @me highlighting in search queries

Author: eamodio

src/git/search.ts

@@ -104,11 +104,14 @@ export function getSearchQueryComparisonKey(search: SearchQuery | StoredSearchQu
 	}${search.matchRegex ? 'R' : ''}${search.matchWholeWord ? 'W' : ''}${search.naturalLanguage ? 'NL' : ''}`;
 }
 
+/** Operators plus special tokens that can be highlighted */
+export type HighlightableOperator = SearchOperators | '@me';
+
 export interface ParsedSearchQuery {
 	operations: Map<SearchOperatorsLongForm, Set<string>>;
 	errors?: string[];
 	/** Positions of operators in the original query string */
-	operatorRanges?: { start: number; end: number; operator: SearchOperators }[];
+	operatorRanges?: { start: number; end: number; operator: HighlightableOperator }[];
 }
 
 export function createSearchQueryForCommit(ref: string): string;
@@ -128,7 +131,7 @@ export function parseSearchQuery(search: SearchQuery, validate: boolean = false)
 	const query = search.query.trim();
 
 	let errors: string[] | undefined;
-	let operatorRanges: Array<{ start: number; end: number; operator: SearchOperators }> | undefined;
+	let operatorRanges: Array<{ start: number; end: number; operator: HighlightableOperator }> | undefined;
 	let pos = 0;
 
 	while (pos < query.length) {
@@ -192,6 +195,7 @@ export function parseSearchQuery(search: SearchQuery, validate: boolean = false)
 
 		if (!matchedOperator) {
 			// No operator found, parse as text
+			const textStart = pos;
 			let text: string;
 
 			// Check if text is quoted
@@ -214,7 +218,18 @@ export function parseSearchQuery(search: SearchQuery, validate: boolean = false)
 			}
 
 			// Handle special text tokens (@me, SHA)
-			op = text === '@me' ? 'author:' : isSha(text) ? 'commit:' : 'message:';
+			if (text === '@me') {
+				op = 'author:';
+				// Track @me position for highlighting
+				operatorRanges ??= [];
+				operatorRanges.push({
+					start: textStart,
+					end: textStart + text.length,
+					operator: '@me',
+				});
+			} else {
+				op = isSha(text) ? 'commit:' : 'message:';
+			}
 			value = text;
 		}
 

src/webviews/apps/shared/components/search/models.ts

@@ -10,7 +10,7 @@ export type SearchCompletionItem = CompletionItem<
 export type SearchCompletionCommand =
 	| { command: 'toggle-natural-language-mode' }
 	| { command: 'pick-author' | 'pick-file'; multi?: boolean }
-	| { command: 'pick-folder' | 'pick-ref'; multi?: never };
+	| { command: 'pick-folder' | 'pick-ref' | 'pick-comparison'; multi?: never };
 
 export interface SearchCompletionValue {
 	/** The operator this value belongs to */
@@ -74,11 +74,17 @@ export const searchCompletionOperators: SearchCompletionOperator[] = [
 		example: html`Use a name or email, e.g. <code>author:eamodio</code>, <code>@:john</code>, or
 			<code>@me</code> for your own commits`,
 		values: [
+			{
+				value: '@me',
+				label: '@me',
+				description: 'Filter to only show your own commits',
+				icon: 'person',
+			},
 			{
 				value: { command: 'pick-author', multi: true },
 				label: 'Choose authors\u2026',
 				description: 'Select one or more contributors to filter by',
-				icon: 'person',
+				icon: 'organization',
 			},
 		],
 	},
@@ -99,10 +105,16 @@ export const searchCompletionOperators: SearchCompletionOperator[] = [
 		values: [
 			{
 				value: { command: 'pick-ref' },
-				label: 'Choose a branch, tag, or range\u2026',
-				description: 'Select a branch, tag, or range to filter by',
+				label: 'Choose a branch or tag\u2026',
+				description: 'Select a branch or tag to filter by',
 				icon: 'git-branch',
 			},
+			{
+				value: { command: 'pick-comparison' },
+				label: 'Choose a comparison range\u2026',
+				description: 'Select two refs to compare (e.g. main..feature)',
+				icon: 'git-compare',
+			},
 		],
 	},
 	{

src/webviews/apps/shared/components/search/search-input.ts

@@ -11,6 +11,7 @@ import { filterMap } from '../../../../../system/array';
 import { fuzzyFilter } from '../../../../../system/fuzzy';
 import {
 	ChooseAuthorRequest,
+	ChooseComparisonRequest,
 	ChooseFileRequest,
 	ChooseRefRequest,
 	SearchHistoryDeleteRequest,
@@ -776,9 +777,9 @@ export class GlSearchInput extends GlElement {
 
 				case 'pick-ref': {
 					const result = await this._ipc.sendRequest(ChooseRefRequest, {
-						title: 'Search by Reference or Range',
-						placeholder: 'Choose a reference to search',
-						allowedAdditionalInput: { range: true, rev: false },
+						title: 'Search by Branch or Tag',
+						placeholder: 'Choose a branch or tag to filter by',
+						allowedAdditionalInput: { range: false, rev: false },
 						include: ['branches', 'tags', 'HEAD'],
 						picked: currentValue || undefined,
 					});
@@ -789,6 +790,18 @@ export class GlSearchInput extends GlElement {
 					break;
 				}
 
+				case 'pick-comparison': {
+					const result = await this._ipc.sendRequest(ChooseComparisonRequest, {
+						title: 'Search by Comparison Range',
+						placeholder: 'Choose two refs to compare',
+					});
+
+					if (result?.range) {
+						this.insertPickerValues([result.range], operator, false);
+					}
+					break;
+				}
+
 				case 'pick-file':
 				case 'pick-folder': {
 					const result = await this._ipc.sendRequest(ChooseFileRequest, {

src/webviews/plus/graph/graphWebview.ts

@@ -116,6 +116,7 @@ import { isMcpBannerEnabled } from '../../../plus/gk/utils/-webview/mcp.utils';
 import type { ConnectionStateChangeEvent } from '../../../plus/integrations/integrationService';
 import { getPullRequestBranchDeepLink } from '../../../plus/launchpad/launchpadProvider';
 import type { AssociateIssueWithBranchCommandArgs } from '../../../plus/startWork/startWork';
+import { showComparisonPicker } from '../../../quickpicks/comparisonPicker';
 import { showContributorsPicker } from '../../../quickpicks/contributorsPicker';
 import { showReferencePicker2 } from '../../../quickpicks/referencePicker';
 import { getRepositoryPickerTitleAndPlaceholder, showRepositoryPicker } from '../../../quickpicks/repositoryPicker';
@@ -209,6 +210,7 @@ import type {
 } from './protocol';
 import {
 	ChooseAuthorRequest,
+	ChooseComparisonRequest,
 	ChooseFileRequest,
 	ChooseRefRequest,
 	ChooseRepositoryCommand,
@@ -831,6 +833,9 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 			case ChooseRefRequest.is(e):
 				void this.onChooseRef(ChooseRefRequest, e);
 				break;
+			case ChooseComparisonRequest.is(e):
+				void this.onChooseComparison(ChooseComparisonRequest, e);
+				break;
 			case ChooseFileRequest.is(e):
 				void this.onChooseFile(ChooseFileRequest, e);
 				break;
@@ -2074,6 +2079,36 @@ export class GraphWebviewProvider implements WebviewProvider<State, State, Graph
 		);
 	}
 
+	private async onChooseComparison<T extends typeof ChooseComparisonRequest>(
+		requestType: T,
+		msg: IpcCallMessageType<T>,
+	) {
+		if (this.repository == null) {
+			return this.host.respond(requestType, msg, { range: undefined });
+		}
+
+		const result = await showComparisonPicker(this.container, this.repository.path, {
+			getTitleAndPlaceholder: step => {
+				switch (step) {
+					case 1:
+						return {
+							title: msg.params.title,
+							placeholder: 'Choose a branch or tag to show commits from',
+						};
+					case 2:
+						return {
+							title: msg.params.title,
+							placeholder: 'Choose a base to compare against (e.g., main)',
+						};
+				}
+			},
+		});
+
+		return this.host.respond(requestType, msg, {
+			range: result != null ? `${result.base.ref}..${result.head.ref}` : undefined,
+		});
+	}
+
 	private async onChooseAuthor<T extends typeof ChooseAuthorRequest>(requestType: T, msg: IpcCallMessageType<T>) {
 		if (this.repository == null) {
 			return this.host.respond(requestType, msg, { authors: undefined });

src/webviews/plus/graph/protocol.ts

@@ -338,6 +338,18 @@ export interface ChooseRefParams {
 }
 export const ChooseRefRequest = new IpcRequest<ChooseRefParams, DidChooseRefParams>(scope, 'chooseRef');
 
+export interface ChooseComparisonParams {
+	title: string;
+	placeholder: string;
+}
+export interface DidChooseComparisonParams {
+	range: string | undefined;
+}
+export const ChooseComparisonRequest = new IpcRequest<ChooseComparisonParams, DidChooseComparisonParams>(
+	scope,
+	'chooseComparison',
+);
+
 export interface ChooseAuthorParams {
 	title: string;
 	placeholder: string;