@apmantza/greedysearch-pi 1.9.2 → 2.1.2

package/src/tools/greedy-search-handler.ts

@@ -16,8 +16,37 @@ import {
 	makeProgressTracker,
 	runSearch,
 	stripQuotes,
+	type ProgressUpdate,
+	type ToolResult,
 } from "./shared.js";
 
+type GreedySearchParams = {
+	query: string;
+	engine?: string;
+	synthesize?: boolean;
+	synthesizer?: string;
+	depth?: "fast" | "standard" | "deep" | "research" | string;
+	breadth?: number;
+	iterations?: number;
+	maxSources?: number;
+	researchOutDir?: string;
+	writeResearchBundle?: boolean;
+	fullAnswer?: boolean;
+	headless?: boolean;
+	visible?: boolean;
+	alwaysVisible?: boolean;
+};
+
+type ToolTheme = {
+	fg(style: string, text: string): string;
+	bold(text: string): string;
+};
+
+type RenderState = {
+	expanded: boolean;
+	isPartial?: boolean;
+};
+
 class Text {
 	constructor(
 		private text: string,
@@ -52,8 +81,10 @@ export function registerGreedySearchTool(pi: ExtensionAPI, baseDir: string) {
 		name: "greedy_search",
 		label: "Greedy Search",
 		description:
-			"WEB SEARCH ONLY — searches live web via Perplexity, Bing Copilot, and Google AI in parallel. " +
-			"Optionally synthesizes results with Gemini, deduplicates sources by consensus. " +
+			"WEB/RESEARCH SEARCH ONLY — searches live web via Perplexity, Google AI, ChatGPT, and Gemini, plus opt-in research through Semantic Scholar and Logically. " +
+			"Research mode reuses the configured ~/.pi/greedyconfig engines for child searches and Gemini for planning/final synthesis. " +
+			"Research mode is the centerpiece: it plans follow-up actions, fetches sources, audits citations, " +
+			"and writes a structured research bundle on disk. Scale-aware: simple queries auto-classify and use a fast single-pass path. " +
 			"Use for: library docs, recent framework changes, error messages, best practices, current events. " +
 			"Reports streaming progress as each engine completes.",
 		promptSnippet: "Multi-engine AI web search with streaming progress",
@@ -61,14 +92,28 @@ export function registerGreedySearchTool(pi: ExtensionAPI, baseDir: string) {
 			query: Type.String({ description: "The search query" }),
 			engine: Type.String({
 				description:
-					'Engine to use: "all" (default), "perplexity", "bing", "google", "gemini", "gem". "all" fans out to Perplexity, Bing, and Google in parallel.',
+					'Engine to use: "all" (default), "perplexity", "google", "chatgpt", "gemini", "gem". Research engines: "semantic-scholar" (alias "s2") and "logically". "all" fans out to the configured engines and fetches top sources. Customize via ~/.pi/greedyconfig. Bing Copilot is still available as "bing" for signed-in users.',
 				default: "all",
 			}),
-			depth: Type.String({
-				description:
-					'Search depth: "fast" (no synthesis/source fetch, ~15-30s), "standard" (synthesis + sources, ~30-90s), "deep" (stronger grounding, ~60-180s), "research" (iterative query/learnings loop; slowest). Default: "standard". Note: single-engine searches default to fast unless depth is "research".',
-				default: "standard",
-			}),
+			synthesize: Type.Optional(
+				Type.Boolean({
+					description:
+						'Only for engine="all": synthesize the multi-engine results and fetched sources. Default: false.',
+					default: false,
+				}),
+			),
+			synthesizer: Type.Optional(
+				Type.String({
+					description:
+						'Synthesis engine for synthesize=true. Defaults to ~/.pi/greedyconfig synthesizer (currently "gemini" by default). Supported: "gemini", "chatgpt".',
+				}),
+			),
+			depth: Type.Optional(
+				Type.String({
+					description:
+						'Deprecated except "research". Use depth="research" for the iterative research workflow. Research child searches use ~/.pi/greedyconfig engines; Gemini handles research planning/final synthesis. Legacy values: "fast" skips source fetching; "standard"/"deep" alias synthesize=true.',
+				}),
+			),
 			breadth: Type.Optional(
 				Type.Number({
 					description:
@@ -89,6 +134,19 @@ export function registerGreedySearchTool(pi: ExtensionAPI, baseDir: string) {
 						'Only for depth="research": maximum fetched sources for the final report, 3-12.',
 				}),
 			),
+			researchOutDir: Type.Optional(
+				Type.String({
+					description:
+						'Only for depth="research": optional directory for the structured research bundle. Defaults to .pi/greedysearch-research/<timestamp>_<query>.',
+				}),
+			),
+			writeResearchBundle: Type.Optional(
+				Type.Boolean({
+					description:
+						'Only for depth="research": write the structured research bundle to disk (default true).',
+					default: true,
+				}),
+			),
 			fullAnswer: Type.Optional(
 				Type.Boolean({
 					description:
@@ -118,27 +176,33 @@ export function registerGreedySearchTool(pi: ExtensionAPI, baseDir: string) {
 				}),
 			),
 		}),
-		execute: async (_toolCallId, params, signal, onUpdate) => {
-			const { query, fullAnswer: fullAnswerParam } = params as {
-				query: string;
-				engine: string;
-				depth?: "fast" | "standard" | "deep" | "research";
-				breadth?: number;
-				iterations?: number;
-				maxSources?: number;
-				fullAnswer?: boolean;
-				headless?: boolean;
-				visible?: boolean;
-				alwaysVisible?: boolean;
-			};
-			const engine = stripQuotes((params as any).engine ?? "all") || "all";
-			const depth = (stripQuotes((params as any).depth ?? "standard") ||
-				"standard") as "fast" | "standard" | "deep" | "research";
-			const effectiveEngine = depth === "research" ? "all" : engine;
+		execute: async (
+			_toolCallId: string,
+			params: GreedySearchParams,
+			signal?: AbortSignal,
+			onUpdate?: (update: ProgressUpdate) => void,
+		) => {
+			const { query, fullAnswer: fullAnswerParam } = params;
+			const engine = stripQuotes(params.engine ?? "all") || "all";
+			const depthRaw = stripQuotes(params.depth ?? "") as
+				| "fast"
+				| "standard"
+				| "deep"
+				| "research"
+				| "";
+			const researchMode = depthRaw === "research";
+			const legacyFast = depthRaw === "fast";
+			const legacySynthesisDepth =
+				depthRaw === "standard" || depthRaw === "deep";
+			const synthesize =
+				engine === "all" &&
+				!legacyFast &&
+				(params.synthesize === true || legacySynthesisDepth);
+			const effectiveEngine = researchMode ? "all" : engine;
 			const visible =
-				(params as any).visible === true ||
-				(params as any).alwaysVisible === true ||
-				(params as any).headless === false ||
+				params.visible === true ||
+				params.alwaysVisible === true ||
+				params.headless === false ||
 				process.env.GREEDY_SEARCH_VISIBLE === "1" ||
 				process.env.GREEDY_SEARCH_ALWAYS_VISIBLE === "1";
 			const headless = !visible;
@@ -148,28 +212,32 @@ export function registerGreedySearchTool(pi: ExtensionAPI, baseDir: string) {
 			const flags: string[] = [];
 			const fullAnswer = fullAnswerParam ?? effectiveEngine !== "all";
 			if (fullAnswer) flags.push("--full");
-			if (depth === "research") {
+			if (researchMode) {
 				flags.push("--depth", "research");
-				if (typeof (params as any).breadth === "number")
-					flags.push("--breadth", String((params as any).breadth));
-				if (typeof (params as any).iterations === "number")
-					flags.push("--iterations", String((params as any).iterations));
-				if (typeof (params as any).maxSources === "number")
-					flags.push("--max-sources", String((params as any).maxSources));
-			} else if (depth === "deep") flags.push("--depth", "deep");
-			else if (depth === "fast") flags.push("--fast");
-			else if (depth === "standard" && engine === "all")
-				flags.push("--synthesize");
+				if (typeof params.breadth === "number")
+					flags.push("--breadth", String(params.breadth));
+				if (typeof params.iterations === "number")
+					flags.push("--iterations", String(params.iterations));
+				if (typeof params.maxSources === "number")
+					flags.push("--max-sources", String(params.maxSources));
+				if (typeof params.researchOutDir === "string")
+					flags.push("--research-out-dir", params.researchOutDir);
+				if (params.writeResearchBundle === false)
+					flags.push("--no-research-bundle");
+			} else if (legacyFast) flags.push("--fast");
+			else if (depthRaw === "deep") flags.push("--depth", "deep");
+			else if (synthesize) flags.push("--synthesize");
+			if (synthesize && typeof params.synthesizer === "string") {
+				flags.push("--synthesizer", params.synthesizer);
+			}
 
-			const onProgress =
-				effectiveEngine === "all"
-					? makeProgressTracker(
-							ALL_ENGINES,
-							onUpdate,
-							depth === "research" ? "Researching" : "Searching",
-							depth,
-						)
-					: undefined;
+			const onProgress = makeProgressTracker(
+				effectiveEngine === "all" ? ALL_ENGINES : [effectiveEngine],
+				onUpdate,
+				researchMode ? "Researching" : "Searching",
+				synthesize && effectiveEngine === "all",
+				query,
+			);
 
 			try {
 				const data = await runSearch(
@@ -179,7 +247,7 @@ export function registerGreedySearchTool(pi: ExtensionAPI, baseDir: string) {
 					`${baseDir}/bin/search.mjs`,
 					signal,
 					onProgress,
-					headless,
+					{ headless },
 				);
 				const text = formatResults(effectiveEngine, data);
 				return {
@@ -191,7 +259,7 @@ export function registerGreedySearchTool(pi: ExtensionAPI, baseDir: string) {
 			}
 		},
 
-		renderCall(args, theme) {
+		renderCall(args: Partial<GreedySearchParams>, theme: ToolTheme) {
 			const q = (args.query || "").slice(0, 60);
 			const qDisplay = q.length < (args.query || "").length ? `${q}...` : q;
 			const engineDisplay =
@@ -205,11 +273,15 @@ export function registerGreedySearchTool(pi: ExtensionAPI, baseDir: string) {
 			);
 		},
 
-		renderResult(result, { expanded, isPartial }, theme) {
+		renderResult(
+			result: ToolResult,
+			{ expanded, isPartial }: RenderState,
+			theme: ToolTheme,
+		) {
 			if (isPartial) {
-				const progressText = (
-					result.content.find((c) => c.type === "text") as any
-				)?.text as string | undefined;
+				const progressText = result.content.find(
+					(c) => c.type === "text",
+				)?.text;
 				const display = progressText
 					? progressText.replace(/\*\*/g, "")
 					: "Searching...";
@@ -217,9 +289,7 @@ export function registerGreedySearchTool(pi: ExtensionAPI, baseDir: string) {
 			}
 
 			const textContent = result.content.find((c) => c.type === "text");
-			const raw = (result.details as any)?.raw as
-				| Record<string, unknown>
-				| undefined;
+			const raw = result.details?.raw as Record<string, unknown> | undefined;
 
 			// Collapsed: one-line summary only
 			if (!expanded) {
@@ -256,7 +326,7 @@ export function registerGreedySearchTool(pi: ExtensionAPI, baseDir: string) {
 				);
 				let totalSources = 0;
 				for (const key of engineKeys) {
-					const eng = (raw as any)[key] as Record<string, unknown> | undefined;
+					const eng = raw?.[key] as Record<string, unknown> | undefined;
 					const s = eng?.sources as Array<unknown> | undefined;
 					if (Array.isArray(s)) totalSources += s.length;
 				}
@@ -272,7 +342,7 @@ export function registerGreedySearchTool(pi: ExtensionAPI, baseDir: string) {
 				}
 
 				// No structured data — show content text as error/fallback
-				const snippet = (textContent as any)?.text as string | undefined;
+				const snippet = textContent?.text;
 				if (snippet) {
 					return new Text(
 						theme.fg("warning", ` → ${snippet.slice(0, 80)}`),