@danypops/pi-lector 0.15.0 → 0.17.0

package/extension/src/external-search/operations.ts

@@ -1,4 +1,4 @@
-import type { GithubRepoSearchResult, NpmPackageCandidate, SourcegraphCodeCandidate } from "@danypops/lector";
+import type { GithubRepoSearchResult, NpmPackageCandidate, SourcegraphCodeSearchResult } from "@danypops/lector";
 import { invokeLectorVehicleOperation, type LectorVehicleCall } from "../vehicle-client.ts";
 
 /** Matches EXTERNAL_SEARCH_PERMISSIONS' own declared value server-side (external-search/operation-registration.ts). */
@@ -12,7 +12,7 @@ const EXTERNAL_SEARCH_PERMISSIONS = ["external-search:read"];
 export interface ExternalSearchOperations {
 	githubRepos(query: string, maxResults: number, call: LectorVehicleCall): Promise<GithubRepoSearchResult>;
 	npmPackages(query: string, maxResults: number, call: LectorVehicleCall): Promise<{ candidates: readonly NpmPackageCandidate[] }>;
-	sourcegraphCode(query: string, maxResults: number, call: LectorVehicleCall): Promise<{ candidates: readonly SourcegraphCodeCandidate[] }>;
+	sourcegraphCode(query: string, maxResults: number, call: LectorVehicleCall): Promise<SourcegraphCodeSearchResult>;
 }
 
 export function createExternalSearchOperations(): ExternalSearchOperations {
@@ -29,12 +29,7 @@ export function createExternalSearchOperations(): ExternalSearchOperations {
 			);
 		},
 		sourcegraphCode(query, maxResults, call) {
-			return invokeLectorVehicleOperation<{ candidates: readonly SourcegraphCodeCandidate[] }>(
-				"search.sourcegraphCode",
-				{ query, maxResults },
-				EXTERNAL_SEARCH_PERMISSIONS,
-				call,
-			);
+			return invokeLectorVehicleOperation<SourcegraphCodeSearchResult>("search.sourcegraphCode", { query, maxResults }, EXTERNAL_SEARCH_PERMISSIONS, call);
 		},
 	};
 }

package/extension/src/external-search/rendering.ts

@@ -1,4 +1,4 @@
-import type { GithubRepoSearchResult, NpmPackageCandidate, SourcegraphCodeCandidate } from "@danypops/lector";
+import type { GithubRepoSearchResult, NpmPackageCandidate, SourcegraphCodeSearchResult } from "@danypops/lector";
 import type { LectorTheme } from "../lector-tui-theme.ts";
 import { presentationTitle } from "../presentation/tool-presentation.ts";
 
@@ -45,17 +45,15 @@ export function formatNpmPackageSearchResult(
 	return lines.join("\n");
 }
 
-export function formatSourcegraphCodeSearchResult(
-	result: { candidates: readonly SourcegraphCodeCandidate[] } | undefined,
-	expanded: boolean,
-	theme: LectorTheme,
-): string {
-	if (!result || result.candidates.length === 0) return theme.fg("dim", "no code matches");
+export function formatSourcegraphCodeSearchResult(result: SourcegraphCodeSearchResult | undefined, expanded: boolean, theme: LectorTheme): string {
+	if (!result) return theme.fg("dim", "no code matches");
 	const { visible, more } = boundedCandidates(result.candidates, expanded);
 	const lines = visible.map((candidate) => {
 		const matches = candidate.lineMatches.slice(0, expanded ? candidate.lineMatches.length : 3);
 		return `${theme.fg("accent", `${candidate.repository}/${candidate.path}`)}\n${matches.map((match) => `  ${match.line}: ${match.preview}`).join("\n")}`;
 	});
 	if (more > 0) lines.push(theme.fg("muted", `… ${more} more (expand to show)`));
+	if (result.truncated) lines.push(theme.fg("warning", `partial results · ${result.stopReason ?? "bounded"}`));
+	if (lines.length === 0) return theme.fg("dim", "no code matches");
 	return lines.join("\n");
 }

package/extension/src/index.ts

@@ -21,7 +21,7 @@ import type {
 	PackageSourceOperationResult,
 	PopulateSymbolGraphResult,
 	RepoFetchResult,
-	SourcegraphCodeCandidate,
+	SourcegraphCodeSearchResult,
 	SymbolAnnotation,
 	SymbolNode,
 	SymbolSearchResult,
@@ -2457,7 +2457,7 @@ export default function (pi: ExtensionAPI) {
 		type ExternalSearchToolDetails =
 			| { readonly action: "github_repos"; readonly result: GithubRepoSearchResult }
 			| { readonly action: "npm_packages"; readonly result: { candidates: readonly NpmPackageCandidate[] } }
-			| { readonly action: "sourcegraph_code"; readonly result: { candidates: readonly SourcegraphCodeCandidate[] } };
+			| { readonly action: "sourcegraph_code"; readonly result: SourcegraphCodeSearchResult };
 
 		const externalSearchOperations = createExternalSearchOperations();
 		registerLectorTool({

package/extension/src/mutation-history/operations.ts

@@ -1,14 +1,18 @@
-import type { MutationHistoryEntry } from "@danypops/lector";
+import type { MutationHistoryEntry, MutationTransactionLookupOutcome } from "@danypops/lector";
 import { withWorkspace, workspaceForPath } from "../lector-client.ts";
 import { invokeLectorVehicleOperation, type LectorVehicleCall } from "../vehicle-client.ts";
 import { toWorkspaceRelativePath } from "../workspace-relative-path.ts";
 
 const MAX_INTERNAL_HISTORY_LOOKUP_RESULTS = 2_000;
 
-export interface MutationTransactionRevertOutcome {
-	readonly transactionId: string;
-	readonly reverted: readonly { readonly path: string; readonly newHash: string | null }[];
-}
+export type MutationTransactionRevertOutcome =
+	| {
+			readonly status: "reverted";
+			readonly transactionId: string;
+			readonly reverted: readonly { readonly path: string; readonly newHash: string | null }[];
+	  }
+	| { readonly status: "stale"; readonly transactionId: string; readonly stalePaths: readonly string[] }
+	| Extract<MutationTransactionLookupOutcome, { readonly status: "evicted" | "wrong-workspace" | "unknown" }>;
 
 /** Match MUTATION_HISTORY_READ_PERMISSIONS/MUTATION_HISTORY_WRITE_PERMISSIONS' own declared values server-side (mutation-history/operation-registration.ts). */
 const MUTATION_HISTORY_READ_PERMISSIONS = ["workspace:read"];
@@ -32,24 +36,14 @@ async function listResolvedHistory(
 	maxResults: number,
 	call: LectorVehicleCall,
 ): Promise<readonly MutationHistoryEntry[]> {
-	const relativePath = toWorkspaceRelativePath(root, absolutePath);
-	// Single-file edits historically record the caller's workspace-relative path, while LSP
-	// WorkspaceEdits record canonical absolute paths. Query both identities until the daemon's
-	// stored-history migration can normalize old entries, then deduplicate by immutable entry id.
-	const paths = relativePath === absolutePath ? [absolutePath] : [relativePath, absolutePath];
-	const pages = await Promise.all(
-		paths.map((path) =>
-			invokeLectorVehicleOperation<{ entries: readonly MutationHistoryEntry[] }>(
-				"workspace.mutationHistory",
-				{ workspaceId, path, maxResults },
-				MUTATION_HISTORY_READ_PERMISSIONS,
-				call,
-			),
-		),
+	const path = toWorkspaceRelativePath(root, absolutePath);
+	const page = await invokeLectorVehicleOperation<{ entries: readonly MutationHistoryEntry[] }>(
+		"workspace.mutationHistory",
+		{ workspaceId, path, maxResults },
+		MUTATION_HISTORY_READ_PERMISSIONS,
+		call,
 	);
-	const byId = new Map<string, MutationHistoryEntry>();
-	for (const page of pages) for (const entry of page.entries) byId.set(entry.id, entry);
-	return [...byId.values()].sort((a, b) => b.timestamp - a.timestamp).slice(0, maxResults);
+	return page.entries;
 }
 
 export function createMutationHistoryOperations(): MutationHistoryOperations {
@@ -84,13 +78,23 @@ export function createMutationHistoryOperations(): MutationHistoryOperations {
 		revertTransaction(absolutePath, transactionId, call) {
 			return withWorkspace(
 				() => workspaceForPath(absolutePath),
-				({ workspaceId }) =>
-					invokeLectorVehicleOperation<MutationTransactionRevertOutcome>(
+				async ({ workspaceId }) => {
+					const lookup = await invokeLectorVehicleOperation<MutationTransactionLookupOutcome>(
+						"workspace.mutationTransaction",
+						{ workspaceId, transactionId },
+						MUTATION_HISTORY_READ_PERMISSIONS,
+						call,
+					);
+					if (lookup.status === "stale") return { status: "stale", transactionId, stalePaths: lookup.stalePaths };
+					if (lookup.status !== "ready") return lookup;
+					const reverted = await invokeLectorVehicleOperation<Omit<Extract<MutationTransactionRevertOutcome, { status: "reverted" }>, "status">>(
 						"workspace.revertMutationTransaction",
 						{ workspaceId, transactionId },
 						MUTATION_HISTORY_WRITE_PERMISSIONS,
 						call,
-					),
+					);
+					return { status: "reverted", ...reverted };
+				},
 			);
 		},
 	};

package/extension/src/mutation-history/rendering.ts

@@ -12,9 +12,23 @@ export function formatMutationHistoryList(entries: readonly MutationHistoryEntry
 }
 
 export function formatMutationTransactionRevert(originalTransactionId: string, outcome: MutationTransactionRevertOutcome): string {
-	const lines = [
-		`${originalTransactionId} reverted atomically; revert recorded as transaction ${outcome.transactionId}`,
-		...outcome.reverted.map((entry) => `${entry.path} -> ${entry.newHash ?? "(deleted)"}`),
-	];
-	return lines.join("\n");
+	switch (outcome.status) {
+		case "reverted":
+			return [
+				`${originalTransactionId} reverted atomically; revert recorded as transaction ${outcome.transactionId}`,
+				...outcome.reverted.map((entry) => `${entry.path} -> ${entry.newHash ?? "(deleted)"}`),
+			].join("\n");
+		case "stale":
+			return `${originalTransactionId} is stale at ${outcome.stalePaths.length} path(s); no files were reverted\n${outcome.stalePaths.join("\n")}`;
+		case "evicted":
+			return `${originalTransactionId} cannot be reverted because its bounded process-local history was evicted`;
+		case "wrong-workspace":
+			return `${originalTransactionId} belongs to a different registered workspace; use a path from that workspace`;
+		case "unknown":
+			return `${originalTransactionId} is unknown; mutation history is process-local and is lost after daemon restart`;
+		default: {
+			const exhaustive: never = outcome;
+			return exhaustive;
+		}
+	}
 }

package/extension/src/workspace-cache/rendering.ts

@@ -26,7 +26,16 @@ export function formatWorkspaceCacheCall(
 
 function formatResultCounts(result: CacheResultCounts): string {
 	const failed = result.filesFailed > 0 ? `, ${result.filesFailed} failed` : "";
-	return `${result.filesProcessed}/${result.filesAttempted} files${failed}, ${result.symbolsProcessed} symbols, ${result.nodesAdded} nodes, ${result.edgesAdded} edges`;
+	const reuse = result.filesReused === undefined ? "" : `, ${result.filesReused} reused, ${result.filesReprocessed ?? 0} reprocessed`;
+	const retries = result.staleRetries ? `, ${result.staleRetries} stale ${result.staleRetries === 1 ? "retry" : "retries"}` : "";
+	const coverage = result.sourceCoverage;
+	const scopes = coverage?.scopes
+		.slice(0, 3)
+		.map((entry) => `${entry.scope}:${entry.files}`)
+		.join(", ");
+	const omitted = coverage ? coverage.scopeOmittedCount + Math.max(0, coverage.scopes.length - 3) : 0;
+	const scopeSummary = scopes ? `; coverage ${scopes}${omitted > 0 ? ` (+${omitted} scopes)` : ""}${coverage?.truncated ? " [bounded]" : ""}` : "";
+	return `${result.filesProcessed}/${result.filesAttempted} files${failed}${reuse}${retries}, ${result.symbolsProcessed} symbols, ${result.nodesAdded} nodes, ${result.edgesAdded} edges${scopeSummary}`;
 }
 
 export function formatWorkspaceReleaseModelContent(outcome: OperationOutputs["workspace.release"]): string {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@danypops/pi-lector",
-	"version": "0.15.0",
+	"version": "0.17.0",
 	"description": "Pi host adapter for Lector: overrides read/write/edit with a daemon-backed, hash-guarded filesystem",
 	"license": "MIT",
 	"type": "module",
@@ -22,7 +22,7 @@
 		"@danypops/vehicle-client-pi": "^0.45.0"
 	},
 	"dependencies": {
-		"@danypops/lector": "^0.21.0",
+		"@danypops/lector": "^0.23.0",
 		"@danypops/vehicle-client": "^0.10.8",
 		"@danypops/vehicle-core": "^0.19.1",
 		"malevich-tui-components": "^0.32.1",