pi-lean-search 0.6.0 → 0.7.1

package/index.ts

@@ -4,11 +4,15 @@
  * Registers the `web-search` tool and a `/searxng-status` diagnostic command.
  * Manages the `search` status bar slot with health-colored glyphs.
  *
- * Owns the `pi-lean-dimension.search` toolset (co-activated off `pi-lean-dimension.web`):
+ * Owns the `pi-lean-dimension.search` toolset:
  *   ● searxng  (accent/blue)    — healthy and reachable
  *   ● searxng  (warning/yellow)  — server up but pipeline degraded
  *   ● searxng  (error/red)      — unreachable
  *   ○ searxng                    — search tools off
+ *
+ * Co-activation with the web workflow is portal-owned: `/web on|off|learn`
+ * batches the search toolset id directly. Search is independently togglable
+ * via /tbox and focus.
  */
 
 import type {
@@ -19,9 +23,11 @@ import type {
 import {
 	defineToolset,
 	TOOLSET_EVENTS,
-	getDefaultResolutionMode,
 } from "pi-tool-masking";
-import type { ToolsetSpec, ToolsetChangedEvent } from "pi-tool-masking";
+import type {
+	ToolsetSpec,
+	ToolsetChangedEvent,
+} from "pi-tool-masking";
 import { readSearxngUrl } from "./search-config.js";
 import { webSearchTool, normalizeBaseUrl } from "./web-search-tool.js";
 
@@ -51,6 +57,12 @@ let _lastDegraded = false;
 /** Cached ExtensionContext for event-driven glyph rendering. */
 let _lastCtx: ExtensionContext | 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 factory prologue / session_shutdown to avoid
+ *  stacking duplicate listeners on the shared event bus. */
+let _offSync: (() => void)[] = [];
+
 // ─── Health probes ───────────────────────────────────────────────
 
 /**
@@ -177,33 +189,23 @@ export { _resetStateForTest };
 // ─── Extension entry point ───────────────────────────────────────
 
 export default function (pi: ExtensionAPI) {
+	// --- 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.
+	for (const off of _offSync) off();
+	_offSync = [];
+
 	// ── Register the web-search tool ─────────────────────────
 	pi.registerTool(webSearchTool);
 
 	// ── Define the pi-lean-dimension.search toolset ───────────
 	// Registers restore handler on session_start / session_tree.
-	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) => {
-		const event = data as ToolsetChangedEvent;
-		if (event.id === "pi-lean-dimension.web") {
-			if (getDefaultResolutionMode() === "allowlist") return;
-			if (event.enabled) {
-				searchToolset.enable(pi);
-			} else {
-				searchToolset.disable(pi);
-			}
-		}
-	});
+	defineToolset(pi, SEARCH_WEB_SPEC);
 
 	// ── Keep cached state in sync with library events ────────
+	// Glyph cache only — display re-render, not actuation. Co-activation
+	// lives in portal's /web command (it batches this toolset id directly).
 	const syncSearchState = (data: unknown) => {
 		const event = data as ToolsetChangedEvent;
 		if (event.id === "pi-lean-dimension.search") {
@@ -211,8 +213,10 @@ 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) => {
@@ -271,6 +275,8 @@ export default function (pi: ExtensionAPI) {
 
 	// ── Session shutdown: clean up ───────────────────────────
 	pi.on("session_shutdown", async (_event, ctx) => {
+		for (const off of _offSync) off();
+		_offSync = [];
 		_lastCtx = null;
 		try {
 			ctx?.ui?.setStatus?.("search", "");

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-lean-search",
-	"version": "0.6.0",
+	"version": "0.7.1",
 	"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": "*",