@danypops/pi-lector 0.13.9 → 0.14.0

package/extension/src/git/operations.ts

@@ -1,4 +1,4 @@
-import type { GitDiffResult, GitLogEntry, GitStatusSummary, OperationOutputs } from "@danypops/lector";
+import type { GitDiffResult, GitLogEntry, GitStatusSummary, OperationInputs, OperationOutputs } from "@danypops/lector";
 import { lectorClient, withWorkspace, workspaceForDirectory } from "../lector-client.ts";
 import { invokeLectorVehicleOperation, type LectorVehicleCall } from "../vehicle-client.ts";
 
@@ -6,6 +6,8 @@ type SymbolComparison = OperationOutputs["workspace.compareSymbolAcrossVersions"
 type GitWorktreeAddResult = OperationOutputs["workspace.gitWorktreeAdd"];
 type GitWorktreeRemoveResult = OperationOutputs["workspace.gitWorktreeRemove"];
 type GitGrepResult = OperationOutputs["workspace.gitGrep"];
+type GitHistoryGrepResult = OperationOutputs["workspace.gitGrepHistory"];
+type GitHistoryGrepBounds = Omit<OperationInputs["workspace.gitGrepHistory"], "workspaceId" | "pattern" | "pathspecs">;
 type GitListFilesResult = OperationOutputs["workspace.gitListFiles"];
 
 /** Matches GIT_READ_PERMISSIONS' own declared value server-side (git/operation-registration.ts). */
@@ -42,6 +44,14 @@ export interface GitOperations {
 		maxBytes: number,
 		call: LectorVehicleCall,
 	): Promise<GitGrepResult>;
+	/** Bounded extended-regex search across commit trees reachable from every ref, with deterministic topological paging and exact-match deduplication. */
+	grepHistory(
+		directory: string,
+		pattern: string,
+		pathspecs: readonly string[] | undefined,
+		bounds: GitHistoryGrepBounds,
+		call: LectorVehicleCall,
+	): Promise<GitHistoryGrepResult>;
 	/** Every file path in `ref`'s own tree, no checkout -- pathspecs narrows the listing (prefix-based, not glob-based like grep's). */
 	listFiles(directory: string, ref: string, pathspecs: readonly string[] | undefined, maxResults: number, call: LectorVehicleCall): Promise<GitListFilesResult>;
 	/** True iff ancestorRef is a real ancestor of (or the exact same commit as) ref -- the backport/reachability check "was this fix ported to this branch" actually needs. */
@@ -139,6 +149,18 @@ export function createLectorGitOperations(): GitOperations {
 					),
 			);
 		},
+		async grepHistory(directory, pattern, pathspecs, bounds, call) {
+			return withWorkspace(
+				() => workspaceForDirectory(directory),
+				({ workspaceId }) =>
+					invokeLectorVehicleOperation<GitHistoryGrepResult>(
+						"workspace.gitGrepHistory",
+						{ workspaceId, pattern, pathspecs, ...bounds },
+						GIT_READ_PERMISSIONS,
+						call,
+					),
+			);
+		},
 		async listFiles(directory, ref, pathspecs, maxResults, call) {
 			return withWorkspace(
 				() => workspaceForDirectory(directory),

package/extension/src/git/rendering.ts

@@ -3,6 +3,7 @@ import { keyHint } from "@earendil-works/pi-coding-agent";
 import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 import { renderDiffLines, renderTruncatedList, type TextMeasure } from "malevich-tui-components";
 import type { LectorTheme } from "../lector-tui-theme.ts";
+import { presentationTitle } from "../presentation/tool-presentation.ts";
 
 /** Real ANSI-aware measurement, not Malevich's own ASCII-only default -- every diff line renderDiffLines receives is already theme.fg-styled. */
 const measure: TextMeasure = { visibleWidth, truncateToWidth };
@@ -11,12 +12,24 @@ const DEFAULT_VISIBLE_FILES = 20;
 const DEFAULT_VISIBLE_COMMITS = 10;
 const DEFAULT_VISIBLE_DIFF_LINES = 60;
 
-export type GitAction = "status" | "log" | "diff" | "compare-symbol" | "worktree-add" | "worktree-remove" | "show" | "grep-ref" | "ls-ref" | "is-ancestor";
+export type GitAction =
+	| "status"
+	| "log"
+	| "diff"
+	| "compare-symbol"
+	| "worktree-add"
+	| "worktree-remove"
+	| "show"
+	| "grep-ref"
+	| "grep-history"
+	| "ls-ref"
+	| "is-ancestor";
 
 type SymbolComparison = OperationOutputs["workspace.compareSymbolAcrossVersions"];
 type GitWorktreeAddResult = OperationOutputs["workspace.gitWorktreeAdd"];
 type GitWorktreeRemoveResult = OperationOutputs["workspace.gitWorktreeRemove"];
 type GitGrepResult = OperationOutputs["workspace.gitGrep"];
+type GitHistoryGrepResult = OperationOutputs["workspace.gitGrepHistory"];
 type GitListFilesResult = OperationOutputs["workspace.gitListFiles"];
 
 export interface GitToolDetails {
@@ -29,6 +42,7 @@ export interface GitToolDetails {
 	readonly worktreeRemove?: GitWorktreeRemoveResult;
 	readonly showFile?: { readonly ref: string; readonly path: string; readonly content: string | undefined };
 	readonly grep?: GitGrepResult;
+	readonly historyGrep?: GitHistoryGrepResult;
 	readonly listFiles?: GitListFilesResult;
 	readonly isAncestor?: { readonly ancestorRef: string; readonly ref: string; readonly result: boolean };
 }
@@ -48,31 +62,32 @@ export function formatGitCall(
 	theme: LectorTheme,
 ): string {
 	const action = typeof args.action === "string" ? args.action : "";
+	const label = theme.fg("toolTitle", theme.bold(presentationTitle("git", action)));
 	const directory = typeof args.directory === "string" ? args.directory : "";
 	if (action === "compare-symbol") {
 		const path = typeof args.path === "string" ? args.path : "";
 		const symbol = typeof args.symbol === "string" ? args.symbol : "";
 		const fromRef = typeof args.fromRef === "string" ? args.fromRef : "";
 		const toRef = typeof args.toRef === "string" ? ` -> ${args.toRef}` : "";
-		return `${theme.fg("toolTitle", theme.bold("git"))} ${theme.fg("muted", action)} ${theme.fg("accent", `${directory}/${path}`)} (${symbol}) ${fromRef}${toRef}`;
+		return `${label} ${theme.fg("accent", `${directory}/${path}`)} (${symbol}) ${fromRef}${toRef}`;
 	}
 	if (action === "is-ancestor") {
 		const ancestorRef = typeof args.ancestorRef === "string" ? args.ancestorRef : "";
 		const ref = typeof args.ref === "string" ? args.ref : "";
-		return `${theme.fg("toolTitle", theme.bold("git"))} ${theme.fg("muted", action)} ${theme.fg("accent", directory)} ${ancestorRef} -> ${ref}`;
+		return `${label} ${theme.fg("accent", directory)} ${ancestorRef} -> ${ref}`;
 	}
-	if (action === "grep-ref") {
-		const ref = typeof args.ref === "string" ? args.ref : "";
+	if (action === "grep-ref" || action === "grep-history") {
+		const ref = action === "grep-ref" && typeof args.ref === "string" ? `${args.ref} ` : "";
 		const pattern = typeof args.pattern === "string" ? args.pattern : "";
-		return `${theme.fg("toolTitle", theme.bold("git"))} ${theme.fg("muted", action)} ${theme.fg("accent", directory)} ${ref} "${pattern}"`;
+		return `${label} ${theme.fg("accent", directory)} ${ref}"${pattern}"`;
 	}
 	if (action === "show") {
 		const ref = typeof args.ref === "string" ? args.ref : "";
 		const path = typeof args.path === "string" ? args.path : "";
-		return `${theme.fg("toolTitle", theme.bold("git"))} ${theme.fg("muted", action)} ${theme.fg("accent", `${directory}/${path}`)} @ ${ref}`;
+		return `${label} ${theme.fg("accent", `${directory}/${path}`)} @ ${ref}`;
 	}
 	const ref = typeof args.ref === "string" ? ` ${args.ref}` : "";
-	return `${theme.fg("toolTitle", theme.bold("git"))} ${theme.fg("muted", action)} ${theme.fg("accent", directory)}${ref}`;
+	return `${label} ${theme.fg("accent", directory)}${ref}`;
 }
 
 function formatGitWorktreeAddResult(result: GitWorktreeAddResult | undefined, theme: LectorTheme): string {
@@ -105,6 +120,30 @@ function formatGitGrepResult(result: GitGrepResult | undefined, expanded: boolea
 	return lines.join("\n");
 }
 
+function formatGitHistoryGrepResult(result: GitHistoryGrepResult | undefined, expanded: boolean, theme: LectorTheme): string {
+	if (!result || result.matches.length === 0) {
+		if (result?.deadlineReached) return theme.fg("warning", "No matches before the deadline.");
+		return theme.fg("dim", "No historical matches.");
+	}
+	const lines = renderTruncatedList({
+		items: result.matches,
+		expanded,
+		visibleCount: DEFAULT_VISIBLE_FILES,
+		formatItem: (match) => {
+			const occurrences = match.occurrences > 1 ? ` (${match.occurrences} commits)` : "";
+			return `${theme.fg("muted", match.commit.slice(0, 8))} ${theme.fg("accent", `${match.path}:${match.line}`)}:${match.text}${occurrences}`;
+		},
+		moreLine: moreLine(theme),
+		truncationWarning: result.deadlineReached
+			? theme.fg("warning", "(deadline reached)")
+			: result.truncated
+				? theme.fg("warning", "(bounded by maxMatches/maxBytes)")
+				: undefined,
+	});
+	if (result.nextCommitOffset !== undefined) lines.push(theme.fg("muted", `next commit offset: ${result.nextCommitOffset}`));
+	return lines.join("\n");
+}
+
 function formatGitListFilesResult(result: GitListFilesResult | undefined, expanded: boolean, theme: LectorTheme): string {
 	if (!result || result.paths.length === 0) return theme.fg("dim", "No files.");
 	const lines = renderTruncatedList({
@@ -133,6 +172,7 @@ export function formatGitResult(details: GitToolDetails | undefined, expanded: b
 	if (details.action === "worktree-remove") return formatGitWorktreeRemoveResult(details.worktreeRemove, theme);
 	if (details.action === "show") return formatGitShowFileResult(details.showFile, theme);
 	if (details.action === "grep-ref") return formatGitGrepResult(details.grep, expanded, theme);
+	if (details.action === "grep-history") return formatGitHistoryGrepResult(details.historyGrep, expanded, theme);
 	if (details.action === "ls-ref") return formatGitListFilesResult(details.listFiles, expanded, theme);
 	if (details.action === "is-ancestor") return formatGitIsAncestorResult(details.isAncestor, theme);
 	return formatGitDiffResult(details.result, expanded, theme);