@oh-my-pi/pi-coding-agent 15.9.3 → 15.9.5

package/src/tools/read.ts

@@ -2316,6 +2316,49 @@ interface ReadRenderArgs {
 	raw?: boolean;
 }
 
+const INTERNAL_URL_LIKE_RE = /^[a-z][a-z0-9+.-]*:\/\//i;
+
+function splitReadRenderPath(rawPath: string): { path: string; sel?: string } {
+	if (INTERNAL_URL_LIKE_RE.test(rawPath)) {
+		const internal = splitInternalUrlSel(rawPath);
+		if (internal.sel) return internal;
+	}
+	return splitPathAndSel(rawPath);
+}
+
+function firstReadSelectorLine(sel: string | undefined): number | undefined {
+	if (!sel) return undefined;
+	try {
+		const parsed = parseSel(sel);
+		if (parsed.kind !== "lines") return undefined;
+		return parsed.ranges[0].startLine;
+	} catch {
+		return undefined;
+	}
+}
+
+function formatReadPathLink(
+	rawPath: string,
+	options: {
+		resolvedPath?: string;
+		suffixResolution?: { from: string; to: string };
+		offset?: number;
+		fallbackLabel?: string;
+	},
+): string {
+	const split = splitReadRenderPath(rawPath);
+	const basePath = split.path || rawPath;
+	const selectorSuffix = split.sel ? `:${split.sel}` : "";
+	const plainDisplayPath = options.suffixResolution
+		? shortenPath(options.suffixResolution.to)
+		: shortenPath(basePath || options.resolvedPath || options.fallbackLabel || rawPath);
+	const target = options.resolvedPath ?? tryResolveInternalUrlSync(basePath);
+	const line = firstReadSelectorLine(split.sel) ?? options.offset;
+	const linkOptions = line !== undefined ? { line } : undefined;
+	const displayPath = target ? fileHyperlink(target, plainDisplayPath, linkOptions) : plainDisplayPath;
+	return `${displayPath}${selectorSuffix}`;
+}
+
 export const readToolRenderer = {
 	renderCall(args: ReadRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		if (isReadableUrlPath(args.file_path || args.path || "")) {
@@ -2323,13 +2366,10 @@ export const readToolRenderer = {
 		}
 
 		const rawPath = args.file_path || args.path || "";
-		const shortPath = shortenPath(rawPath);
-		const linkTarget = tryResolveInternalUrlSync(rawPath);
-		const filePath = linkTarget ? fileHyperlink(linkTarget, shortPath) : shortPath;
 		const offset = args.offset;
 		const limit = args.limit;
 
-		let pathDisplay = filePath || "…";
+		let pathDisplay = formatReadPathLink(rawPath, { offset, fallbackLabel: "…" }) || "…";
 		if (offset !== undefined || limit !== undefined) {
 			const startLine = offset ?? 1;
 			const endLine = limit !== undefined ? startLine + limit - 1 : "";
@@ -2363,7 +2403,7 @@ export const readToolRenderer = {
 			const rawErrorText = result.content?.find(c => c.type === "text")?.text ?? "";
 			const errorText = (rawErrorText || "Unknown error").replace(/^Error:\s*/, "");
 			const rawPath = args?.file_path || args?.path || "";
-			const filePath = shortenPath(rawPath);
+			const filePath = formatReadPathLink(rawPath, { offset: args?.offset }) || shortenPath(rawPath);
 			let title = filePath ? `Read ${filePath}` : "Read";
 			if (args?.offset !== undefined || args?.limit !== undefined) {
 				const startLine = args.offset ?? 1;
@@ -2388,8 +2428,8 @@ export const readToolRenderer = {
 		const contentText = details?.displayContent?.text ?? stripOutputNotice(rawText, details?.meta);
 		const imageContent = result.content?.find(c => c.type === "image");
 		const rawPath = args?.file_path || args?.path || "";
-		const filePath = shortenPath(rawPath);
-		const lang = getLanguageFromPath(splitPathAndSel(rawPath).path);
+		const renderPath = splitReadRenderPath(rawPath);
+		const lang = getLanguageFromPath(renderPath.path);
 
 		const warningLines: string[] = [];
 		const truncation = details?.meta?.truncation;
@@ -2412,7 +2452,11 @@ export const readToolRenderer = {
 
 		if (imageContent) {
 			const suffix = details?.suffixResolution;
-			const displayPath = suffix ? shortenPath(suffix.to) : filePath || rawPath || "image";
+			const displayPath = formatReadPathLink(rawPath, {
+				resolvedPath: details?.resolvedPath,
+				suffixResolution: suffix,
+				fallbackLabel: "image",
+			});
 			const correction = suffix ? ` ${uiTheme.fg("dim", `(corrected from ${shortenPath(suffix.from)})`)}` : "";
 			const header = renderStatusLine(
 				{ icon: suffix ? "warning" : "success", title: "Read", description: `${displayPath}${correction}` },
@@ -2442,13 +2486,15 @@ export const readToolRenderer = {
 		}
 
 		const suffix = details?.suffixResolution;
-		const plainDisplayPath = suffix ? shortenPath(suffix.to) : filePath;
 		// resolvedPath is the absolute fs path for fs-backed reads (regular files plus
 		// local:// / memory:// / skill:// / artifact:// resources). Fall back to a sync
 		// resolver for fs-backed internal URLs so the title is clickable even before the
 		// result lands or if the handler didn't populate resolvedPath.
-		const absForLink = details?.resolvedPath ?? tryResolveInternalUrlSync(rawPath);
-		const displayPath = absForLink ? fileHyperlink(absForLink, plainDisplayPath) : plainDisplayPath;
+		const displayPath = formatReadPathLink(rawPath, {
+			resolvedPath: details?.resolvedPath,
+			suffixResolution: suffix,
+			offset: args?.offset,
+		});
 		const correction = suffix ? ` ${uiTheme.fg("dim", `(corrected from ${shortenPath(suffix.from)})`)}` : "";
 		let title = displayPath ? `Read ${displayPath}${correction}` : "Read";
 		if (args?.offset !== undefined || args?.limit !== undefined) {
@@ -2463,7 +2509,7 @@ export const readToolRenderer = {
 			const n = details.conflictCount;
 			title += ` ${uiTheme.fg("warning", `(⚠ ${n} conflict${n === 1 ? "" : "s"})`)}`;
 		}
-		const rawRequested = args?.raw === true || isRawSelector(parseSel(splitPathAndSel(rawPath).sel));
+		const rawRequested = args?.raw === true || isRawSelector(parseSel(renderPath.sel));
 		const isMarkdown = details?.contentType === "text/markdown" && !rawRequested;
 		let cachedWidth: number | undefined;
 		let cachedExpanded: boolean | undefined;

package/src/tools/search-tool-bm25.ts

@@ -6,6 +6,7 @@ import * as z from "zod/v4";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
 import searchToolBm25Description from "../prompts/tools/search-tool-bm25.md" with { type: "text" };
+import { resolveEffectiveToolDiscoveryMode } from "../tool-discovery/mode";
 import {
 	buildDiscoverableToolSearchIndex,
 	type DiscoverableTool,
@@ -198,12 +199,9 @@ export class SearchToolBm25Tool implements AgentTool<typeof searchToolBm25Schema
 	constructor(private readonly session: ToolSession) {}
 
 	static createIf(session: ToolSession): SearchToolBm25Tool | null {
-		// Active when new tools.discoveryMode is non-"off" or legacy mcp.discoveryMode is true
-		const toolsDiscoveryMode = session.settings.get("tools.discoveryMode");
-		const active =
-			(toolsDiscoveryMode !== undefined && toolsDiscoveryMode !== "off") ||
-			session.settings.get("mcp.discoveryMode") === true;
-		if (!active) return null;
+		// Direct createTools() calls do not know the final MCP/extension catalog yet, so
+		// auto mode is activated later by createAgentSession after the full registry exists.
+		if (resolveEffectiveToolDiscoveryMode(session.settings, 0) === "off") return null;
 		return supportsToolDiscoveryExecution(session) ? new SearchToolBm25Tool(session) : null;
 	}
 

package/src/tools/search.ts

@@ -16,7 +16,15 @@ import type { InternalResource, ResolveContext } from "../internal-urls/types";
 import type { Theme } from "../modes/theme/theme";
 import searchDescription from "../prompts/tools/search.md" with { type: "text" };
 import { DEFAULT_MAX_COLUMN, type TruncationResult, truncateHead, truncateLine } from "../session/streaming-output";
-import { Ellipsis, fileHyperlink, renderStatusLine, renderTreeList, truncateToWidth } from "../tui";
+import {
+	Ellipsis,
+	fileHyperlink,
+	renderStatusLine,
+	renderTreeList,
+	truncateToWidth,
+	tryResolveInternalUrlSync,
+	uriHyperlink,
+} from "../tui";
 import { resolveFileDisplayMode } from "../utils/file-display-mode";
 import type { ToolSession } from ".";
 import {
@@ -1162,6 +1170,26 @@ interface SearchRenderArgs {
 
 const COLLAPSED_TEXT_LIMIT = PREVIEW_LIMITS.COLLAPSED_LINES * 2;
 
+const SEARCH_CODE_FRAME_LINE_RE = /^\s*\*?(\d+)│/;
+
+function searchScopeMeta(details: SearchToolDetails | undefined): string | undefined {
+	if (!details?.scopePath) return undefined;
+	const label = details.searchPath ? fileHyperlink(details.searchPath, details.scopePath) : details.scopePath;
+	return `in ${label}`;
+}
+
+function linkUrlLikeSearchHeader(raw: string, styled: string): { line: string; absPath?: string } {
+	const resolvedPath = tryResolveInternalUrlSync(raw);
+	if (resolvedPath) return { line: fileHyperlink(resolvedPath, styled), absPath: resolvedPath };
+	return { line: uriHyperlink(raw, styled) };
+}
+
+function parseSearchDisplayLineNumber(line: string): number | undefined {
+	const match = SEARCH_CODE_FRAME_LINE_RE.exec(line);
+	if (!match) return undefined;
+	return Number.parseInt(match[1]!, 10);
+}
+
 export const searchToolRenderer = {
 	inline: true,
 	renderCall(args: SearchRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
@@ -1237,8 +1265,11 @@ export const searchToolRenderer = {
 				: undefined;
 
 		if (matchCount === 0) {
+			const meta = ["0 matches"];
+			const scopeMeta = searchScopeMeta(details);
+			if (scopeMeta) meta.push(scopeMeta);
 			const header = renderStatusLine(
-				{ icon: "warning", title: "Search", description: args?.pattern, meta: ["0 matches"] },
+				{ icon: "warning", title: "Search", description: args?.pattern, meta },
 				uiTheme,
 			);
 			const lines = [header, formatEmptyMessage("No matches found", uiTheme)];
@@ -1248,7 +1279,8 @@ export const searchToolRenderer = {
 
 		const summaryParts = [formatCount("match", matchCount), formatCount("file", fileCount)];
 		const meta = [...summaryParts];
-		if (details?.scopePath) meta.push(`in ${details.scopePath}`);
+		const scopeMeta = searchScopeMeta(details);
+		if (scopeMeta) meta.push(scopeMeta);
 		if (truncated) meta.push(uiTheme.fg("warning", "truncated"));
 		const description = args?.pattern ?? undefined;
 		const header = renderStatusLine(
@@ -1287,10 +1319,11 @@ export const searchToolRenderer = {
 						maxCollapsedLines: collapsedMatchLineBudget,
 						itemType: "match",
 						renderItem: group => {
-							// Track directory context within a group for ## file headers.
-							// `# foo/` is a directory header; `# foo.ts` is a root-level file
-							// from formatGroupedFiles (single-# when directory is `.`).
+							// Track directory/file context within a group so headers and code-frame
+							// lines link to the backing file, with line-specific links for matches.
 							let contextDir = searchBase ?? "";
+							const hasFileHeader = group.some(line => line.startsWith("# "));
+							let currentFilePath: string | undefined = hasFileHeader ? undefined : searchBase;
 							return group.map(line => {
 								if (line.startsWith("## ")) {
 									// Strip optional ` (suffix)` and `#hash` before resolving.
@@ -1300,6 +1333,7 @@ export const searchToolRenderer = {
 										.replace(/\s+\([^)]*\)\s*$/, "")
 										.replace(/#[0-9a-f]+$/, "");
 									const absPath = contextDir && fileName ? path.join(contextDir, fileName) : undefined;
+									currentFilePath = absPath;
 									const styled = uiTheme.fg("dim", line);
 									return absPath ? fileHyperlink(absPath, styled) : styled;
 								}
@@ -1310,22 +1344,37 @@ export const searchToolRenderer = {
 										.replace(/\s+\([^)]*\)\s*$/, "");
 									if (INTERNAL_URL_DISPLAY_RE.test(raw)) {
 										contextDir = "";
-										return uiTheme.fg("accent", line);
+										const styled = uiTheme.fg("accent", line);
+										const linked = linkUrlLikeSearchHeader(raw, styled);
+										currentFilePath = linked.absPath;
+										return linked.line;
 									}
 									const isDirectory = raw.endsWith("/");
 									const name = isDirectory ? raw.replace(/\/$/, "") : raw.replace(/#[0-9a-f]+$/, "");
 									if (isDirectory) {
-										if (searchBase) {
-											contextDir = name === "." ? searchBase : path.join(searchBase, name);
+										const absPath = searchBase
+											? name === "."
+												? searchBase
+												: path.join(searchBase, name)
+											: undefined;
+										if (absPath) {
+											contextDir = absPath;
 										}
-										return uiTheme.fg("accent", line);
+										currentFilePath = undefined;
+										const styled = uiTheme.fg("accent", line);
+										return absPath ? fileHyperlink(absPath, styled) : styled;
 									}
 									// Root-level file emitted by formatGroupedFiles when the directory is `.`.
 									const absPath = searchBase && name ? path.join(searchBase, name) : undefined;
+									currentFilePath = absPath;
 									const styled = uiTheme.fg("accent", line);
 									return absPath ? fileHyperlink(absPath, styled) : styled;
 								}
-								return uiTheme.fg("toolOutput", line);
+								const styled = uiTheme.fg("toolOutput", line);
+								const lineNumber = parseSearchDisplayLineNumber(line);
+								return currentFilePath && lineNumber !== undefined
+									? fileHyperlink(currentFilePath, styled, { line: lineNumber })
+									: styled;
 							});
 						},
 					},

package/src/tui/hyperlink.ts

@@ -1,5 +1,5 @@
 /**
- * OSC 8 terminal hyperlink support for file paths.
+ * OSC 8 terminal hyperlink support for paths and URLs.
  *
  * Wraps display text in `ESC ] 8 ; id=HASH ; URI ESC \ TEXT ESC ] 8 ; ; ESC \`
  * sequences when the active terminal supports hyperlinks and the user setting
@@ -63,6 +63,46 @@ export function isHyperlinkEnabled(): boolean {
 	return TERMINAL.hyperlinks;
 }
 
+function safeHyperlinkUri(uri: string): string | undefined {
+	if (!uri || /[\x00-\x1f\x7f]/.test(uri)) return undefined;
+	return uri;
+}
+
+function wrapHyperlink(uri: string, displayText: string): string {
+	if (!isHyperlinkEnabled()) return displayText;
+	// Do not double-wrap if the text already embeds an OSC 8 sequence.
+	if (displayText.includes("\x1b]8;")) return displayText;
+	const safeUri = safeHyperlinkUri(uri);
+	if (!safeUri) return displayText;
+	const id = buildLinkId(safeUri);
+	return `${OSC}8;id=${id};${safeUri}${ST}${displayText}${OSC}8;;${ST}`;
+}
+
+/**
+ * Wrap `displayText` in an OSC 8 hyperlink pointing at `uri`.
+ *
+ * Returns `displayText` unchanged when hyperlinks are disabled, `uri` contains
+ * terminal control bytes, or `displayText` already contains an OSC 8 sequence.
+ */
+export function uriHyperlink(uri: string, displayText: string): string {
+	return wrapHyperlink(uri, displayText);
+}
+
+/**
+ * Wrap `displayText` in an OSC 8 hyperlink pointing at an HTTP(S) URL.
+ * `www.example.com` inputs are linked as `https://www.example.com`.
+ */
+export function urlHyperlink(url: string, displayText: string): string {
+	const normalized = url.match(/^www\./i) ? `https://${url}` : url;
+	try {
+		const parsed = new URL(normalized);
+		if (parsed.protocol !== "http:" && parsed.protocol !== "https:") return displayText;
+		return wrapHyperlink(parsed.href, displayText);
+	} catch {
+		return displayText;
+	}
+}
+
 /**
  * Wrap `displayText` in an OSC 8 hyperlink pointing at the given absolute file path.
  *
@@ -78,12 +118,7 @@ export function isHyperlinkEnabled(): boolean {
  * @param opts - Optional line/col position appended as `?line=N&col=M` query params
  */
 export function fileHyperlink(absPath: string, displayText: string, opts?: { line?: number; col?: number }): string {
-	if (!isHyperlinkEnabled()) return displayText;
-	// Do not double-wrap if the text already embeds an OSC 8 sequence.
-	if (displayText.includes("\x1b]8;")) return displayText;
-	const uri = buildFileUri(absPath, opts);
-	const id = buildLinkId(uri);
-	return `${OSC}8;id=${id};${uri}${ST}${displayText}${OSC}8;;${ST}`;
+	return wrapHyperlink(buildFileUri(absPath, opts), displayText);
 }
 
 /**

package/src/web/search/index.ts

@@ -278,8 +278,8 @@ export const webSearchCustomTool: CustomTool<typeof webSearchSchema, SearchRende
 		return renderSearchCall(args, options, theme);
 	},
 
-	renderResult(result, options: RenderResultOptions, theme: Theme) {
-		return renderSearchResult(result, options, theme);
+	renderResult(result, options: RenderResultOptions, theme: Theme, args) {
+		return renderSearchResult(result, options, theme, args);
 	},
 };
 

package/src/web/search/render.ts

@@ -5,9 +5,9 @@
  */
 
 import type { Component } from "@oh-my-pi/pi-tui";
-import { Text, visibleWidth, wrapTextWithAnsi } from "@oh-my-pi/pi-tui";
+import { Markdown, Text } from "@oh-my-pi/pi-tui";
 import type { RenderResultOptions } from "../../extensibility/custom-tools/types";
-import type { Theme } from "../../modes/theme/theme";
+import { getMarkdownTheme, type Theme } from "../../modes/theme/theme";
 import {
 	formatAge,
 	formatCount,
@@ -26,8 +26,6 @@ import { getSearchProviderLabel } from "./provider";
 import type { SearchResponse } from "./types";
 
 const MAX_COLLAPSED_ANSWER_LINES = PREVIEW_LIMITS.COLLAPSED_LINES;
-const MAX_EXPANDED_ANSWER_LINES = PREVIEW_LIMITS.EXPANDED_LINES;
-const MAX_ANSWER_LINE_LEN = TRUNCATE_LENGTHS.LINE;
 const MAX_SNIPPET_LINES = 2;
 const MAX_SNIPPET_LINE_LEN = TRUNCATE_LENGTHS.LINE;
 const MAX_COLLAPSED_ITEMS = PREVIEW_LIMITS.COLLAPSED_ITEMS;
@@ -75,7 +73,6 @@ export function renderSearchResult(
 	theme: Theme,
 	args?: {
 		query?: string;
-		allowLongAnswer?: boolean;
 		maxAnswerLines?: number;
 	},
 ): Component {
@@ -104,13 +101,6 @@ export function renderSearchResult(
 	// Get answer text
 	const answerText = typeof response.answer === "string" ? response.answer.trim() : "";
 	const contentText = answerText || rawText;
-	const answerLines = contentText
-		? contentText
-				.split("\n")
-				.filter(l => l.trim())
-				.map(l => l.trim())
-		: [];
-	const totalAnswerLines = answerLines.length;
 
 	const providerLabel = provider !== "none" ? getSearchProviderLabel(provider) : "None";
 	const queryPreview = args?.query
@@ -159,6 +149,7 @@ export function renderSearchResult(
 		metaLines.push(`${theme.fg("muted", "Queries:")} ${theme.fg("text", queryList.join("; "))}${suffix}`);
 	}
 
+	const answerMarkdown = contentText ? new Markdown(contentText, 0, 0, getMarkdownTheme()) : undefined;
 	const outputBlock = new CachedOutputBlock();
 
 	return {
@@ -166,14 +157,22 @@ export function renderSearchResult(
 			// Read mutable state at render time
 			const { expanded } = options;
 
-			// Expanded-dependent computations
-			const answerLimit = expanded ? MAX_EXPANDED_ANSWER_LINES : MAX_COLLAPSED_ANSWER_LINES;
-			const answerPreview = contentText
-				? args?.allowLongAnswer
-					? answerLines.slice(0, args.maxAnswerLines ?? answerLines.length)
-					: getPreviewLines(contentText, answerLimit, MAX_ANSWER_LINE_LEN)
-				: [];
-			const remainingAnswer = totalAnswerLines - answerPreview.length;
+			// Answer lines: full markdown when expanded, capped markdown preview when collapsed.
+			const answerWidth = Math.max(20, width - 3);
+			const renderedAnswer = answerMarkdown ? answerMarkdown.render(answerWidth) : [];
+			let answerLines: string[];
+			if (renderedAnswer.length === 0) {
+				answerLines = [theme.fg("muted", "No answer text returned")];
+			} else if (expanded) {
+				answerLines = renderedAnswer;
+			} else {
+				const collapsedCap = args?.maxAnswerLines ?? MAX_COLLAPSED_ANSWER_LINES;
+				answerLines = renderedAnswer.slice(0, collapsedCap);
+				const remaining = renderedAnswer.length - answerLines.length;
+				if (remaining > 0) {
+					answerLines.push(theme.fg("muted", formatMoreItems(remaining, "line")));
+				}
+			}
 
 			const sourceTree = renderTreeList(
 				{
@@ -217,37 +216,6 @@ export function renderSearchResult(
 				theme,
 			);
 
-			// Build answer section
-			const answerState = sourceCount > 0 ? "success" : "warning";
-			const borderColor: "warning" | "dim" = answerState === "warning" ? "warning" : "dim";
-			const border = (t: string) => theme.fg(borderColor, t);
-			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 outputBlock.render(
 				{
 					header,
@@ -262,7 +230,7 @@ export function renderSearchResult(
 							: []),
 						{
 							label: theme.fg("toolTitle", "Answer"),
-							lines: answerTree,
+							lines: answerLines,
 						},
 						{
 							label: theme.fg("toolTitle", "Sources"),