@apmantza/greedysearch-pi 1.8.0 → 1.8.2

package/src/tools/shared.ts

@@ -1,131 +1,131 @@
-/**
- * Shared types, utilities, and runSearch for Pi tool handlers
- */
-
-import { spawn } from "node:child_process";
-import { existsSync } from "node:fs";
-import { join } from "node:path";
-import type { ProgressUpdate, ToolResult } from "../types.js";
-
-export type { ProgressUpdate, ToolResult } from "../types.js";
-
-// Canonical source is src/search/constants.mjs — keep in sync
-const ALL_ENGINES = ["perplexity", "bing", "google"] as const;
-export { ALL_ENGINES };
-
-/**
- * Check if the CDP module is available in the package directory
- */
-export function cdpAvailable(baseDir: string): boolean {
-	return existsSync(join(baseDir, "bin", "cdp.mjs"));
-}
-
-/**
- * Create a "cdp missing" error result
- */
-export function cdpMissingResult(): ToolResult {
-	return {
-		content: [
-			{
-				type: "text",
-				text: "cdp.mjs missing — try reinstalling: pi install git:github.com/apmantza/GreedySearch-pi",
-			},
-		],
-		details: {} as Record<string, unknown>,
-	};
-}
-
-/**
- * Create an error result with a message
- */
-export function errorResult(prefix: string, e: unknown): ToolResult {
-	const msg = e instanceof Error ? e.message : String(e);
-	return {
-		content: [{ type: "text", text: `${prefix}: ${msg}` }],
-		details: {} as Record<string, unknown>,
-	};
-}
-
-/**
- * Spawn search.mjs and collect JSON results, with progress streaming via stderr.
- * Shared by greedy_search and deep_research tool handlers.
- */
-export function runSearch(
-	engine: string,
-	query: string,
-	flags: string[],
-	searchBin: string,
-	signal?: AbortSignal,
-	onProgress?: (engine: string, status: "done" | "error") => void,
-): Promise<Record<string, unknown>> {
-	return new Promise((resolve, reject) => {
-		const proc = spawn(
-			"node",
-			[searchBin, engine, "--inline", ...flags, query],
-			{ stdio: ["ignore", "pipe", "pipe"] },
-		);
-		let out = "";
-		let err = "";
-
-		const onAbort = () => {
-			proc.kill("SIGTERM");
-			reject(new Error("Aborted"));
-		};
-		signal?.addEventListener("abort", onAbort, { once: true });
-
-		proc.stderr.on("data", (d: Buffer) => {
-			err += d;
-			for (const line of d.toString().split("\n")) {
-				const match = line.match(/^PROGRESS:(\w+):(done|error)$/);
-				if (match && onProgress) {
-					onProgress(match[1], match[2] as "done" | "error");
-				}
-			}
-		});
-
-		proc.stdout.on("data", (d: Buffer) => (out += d));
-		proc.on("close", (code: number) => {
-			signal?.removeEventListener("abort", onAbort);
-			if (code !== 0) {
-				reject(new Error(err.trim() || `search.mjs exited with code ${code}`));
-			} else {
-				try {
-					resolve(JSON.parse(out.trim()));
-				} catch {
-					reject(new Error(`Invalid JSON from search.mjs: ${out.slice(0, 200)}`));
-				}
-			}
-		});
-	});
-}
-
-/**
- * Build a progress callback that tracks completed engines.
- * Returns an onProgress function suitable for runSearch.
- */
-export function makeProgressTracker(
-	engines: readonly string[],
-	onUpdate: ((update: ProgressUpdate) => void) | undefined,
-	suffix: "Searching" | "Researching",
-	depth: string,
-) {
-	const completed = new Set<string>();
-
-	return (eng: string, _status: "done" | "error") => {
-		completed.add(eng);
-		const parts: string[] = [];
-		for (const e of engines) {
-			if (completed.has(e)) parts.push(`✅ ${e} done`);
-			else parts.push(`⏳ ${e}`);
-		}
-		if (depth !== "fast" && completed.size >= 3)
-			parts.push("🔄 synthesizing");
-
-		onUpdate?.({
-			content: [
-				{ type: "text", text: `**${suffix}...** ${parts.join(" · ")}` },
-			],
-			details: { _progress: true },
-		} satisfies ProgressUpdate);
-	};
+/**
+ * Shared types, utilities, and runSearch for Pi tool handlers
+ */
+
+import { spawn } from "node:child_process";
+import { existsSync } from "node:fs";
+import { join } from "node:path";
+import type { ProgressUpdate, ToolResult } from "../types.js";
+
+export type { ProgressUpdate, ToolResult } from "../types.js";
+
+// Canonical source is src/search/constants.mjs — keep in sync
+const ALL_ENGINES = ["perplexity", "bing", "google"] as const;
+export { ALL_ENGINES };
+
+/**
+ * Check if the CDP module is available in the package directory
+ */
+export function cdpAvailable(baseDir: string): boolean {
+	return existsSync(join(baseDir, "bin", "cdp.mjs"));
+}
+
+/**
+ * Create a "cdp missing" error result
+ */
+export function cdpMissingResult(): ToolResult {
+	return {
+		content: [
+			{
+				type: "text",
+				text: "cdp.mjs missing — try reinstalling: pi install git:github.com/apmantza/GreedySearch-pi",
+			},
+		],
+		details: {} as Record<string, unknown>,
+	};
+}
+
+/**
+ * Create an error result with a message
+ */
+export function errorResult(prefix: string, e: unknown): ToolResult {
+	const msg = e instanceof Error ? e.message : String(e);
+	return {
+		content: [{ type: "text", text: `${prefix}: ${msg}` }],
+		details: {} as Record<string, unknown>,
+	};
+}
+
+/**
+ * Spawn search.mjs and collect JSON results, with progress streaming via stderr.
+ * Shared by greedy_search and deep_research tool handlers.
+ */
+export function runSearch(
+	engine: string,
+	query: string,
+	flags: string[],
+	searchBin: string,
+	signal?: AbortSignal,
+	onProgress?: (engine: string, status: "done" | "error") => void,
+): Promise<Record<string, unknown>> {
+	return new Promise((resolve, reject) => {
+		const proc = spawn(
+			"node",
+			[searchBin, engine, "--inline", ...flags, query],
+			{ stdio: ["ignore", "pipe", "pipe"] },
+		);
+		let out = "";
+		let err = "";
+
+		const onAbort = () => {
+			proc.kill("SIGTERM");
+			reject(new Error("Aborted"));
+		};
+		signal?.addEventListener("abort", onAbort, { once: true });
+
+		proc.stderr.on("data", (d: Buffer) => {
+			err += d;
+			for (const line of d.toString().split("\n")) {
+				const match = line.match(/^PROGRESS:(\w+):(done|error)$/);
+				if (match && onProgress) {
+					onProgress(match[1], match[2] as "done" | "error");
+				}
+			}
+		});
+
+		proc.stdout.on("data", (d: Buffer) => (out += d));
+		proc.on("close", (code: number) => {
+			signal?.removeEventListener("abort", onAbort);
+			if (code !== 0) {
+				reject(new Error(err.trim() || `search.mjs exited with code ${code}`));
+			} else {
+				try {
+					resolve(JSON.parse(out.trim()));
+				} catch {
+					reject(new Error(`Invalid JSON from search.mjs: ${out.slice(0, 200)}`));
+				}
+			}
+		});
+	});
+}
+
+/**
+ * Build a progress callback that tracks completed engines.
+ * Returns an onProgress function suitable for runSearch.
+ */
+export function makeProgressTracker(
+	engines: readonly string[],
+	onUpdate: ((update: ProgressUpdate) => void) | undefined,
+	suffix: "Searching" | "Researching",
+	depth: string,
+) {
+	const completed = new Set<string>();
+
+	return (eng: string, _status: "done" | "error") => {
+		completed.add(eng);
+		const parts: string[] = [];
+		for (const e of engines) {
+			if (completed.has(e)) parts.push(`✅ ${e} done`);
+			else parts.push(`⏳ ${e}`);
+		}
+		if (depth !== "fast" && completed.size >= 3)
+			parts.push("🔄 synthesizing");
+
+		onUpdate?.({
+			content: [
+				{ type: "text", text: `**${suffix}...** ${parts.join(" · ")}` },
+			],
+			details: { _progress: true },
+		} satisfies ProgressUpdate);
+	};
 }

package/src/types.ts

@@ -1,104 +1,104 @@
-/**
- * TypeScript interfaces for GreedySearch data structures
- *
- * These types document the shape of data flowing between modules.
- * They can be imported by TypeScript files (index.ts, tool handlers, formatters)
- * and used for type safety without runtime overhead.
- */
-
-// ============================================================================
-// Search Result Types
-// ============================================================================
-
-/** A single source extracted from search results */
-export interface Source {
-	url: string;
-	title: string;
-	type?: "official-docs" | "maintainer-blog" | "repo" | "community" | "website";
-	domain?: string;
-	snippet?: string;
-}
-
-/** Result from a single search engine */
-export interface SearchResult {
-	engine: string;
-	answer: string;
-	sources: Source[];
-	url?: string;
-	query?: string;
-	error?: string;
-}
-
-/** Synthesis result combining multiple engine results */
-export interface SynthesisResult {
-	answer: string;
-	agreementLevel?: "consensus" | "majority" | "mixed" | "conflicting";
-	claims?: Claim[];
-	sourceIds?: string[];
-	confidence?: ConfidenceMetrics;
-}
-
-/** A single claim within a synthesis */
-export interface Claim {
-	text: string;
-	sourceIds: string[];
-	confidence?: "high" | "medium" | "low";
-}
-
-/** Confidence metrics for a synthesis */
-export interface ConfidenceMetrics {
-	overall: number;        // 0-1
-	consensus: number;      // fraction of engines agreeing
-	sourceCount: number;
-	engineCount: number;
-}
-
-// ============================================================================
-// Source Registry Types
-// ============================================================================
-
-/** A classified source in the registry */
-export interface ClassifiedSource extends Source {
-	engineOrigin: string[];
-	isOfficial: boolean;
-	consensus: number;  // fraction of engines citing this source
-}
-
-// ============================================================================
-// Tool Result Types
-// ============================================================================
-
-/** Progress update sent via onUpdate during long-running searches */
-export interface ProgressUpdate {
-	content: Array<{ type: "text"; text: string }>;
-	details: { _progress: true };
-}
-
-/** Pi tool result format */
-export interface ToolResult {
-	content: Array<{ type: "text"; text: string }>;
-	details: Record<string, unknown>;
-}
-
-// ============================================================================
-// Engine Configuration Types
-// ============================================================================
-
-/** Engine definition for the ENGINES map */
-export interface EngineConfig {
-	/** Extractor script filename (e.g. "perplexity.mjs") */
-	script: string;
-	/** Human-readable label for progress messages */
-	label: string;
-	/** Domain pattern for source matching */
-	domain: string;
-	/** URL pattern for the engine */
-	url: string;
-}
-
-// ============================================================================
-// Constants
-// ============================================================================
-
-// Runtime defaults are in src/search/defaults.mjs (since .ts files can't be
+/**
+ * TypeScript interfaces for GreedySearch data structures
+ *
+ * These types document the shape of data flowing between modules.
+ * They can be imported by TypeScript files (index.ts, tool handlers, formatters)
+ * and used for type safety without runtime overhead.
+ */
+
+// ============================================================================
+// Search Result Types
+// ============================================================================
+
+/** A single source extracted from search results */
+export interface Source {
+	url: string;
+	title: string;
+	type?: "official-docs" | "maintainer-blog" | "repo" | "community" | "website";
+	domain?: string;
+	snippet?: string;
+}
+
+/** Result from a single search engine */
+export interface SearchResult {
+	engine: string;
+	answer: string;
+	sources: Source[];
+	url?: string;
+	query?: string;
+	error?: string;
+}
+
+/** Synthesis result combining multiple engine results */
+export interface SynthesisResult {
+	answer: string;
+	agreementLevel?: "consensus" | "majority" | "mixed" | "conflicting";
+	claims?: Claim[];
+	sourceIds?: string[];
+	confidence?: ConfidenceMetrics;
+}
+
+/** A single claim within a synthesis */
+export interface Claim {
+	text: string;
+	sourceIds: string[];
+	confidence?: "high" | "medium" | "low";
+}
+
+/** Confidence metrics for a synthesis */
+export interface ConfidenceMetrics {
+	overall: number;        // 0-1
+	consensus: number;      // fraction of engines agreeing
+	sourceCount: number;
+	engineCount: number;
+}
+
+// ============================================================================
+// Source Registry Types
+// ============================================================================
+
+/** A classified source in the registry */
+export interface ClassifiedSource extends Source {
+	engineOrigin: string[];
+	isOfficial: boolean;
+	consensus: number;  // fraction of engines citing this source
+}
+
+// ============================================================================
+// Tool Result Types
+// ============================================================================
+
+/** Progress update sent via onUpdate during long-running searches */
+export interface ProgressUpdate {
+	content: Array<{ type: "text"; text: string }>;
+	details: { _progress: true };
+}
+
+/** Pi tool result format */
+export interface ToolResult {
+	content: Array<{ type: "text"; text: string }>;
+	details: Record<string, unknown>;
+}
+
+// ============================================================================
+// Engine Configuration Types
+// ============================================================================
+
+/** Engine definition for the ENGINES map */
+export interface EngineConfig {
+	/** Extractor script filename (e.g. "perplexity.mjs") */
+	script: string;
+	/** Human-readable label for progress messages */
+	label: string;
+	/** Domain pattern for source matching */
+	domain: string;
+	/** URL pattern for the engine */
+	url: string;
+}
+
+// ============================================================================
+// Constants
+// ============================================================================
+
+// Runtime defaults are in src/search/defaults.mjs (since .ts files can't be
 // imported directly by Node.js). Import DEFAULTS from there for runtime values.