@f5-sales-demo/xcsh 21.43.1 → 21.43.2

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/xcsh",
-	"version": "21.43.1",
+	"version": "21.43.2",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/f5-sales-demo/xcsh",
 	"author": "Can Boluk",
@@ -64,13 +64,13 @@
 	},
 	"dependencies": {
 		"@agentclientprotocol/sdk": "1.4.0",
-		"@f5-sales-demo/pi-agent-core": "21.43.1",
-		"@f5-sales-demo/pi-ai": "21.43.1",
-		"@f5-sales-demo/pi-natives": "21.43.1",
-		"@f5-sales-demo/pi-resource-management": "21.43.1",
-		"@f5-sales-demo/pi-tui": "21.43.1",
-		"@f5-sales-demo/pi-utils": "21.43.1",
-		"@f5-sales-demo/xcsh-stats": "21.43.1",
+		"@f5-sales-demo/pi-agent-core": "21.43.2",
+		"@f5-sales-demo/pi-ai": "21.43.2",
+		"@f5-sales-demo/pi-natives": "21.43.2",
+		"@f5-sales-demo/pi-resource-management": "21.43.2",
+		"@f5-sales-demo/pi-tui": "21.43.2",
+		"@f5-sales-demo/pi-utils": "21.43.2",
+		"@f5-sales-demo/xcsh-stats": "21.43.2",
 		"@mozilla/readability": "^0.6",
 		"@sinclair/typebox": "0.34.52",
 		"@tobilu/qmd": "2.8.3",

package/src/internal-urls/build-info.generated.ts

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "21.43.1",
-	"commit": "52977a8638fa3f0543c64d1ca887c7568e7846d4",
-	"shortCommit": "52977a8",
+	"version": "21.43.2",
+	"commit": "117d89d2d2ba9619e4c652d28b6db7c7d17eafd9",
+	"shortCommit": "117d89d",
 	"branch": "main",
-	"tag": "v21.43.1",
-	"commitDate": "2026-09-24T03:08:49+00:00",
-	"buildDate": "2026-09-24T04:17:08.314Z",
+	"tag": "v21.43.2",
+	"commitDate": "2026-09-24T04:11:20+00:00",
+	"buildDate": "2026-09-24T05:21:13.289Z",
 	"dirty": true,
 	"prNumber": "",
 	"repoUrl": "https://github.com/f5-sales-demo/xcsh",
 	"repoSlug": "f5-sales-demo/xcsh",
-	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/52977a8638fa3f0543c64d1ca887c7568e7846d4",
-	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v21.43.1"
+	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/117d89d2d2ba9619e4c652d28b6db7c7d17eafd9",
+	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v21.43.2"
 };

package/src/modes/components/tool-execution.ts

@@ -33,6 +33,7 @@ import { PYTHON_DEFAULT_PREVIEW_LINES } from "../../tools/python";
 import { formatExpandHint, replaceTabs, resolveImageOptions, truncateToWidth } from "../../tools/render-utils";
 import { toolRenderers } from "../../tools/renderers";
 import { renderStatusLine } from "../../tui";
+import { renderStructuredRow, renderStructuredTreeLine } from "../../tui/tree-list";
 import { convertToPng } from "../../utils/image-convert";
 import { sanitizeWithImagePassthrough } from "../../utils/image-passthrough";
 import { renderDiff } from "./diff";
@@ -699,6 +700,7 @@ export class ToolExecutionComponent extends Container {
 	 */
 	#formatToolExecution(width = 80): string {
 		const lines: string[] = [];
+		const contentWidth = Math.max(1, width - 2); // Text has one cell of padding on each side.
 		const icon = this.#isPartial ? "pending" : undefined;
 		lines.push(renderStatusLine({ icon, title: this.#toolLabel }, theme));
 
@@ -706,7 +708,14 @@ export class ToolExecutionComponent extends Container {
 		if (!this.#expanded && argsObject && Object.keys(argsObject).length > 0) {
 			const preview = formatArgsInline(argsObject, Math.max(20, width - 10));
 			if (preview) {
-				lines.push(` ${theme.fg("dim", theme.tree.last)} ${theme.fg("dim", preview)}`);
+				lines.push(
+					...renderStructuredRow(
+						theme.fg("dim", preview),
+						` ${theme.fg("dim", theme.tree.last)} `,
+						"    ",
+						contentWidth,
+					),
+				);
 			}
 		}
 
@@ -722,7 +731,7 @@ export class ToolExecutionComponent extends Container {
 				JSON_TREE_MAX_LINES_EXPANDED,
 				JSON_TREE_SCALAR_LEN_EXPANDED,
 			);
-			lines.push(...tree.lines);
+			lines.push(...tree.lines.flatMap(line => renderStructuredTreeLine(line, contentWidth)));
 			if (tree.truncated) {
 				lines.push(theme.fg("dim", "…"));
 			}
@@ -748,7 +757,7 @@ export class ToolExecutionComponent extends Container {
 				const tree = renderJsonTreeLines(parsed, theme, maxDepth, maxLines, maxScalarLen);
 
 				if (tree.lines.length > 0) {
-					lines.push(...tree.lines);
+					lines.push(...tree.lines.flatMap(line => renderStructuredTreeLine(line, contentWidth)));
 					if (!this.#expanded) {
 						lines.push(formatExpandHint(theme, this.#expanded, true));
 					} else if (tree.truncated) {

package/src/task/render.ts

@@ -26,7 +26,8 @@ import {
 	type ReportFindingDetails,
 	type SubmitReviewDetails,
 } from "../tools/review";
-import { Ellipsis, Hasher, type RenderCache, renderStatusLine } from "../tui";
+import { Hasher, type RenderCache, renderStatusLine } from "../tui";
+import { renderStructuredRow, renderStructuredTreeLine } from "../tui/tree-list";
 import { subprocessToolRegistry } from "./subprocess-tool-registry";
 import type { AgentProgress, SingleResult, TaskParams, TaskToolDetails } from "./types";
 
@@ -404,7 +405,7 @@ function renderTaskSection(
 	lines.push(`${continuePrefix}${theme.fg("dim", "Task")}`);
 	const taskLines = trimmed.split("\n");
 	for (const line of taskLines.slice(0, maxExpanded)) {
-		lines.push(`${continuePrefix}  ${theme.fg("dim", truncateToWidth(replaceTabs(line), 70))}`);
+		lines.push(`${continuePrefix}  ${theme.fg("dim", replaceTabs(line))}`);
 	}
 	if (taskLines.length > maxExpanded) {
 		lines.push(`${continuePrefix}  ${theme.fg("dim", formatMoreItems(taskLines.length - maxExpanded, "line"))}`);
@@ -476,9 +477,6 @@ function formatOutputInline(data: unknown, theme: Theme, maxWidth = 80): string
  * Render the tool call arguments.
  */
 export function renderCall(args: TaskParams, _options: RenderResultOptions, theme: Theme): Component {
-	const lines: string[] = [];
-	lines.push(renderStatusLine({ icon: "pending", title: "Task", description: args.agent }, theme));
-
 	const contextTemplate = args.context ?? "";
 	const context = contextTemplate.trim();
 	const hasContext = context.length > 0;
@@ -487,26 +485,50 @@ export function renderCall(args: TaskParams, _options: RenderResultOptions, them
 	const vertical = theme.fg("dim", theme.tree.vertical);
 	const showIsolated = "isolated" in args && args.isolated === true;
 
-	if (hasContext) {
-		lines.push(` ${branch} ${theme.fg("dim", "Context")}`);
-		for (const line of context.split("\n")) {
-			const content = line ? theme.fg("muted", replaceTabs(line)) : "";
-			lines.push(` ${vertical}  ${content}`);
-		}
-		const taskPrefix = showIsolated ? branch : last;
-		lines.push(` ${taskPrefix} ${theme.fg("dim", "Tasks")}: ${theme.fg("muted", `${args.tasks.length} agents`)}`);
-		if (showIsolated) {
-			lines.push(` ${last} ${theme.fg("dim", "Isolated")}: ${theme.fg("muted", "true")}`);
-		}
-		return new Text(lines.join("\n"), 0, 0);
-	}
-
-	lines.push(`${theme.fg("dim", "Tasks")}: ${theme.fg("muted", `${args.tasks.length} agents`)}`);
-	if (showIsolated) {
-		lines.push(`${theme.fg("dim", "Isolated")}: ${theme.fg("muted", "true")}`);
-	}
-
-	return new Text(lines.join("\n"), 0, 0);
+	return {
+		render(width) {
+			const lines = [renderStatusLine({ icon: "pending", title: "Task", description: args.agent }, theme)];
+			if (hasContext) {
+				lines.push(...renderStructuredRow(theme.fg("dim", "Context"), ` ${branch} `, ` ${vertical} `, width));
+				for (const line of context.split("\n")) {
+					lines.push(...renderStructuredRow(theme.fg("muted", line), ` ${vertical}  `, ` ${vertical}  `, width));
+				}
+				const taskPrefix = showIsolated ? branch : last;
+				lines.push(
+					...renderStructuredRow(
+						`${theme.fg("dim", "Tasks")}: ${theme.fg("muted", `${args.tasks.length} agents`)}`,
+						` ${taskPrefix} `,
+						` ${showIsolated ? vertical : " "}  `,
+						width,
+					),
+				);
+				if (showIsolated)
+					lines.push(
+						...renderStructuredRow(
+							`${theme.fg("dim", "Isolated")}: ${theme.fg("muted", "true")}`,
+							` ${last} `,
+							"    ",
+							width,
+						),
+					);
+			} else {
+				lines.push(
+					...renderStructuredRow(
+						`${theme.fg("dim", "Tasks")}: ${theme.fg("muted", `${args.tasks.length} agents`)}`,
+						"",
+						"",
+						width,
+					),
+				);
+				if (showIsolated)
+					lines.push(
+						...renderStructuredRow(`${theme.fg("dim", "Isolated")}: ${theme.fg("muted", "true")}`, "", "", width),
+					);
+			}
+			return lines;
+		},
+		invalidate() {},
+	};
 }
 
 /**
@@ -996,8 +1018,8 @@ export function renderResult(
 				}
 			}
 
-			const indented = lines.map(line =>
-				line.length > 0 ? truncateToWidth(`   ${line}`, width, Ellipsis.Omit) : "",
+			const indented = lines.flatMap(line =>
+				line.length > 0 ? renderStructuredTreeLine(line, Math.max(1, width - 3)).map(row => `   ${row}`) : [""],
 			);
 			cached = { key, lines: indented };
 			return indented;

package/src/tools/calculator.ts

@@ -523,6 +523,7 @@ export const calculatorToolRenderer = {
 				const treeLines = renderTreeList(
 					{
 						items: outputs,
+						viewportWidth: width,
 						expanded,
 						maxCollapsed: COLLAPSED_LIST_LIMIT,
 						itemType: "result",
@@ -530,7 +531,7 @@ export const calculatorToolRenderer = {
 					},
 					uiTheme,
 				);
-				const lines = [header, ...treeLines].map(l => truncateToWidth(l, width, Ellipsis.Omit));
+				const lines = [truncateToWidth(header, width, Ellipsis.Omit), ...treeLines];
 				cached = { key, lines };
 				return lines;
 			},

package/src/tools/find.ts

@@ -366,6 +366,7 @@ export const findToolRenderer = {
 					const listLines = renderTreeList(
 						{
 							items: lines,
+							viewportWidth: width,
 							expanded,
 							maxCollapsed: COLLAPSED_LIST_LIMIT,
 							itemType: "file",
@@ -373,7 +374,7 @@ export const findToolRenderer = {
 						},
 						uiTheme,
 					);
-					const result = [header, ...listLines].map(l => truncateToWidth(l, width, Ellipsis.Omit));
+					const result = [truncateToWidth(header, width, Ellipsis.Omit), ...listLines];
 					cached = { key, lines: result };
 					return result;
 				},
@@ -419,12 +420,17 @@ export const findToolRenderer = {
 				const fileLines = renderFileList(
 					{
 						files: files.map(entry => ({ path: entry, isDirectory: entry.endsWith("/") })),
+						viewportWidth: width,
 						expanded,
 						maxCollapsed: COLLAPSED_LIST_LIMIT,
 					},
 					uiTheme,
 				);
-				const result = [header, ...fileLines, ...extraLines].map(l => truncateToWidth(l, width, Ellipsis.Omit));
+				const result = [
+					truncateToWidth(header, width, Ellipsis.Omit),
+					...fileLines,
+					...extraLines.map(l => truncateToWidth(l, width, Ellipsis.Omit)),
+				];
 				cached = { key, lines: result };
 				return result;
 			},

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

@@ -292,19 +292,23 @@ export const searchToolBm25Renderer = {
 			return new Text(`${header}\n${uiTheme.fg("muted", emptyMessage)}`, 0, 0);
 		}
 
-		const lines = [header];
-		const treeLines = renderTreeList(
-			{
-				items: details.tools,
-				expanded: options.expanded,
-				maxCollapsed: COLLAPSED_MATCH_LIMIT,
-				itemType: "tool",
-				renderItem: match => renderMatchLines(match, uiTheme),
+		return {
+			render(width) {
+				const treeLines = renderTreeList(
+					{
+						items: details.tools,
+						viewportWidth: width,
+						expanded: options.expanded,
+						maxCollapsed: COLLAPSED_MATCH_LIMIT,
+						itemType: "tool",
+						renderItem: match => renderMatchLines(match, uiTheme),
+					},
+					uiTheme,
+				);
+				return [header, ...treeLines];
 			},
-			uiTheme,
-		);
-		lines.push(...treeLines);
-		return new Text(lines.join("\n"), 0, 0);
+			invalidate() {},
+		};
 	},
 
 	mergeCallAndResult: true,

package/src/tools/todo-write.ts

@@ -412,29 +412,33 @@ export const todoWriteToolRenderer = {
 		}
 
 		const { expanded } = options;
-		const lines: string[] = [header];
 		const indent = phases.length > 1 ? "  " : "";
-		for (const phase of phases) {
-			if (phases.length > 1) {
-				lines.push(uiTheme.fg("contentAccent", `${indent}${uiTheme.tree.hook} ${phase.name}`));
-			}
-			const treeLines = renderTreeList(
-				{
-					items: phase.tasks,
-					expanded,
-					maxCollapsed: PREVIEW_LIMITS.COLLAPSED_ITEMS,
-					itemType: "todo",
-					renderItem: todo => formatTodoLine(todo, uiTheme, ""),
-				},
-				uiTheme,
-			);
-			for (const line of treeLines) lines.push(`${indent}${line}`);
-		}
-
-		const summary = renderTodoSummary(allTasks, uiTheme);
-		if (summary !== null) lines.push(`${indent}${summary}`);
-
-		return new Text(lines.join("\n"), 0, 0);
+		return {
+			render(width) {
+				const lines: string[] = [header];
+				for (const phase of phases) {
+					if (phases.length > 1) {
+						lines.push(uiTheme.fg("contentAccent", `${indent}${uiTheme.tree.hook} ${phase.name}`));
+					}
+					const treeLines = renderTreeList(
+						{
+							items: phase.tasks,
+							viewportWidth: Math.max(1, width - indent.length),
+							expanded,
+							maxCollapsed: PREVIEW_LIMITS.COLLAPSED_ITEMS,
+							itemType: "todo",
+							renderItem: todo => formatTodoLine(todo, uiTheme, ""),
+						},
+						uiTheme,
+					);
+					for (const line of treeLines) lines.push(`${indent}${line}`);
+				}
+				const summary = renderTodoSummary(allTasks, uiTheme);
+				if (summary !== null) lines.push(`${indent}${summary}`);
+				return lines;
+			},
+			invalidate() {},
+		};
 	},
 	mergeCallAndResult: true,
 };

package/src/tui/file-list.ts

@@ -13,17 +13,19 @@ export interface FileEntry {
 
 export interface FileListOptions {
 	files: FileEntry[];
+	viewportWidth?: number;
 	expanded?: boolean;
 	maxCollapsed?: number;
 	showIcons?: boolean;
 }
 
 export function renderFileList(options: FileListOptions, theme: Theme): string[] {
-	const { files, expanded = false, maxCollapsed = 8, showIcons = true } = options;
+	const { files, expanded = false, maxCollapsed = 8, showIcons = true, viewportWidth } = options;
 
 	return renderTreeList(
 		{
 			items: files,
+			viewportWidth,
 			expanded,
 			maxCollapsed,
 			itemType: "file",

package/src/tui/output-block.ts

@@ -4,6 +4,7 @@
 import { ImageProtocol, padding, TERMINAL, visibleWidth, wrapTextWithAnsi } from "@f5-sales-demo/pi-tui";
 import type { Theme, ThemeColor } from "../modes/theme/theme";
 import { getImageLineMask } from "../utils/image-passthrough";
+import { renderStructuredTreeLine } from "./tree-list";
 import type { State } from "./types";
 import type { RenderCache } from "./utils";
 import { Ellipsis, getStateBgColor, Hasher, padToWidth, truncateToWidth } from "./utils";
@@ -18,7 +19,7 @@ export interface OutputBlockOptions {
 	header?: string;
 	headerMeta?: string;
 	state?: State;
-	sections?: Array<{ label?: string; lines: string[] }>;
+	sections?: Array<{ label?: string; lines: string[]; structured?: boolean }>;
 	width: number;
 	applyBg?: boolean;
 	/** Override the state-derived border color. Always takes precedence, including on error. Use for branded core tools. */
@@ -108,7 +109,9 @@ export function renderOutputBlock(options: OutputBlockOptions, theme: Theme): st
 				continue;
 			}
 			const wrappedLines = wrapContent
-				? wrapTextWithAnsi(line.trimEnd(), contentWidth)
+				? section.structured
+					? renderStructuredTreeLine(line.trimEnd(), contentWidth)
+					: wrapTextWithAnsi(line.trimEnd(), contentWidth)
 				: // Clip cleanly with no trailing ellipsis — a column of "…" down the
 					// right edge of a clipped diagram is clutter, not information.
 					[truncateToWidth(line.trimEnd(), contentWidth, Ellipsis.Omit)];
@@ -165,6 +168,7 @@ export class CachedOutputBlock {
 		if (options.sections) {
 			for (const s of options.sections) {
 				h.optional(s.label);
+				h.bool(s.structured ?? false);
 				for (const line of s.lines) {
 					h.str(line);
 				}

package/src/tui/tree-list.ts

@@ -2,12 +2,38 @@
  * Hierarchical tree list rendering helper.
  */
 
-import { replaceTabs } from "@f5-sales-demo/pi-tui";
+import { sanitizeText } from "@f5-sales-demo/pi-natives";
+import { replaceTabs, sliceWithWidth, visibleWidth, wrapTextWithAnsi } from "@f5-sales-demo/pi-tui";
 import type { Theme } from "../modes/theme/theme";
 import { formatMoreItems } from "../tools/render-utils";
 import type { TreeContext } from "./types";
 import { getTreeBranch, getTreeContinuePrefix } from "./utils";
 
+/** Wrap a structured transcript row while keeping its tree rail on every line. */
+export function renderStructuredRow(
+	content: string,
+	firstPrefix: string,
+	continuationPrefix: string,
+	width: number,
+): string[] {
+	const normalized = replaceTabs(content);
+	const firstWidth = visibleWidth(firstPrefix);
+	const continuationWidth = visibleWidth(continuationPrefix);
+	const available = Math.max(1, width - Math.max(firstWidth, continuationWidth));
+	const wrapped = normalized ? wrapTextWithAnsi(normalized, available) : [""];
+	return wrapped.map((line, index) => `${index === 0 ? firstPrefix : continuationPrefix}${line}`);
+}
+
+/** Wrap an existing tree row without discarding ANSI styling in its prefix. */
+export function renderStructuredTreeLine(line: string, width: number): string[] {
+	const prefix = sanitizeText(line).match(/^[ │├└╰─]*/)?.[0] ?? "";
+	const prefixWidth = prefix.length;
+	const firstPrefix = sliceWithWidth(line, 0, prefixWidth, true).text;
+	const content = sliceWithWidth(line, prefixWidth, Math.max(0, visibleWidth(line) - prefixWidth), true).text;
+	const continuationPrefix = prefix.replaceAll("├", "│").replaceAll(/[└╰─]/g, " ");
+	return renderStructuredRow(content, firstPrefix, continuationPrefix, width);
+}
+
 export interface TreeListOptions<T> {
 	items: T[];
 	expanded?: boolean;
@@ -17,13 +43,23 @@ export interface TreeListOptions<T> {
 	 */
 	maxCollapsedLines?: number;
 	itemType?: string;
+	/** Available terminal columns when list rows should wrap with their tree rails. */
+	viewportWidth?: number;
 	/** Called once per item with `isLast: false` during budget calculation;
 	 *  line count MUST NOT vary based on `isLast`. */
 	renderItem: (item: T, context: TreeContext) => string | string[];
 }
 
 export function renderTreeList<T>(options: TreeListOptions<T>, theme: Theme): string[] {
-	const { items, expanded = false, maxCollapsed = 8, maxCollapsedLines, itemType = "item", renderItem } = options;
+	const {
+		items,
+		expanded = false,
+		maxCollapsed = 8,
+		maxCollapsedLines,
+		itemType = "item",
+		renderItem,
+		viewportWidth,
+	} = options;
 	const maxItems = expanded ? items.length : Math.min(items.length, maxCollapsed);
 	const linesBudget = !expanded && maxCollapsedLines !== undefined ? maxCollapsedLines : Infinity;
 
@@ -49,7 +85,13 @@ export function renderTreeList<T>(options: TreeListOptions<T>, theme: Theme): st
 	if (linesBudget !== Infinity) {
 		fittingCount = 0;
 		for (let i = 0; i < maxItems; i++) {
-			const count = preRendered[i]!.length;
+			const count =
+				viewportWidth === undefined
+					? preRendered[i]!.length
+					: preRendered[i]!.reduce(
+							(total, line) => total + renderStructuredRow(line, "├─ ", "│  ", viewportWidth).length,
+							0,
+						);
 			const remainingAfter = items.length - (i + 1);
 			const reservedSummaryLines = remainingAfter > 0 ? 1 : 0;
 			if (fittedLineCount + count + reservedSummaryLines > linesBudget) break;
@@ -70,9 +112,11 @@ export function renderTreeList<T>(options: TreeListOptions<T>, theme: Theme): st
 		const continuePrefix = `${theme.fg("dim", getTreeContinuePrefix(isLast, theme))}`;
 		const itemLines = preRendered[i]!;
 		if (itemLines.length === 0) continue;
-		lines.push(`${prefix}${replaceTabs(itemLines[0]!)}`);
+		if (viewportWidth === undefined) lines.push(`${prefix}${replaceTabs(itemLines[0]!)}`);
+		else lines.push(...renderStructuredRow(itemLines[0]!, prefix, continuePrefix, viewportWidth));
 		for (let j = 1; j < itemLines.length; j++) {
-			lines.push(`${continuePrefix}${replaceTabs(itemLines[j]!)}`);
+			if (viewportWidth === undefined) lines.push(`${continuePrefix}${replaceTabs(itemLines[j]!)}`);
+			else lines.push(...renderStructuredRow(itemLines[j]!, continuePrefix, continuePrefix, viewportWidth));
 		}
 	}
 

package/src/web/search/render.ts

@@ -216,6 +216,7 @@ export function renderSearchResult(
 			const sourceTree = renderTreeList(
 				{
 					items: sources,
+					viewportWidth: Math.max(1, width - 3),
 					expanded,
 					maxCollapsed: MAX_COLLAPSED_ITEMS,
 					itemType: "source",
@@ -226,7 +227,7 @@ export function renderSearchResult(
 								: typeof src.url === "string" && src.url.trim()
 									? src.url
 									: "Untitled";
-						const title = truncateToWidth(titleText, width);
+						const title = titleText;
 						const url = typeof src.url === "string" ? src.url : "";
 						const domain = url ? getDomain(url) : "";
 						const age =
@@ -240,9 +241,7 @@ export function renderSearchResult(
 						if (age) metaParts.push(theme.fg("muted", age));
 						const metaSep = theme.fg("dim", theme.sep.dot);
 						const metaSuffix = metaParts.length > 0 ? ` ${metaParts.join(metaSep)}` : "";
-						const srcLines: string[] = [
-							truncateToWidth(`${theme.fg("contentAccent", title)}${metaSuffix}`, width),
-						];
+						const srcLines: string[] = [`${theme.fg("contentAccent", title)}${metaSuffix}`];
 						const snippetText = typeof src.snippet === "string" ? src.snippet : "";
 						if (snippetText.trim()) {
 							const snippetLines = getPreviewLines(snippetText, MAX_SNIPPET_LINES, width);
@@ -250,7 +249,7 @@ export function renderSearchResult(
 								srcLines.push(theme.fg("muted", `${theme.format.dash} ${snippetLine}`));
 							}
 						}
-						if (url) srcLines.push(theme.fg("mdLinkUrl", truncateToWidth(url, width)));
+						if (url) srcLines.push(theme.fg("mdLinkUrl", url));
 						return srcLines;
 					},
 				},
@@ -268,6 +267,7 @@ export function renderSearchResult(
 			const answerTree = renderTreeList(
 				{
 					items: answerTreeLines,
+					viewportWidth: Math.max(1, contentWidth),
 					expanded: true,
 					maxCollapsed: answerTreeLines.length,
 					itemType: "line",
@@ -303,10 +303,12 @@ export function renderSearchResult(
 						{
 							label: theme.fg("toolTitle", "Answer"),
 							lines: answerTree,
+							structured: true,
 						},
 						{
 							label: theme.fg("toolTitle", "Sources"),
 							lines: sourceTree.length > 0 ? sourceTree : [theme.fg("muted", "No sources returned")],
+							structured: true,
 						},
 						{ label: theme.fg("toolTitle", "Metadata"), lines: allMetaLines },
 					],