@oh-my-pi/pi-coding-agent 11.0.3 → 11.2.0

package/src/web/search/render.ts

@@ -3,8 +3,10 @@
  *
  * Tree-based rendering with collapsed/expanded states for web search results.
  */
+
+import { getSearchProvider } from "@oh-my-pi/pi-coding-agent/web/search/provider";
 import type { Component } from "@oh-my-pi/pi-tui";
-import { Text } from "@oh-my-pi/pi-tui";
+import { Text, visibleWidth, wrapTextWithAnsi } from "@oh-my-pi/pi-tui";
 import type { RenderResultOptions } from "../../extensibility/custom-tools/types";
 import type { Theme } from "../../modes/theme/theme";
 import {
@@ -20,7 +22,7 @@ import {
 	truncateToWidth,
 } from "../../tools/render-utils";
 import { renderOutputBlock, renderStatusLine, renderTreeList } from "../../tui";
-import type { WebSearchResponse } from "./types";
+import type { SearchResponse } from "./types";
 
 const MAX_COLLAPSED_ANSWER_LINES = PREVIEW_LIMITS.COLLAPSED_LINES;
 const MAX_EXPANDED_ANSWER_LINES = PREVIEW_LIMITS.EXPANDED_LINES;
@@ -60,17 +62,22 @@ function renderFallbackText(contentText: string, expanded: boolean, theme: Theme
 	return new Text(text, 0, 0);
 }
 
-export interface WebSearchRenderDetails {
-	response: WebSearchResponse;
+export interface SearchRenderDetails {
+	response: SearchResponse;
 	error?: string;
 }
 
 /** Render web search result with tree-based layout */
-export function renderWebSearchResult(
-	result: { content: Array<{ type: string; text?: string }>; details?: WebSearchRenderDetails },
+export function renderSearchResult(
+	result: { content: Array<{ type: string; text?: string }>; details?: SearchRenderDetails },
 	options: RenderResultOptions,
 	theme: Theme,
-	args?: { query?: string; provider?: string },
+	args?: {
+		query?: string;
+		provider?: string;
+		allowLongAnswer?: boolean;
+		maxAnswerLines?: number;
+	},
 ): Component {
 	const { expanded } = options;
 	const details = result.details;
@@ -90,10 +97,6 @@ export function renderWebSearchResult(
 	const sourceCount = sources.length;
 	const citations = Array.isArray(response.citations) ? response.citations : [];
 	const citationCount = citations.length;
-	const related = Array.isArray(response.relatedQuestions)
-		? response.relatedQuestions.filter(item => typeof item === "string")
-		: [];
-	const relatedCount = related.length;
 	const searchQueries = Array.isArray(response.searchQueries)
 		? response.searchQueries.filter(item => typeof item === "string")
 		: [];
@@ -102,20 +105,21 @@ export function renderWebSearchResult(
 	// Get answer text
 	const answerText = typeof response.answer === "string" ? response.answer.trim() : "";
 	const contentText = answerText || rawText;
-	const totalAnswerLines = contentText ? contentText.split("\n").filter(l => l.trim()).length : 0;
+	const answerLines = contentText
+		? contentText
+				.split("\n")
+				.filter(l => l.trim())
+				.map(l => l.trim())
+		: [];
+	const totalAnswerLines = answerLines.length;
 	const answerLimit = expanded ? MAX_EXPANDED_ANSWER_LINES : MAX_COLLAPSED_ANSWER_LINES;
-	const answerPreview = contentText ? getPreviewLines(contentText, answerLimit, MAX_ANSWER_LINE_LEN) : [];
+	const answerPreview = contentText
+		? args?.allowLongAnswer
+			? answerLines.slice(0, args.maxAnswerLines ?? answerLines.length)
+			: getPreviewLines(contentText, answerLimit, MAX_ANSWER_LINE_LEN)
+		: [];
 
-	const providerLabel =
-		provider === "anthropic"
-			? "Anthropic"
-			: provider === "perplexity"
-				? "Perplexity"
-				: provider === "exa"
-					? "Exa"
-					: provider === "jina"
-						? "Jina"
-						: "Unknown";
+	const providerLabel = provider !== "none" ? getSearchProvider(provider).label : "None";
 	const queryPreview = args?.query
 		? truncateToWidth(args.query, 80)
 		: searchQueries[0]
@@ -132,20 +136,6 @@ export function renderWebSearchResult(
 	);
 
 	const remainingAnswer = totalAnswerLines - answerPreview.length;
-	const answerLines = answerPreview.length > 0 ? answerPreview : ["No answer text returned"];
-	const answerTree = renderTreeList(
-		{
-			items: answerLines,
-			expanded: true,
-			maxCollapsed: answerLines.length,
-			itemType: "line",
-			renderItem: line => (line === "No answer text returned" ? theme.fg("muted", line) : theme.fg("dim", line)),
-		},
-		theme,
-	);
-	if (remainingAnswer > 0) {
-		answerTree.push(theme.fg("muted", formatMoreItems(remainingAnswer, "line")));
-	}
 
 	const sourceTree = renderTreeList(
 		{
@@ -185,28 +175,12 @@ export function renderWebSearchResult(
 		theme,
 	);
 
-	const relatedLines = related.length > 0 ? related : ["No related questions"];
-	const relatedTree = renderTreeList(
-		{
-			items: relatedLines,
-			expanded,
-			maxCollapsed: MAX_COLLAPSED_ITEMS,
-			itemType: "question",
-			renderItem: line => theme.fg("muted", line === "No related questions" ? line : `${theme.format.dash} ${line}`),
-		},
-		theme,
-	);
-	if (!expanded && relatedCount > MAX_COLLAPSED_ITEMS) {
-		relatedTree.push(theme.fg("muted", formatMoreItems(relatedCount - MAX_COLLAPSED_ITEMS, "question")));
-	}
-
 	const metaLines: string[] = [];
 	metaLines.push(`${theme.fg("muted", "Provider:")} ${theme.fg("text", providerLabel)}`);
 	if (response.model) metaLines.push(`${theme.fg("muted", "Model:")} ${theme.fg("text", response.model)}`);
 	metaLines.push(`${theme.fg("muted", "Sources:")} ${theme.fg("text", String(sourceCount))}`);
 	if (citationCount > 0)
 		metaLines.push(`${theme.fg("muted", "Citations:")} ${theme.fg("text", String(citationCount))}`);
-	if (relatedCount > 0) metaLines.push(`${theme.fg("muted", "Related:")} ${theme.fg("text", String(relatedCount))}`);
 	if (response.usage) {
 		const usageParts: string[] = [];
 		if (response.usage.inputTokens !== undefined) usageParts.push(`in ${response.usage.inputTokens}`);
@@ -228,30 +202,66 @@ export function renderWebSearchResult(
 		metaLines.push(`${theme.fg("muted", "Queries:")} ${theme.fg("text", queryList.join("; "))}${suffix}`);
 	}
 
-	const sections = [
-		...(queryPreview
-			? [
-					{
-						lines: [`${theme.fg("muted", "Query:")} ${theme.fg("text", queryPreview)}`],
-					},
-				]
-			: []),
-		{ label: theme.fg("toolTitle", "Answer"), lines: answerTree },
-		{
-			label: theme.fg("toolTitle", "Sources"),
-			lines: sourceTree.length > 0 ? sourceTree : [theme.fg("muted", "No sources returned")],
-		},
-		{ label: theme.fg("toolTitle", "Related"), lines: relatedTree },
-		{ label: theme.fg("toolTitle", "Metadata"), lines: metaLines },
-	];
-
 	return {
 		render: (width: number) =>
 			renderOutputBlock(
 				{
 					header,
 					state: sourceCount > 0 ? "success" : "warning",
-					sections,
+					sections: [
+						...(queryPreview
+							? [
+									{
+										lines: [`${theme.fg("muted", "Query:")} ${theme.fg("text", queryPreview)}`],
+									},
+								]
+							: []),
+						{
+							label: theme.fg("toolTitle", "Answer"),
+							lines: (() => {
+								const state = sourceCount > 0 ? "success" : "warning";
+								const borderColor: "warning" | "dim" = state === "warning" ? "warning" : "dim";
+								const border = (text: string) => theme.fg(borderColor, text);
+								const contentPrefix = border(`${theme.boxSharp.vertical} `);
+								const contentSuffix = border(theme.boxSharp.vertical);
+								const contentWidth = Math.max(
+									0,
+									width - visibleWidth(contentPrefix) - visibleWidth(contentSuffix),
+								);
+								const answerTreeLines = answerPreview.length > 0 ? answerPreview : ["No answer text returned"];
+								const answerTree = renderTreeList(
+									{
+										items: answerTreeLines,
+										expanded: true,
+										maxCollapsed: answerTreeLines.length,
+										itemType: "line",
+										renderItem: (line, context) => {
+											const coloredLine =
+												line === "No answer text returned"
+													? theme.fg("muted", line)
+													: theme.fg("dim", line);
+											if (!args?.allowLongAnswer) {
+												return coloredLine;
+											}
+											const prefixWidth = visibleWidth(context.continuePrefix);
+											const wrapWidth = Math.max(10, contentWidth - prefixWidth);
+											return wrapTextWithAnsi(coloredLine, wrapWidth);
+										},
+									},
+									theme,
+								);
+								if (remainingAnswer > 0) {
+									answerTree.push(theme.fg("muted", formatMoreItems(remainingAnswer, "line")));
+								}
+								return answerTree;
+							})(),
+						},
+						{
+							label: theme.fg("toolTitle", "Sources"),
+							lines: sourceTree.length > 0 ? sourceTree : [theme.fg("muted", "No sources returned")],
+						},
+						{ label: theme.fg("toolTitle", "Metadata"), lines: metaLines },
+					],
 					width,
 				},
 				theme,
@@ -261,7 +271,7 @@ export function renderWebSearchResult(
 }
 
 /** Render web search call (query preview) */
-export function renderWebSearchCall(
+export function renderSearchCall(
 	args: { query: string; provider?: string; [key: string]: unknown },
 	theme: Theme,
 ): Component {
@@ -272,7 +282,7 @@ export function renderWebSearchCall(
 }
 
 export const webSearchToolRenderer = {
-	renderCall: renderWebSearchCall,
-	renderResult: renderWebSearchResult,
+	renderCall: renderSearchCall,
+	renderResult: renderSearchResult,
 	mergeCallAndResult: true,
 };

package/src/web/search/types.ts

@@ -5,10 +5,10 @@
  */
 
 /** Supported web search providers */
-export type WebSearchProvider = "exa" | "jina" | "anthropic" | "perplexity" | "gemini" | "codex";
+export type SearchProviderId = "exa" | "jina" | "anthropic" | "perplexity" | "gemini" | "codex";
 
 /** Source returned by search (all providers) */
-export interface WebSearchSource {
+export interface SearchSource {
 	title: string;
 	url: string;
 	snippet?: string;
@@ -20,14 +20,14 @@ export interface WebSearchSource {
 }
 
 /** Citation with text reference (anthropic, perplexity) */
-export interface WebSearchCitation {
+export interface SearchCitation {
 	url: string;
 	title: string;
 	citedText?: string;
 }
 
 /** Usage metrics */
-export interface WebSearchUsage {
+export interface SearchUsage {
 	inputTokens?: number;
 	outputTokens?: number;
 	/** Anthropic: number of web search requests made */
@@ -37,20 +37,20 @@ export interface WebSearchUsage {
 }
 
 /** Unified response across providers */
-export interface WebSearchResponse {
-	provider: WebSearchProvider;
+export interface SearchResponse {
+	provider: SearchProviderId | "none";
 	/** Synthesized answer text (anthropic, perplexity) */
 	answer?: string;
 	/** Search result sources */
-	sources: WebSearchSource[];
+	sources: SearchSource[];
 	/** Text citations with context */
-	citations?: WebSearchCitation[];
-	/** Follow-up questions (perplexity) */
-	relatedQuestions?: string[];
+	citations?: SearchCitation[];
 	/** Intermediate search queries (anthropic) */
 	searchQueries?: string[];
+	/** Follow-up question suggestions (provider-dependent) */
+	relatedQuestions?: string[];
 	/** Token usage metrics */
-	usage?: WebSearchUsage;
+	usage?: SearchUsage;
 	/** Model used */
 	model?: string;
 	/** Request ID for debugging */
@@ -58,15 +58,14 @@ export interface WebSearchResponse {
 }
 
 /** Provider-specific error with optional HTTP status */
-export class WebSearchProviderError extends Error {
-	provider: WebSearchProvider;
-	status?: number;
-
-	constructor(provider: WebSearchProvider, message: string, status?: number) {
+export class SearchProviderError extends Error {
+	constructor(
+		public readonly provider: SearchProviderId,
+		message: string,
+		public readonly status?: number,
+	) {
 		super(message);
-		this.name = "WebSearchProviderError";
-		this.provider = provider;
-		this.status = status;
+		this.name = "SearchProviderError";
 	}
 }
 
@@ -89,7 +88,7 @@ export interface ModelsJson {
 	>;
 }
 
-/** auth.json structure for OAuth credentials */
+/** OAuth credential for Anthropic API access */
 export interface AnthropicOAuthCredential {
 	type: "oauth";
 	access: string;
@@ -98,14 +97,8 @@ export interface AnthropicOAuthCredential {
 	expires: number;
 }
 
-export type AnthropicAuthJsonEntry = AnthropicOAuthCredential | AnthropicOAuthCredential[];
-
-export interface AuthJson {
-	anthropic?: AnthropicAuthJsonEntry;
-}
-
 /** Anthropic API response types */
-export interface AnthropicWebSearchResult {
+export interface AnthropicSearchResult {
 	type: "web_search_result";
 	title: string;
 	url: string;
@@ -132,7 +125,7 @@ export interface AnthropicContentBlock {
 	/** Tool input (for type="server_tool_use") */
 	input?: { query: string };
 	/** Search results (for type="web_search_tool_result") */
-	content?: AnthropicWebSearchResult[];
+	content?: AnthropicSearchResult[];
 }
 
 export interface AnthropicApiResponse {
@@ -149,51 +142,284 @@ export interface AnthropicApiResponse {
 }
 
 /** Perplexity API types */
-export interface PerplexityMessage {
-	role: "system" | "user" | "assistant";
-	content: string;
+export type PerplexityChatMessageRole = "system" | "user" | "assistant" | "tool";
+
+export interface PerplexityUrl {
+	url: string;
+}
+
+export interface PerplexityVideoUrl {
+	url: string;
+	frame_interval?: string | number;
+}
+
+export interface PerplexityContentTextChunk {
+	type: "text";
+	text: string;
+}
+
+export interface PerplexityContentImageChunk {
+	type: "image_url";
+	image_url: PerplexityUrl | string;
+}
+
+export interface PerplexityContentFileChunk {
+	type: "file_url";
+	file_url: PerplexityUrl | string;
+	file_name?: string | null;
+}
+
+export interface PerplexityContentPdfChunk {
+	type: "pdf_url";
+	pdf_url: PerplexityUrl | string;
+}
+
+export interface PerplexityContentVideoChunk {
+	type: "video_url";
+	video_url: PerplexityVideoUrl | string;
+}
+
+export type PerplexityContentChunk =
+	| PerplexityContentTextChunk
+	| PerplexityContentImageChunk
+	| PerplexityContentFileChunk
+	| PerplexityContentPdfChunk
+	| PerplexityContentVideoChunk;
+
+export interface PerplexitySearchStepDetails {
+	search_results: PerplexitySearchResult[];
+	search_keywords: string[];
+}
+
+export interface PerplexityFetchUrlContentStepDetails {
+	contents: PerplexitySearchResult[];
+}
+
+export interface PerplexityExecutePythonStepDetails {
+	code: string;
+	result: string;
+}
+
+export interface PerplexityReasoningStepInput {
+	thought: string;
+	type?: string | null;
+	web_search?: PerplexitySearchStepDetails | null;
+	fetch_url_content?: PerplexityFetchUrlContentStepDetails | null;
+	execute_python?: PerplexityExecutePythonStepDetails | null;
+}
+
+export interface PerplexityReasoningStepOutput {
+	thought: string;
+	type?: string | null;
+	web_search?: PerplexitySearchStepDetails | null;
+	fetch_url_content?: PerplexityFetchUrlContentStepDetails | null;
+	execute_python?: PerplexityExecutePythonStepDetails | null;
+}
+
+export interface PerplexityToolCallFunction {
+	name?: string | null;
+	arguments?: string | null;
+}
+
+export interface PerplexityToolCall {
+	id?: string | null;
+	type?: "function" | null;
+	function?: PerplexityToolCallFunction | null;
+}
+
+export interface PerplexityMessageInput {
+	role: PerplexityChatMessageRole;
+	content: string | PerplexityContentChunk[] | null;
+	reasoning_steps?: PerplexityReasoningStepInput[] | null;
+	tool_calls?: PerplexityToolCall[] | null;
+	tool_call_id?: string | null;
+}
+
+export interface PerplexityMessageOutput {
+	role: PerplexityChatMessageRole;
+	content: string | PerplexityContentChunk[] | null;
+	reasoning_steps?: PerplexityReasoningStepOutput[] | null;
+	tool_calls?: PerplexityToolCall[] | null;
+	tool_call_id?: string | null;
+}
+
+export type PerplexityMessage = PerplexityMessageInput;
+
+export interface PerplexityResponseFormatText {
+	type: "text";
+}
+
+export interface PerplexityJSONSchema {
+	schema: Record<string, unknown>;
+	name?: string | null;
+	description?: string | null;
+	strict?: boolean | null;
+}
+
+export interface PerplexityResponseFormatJSONSchema {
+	type: "json_schema";
+	json_schema: PerplexityJSONSchema;
+}
+
+export interface PerplexityRegexSchema {
+	regex: string;
+	name?: string | null;
+	description?: string | null;
+	strict?: boolean | null;
+}
+
+export interface PerplexityResponseFormatRegex {
+	type: "regex";
+	regex: PerplexityRegexSchema;
+}
+
+export type PerplexityResponseFormat =
+	| PerplexityResponseFormatText
+	| PerplexityResponseFormatJSONSchema
+	| PerplexityResponseFormatRegex;
+
+export interface PerplexityParameterSpec {
+	type: string;
+	properties: Record<string, unknown>;
+	required?: string[] | null;
+	additional_properties?: boolean | null;
+}
+
+export interface PerplexityFunctionSpec {
+	name: string;
+	description: string;
+	parameters: PerplexityParameterSpec;
+	strict?: boolean | null;
+}
+
+export interface PerplexityToolSpec {
+	type: "function";
+	function: PerplexityFunctionSpec;
+}
+
+export interface PerplexityUserLocation {
+	latitude?: number | null;
+	longitude?: number | null;
+	country?: string | null;
+	city?: string | null;
+	region?: string | null;
+}
+
+export interface PerplexitySearchOptions {
+	search_context_size?: "low" | "medium" | "high";
+	search_type?: "fast" | "pro" | "auto" | null;
+	user_location?: PerplexityUserLocation | null;
+	image_results_enhanced_relevance?: boolean;
 }
 
 export interface PerplexityRequest {
+	max_tokens?: number | null;
+	temperature?: number | null;
+	n?: number | null;
 	model: string;
-	messages: PerplexityMessage[];
-	temperature?: number;
-	max_tokens?: number;
-	search_domain_filter?: string[];
-	search_recency_filter?: "day" | "week" | "month" | "year";
-	return_images?: boolean;
-	return_related_questions?: boolean;
-	web_search_options?: {
-		search_context_size?: "low" | "medium" | "high";
-	};
+	stream?: boolean | null;
+	stop?: string | string[] | null;
+	cum_logprobs?: boolean | null;
+	logprobs?: boolean | null;
+	top_logprobs?: number | null;
+	best_of?: number | null;
+	response_metadata?: Record<string, unknown> | null;
+	response_format?: PerplexityResponseFormat | null;
+	diverse_first_token?: boolean | null;
+	_inputs?: number[] | null;
+	_prompt_token_length?: number | null;
+	messages: PerplexityMessageInput[];
+	tools?: PerplexityToolSpec[] | null;
+	tool_choice?: "none" | "auto" | "required" | null;
+	parallel_tool_calls?: boolean | null;
+	web_search_options?: PerplexitySearchOptions;
+	search_mode?: "web" | "academic" | "sec" | null;
+	return_images?: boolean | null;
+	return_related_questions?: boolean | null;
+	num_search_results?: number;
+	num_images?: number;
+	enable_search_classifier?: boolean | null;
+	disable_search?: boolean | null;
+	search_domain_filter?: string[] | null;
+	search_language_filter?: string[] | null;
+	search_tenant?: string | null;
+	ranking_model?: string | null;
+	latitude?: number | null;
+	longitude?: number | null;
+	country?: string | null;
+	search_recency_filter?: "hour" | "day" | "week" | "month" | "year" | null;
+	search_after_date_filter?: string | null;
+	search_before_date_filter?: string | null;
+	last_updated_before_filter?: string | null;
+	last_updated_after_filter?: string | null;
+	image_format_filter?: string[] | null;
+	image_domain_filter?: string[] | null;
+	safe_search?: boolean | null;
+	file_workspace_id?: string | null;
+	updated_before_timestamp?: number | null;
+	updated_after_timestamp?: number | null;
+	search_internal_properties?: Record<string, unknown> | null;
+	use_threads?: boolean | null;
+	thread_id?: string | null;
+	stream_mode?: "full" | "concise";
+	_debug_pro_search?: boolean;
+	has_image_url?: boolean;
+	reasoning_effort?: "minimal" | "low" | "medium" | "high" | null;
+	language_preference?: string | null;
+	user_original_query?: string | null;
+	_force_new_agent?: boolean | null;
 }
 
 export interface PerplexitySearchResult {
 	title: string;
 	url: string;
-	date?: string;
+	date?: string | null;
+	last_updated?: string | null;
 	snippet?: string;
+	source?: "web" | "attachment";
+}
+
+export interface PerplexityCost {
+	input_tokens_cost: number;
+	output_tokens_cost: number;
+	reasoning_tokens_cost?: number | null;
+	request_cost?: number | null;
+	citation_tokens_cost?: number | null;
+	search_queries_cost?: number | null;
+	total_cost: number;
+}
+
+export interface PerplexityUsageInfo {
+	prompt_tokens: number;
+	completion_tokens: number;
+	total_tokens: number;
+	search_context_size?: string | null;
+	citation_tokens?: number | null;
+	num_search_queries?: number | null;
+	reasoning_tokens?: number | null;
+	cost: PerplexityCost;
+}
+
+export type PerplexityCompletionResponseType = "message" | "info" | "end_of_stream";
+
+export type PerplexityCompletionResponseStatus = "PENDING" | "COMPLETED";
+
+export interface PerplexityChoice {
+	index: number;
+	finish_reason?: "stop" | "length" | null;
+	message: PerplexityMessageOutput;
+	delta: PerplexityMessageOutput;
 }
 
 export interface PerplexityResponse {
 	id: string;
 	model: string;
 	created: number;
-	usage: {
-		prompt_tokens: number;
-		completion_tokens: number;
-		total_tokens: number;
-		search_context_size?: string;
-	};
-	citations?: string[];
-	search_results?: PerplexitySearchResult[];
-	related_questions?: string[];
-	choices: Array<{
-		index: number;
-		finish_reason: string;
-		message: {
-			role: string;
-			content: string;
-		};
-	}>;
+	usage?: PerplexityUsageInfo | null;
+	object?: string;
+	choices: PerplexityChoice[];
+	citations?: string[] | null;
+	search_results?: PerplexitySearchResult[] | null;
+	type?: PerplexityCompletionResponseType | null;
+	status?: PerplexityCompletionResponseStatus | null;
 }