@danypops/pi-lector 0.1.10 → 0.1.12

package/extension/src/code-intelligence-rendering.ts

@@ -140,7 +140,7 @@ export function formatDiagnosticsResult(diagnostics: readonly Diagnostic[] | und
 	const lines = [theme.fg("muted", `${diagnostics.length} diagnostic${diagnostics.length === 1 ? "" : "s"}:`)];
 
 	for (const diagnostic of diagnostics.slice(0, displayCount)) {
-		const severity = theme.fg(DIAGNOSTIC_SEVERITY_COLOR[diagnostic.severity] ?? "muted", theme.bold(diagnostic.severity));
+		const severity = theme.fg(DIAGNOSTIC_SEVERITY_COLOR[diagnostic.severity], theme.bold(diagnostic.severity));
 		const location = formatLocation(theme, diagnostic.range.path, diagnostic.range.start.line, diagnostic.range.start.character);
 		const origin = diagnostic.source ? theme.fg("dim", ` (${diagnostic.source}${diagnostic.code !== undefined ? ` ${diagnostic.code}` : ""})`) : "";
 		lines.push(`  ${severity} ${location} -- ${diagnostic.message}${origin}`);
@@ -209,7 +209,11 @@ export function describePopulateSymbolGraphJob(job: JobSnapshot<PopulateSymbolGr
 	if (job.status === "running") return `Source workspace is registered; symbol graph is still loading (job ${job.id}). Poll job_status.`;
 	if (job.status === "failed") return `Job ${job.id} failed [${job.error.code}] -- ${job.error.message}`;
 	const result = job.result;
-	return `Job ${job.id} cached ${result.filesProcessed} file${result.filesProcessed === 1 ? "" : "s"}, ${result.symbolsProcessed} symbol${result.symbolsProcessed === 1 ? "" : "s"}, ${result.nodesAdded} node${result.nodesAdded === 1 ? "" : "s"}, ${result.edgesAdded} edge${result.edgesAdded === 1 ? "" : "s"}`;
+	const counts = `${result.filesProcessed}/${result.filesAttempted} files, ${result.symbolsProcessed} symbol${result.symbolsProcessed === 1 ? "" : "s"}, ${result.nodesAdded} node${result.nodesAdded === 1 ? "" : "s"}, ${result.edgesAdded} edge${result.edgesAdded === 1 ? "" : "s"}`;
+	if (result.completeness === "complete") return `Job ${job.id} cached ${counts}`;
+	const first = result.failures[0];
+	const failure = first ? ` First failure: ${first.path} [${first.code} via ${first.provenance.backend}] ${first.message}` : "";
+	return `Job ${job.id} partially cached ${counts}; ${result.filesFailed} failed file${result.filesFailed === 1 ? "" : "s"} (${result.failureCount} failed operations).${failure}`;
 }
 
 export function formatPopulateSymbolGraphResult(job: JobSnapshot<PopulateSymbolGraphResult> | undefined, theme: LectorTheme): string {

package/extension/src/lector-client.ts

@@ -1,4 +1,5 @@
 import { dirname, parse } from "node:path";
+import { createRetryingClient, type RetryingClient } from "@danypops/daemon-kit/pi-client";
 import {
 	connectLectorClient,
 	type LectorClient,
@@ -20,60 +21,33 @@ import { nearestGitRoot } from "./nearest-workspace-root.ts";
  *
  * The daemon binds a new random port on every restart. A client resolved
  * once and cached for the rest of the session would otherwise point at a
- * dead port after any later restart -- lectorClient()'s returned .call()
+ * dead port after any later restart -- daemon-kit's createRetryingClient
  * detects that on the failing call itself (not just the first connection
- * attempt) and retries once against a freshly re-resolved client, matching
- * the pattern already proven in this house's papyrusClient()/callService().
+ * attempt) and retries once against a freshly re-resolved client, the same
+ * policy this file used to hand-roll and now shares with web-spider's
+ * callWebSpider(), papyrus's callService(), and pi-packed's createNatives().
  */
 
 type ClientConnector = () => Promise<LectorClient>;
 
 let connector: ClientConnector = () => connectLectorClient();
-let cachedClient: Promise<LectorClient> | undefined;
+// Wraps `() => connector()` rather than `connector` itself, so a test's
+// setLectorClientConnectorForTests still takes effect after this retrying
+// client is constructed once at module load.
+const retryingClient: RetryingClient<LectorClient> = createRetryingClient(() => connector(), { label: "Lector" });
 const workspaceIdByRoot = new Map<string, WorkspaceId>();
 
-async function resolveClient(): Promise<LectorClient> {
-	if (!cachedClient) {
-		cachedClient = connector().catch((error: unknown) => {
-			cachedClient = undefined;
-			throw error;
-		});
-	}
-	return cachedClient;
-}
-
-/**
- * True when `error` means the connection itself is bad (the daemon
- * restarted on a new port since this client was cached, or died outright)
- * -- worth invalidating the cache and retrying once. False for a genuine
- * domain-level rejection (e.g. UnknownWorkspace), which a retry cannot fix
- * and would only mask.
- */
-function isStaleConnectionError(error: unknown): boolean {
-	if (error instanceof TypeError) return true; // fetch()'s own connection-refused/DNS-failure shape
-	if (!(error instanceof Error)) return false;
-	if (error.name === "AbortError" || error.name === "TimeoutError") return true;
-	return /fetch failed|unable to connect|network|socket|ECONNRESET|ECONNREFUSED|connection refused/i.test(error.message);
-}
-
 export interface RetryingLectorClient {
 	call<Name extends OperationName>(operation: Name, input: OperationInputs[Name]): Promise<OperationOutputs[Name]>;
 }
 
+// Kept async even though its own body has no await: every call site across this package does
+// `await lectorClient()`, and dropping async here (just to satisfy require-await) would turn an
+// internal implementation detail into a signature change rippling through every one of them.
+// eslint-disable-next-line @typescript-eslint/require-await
 export async function lectorClient(): Promise<RetryingLectorClient> {
 	return {
-		async call(operation, input) {
-			for (let attempt = 0; attempt < 2; attempt++) {
-				const client = await resolveClient();
-				try {
-					return await client.call(operation, input);
-				} catch (error) {
-					cachedClient = undefined;
-					if (attempt === 1 || !isStaleConnectionError(error)) throw error;
-				}
-			}
-			throw new Error("Lector daemon client retry exhausted");
-		},
+		call: (operation, input) => retryingClient.call((client) => client.call(operation, input)),
 	};
 }
 
@@ -163,13 +137,13 @@ export async function withWorkspace<T>(resolve: () => Promise<ResolvedWorkspace>
 }
 
 export function setLectorClientConnectorForTests(value: ClientConnector): void {
-	cachedClient = undefined;
+	retryingClient.reset();
 	workspaceIdByRoot.clear();
 	connector = value;
 }
 
 export function resetLectorClientForTests(): void {
-	cachedClient = undefined;
+	retryingClient.reset();
 	workspaceIdByRoot.clear();
 	connector = () => connectLectorClient();
 }

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

@@ -44,12 +44,14 @@ export type CachePresentationState =
 	| { readonly status: "not-cached"; readonly reason: string }
 	| { readonly status: "caching"; readonly jobId: string }
 	| { readonly status: "finished-caching"; readonly job: JobSnapshot<PopulateSymbolGraphResult> & { readonly status: "succeeded" } }
+	| { readonly status: "partial"; readonly result: PopulateSymbolGraphResult }
 	| { readonly status: "cached" };
 
 export function describeCacheState(state: CachePresentationState): string {
 	if (state.status === "not-cached") return `not cached (${state.reason})`;
 	if (state.status === "caching") return `caching (job ${state.jobId})`;
 	if (state.status === "finished-caching") return `finished caching (job ${state.job.id})`;
+	if (state.status === "partial") return `partially cached (${state.result.filesFailed} failed file${state.result.filesFailed === 1 ? "" : "s"})`;
 	return "cached";
 }
 
@@ -57,6 +59,7 @@ export function cacheContextMessage(state: CachePresentationState): string {
 	const prefix = `Lector workspace cache: ${describeCacheState(state)}.`;
 	if (state.status === "not-cached") return `${prefix} Live code-intelligence operations remain available.`;
 	if (state.status === "caching") return `${prefix} The cached graph is still building; use live code-intelligence operations until it is ready.`;
+	if (state.status === "partial") return `${prefix} The graph is usable, but live code-intelligence operations are required for failed files.`;
 	return `${prefix} The cached graph is ready.`;
 }
 
@@ -80,6 +83,15 @@ export async function monitorWorkspaceCache(operations: WorkspaceCacheOperations
 		options.onState({ status: "cached" });
 		return;
 	}
+	if (initial.status === "partial") {
+		options.onState({ status: "partial", result: initial.generation.result });
+		return;
+	}
+
+	function reportCompleted(job: JobSnapshot<PopulateSymbolGraphResult> & { readonly status: "succeeded" }): void {
+		options.onState({ status: "finished-caching", job });
+		options.onState(job.result.completeness === "partial" ? { status: "partial", result: job.result } : { status: "cached" });
+	}
 
 	let jobId: string;
 	if (initial.status === "caching") {
@@ -89,8 +101,7 @@ export async function monitorWorkspaceCache(operations: WorkspaceCacheOperations
 		const submitted = await operations.submit(options.directory, options.maxFiles, options.maxSymbolsPerFile);
 		if (submitted.status === "failed") throw new Error(`${submitted.error.code}: ${submitted.error.message}`);
 		if (submitted.status === "succeeded") {
-			options.onState({ status: "finished-caching", job: submitted });
-			options.onState({ status: "cached" });
+			reportCompleted(submitted);
 			return;
 		}
 		jobId = submitted.id;
@@ -103,8 +114,7 @@ export async function monitorWorkspaceCache(operations: WorkspaceCacheOperations
 		const job = await operations.jobStatus(jobId);
 		if (job.status === "failed") throw new Error(`${job.error.code}: ${job.error.message}`);
 		if (job.status === "succeeded") {
-			options.onState({ status: "finished-caching", job });
-			options.onState({ status: "cached" });
+			reportCompleted(job);
 			return;
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@danypops/pi-lector",
-	"version": "0.1.10",
+	"version": "0.1.12",
 	"description": "Pi host adapter for Lector: overrides read/write/edit with a daemon-backed, hash-guarded filesystem",
 	"license": "MIT",
 	"type": "module",
@@ -18,7 +18,8 @@
 		"typebox": "*"
 	},
 	"dependencies": {
-		"@danypops/lector": "^0.1.9"
+		"@danypops/daemon-kit": "^0.4.0",
+		"@danypops/lector": "^0.1.10"
 	},
 	"devDependencies": {
 		"@earendil-works/pi-ai": "^0.81.1",