@danypops/pi-lector 0.9.1 → 0.9.2

package/extension/src/git-operations.ts

@@ -1,6 +1,8 @@
-import type { GitDiffResult, GitLogEntry, GitStatusSummary } from "@danypops/lector";
+import type { GitDiffResult, GitLogEntry, GitStatusSummary, OperationOutputs } from "@danypops/lector";
 import { lectorClient, withWorkspace, workspaceForDirectory } from "./lector-client.ts";
 
+type SymbolComparison = OperationOutputs["workspace.compareSymbolAcrossVersions"];
+
 /**
  * Thin wrappers over Lector's read-only git operations. `directory` is
  * required, same convention as find_symbols -- no implicit "whatever the
@@ -10,6 +12,7 @@ export interface GitOperations {
 	status(directory: string): Promise<GitStatusSummary>;
 	log(directory: string, maxCount: number): Promise<readonly GitLogEntry[]>;
 	diff(directory: string, ref: string | undefined, maxBytes: number): Promise<GitDiffResult>;
+	compareSymbol(directory: string, path: string, symbolName: string, fromRef: string, toRef: string | undefined, maxBytes: number): Promise<SymbolComparison>;
 }
 
 export function createLectorGitOperations(): GitOperations {
@@ -42,5 +45,14 @@ export function createLectorGitOperations(): GitOperations {
 				},
 			);
 		},
+		async compareSymbol(directory, path, symbolName, fromRef, toRef, maxBytes) {
+			return withWorkspace(
+				() => workspaceForDirectory(directory),
+				async ({ workspaceId }) => {
+					const client = await lectorClient();
+					return client.call("workspace.compareSymbolAcrossVersions", { workspaceId, path, symbolName, fromRef, toRef, maxBytes });
+				},
+			);
+		},
 	};
 }

package/extension/src/git-rendering.ts

@@ -1,4 +1,4 @@
-import type { GitDiffResult, GitLogEntry, GitStatusSummary } from "@danypops/lector";
+import type { GitDiffResult, GitLogEntry, GitStatusSummary, OperationOutputs } from "@danypops/lector";
 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";
@@ -11,18 +11,31 @@ const DEFAULT_VISIBLE_FILES = 20;
 const DEFAULT_VISIBLE_COMMITS = 10;
 const DEFAULT_VISIBLE_DIFF_LINES = 60;
 
-export type GitAction = "status" | "log" | "diff";
+export type GitAction = "status" | "log" | "diff" | "compare-symbol";
+
+type SymbolComparison = OperationOutputs["workspace.compareSymbolAcrossVersions"];
 
 export interface GitToolDetails {
 	readonly action: GitAction;
 	readonly summary?: GitStatusSummary;
 	readonly entries?: readonly GitLogEntry[];
 	readonly result?: GitDiffResult;
+	readonly comparison?: SymbolComparison;
 }
 
-export function formatGitCall(args: { action?: unknown; directory?: unknown; ref?: unknown }, theme: LectorTheme): string {
+export function formatGitCall(
+	args: { action?: unknown; directory?: unknown; ref?: unknown; path?: unknown; symbol?: unknown; fromRef?: unknown; toRef?: unknown },
+	theme: LectorTheme,
+): string {
 	const action = typeof args.action === "string" ? args.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}`;
+	}
 	const ref = typeof args.ref === "string" ? ` ${args.ref}` : "";
 	return `${theme.fg("toolTitle", theme.bold("git"))} ${theme.fg("muted", action)} ${theme.fg("accent", directory)}${ref}`;
 }
@@ -31,6 +44,7 @@ export function formatGitResult(details: GitToolDetails | undefined, expanded: b
 	if (!details) return theme.fg("dim", "No result.");
 	if (details.action === "status") return formatGitStatusResult(details.summary, expanded, theme);
 	if (details.action === "log") return formatGitLogResult(details.entries, expanded, theme);
+	if (details.action === "compare-symbol") return formatCompareSymbolResult(details.comparison, expanded, theme);
 	return formatGitDiffResult(details.result, expanded, theme);
 }
 
@@ -90,11 +104,11 @@ function formatGitLogResult(entries: readonly GitLogEntry[] | undefined, expande
  * is the still-open "render file and Git diffs as bounded native Pi
  * visuals" follow-up.
  */
-function formatGitDiffResult(result: GitDiffResult | undefined, expanded: boolean, theme: LectorTheme): string {
-	if (!result || result.diff.length === 0) return theme.fg("dim", "No differences.");
+/** Shared by formatGitDiffResult and formatCompareSymbolResult -- both display a real unified-diff string, styled and bounded the same way. */
+function renderStyledDiffLines(diff: string, truncatedUpstream: boolean, expanded: boolean, theme: LectorTheme): string {
 	const styledLines = renderDiffLines(
 		Number.MAX_SAFE_INTEGER,
-		result.diff,
+		diff,
 		{
 			add: (s) => theme.fg("success", s),
 			remove: (s) => theme.fg("error", s),
@@ -110,7 +124,20 @@ function formatGitDiffResult(result: GitDiffResult | undefined, expanded: boolea
 		visibleCount: DEFAULT_VISIBLE_DIFF_LINES,
 		formatItem: (line) => line,
 		moreLine: (hidden) => theme.fg("dim", `... ${hidden} more line${hidden === 1 ? "" : "s"} (${keyHint("app.tools.expand", "to expand")})`),
-		truncationWarning: result.truncated ? theme.fg("warning", "(diff output itself was truncated by maxBytes)") : undefined,
+		truncationWarning: truncatedUpstream ? theme.fg("warning", "(diff output itself was truncated by maxBytes)") : undefined,
 	});
 	return lines.join("\n");
 }
+
+function formatGitDiffResult(result: GitDiffResult | undefined, expanded: boolean, theme: LectorTheme): string {
+	if (!result || result.diff.length === 0) return theme.fg("dim", "No differences.");
+	return renderStyledDiffLines(result.diff, result.truncated, expanded, theme);
+}
+
+function formatCompareSymbolResult(comparison: SymbolComparison | undefined, expanded: boolean, theme: LectorTheme): string {
+	if (!comparison) return theme.fg("dim", "No result.");
+	const header = theme.fg("accent", `${comparison.path} (${comparison.symbolName}) -- ${comparison.fromRef} -> ${comparison.toRef}`);
+	if (comparison.status === "both-missing") return `${header}\n${theme.fg("dim", "symbol found at neither version")}`;
+	if (comparison.status === "unchanged") return `${header}\n${theme.fg("dim", "unchanged")}`;
+	return `${header}\n${renderStyledDiffLines(comparison.diff, comparison.truncated, expanded, theme)}`;
+}

package/extension/src/index.ts

@@ -1033,17 +1033,26 @@ export default function (pi: ExtensionAPI) {
 			name: "git",
 			label: "Git",
 			description:
-				"Working tree status, recent commit log, and unified diff for a real git repository, in one tool. Fails clearly if `directory` is not inside a git repository. ACTIONS: status (working tree state, ahead/behind tracking), log (recent commits, bounded by maxCount), diff (unified diff against `ref`, defaulting to HEAD, bounded by maxBytes).",
-			promptSnippet: "Show a repository's status, log, or diff",
+				"Working tree status, recent commit log, unified diff, and one symbol's own declaration diff across two versions, for a real git repository, in one tool. Fails clearly if `directory` is not inside a git repository. ACTIONS: status (working tree state, ahead/behind tracking), log (recent commits, bounded by maxCount), diff (unified diff against `ref`, defaulting to HEAD, bounded by maxBytes), compare-symbol (a named symbol's own declaration text diffed between fromRef and toRef, or fromRef and the current working tree when toRef is omitted -- tree-sitter syntactic tier only, TypeScript/JavaScript files only, no project-aware cross-reference resolution).",
+			promptSnippet: "Show a repository's status, log, diff, or one symbol's diff across versions",
 			promptGuidelines: [
-				"maxCount is required for action=log; maxBytes is required for action=diff -- every bounded query needs its bound stated explicitly, never defaulted silently.",
+				"maxCount is required for action=log; maxBytes is required for action=diff/compare-symbol -- every bounded query needs its bound stated explicitly, never defaulted silently.",
+				"path, symbol, and fromRef are required for action=compare-symbol; toRef is optional and means 'the current working tree' when omitted.",
 			],
 			parameters: Type.Object({
-				action: Type.String({ description: "status | log | diff" }),
+				action: Type.String({ description: "status | log | diff | compare-symbol" }),
 				directory: Type.String({ description: "Directory inside the repository to check, absolute or relative to the current working directory" }),
 				maxCount: Type.Optional(Type.Number({ description: "Maximum number of commits to return, most recent first -- required for action=log" })),
 				ref: Type.Optional(Type.String({ description: "Ref to diff against; defaults to HEAD -- only used for action=diff" })),
-				maxBytes: Type.Optional(Type.Number({ description: "Maximum diff size in bytes before truncating -- required for action=diff" })),
+				maxBytes: Type.Optional(
+					Type.Number({ description: "Maximum diff/comparison size in bytes before truncating -- required for action=diff/compare-symbol" }),
+				),
+				path: Type.Optional(Type.String({ description: "File path (relative to directory) containing the symbol -- required for action=compare-symbol" })),
+				symbol: Type.Optional(Type.String({ description: "Exact symbol name to compare -- required for action=compare-symbol" })),
+				fromRef: Type.Optional(Type.String({ description: "Git ref for the 'before' version -- required for action=compare-symbol" })),
+				toRef: Type.Optional(
+					Type.String({ description: "Git ref for the 'after' version; omit to compare against the current working tree -- action=compare-symbol only" }),
+				),
 			}),
 			async execute(_toolCallId, params) {
 				const directory = resolve(cwd, params.directory);
@@ -1066,6 +1075,13 @@ export default function (pi: ExtensionAPI) {
 					const details: GitToolDetails = { action: "diff", result };
 					return { content: [{ type: "text", text: result.diff.length === 0 ? "No differences." : result.diff }], details };
 				}
+				if (params.action === "compare-symbol") {
+					if (!params.path || !params.symbol || !params.fromRef) throw new Error("git action=compare-symbol requires path, symbol, and fromRef");
+					if (params.maxBytes === undefined) throw new Error("git action=compare-symbol requires maxBytes");
+					const comparison = await gitOperations.compareSymbol(directory, params.path, params.symbol, params.fromRef, params.toRef, params.maxBytes);
+					const details: GitToolDetails = { action: "compare-symbol", comparison };
+					return { content: [{ type: "text", text: JSON.stringify(comparison) }], details };
+				}
 				throw new Error(`unknown git action: ${String(params.action)}`);
 			},
 			renderCall(args, theme, context) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@danypops/pi-lector",
-	"version": "0.9.1",
+	"version": "0.9.2",
 	"description": "Pi host adapter for Lector: overrides read/write/edit with a daemon-backed, hash-guarded filesystem",
 	"license": "MIT",
 	"type": "module",
@@ -19,7 +19,7 @@
 	},
 	"dependencies": {
 		"@danypops/vehicle-client": "^0.1.1",
-		"@danypops/lector": "^0.10.0",
+		"@danypops/lector": "^0.11.0",
 		"malevich-tui-components": "^0.19.0"
 	},
 	"devDependencies": {