pi-lean-search 0.5.0 → 0.7.0

package/index.ts

@@ -19,9 +19,12 @@ import type {
 import {
 	defineToolset,
 	TOOLSET_EVENTS,
-	getDefaultResolutionMode,
 } from "pi-tool-masking";
-import type { ToolsetSpec, ToolsetChangedEvent } from "pi-tool-masking";
+import type {
+	ToolsetSpec,
+	ToolsetChangedEvent,
+	BranchReader,
+} from "pi-tool-masking";
 import { readSearxngUrl } from "./search-config.js";
 import { webSearchTool, normalizeBaseUrl } from "./web-search-tool.js";
 
@@ -51,6 +54,21 @@ let _lastDegraded = false;
 /** Cached ExtensionContext for event-driven glyph rendering. */
 let _lastCtx: ExtensionContext | null = null;
 
+/** Live sessionManager reference for the co-activation mirror — stored at
+ *  session_start; the library invokes getBranch() fresh per apply, so the
+ *  stored reference stays correct across cascades and external writes. */
+let _sessionManager: BranchReader | null = null;
+
+/** Unsubscribe for the co-activation mirror (registered inside session_start,
+ *  torn down in session_shutdown so re-fires don't stack listeners). */
+let _offMirror: (() => void) | null = null;
+
+/** Unsubscribers for the factory-time glyph-sync listeners — pi re-invokes
+ *  the cached extension factory per load pass, so these are re-registered
+ *  each time and torn down in the reset block / session_shutdown to avoid
+ *  stacking duplicate listeners on the shared event bus. */
+let _offSync: (() => void)[] = [];
+
 // ─── Health probes ───────────────────────────────────────────────
 
 /**
@@ -170,6 +188,8 @@ function _resetStateForTest(): void {
 	_lastHealth = null;
 	_lastDegraded = false;
 	_lastCtx = null;
+	_sessionManager = null;
+	_offMirror = null;
 }
 
 export { _resetStateForTest };
@@ -177,8 +197,16 @@ export { _resetStateForTest };
 // ─── Extension entry point ───────────────────────────────────────
 
 export default function (pi: ExtensionAPI) {
-	// Read config at startup
-	_searxngUrl = readSearxngUrl();
+	// --- Ensure idempotent re-invocation ----------------------------
+	// pi reuses the cached extension factory on /resume (same cwd),
+	// which re-invokes this function with the same module-level
+	// singletons. Reset the mirror state so the second load doesn't
+	// skip re-registration behind a stale _offMirror.
+	_offMirror?.();
+	_offMirror = null;
+	_sessionManager = null;
+	for (const off of _offSync) off();
+	_offSync = [];
 
 	// ── Register the web-search tool ─────────────────────────
 	pi.registerTool(webSearchTool);
@@ -188,23 +216,27 @@ export default function (pi: ExtensionAPI) {
 	const searchToolset = defineToolset(pi, SEARCH_WEB_SPEC);
 
 	// ── Co-activation: mirror pi-lean-dimension.web changed events ─
-	// Listen on changed ONLY, not restored.
-	//
-	// Focus-mode guard: while allowlist focus holds the line, skip
-	// co-activation. The focus set is authoritative, so a web `changed` event
-	// — including one a stale library `doRestore` emits during resume — must
-	// not disable search or write a focus-indistinguishable {enabled} entry.
-	pi.events.on(TOOLSET_EVENTS.changed, (data: unknown) => {
+	// Listen on changed ONLY, not restored. Registered inside session_start
+	// (after _sessionManager is stored) so the reader always exists when the
+	// mirror runs — there is no reader-less window.
+	const mirrorWebChanged = (data: unknown) => {
 		const event = data as ToolsetChangedEvent;
-		if (event.id === "pi-lean-dimension.web") {
-			if (getDefaultResolutionMode() === "allowlist") return;
+		if (event.id !== "pi-lean-dimension.web") return;
+		// Catch AllowlistModeError by name, never `instanceof` — the handle
+		// may come from a different library copy via the shared registry;
+		// refusal means "nothing changed" — skip co-activation.
+		try {
 			if (event.enabled) {
-				searchToolset.enable(pi);
+				searchToolset.enable(pi, _sessionManager!);
 			} else {
-				searchToolset.disable(pi);
+				searchToolset.disable(pi, _sessionManager!);
+			}
+		} catch (err) {
+			if ((err as { name?: string } | undefined)?.name !== "AllowlistModeError") {
+				throw err;
 			}
 		}
-	});
+	};
 
 	// ── Keep cached state in sync with library events ────────
 	const syncSearchState = (data: unknown) => {
@@ -214,13 +246,22 @@ export default function (pi: ExtensionAPI) {
 			if (_lastCtx) renderSearchGlyph(_lastCtx);
 		}
 	};
-	pi.events.on(TOOLSET_EVENTS.changed, syncSearchState);
-	pi.events.on(TOOLSET_EVENTS.restored, syncSearchState);
+	_offSync = [
+		pi.events.on(TOOLSET_EVENTS.changed, syncSearchState),
+		pi.events.on(TOOLSET_EVENTS.restored, syncSearchState),
+	];
 
 	// ── Session start: health probe + glyph ──────────────────
 	pi.on("session_start", async (event, ctx) => {
+		_sessionManager = ctx.sessionManager;
 		_lastCtx = ctx;
 
+		// Register the co-activation mirror once, after the reader is stored
+		// (dedup across re-fires of session_start for the same instance).
+		if (!_offMirror) {
+			_offMirror = pi.events.on(TOOLSET_EVENTS.changed, mirrorWebChanged);
+		}
+
 		// Re-read config in case it changed between sessions
 		_searxngUrl = readSearxngUrl();
 
@@ -274,7 +315,12 @@ export default function (pi: ExtensionAPI) {
 
 	// ── Session shutdown: clean up ───────────────────────────
 	pi.on("session_shutdown", async (_event, ctx) => {
+		_offMirror?.();
+		_offMirror = null;
+		for (const off of _offSync) off();
+		_offSync = [];
 		_lastCtx = null;
+		_sessionManager = null;
 		try {
 			ctx?.ui?.setStatus?.("search", "");
 		} catch {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-lean-search",
-	"version": "0.5.0",
+	"version": "0.7.0",
 	"description": "SearXNG web search for Pi. Self-hosted or public instance, no API keys or quotas; returns a setup message instead of erroring when unreachable. Pairs with pi-lean-portal's /web toggle or works standalone.",
 	"keywords": [
 		"pi-package",
@@ -36,7 +36,7 @@
 		"test": "vitest run"
 	},
 	"dependencies": {
-		"pi-tool-masking": "^1.3.0"
+		"pi-tool-masking": "^2.0.1"
 	},
 	"peerDependencies": {
 		"@earendil-works/pi-ai": "*",

package/web-search-tool.ts

@@ -393,6 +393,19 @@ export const webSearchTool = defineTool({
 			controller.abort();
 		}, timeoutSeconds * 1000);
 
+		// Abort can surface in either fetch or the body read; label it correctly.
+		const abortFail = () => {
+			if (timedOut) {
+				return fail(
+					`Web search timed out after ${timeoutSeconds}s. ` +
+						`The SearXNG instance at \`${searxngUrl}\` may be slow ` +
+						"or unresponsive.",
+					{ timedOut: true, timeout: timeoutSeconds },
+				);
+			}
+			return fail("Web search was cancelled.", { cancelled: true });
+		};
+
 		try {
 			// ── Layer 1: Connection-level error handling ──
 			let response: Response;
@@ -402,20 +415,11 @@ export const webSearchTool = defineTool({
 					headers: { Accept: "application/json" },
 				});
 			} catch (connectionErr) {
-				clearTimeout(timeoutId);
 				if (
 					connectionErr instanceof DOMException &&
 					connectionErr.name === "AbortError"
 				) {
-					if (timedOut) {
-						return fail(
-							`Web search timed out after ${timeoutSeconds}s. ` +
-								`The SearXNG instance at \`${searxngUrl}\` may be slow ` +
-								"or unresponsive.",
-							{ timedOut: true, timeout: timeoutSeconds },
-						);
-					}
-					return fail("Web search was cancelled.", { cancelled: true });
+					return abortFail();
 				}
 				return fail(
 					"Web search connection failed: " +
@@ -426,8 +430,6 @@ export const webSearchTool = defineTool({
 				);
 			}
 
-			clearTimeout(timeoutId);
-
 			// ── Layer 2: HTTP error handling ──
 			if (!response.ok) {
 				return fail(
@@ -444,6 +446,10 @@ export const webSearchTool = defineTool({
 					? (JSON.parse(text) as SearXNGResponse)
 					: { results: [], answers: [], suggestions: [] };
 			} catch (parseErr) {
+				// Abort can surface here if the body read stalls past the timeout.
+				if (parseErr instanceof DOMException && parseErr.name === "AbortError") {
+					return abortFail();
+				}
 				return fail(
 					"Web search returned unexpected response format. " +
 						"SearXNG may be misconfigured. Error: " +
@@ -545,7 +551,6 @@ export const webSearchTool = defineTool({
 				},
 			};
 		} catch (unexpectedErr) {
-			clearTimeout(timeoutId);
 			return fail(
 				"An unexpected error occurred during web search: " +
 					(unexpectedErr instanceof Error
@@ -553,6 +558,10 @@ export const webSearchTool = defineTool({
 						: String(unexpectedErr)),
 				{ unexpectedError: true },
 			);
+		} finally {
+			// Timer stays armed through the body read, so `timeout` bounds the
+			// whole request, not just the response headers.
+			clearTimeout(timeoutId);
 		}
 	},