pi-lean-search 0.1.0 → 0.2.0

package/README.md

@@ -1,6 +1,10 @@
 # pi-lean-search
 
-> SearXNG search tool for Pi. Part of the [pi-lean-dimension](https://github.com/coreyryanhanson/pi-lean-dimension) web-tools suite.
+> SearXNG search tool for Pi. Pairs with [pi-lean-portal](https://www.npmjs.com/package/pi-lean-portal)'s
+> `/web` toggle — search-only installs are valid, or add it to a portal install
+> for the full web-tools suite. Part of the
+> [pi-lean-dimension](https://github.com/coreyryanhanson/pi-lean-dimension)
+> web-tools suite.
 
 ## Quick start
 
@@ -19,7 +23,7 @@ pi install npm:pi-lean-dimension # portal + search, requires SearXNG server
 
 | Command / Tool | Description |
 |---|---|
-| `web-search` tool | Search the web via your SearXNG instance. Agents use this automatically. |
+| `web-search` tool | Search the web via your SearXNG instance. Supports `count` (1–100) and `pageno` (1-indexed) for deeper result pagination. Agents use this automatically. |
 | `/searxng-status` | Test and diagnose the SearXNG connection. |
 
 The `web-search` tool is automatically included in `/web on` / `/web off` toggling

package/index.ts

@@ -44,8 +44,8 @@ async function checkServerReachable(
 		let res: Response;
 		try {
 			const mergedSignal = signal
-				? combineAbortSignals(signal, controller.signal)
-				: (controller.signal as AbortSignal);
+				? AbortSignal.any([signal, controller.signal])
+				: controller.signal;
 			res = await fetch(url, { signal: mergedSignal });
 		} finally {
 			clearTimeout(timeoutId);
@@ -75,8 +75,8 @@ async function checkSearchReachable(
 		let res: Response;
 		try {
 			const mergedSignal = signal
-				? combineAbortSignals(signal, controller.signal)
-				: (controller.signal as AbortSignal);
+				? AbortSignal.any([signal, controller.signal])
+				: controller.signal;
 			res = await fetch(searchUrl, {
 				signal: mergedSignal,
 				headers: { Accept: "application/json" },
@@ -95,23 +95,6 @@ async function checkSearchReachable(
 	}
 }
 
-/**
- * Combine two AbortSignals into one that aborts when either aborts.
- */
-function combineAbortSignals(...signals: AbortSignal[]): AbortSignal {
-	const controller = new AbortController();
-	for (const sig of signals) {
-		if (sig.aborted) {
-			controller.abort(sig.reason);
-			return controller.signal;
-		}
-		sig.addEventListener("abort", () => controller.abort(sig.reason), {
-			once: true,
-		});
-	}
-	return controller.signal;
-}
-
 // ─── Status slot helpers ──────────────────────────────────────────
 
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "pi-lean-search",
-	"version": "0.1.0",
-	"description": "Pi extension. SearXNG search tool for Pi. Pairs with pi-lean-portal's /web toggle (soft peer — search-only installs are valid).",
+	"version": "0.2.0",
+	"description": "Pi extension. SearXNG search tool for Pi — pairs with pi-lean-portal's /web toggle; search-only installs are valid, or add it to a portal install for the full web-tools suite.",
 	"keywords": [
 		"pi-package",
 		"pi-extension",

package/verify-ship-manifest.ts

@@ -1,96 +1,10 @@
 /**
- * Ship-manifest verification helper.
+ * Ship-manifest verification helper (thin re-export).
  *
- * Walks a package directory for production `.ts` files and compares them to
- * the `files` array in `package.json`. Used by `ship-manifest.test.ts` files
- * across the monorepo so every published package can prove its npm tarball
- * actually contains the modules it imports at runtime.
- *
- * Ported from pi-lean-portal's verify-ship-manifest.ts (rpiv-mono pattern).
+ * Re-exports the shared {@link verifyShipManifest} from pi-lean-portal's
+ * core/shared/ship-manifest.ts. Kept so `ship-manifest.test.ts` can import
+ * from a local path without depending on a specific cross-package layout.
  */
 
-import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
-import { dirname, relative, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-
-const SKIP_DIRS = new Set(["node_modules", "docs", "__tests__"]);
-const SKIP_FILES = new Set(["test-fixtures.ts"]);
-/** Entries that won't exist on disk at rest but are valid (generated at pack time, e.g. by prepack). */
-const SKIP_STALE = new Set(["LICENSE"]);
-
-export interface ShipManifestResult {
-	declared: readonly string[];
-	onDisk: readonly string[];
-	missing: readonly string[];
-	stale: readonly string[];
-}
-
-export function verifyShipManifest(
-	packageDirOrUrl: string,
-): ShipManifestResult {
-	const packageDir = packageDirOrUrl.startsWith("file:")
-		? dirname(fileURLToPath(packageDirOrUrl))
-		: packageDirOrUrl;
-	const pkgRaw = readFileSync(resolve(packageDir, "package.json"), "utf8");
-	const pkg = JSON.parse(pkgRaw) as { files?: string[] };
-	const declared = pkg.files ?? [];
-	const exactFiles = new Set<string>();
-	const dirPrefixes: string[] = [];
-	for (const entry of declared) {
-		// Negation patterns (`!foo/`) are npm `files`-array syntax for excluding
-		// sub-paths within an included directory. They have no on-disk counterpart;
-		// skip them for existence checks and staleness detection.
-		if (entry.startsWith("!")) continue;
-		if (entry.endsWith("/")) dirPrefixes.push(entry);
-		else if (isDirOnDisk(packageDir, entry)) dirPrefixes.push(`${entry}/`);
-		else exactFiles.add(entry);
-	}
-
-	const onDisk = walkProductionTs(packageDir, packageDir);
-	const missing = onDisk.filter((f) => !isCovered(f, exactFiles, dirPrefixes));
-	const stale = declared.filter(
-		(entry) =>
-			!entry.startsWith("!") &&
-			!SKIP_STALE.has(entry) &&
-			!existsSync(resolve(packageDir, entry)),
-	);
-
-	return { declared, onDisk, missing, stale };
-}
-
-function isDirOnDisk(packageDir: string, entry: string): boolean {
-	try {
-		return statSync(resolve(packageDir, entry)).isDirectory();
-	} catch {
-		return false;
-	}
-}
-
-function isCovered(
-	file: string,
-	exactFiles: Set<string>,
-	dirPrefixes: readonly string[],
-): boolean {
-	if (exactFiles.has(file)) return true;
-	for (const prefix of dirPrefixes) {
-		if (file.startsWith(prefix)) return true;
-	}
-	return false;
-}
-
-function walkProductionTs(root: string, dir: string): string[] {
-	const out: string[] = [];
-	for (const entry of readdirSync(dir, { withFileTypes: true })) {
-		if (entry.name.startsWith(".")) continue;
-		if (entry.isDirectory() && SKIP_DIRS.has(entry.name)) continue;
-		const abs = resolve(dir, entry.name);
-		if (entry.isDirectory()) {
-			out.push(...walkProductionTs(root, abs));
-			continue;
-		}
-		if (!entry.isFile() || !entry.name.endsWith(".ts")) continue;
-		if (entry.name.endsWith(".test.ts") || SKIP_FILES.has(entry.name)) continue;
-		out.push(relative(root, abs));
-	}
-	return out;
-}
+export type { ShipManifestResult } from "../pi-lean-portal/core/shared/ship-manifest.js";
+export { verifyShipManifest } from "../pi-lean-portal/core/shared/ship-manifest.js";

package/web-search-tool.ts

@@ -1,16 +1,6 @@
 /**
- * web-search tool definition for pi-lean-search.
- *
- * Searches the web via a SearXNG instance. Degrades gracefully when
- * no SearXNG URL is configured — returns a setup message on first call.
- *
- * Adapted from the prototype at:
- *   /root/lab/startup_scripts/firecracker/config/pi/extensions/searxng-search/index.ts
- *
- * Changes from prototype:
- *   - Config read from Pi settings.json (searxng.url) instead of env vars
- *   - No injectUnavailabilityNotice (graceful degradation via tool output only)
- *   - Health state management lives in index.ts, not in the tool
+ * web-search tool for pi-lean-search — SearXNG web search with graceful degradation.
+ * Config read from Pi settings.json; health state managed in index.ts.
  */
 
 import { defineTool } from "@earendil-works/pi-coding-agent";
@@ -41,6 +31,7 @@ function buildSearchUrl(
 	query: string,
 	options: {
 		count: number;
+		pageno: number;
 		language: string;
 		safesearch: string;
 		time_range: string;
@@ -60,6 +51,7 @@ function buildSearchUrl(
 	if (options.safesearch) params.set("safesearch", options.safesearch);
 	if (options.time_range) params.set("time_range", options.time_range);
 	if (options.category) params.set("categories", options.category);
+	if (options.pageno > 1) params.set("pageno", String(options.pageno));
 	if (options.engines) params.set("engines", options.engines);
 
 	return `${normalized}/search?${params.toString()}`;
@@ -75,8 +67,10 @@ export const webSearchTool = defineTool({
 		"Use for finding current information, research, news, and fact-checking.",
 	promptSnippet:
 		"Search the web via a local SearXNG instance — use for up-to-date facts, verification, or research.",
-	promptGuidelines:
+	promptGuidelines: [
 		'Use when you need recent/current information not already known. Increase `count` for broad research; keep it small for quick lookups. Filter by time_range="day" for breaking news, category="news" for journalism. Set language to match the query (e.g. "de" for German, "es" for Spanish).',
+		"Use `pageno` (1-indexed) to fetch deeper pages when `count` results are not enough.",
+	],
 
 	parameters: Type.Object({
 		query: Type.String({ description: "The search query" }),
@@ -128,6 +122,13 @@ export const webSearchTool = defineTool({
 				},
 			),
 		),
+		pageno: Type.Optional(
+			Type.Number({
+				description:
+					"Page number, 1-indexed (default: 1). Combine with count to page through results.",
+				minimum: 1,
+			}),
+		),
 		engines: Type.Optional(
 			Type.String({
 				description:
@@ -140,6 +141,7 @@ export const webSearchTool = defineTool({
 		const {
 			query,
 			count = 5,
+			pageno = 1,
 			timeout: userTimeout,
 			language = "",
 			safesearch = "0",
@@ -174,6 +176,7 @@ export const webSearchTool = defineTool({
 		// ── Build URL ──
 		const url = buildSearchUrl(searxngUrl, query, {
 			count,
+			pageno,
 			language,
 			safesearch,
 			time_range,
@@ -359,6 +362,7 @@ export const webSearchTool = defineTool({
 				details: {
 					resultCount: results.length,
 					query,
+					pageno,
 					timeout: timeoutSeconds,
 					results: results.map((r) => ({
 						title: r.title,
@@ -392,6 +396,8 @@ export const webSearchTool = defineTool({
 		const parts: string[] = [theme.fg("toolTitle", theme.bold("web-search "))];
 		parts.push(theme.fg("accent", `"${args.query}"`));
 		if (args.count) parts.push(theme.fg("dim", `count=${args.count}`));
+		if (args.pageno && args.pageno > 1)
+			parts.push(theme.fg("dim", `p${args.pageno}`));
 		if (args.category) parts.push(theme.fg("dim", `cat:${args.category}`));
 		if (args.time_range) parts.push(theme.fg("dim", `time:${args.time_range}`));
 		return new Text(parts.join(" "), 0, 0);