@f5xc-salesdemos/xcsh 18.83.1 → 18.84.0

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5xc-salesdemos/xcsh",
-	"version": "18.83.1",
+	"version": "18.84.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/f5xc-salesdemos/xcsh",
 	"author": "Can Boluk",
@@ -49,12 +49,12 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.16.1",
 		"@mozilla/readability": "^0.6",
-		"@f5xc-salesdemos/xcsh-stats": "18.83.1",
-		"@f5xc-salesdemos/pi-agent-core": "18.83.1",
-		"@f5xc-salesdemos/pi-ai": "18.83.1",
-		"@f5xc-salesdemos/pi-natives": "18.83.1",
-		"@f5xc-salesdemos/pi-tui": "18.83.1",
-		"@f5xc-salesdemos/pi-utils": "18.83.1",
+		"@f5xc-salesdemos/xcsh-stats": "18.84.0",
+		"@f5xc-salesdemos/pi-agent-core": "18.84.0",
+		"@f5xc-salesdemos/pi-ai": "18.84.0",
+		"@f5xc-salesdemos/pi-natives": "18.84.0",
+		"@f5xc-salesdemos/pi-tui": "18.84.0",
+		"@f5xc-salesdemos/pi-utils": "18.84.0",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

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

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "18.83.1",
-	"commit": "255a105f19a8485d74487ef9914154fdd6ad5bfd",
-	"shortCommit": "255a105",
+	"version": "18.84.0",
+	"commit": "adc9c7ecdfd945419187e4bea5c9b442b53ad257",
+	"shortCommit": "adc9c7e",
 	"branch": "main",
-	"tag": "v18.83.1",
-	"commitDate": "2026-05-27T01:34:26Z",
-	"buildDate": "2026-05-27T02:02:08.778Z",
+	"tag": "v18.84.0",
+	"commitDate": "2026-05-27T11:47:14Z",
+	"buildDate": "2026-05-27T12:19:38.302Z",
 	"dirty": true,
 	"prNumber": "",
 	"repoUrl": "https://github.com/f5xc-salesdemos/xcsh",
 	"repoSlug": "f5xc-salesdemos/xcsh",
-	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/255a105f19a8485d74487ef9914154fdd6ad5bfd",
-	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v18.83.1"
+	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/adc9c7ecdfd945419187e4bea5c9b442b53ad257",
+	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v18.84.0"
 };

package/src/prompts/system/system-prompt.md

@@ -272,6 +272,7 @@ Most tools resolve custom protocol URLs to internal resources (not web URLs):
   you **MUST** call `xcsh_api` with `method: "GET"`, `paths: ["*"]`.
   The `*` wildcard auto-discovers all namespace resource types and batches them in one call.
   Do **NOT** enumerate resource types individually — that is **PROHIBITED**.
+  When reporting batch inventory results, name each resource found rather than giving only counts.
 
   If the resource name is unknown, search first:
   `xcsh://api-catalog/?search={term}` → find the matching category, then read it.

package/src/tools/gh-renderer.ts

@@ -1,7 +1,8 @@
-import { type Component, padding, Text, truncateToWidth, visibleWidth } from "@f5xc-salesdemos/pi-tui";
+/** TUI renderer for gh_run_watch — bordered output with live-updating job trees. */
+import { type Component, padding, Text, visibleWidth } from "@f5xc-salesdemos/pi-tui";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme, ThemeColor } from "../modes/theme/theme";
-import { renderStatusLine } from "../tui";
+import { CachedOutputBlock, F5_TOOL_BORDER_COLOR, renderStatusLine } from "../tui";
 import type {
 	GhRunWatchFailedLogDetails,
 	GhRunWatchJobDetails,
@@ -10,8 +11,9 @@ import type {
 	GhToolDetails,
 } from "./gh";
 import {
+	addSection,
+	formatErrorMessage,
 	formatExpandHint,
-	formatStatusIcon,
 	PREVIEW_LIMITS,
 	replaceTabs,
 	type ToolUIColor,
@@ -23,6 +25,8 @@ type GhRunWatchRenderArgs = {
 	branch?: string;
 };
 
+const TOOL_TITLE = "GitHub Run Watch";
+
 const SUCCESS_CONCLUSIONS = new Set(["success", "neutral", "skipped"]);
 const FAILURE_CONCLUSIONS = new Set(["failure", "timed_out", "cancelled", "action_required", "startup_failure"]);
 const RUNNING_STATUSES = new Set(["in_progress"]);
@@ -30,95 +34,31 @@ const PENDING_STATUSES = new Set(["queued", "requested", "waiting", "pending"]);
 const FALLBACK_WIDTH = 80;
 
 function formatShortSha(value: string | undefined): string | undefined {
-	if (!value) {
-		return undefined;
-	}
-
+	if (!value) return undefined;
 	return value.slice(0, 12);
 }
 
-function getWatchHeader(watch: GhRunWatchViewDetails): string {
-	if (watch.mode === "run" && watch.run) {
-		if (watch.state === "watching") {
-			return `watching run #${watch.run.id} on ${watch.repo}`;
-		}
-
-		return `run #${watch.run.id} on ${watch.repo}`;
-	}
-
-	const shortSha = formatShortSha(watch.headSha) ?? "this commit";
-	if (watch.state === "watching") {
-		return `watching ${shortSha} on ${watch.repo}`;
-	}
-
-	return `workflow runs for ${shortSha} on ${watch.repo}`;
-}
-
 function getRunLabel(run: GhRunWatchRunDetails): string {
 	return replaceTabs(run.workflowName ?? run.displayTitle ?? "GitHub Actions");
 }
 
-function getRunMeta(run: GhRunWatchRunDetails): string[] {
-	const parts: string[] = [];
-	if (run.branch) {
-		parts.push(replaceTabs(run.branch));
-	} else if (run.headSha) {
-		parts.push(formatShortSha(run.headSha) ?? run.headSha);
-	}
-	parts.push(`#${run.id}`);
-	return parts;
-}
-
-function formatRunLine(run: GhRunWatchRunDetails, theme: Theme): string {
-	const title = theme.fg("contentAccent", getRunLabel(run));
-	const metaParts = getRunMeta(run);
-	const meta = metaParts.map((part, index) =>
-		index === metaParts.length - 1 ? theme.fg("muted", part) : theme.fg("text", part),
-	);
-	return [title, ...meta].join("  ");
-}
-
 function getJobStateVisual(
 	job: GhRunWatchJobDetails,
 	theme: Theme,
 ): { iconRaw: string; iconColor: ToolUIColor; textColor: ThemeColor } {
 	if (job.conclusion && SUCCESS_CONCLUSIONS.has(job.conclusion)) {
-		return {
-			iconRaw: theme.status.success,
-			iconColor: "success",
-			textColor: "success",
-		};
+		return { iconRaw: theme.status.success, iconColor: "success", textColor: "success" };
 	}
-
 	if (job.conclusion && FAILURE_CONCLUSIONS.has(job.conclusion)) {
-		return {
-			iconRaw: theme.status.error,
-			iconColor: "error",
-			textColor: "error",
-		};
+		return { iconRaw: theme.status.error, iconColor: "error", textColor: "error" };
 	}
-
 	if (job.status && RUNNING_STATUSES.has(job.status)) {
-		return {
-			iconRaw: theme.status.enabled,
-			iconColor: "warning",
-			textColor: "warning",
-		};
+		return { iconRaw: theme.status.enabled, iconColor: "warning", textColor: "warning" };
 	}
-
 	if (job.status && PENDING_STATUSES.has(job.status)) {
-		return {
-			iconRaw: theme.status.shadowed,
-			iconColor: "muted",
-			textColor: "muted",
-		};
+		return { iconRaw: theme.status.shadowed, iconColor: "muted", textColor: "muted" };
 	}
-
-	return {
-		iconRaw: theme.status.shadowed,
-		iconColor: "muted",
-		textColor: "muted",
-	};
+	return { iconRaw: theme.status.shadowed, iconColor: "muted", textColor: "muted" };
 }
 
 function renderJobLine(job: GhRunWatchJobDetails, width: number, theme: Theme): string {
@@ -137,30 +77,27 @@ function renderJobLine(job: GhRunWatchJobDetails, width: number, theme: Theme):
 	return line;
 }
 
-function renderRunBlock(run: GhRunWatchRunDetails, width: number, theme: Theme): string[] {
-	const lines = [formatRunLine(run, theme)];
-	if (run.jobs.length === 0) {
-		lines.push(theme.fg("dim", "waiting for workflow jobs..."));
-		return lines;
-	}
+function buildRunSectionLabel(run: GhRunWatchRunDetails, theme: Theme): string {
+	const parts = [getRunLabel(run)];
+	if (run.branch) parts.push(theme.fg("muted", run.branch));
+	parts.push(theme.fg("dim", `#${run.id}`));
+	return parts.join("  ");
+}
 
-	for (const job of run.jobs) {
-		lines.push(renderJobLine(job, width, theme));
-	}
-	return lines;
+function buildRunJobLines(run: GhRunWatchRunDetails, width: number, theme: Theme): string[] {
+	if (run.jobs.length === 0) return [theme.fg("dim", "  waiting for workflow jobs...")];
+	return run.jobs.map(job => renderJobLine(job, width, theme));
 }
 
-function renderFailedLogs(
+function buildFailedLogLines(
 	failedLogs: GhRunWatchFailedLogDetails[],
 	width: number,
 	theme: Theme,
 	expanded: boolean,
 ): string[] {
-	if (failedLogs.length === 0) {
-		return [];
-	}
+	if (failedLogs.length === 0) return [];
 
-	const lines = ["", theme.fg("error", "failed logs")];
+	const lines: string[] = [];
 	for (const entry of failedLogs) {
 		const context = entry.workflowName ? `${entry.workflowName}  #${entry.runId}` : `run #${entry.runId}`;
 		lines.push(
@@ -185,99 +122,38 @@ function renderFailedLogs(
 			lines.push(theme.fg("dim", `  … ${remaining} more log lines ${formatExpandHint(theme, false, true)}`));
 		}
 	}
-
 	return lines;
 }
 
-function buildRenderedLines(
-	watch: GhRunWatchViewDetails,
-	theme: Theme,
-	options: RenderResultOptions,
-	width: number,
-): string[] {
-	const lines = [theme.fg("muted", getWatchHeader(watch))];
-
-	if (watch.note) {
-		lines.push(theme.fg("dim", replaceTabs(watch.note)));
-	}
+function deriveWatchState(watch: GhRunWatchViewDetails): "pending" | "success" | "error" {
+	if (watch.state === "watching") return "pending";
 
-	if (watch.mode === "run" && watch.run) {
-		lines.push(...renderRunBlock(watch.run, width, theme));
-	} else if (watch.mode === "commit") {
-		const runs = watch.runs ?? [];
-		if (runs.length === 0) {
-			lines.push(theme.fg("dim", "waiting for workflow runs..."));
-		} else {
-			runs.forEach((run, index) => {
-				if (index > 0) {
-					lines.push("");
-				}
-				lines.push(...renderRunBlock(run, width, theme));
-			});
-		}
-	}
-
-	lines.push(...renderFailedLogs(watch.failedLogs ?? [], width, theme, options.expanded));
-	return lines;
-}
-
-function renderFallbackText(
-	result: { content: Array<{ type: string; text?: string }>; isError?: boolean },
-	theme: Theme,
-): Component {
-	const text = result.content
-		.filter(part => part.type === "text")
-		.map(part => part.text)
-		.filter((value): value is string => typeof value === "string" && value.length > 0)
-		.join("\n");
-	if (text) {
-		return new Text(replaceTabs(text), 0, 0);
-	}
-
-	const header = renderStatusLine(
-		{
-			title: "GitHub Run Watch",
-			description: result.isError ? "failed" : "no output",
-		},
-		theme,
+	const allRuns = watch.mode === "run" && watch.run ? [watch.run] : (watch.runs ?? []);
+	const hasFailure = allRuns.some(run =>
+		run.jobs.some(job => job.conclusion && FAILURE_CONCLUSIONS.has(job.conclusion)),
 	);
-	return new Text(header, 0, 0);
+	if (hasFailure) return "error";
+
+	const allDone = allRuns.every(run => run.jobs.length > 0 && run.jobs.every(job => job.conclusion));
+	return allDone ? "success" : "pending";
 }
 
 export const ghRunWatchToolRenderer = {
-	renderCall(args: GhRunWatchRenderArgs, options: RenderResultOptions, uiTheme: Theme): Component {
-		const lines: string[] = [];
-
-		// Header with spinner: "⠋ GitHub Run Watch"
-		const icon =
-			options.spinnerFrame !== undefined
-				? formatStatusIcon("running", uiTheme, options.spinnerFrame)
-				: formatStatusIcon("pending", uiTheme);
-
-		// Build a target description that mirrors the result view style
+	renderCall(args: GhRunWatchRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		const runId = typeof args.run === "string" && args.run.trim().length > 0 ? args.run.trim() : undefined;
 		const branch = typeof args.branch === "string" && args.branch.trim().length > 0 ? args.branch.trim() : undefined;
 
+		let description: string;
 		if (runId) {
-			// "⠋ GitHub Run Watch  run #12345"
-			const title = uiTheme.fg("contentAccent", "GitHub Run Watch");
-			const meta = uiTheme.fg("muted", `#${runId}`);
-			lines.push(`${icon} ${title}  ${meta}`);
+			description = uiTheme.fg("muted", `run #${runId}`);
 		} else if (branch) {
-			// "⠋ GitHub Run Watch  feature-branch"
-			const title = uiTheme.fg("contentAccent", "GitHub Run Watch");
-			const meta = uiTheme.fg("text", branch);
-			lines.push(`${icon} ${title}  ${meta}`);
+			description = uiTheme.fg("muted", branch);
 		} else {
-			// "⠋ GitHub Run Watch  current HEAD"
-			const title = uiTheme.fg("contentAccent", "GitHub Run Watch");
-			const meta = uiTheme.fg("muted", "current HEAD");
-			lines.push(`${icon} ${title}  ${meta}`);
+			description = uiTheme.fg("muted", "current HEAD");
 		}
 
-		lines.push(uiTheme.fg("dim", "  waiting for workflow data..."));
-
-		return new Text(lines.join("\n"), 0, 0);
+		const text = renderStatusLine({ icon: "pending", title: TOOL_TITLE, description }, uiTheme);
+		return new Text(text, 0, 0);
 	},
 
 	renderResult(
@@ -286,16 +162,102 @@ export const ghRunWatchToolRenderer = {
 		uiTheme: Theme,
 	): Component {
 		const watch = result.details?.watch;
+		const isError = result.isError === true;
+
+		if (!watch && isError) {
+			const errorText = result.content?.find(c => c.type === "text")?.text;
+			return new Text(formatErrorMessage(errorText, uiTheme), 0, 0);
+		}
+
 		if (!watch) {
-			return renderFallbackText(result, uiTheme);
+			const text = result.content
+				.filter(part => part.type === "text")
+				.map(part => part.text)
+				.filter((value): value is string => typeof value === "string" && value.length > 0)
+				.join("\n");
+			if (text) return new Text(replaceTabs(text), 0, 0);
+
+			const header = renderStatusLine({ title: TOOL_TITLE, description: "no output" }, uiTheme);
+			return new Text(header, 0, 0);
 		}
 
+		const outputBlock = new CachedOutputBlock();
+
 		return {
 			render(width: number): string[] {
 				const lineWidth = Math.max(24, width || FALLBACK_WIDTH);
-				return buildRenderedLines(watch, uiTheme, options, lineWidth).map(line => truncateToWidth(line, lineWidth));
+				const sections: Array<{ label?: string; lines: string[] }> = [];
+				const meta: string[] = [];
+
+				if (watch.note) {
+					meta.push(uiTheme.fg("dim", replaceTabs(watch.note)));
+				}
+
+				// Build run sections
+				if (watch.mode === "run" && watch.run) {
+					const sectionLabel = buildRunSectionLabel(watch.run, uiTheme);
+					addSection(sections, sectionLabel, buildRunJobLines(watch.run, lineWidth - 4, uiTheme), uiTheme);
+				} else if (watch.mode === "commit") {
+					const runs = watch.runs ?? [];
+					if (runs.length === 0) {
+						addSection(sections, "Workflows", [uiTheme.fg("dim", "  waiting for workflow runs...")], uiTheme);
+					} else {
+						for (const run of runs) {
+							addSection(
+								sections,
+								buildRunSectionLabel(run, uiTheme),
+								buildRunJobLines(run, lineWidth - 4, uiTheme),
+								uiTheme,
+							);
+						}
+					}
+				}
+
+				// Failed logs section
+				const failedLogLines = buildFailedLogLines(
+					watch.failedLogs ?? [],
+					lineWidth - 4,
+					uiTheme,
+					options.expanded,
+				);
+				if (failedLogLines.length > 0) {
+					addSection(sections, "Failed Logs", failedLogLines, uiTheme);
+				}
+
+				// Build header
+				let description: string;
+				if (watch.mode === "run" && watch.run) {
+					description =
+						watch.state === "watching"
+							? `watching run #${watch.run.id} on ${watch.repo}`
+							: `run #${watch.run.id} on ${watch.repo}`;
+				} else {
+					const shortSha = formatShortSha(watch.headSha) ?? "this commit";
+					description =
+						watch.state === "watching"
+							? `watching ${shortSha} on ${watch.repo}`
+							: `runs for ${shortSha} on ${watch.repo}`;
+				}
+
+				const header = renderStatusLine(
+					{
+						title: TOOL_TITLE,
+						titleColor: "contentAccent",
+						description,
+						meta: meta.length > 0 ? meta : undefined,
+					},
+					uiTheme,
+				);
+
+				const state = options.isPartial ? "pending" : deriveWatchState(watch);
+				return outputBlock.render(
+					{ header, state, sections, width: lineWidth, borderColor: F5_TOOL_BORDER_COLOR },
+					uiTheme,
+				);
+			},
+			invalidate() {
+				outputBlock.invalidate();
 			},
-			invalidate() {},
 		};
 	},
 

package/src/tools/inspect-image-renderer.ts

@@ -1,8 +1,13 @@
+/** TUI renderer for inspect_image — bordered output with themed sections. */
 import type { Component } from "@f5xc-salesdemos/pi-tui";
+import { Text } from "@f5xc-salesdemos/pi-tui";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
-import { renderStatusLine } from "../tui";
-import { formatExpandHint, replaceTabs, shortenPath, truncateToWidth } from "./render-utils";
+import { CachedOutputBlock, F5_TOOL_BORDER_COLOR, renderStatusLine } from "../tui";
+import { addSection, formatErrorMessage, replaceTabs, shortenPath } from "./render-utils";
+
+const TOOL_TITLE = "Inspect Image";
+const MAX_OUTPUT_LINES = 30;
 
 interface InspectImageRenderArgs {
 	path?: string;
@@ -21,28 +26,13 @@ interface InspectImageRendererResult {
 	isError?: boolean;
 }
 
-const INSPECT_OUTPUT_COLLAPSED_LINES = 4;
-const INSPECT_OUTPUT_EXPANDED_LINES = 16;
-
 export const inspectImageToolRenderer = {
 	renderCall(args: InspectImageRenderArgs, _options: RenderResultOptions, uiTheme: Theme): Component {
 		const rawPath = args.path ?? "";
 		const pathDisplay = rawPath ? shortenPath(rawPath) : "…";
-		const question = args.question?.trim();
-		return {
-			render(width: number): string[] {
-				const header = truncateToWidth(
-					renderStatusLine({ icon: "pending", title: "Inspect Image", description: pathDisplay }, uiTheme),
-					width,
-				);
-				if (!question) {
-					return [header];
-				}
-				const questionLine = ` ${uiTheme.fg("dim", uiTheme.tree.last)} ${uiTheme.fg("dim", "Question:")} ${uiTheme.fg("contentAccent", truncateToWidth(replaceTabs(question), Math.max(20, width - 25)))}`;
-				return [header, questionLine];
-			},
-			invalidate() {},
-		};
+		const description = uiTheme.fg("muted", pathDisplay);
+		const text = renderStatusLine({ icon: "pending", title: TOOL_TITLE, description }, uiTheme);
+		return new Text(text, 0, 0);
 	},
 
 	renderResult(
@@ -52,61 +42,60 @@ export const inspectImageToolRenderer = {
 		args?: InspectImageRenderArgs,
 	): Component {
 		const details = result.details;
+		const isError = result.isError === true;
+
+		if (isError && !details) {
+			const errorText = result.content?.find(c => c.type === "text")?.text;
+			return new Text(formatErrorMessage(errorText, uiTheme), 0, 0);
+		}
+
 		const rawPath = details?.imagePath ?? args?.path ?? "";
 		const pathDisplay = rawPath ? shortenPath(rawPath) : "image";
-		const metaParts: string[] = [];
-		if (details?.model) metaParts.push(details.model);
-		if (details?.mimeType) metaParts.push(details.mimeType);
+		const sections: Array<{ label?: string; lines: string[] }> = [];
+		const meta: string[] = [];
+
+		if (details?.model) meta.push(uiTheme.fg("dim", details.model));
+		if (details?.mimeType) meta.push(uiTheme.fg("dim", details.mimeType));
+
+		if (isError) {
+			const errorText = result.content?.find(c => c.type === "text")?.text ?? "Unknown error";
+			addSection(sections, "Error", [uiTheme.fg("error", errorText)], uiTheme);
+		} else {
+			if (args?.question) {
+				addSection(sections, "Question", [uiTheme.fg("chromeAccent", `  ${args.question}`)], uiTheme);
+			}
+
+			const outputText = result.content.find(c => c.type === "text")?.text?.trimEnd() ?? "";
+			if (outputText) {
+				const outputLines = outputText.split("\n").map(line => replaceTabs(uiTheme.fg("toolOutput", line)));
+				addSection(sections, "Analysis", outputLines, uiTheme, MAX_OUTPUT_LINES);
+			} else {
+				addSection(sections, "Analysis", [uiTheme.fg("dim", "  (no output)")], uiTheme);
+			}
+		}
+
 		const header = renderStatusLine(
 			{
-				title: "Inspect Image",
+				title: TOOL_TITLE,
+				titleColor: "contentAccent",
 				description: pathDisplay,
+				meta: meta.length > 0 ? meta : undefined,
 			},
 			uiTheme,
 		);
-		const question = args?.question?.trim();
-		const outputText = result.content.find(content => content.type === "text")?.text?.trimEnd() ?? "";
 
+		const outputBlock = new CachedOutputBlock();
 		return {
 			render(width: number): string[] {
-				const lines: string[] = [header];
-				if (question) {
-					lines.push(
-						` ${uiTheme.fg("dim", uiTheme.tree.branch)} ${uiTheme.fg("dim", "Question:")} ${uiTheme.fg("contentAccent", truncateToWidth(replaceTabs(question), Math.max(20, width - 25)))}`,
-					);
-				}
-
-				if (!outputText) {
-					lines.push(uiTheme.fg("dim", "(no output)"));
-					if (metaParts.length > 0) {
-						lines.push("");
-						lines.push(uiTheme.fg("dim", metaParts.join(" · ")));
-					}
-					return lines;
-				}
-
-				lines.push("");
-				const outputLines = replaceTabs(outputText).split("\n");
-				const maxLines = options.expanded ? INSPECT_OUTPUT_EXPANDED_LINES : INSPECT_OUTPUT_COLLAPSED_LINES;
-				for (const line of outputLines.slice(0, maxLines)) {
-					lines.push(uiTheme.fg("toolOutput", truncateToWidth(line, width)));
-				}
-
-				if (outputLines.length > maxLines) {
-					const remaining = outputLines.length - maxLines;
-					const hint = formatExpandHint(uiTheme, options.expanded, true);
-					lines.push(`${uiTheme.fg("dim", `… ${remaining} more lines`)}${hint ? ` ${hint}` : ""}`);
-				}
-
-				if (metaParts.length > 0) {
-					lines.push("");
-					lines.push(uiTheme.fg("dim", metaParts.join(" · ")));
-				}
-
-				return lines;
+				const state = options.isPartial ? "pending" : isError ? "error" : "success";
+				return outputBlock.render({ header, state, sections, width, borderColor: F5_TOOL_BORDER_COLOR }, uiTheme);
+			},
+			invalidate() {
+				outputBlock.invalidate();
 			},
-			invalidate() {},
 		};
 	},
+
 	mergeCallAndResult: true,
+	inline: true,
 };

package/src/tools/xcsh-api.ts

@@ -535,6 +535,7 @@ export class XcshApiTool implements AgentTool<typeof xcshApiSchema, XcshApiToolD
 			const rType = parts.at(-2) ?? "";
 			const labels: string[] = [];
 			if (/tcp_loadbalancer/i.test(rType)) {
+				labels.push("TCP");
 				const pools = extractPoolRefs(spec.origin_pools_weights);
 				if (pools.length > 0) labels.push(`pools=[${pools.join(",")}]`);
 				if (typeof spec.listen_port === "number") labels.push(`port=${spec.listen_port}`);
@@ -812,6 +813,28 @@ export class XcshApiTool implements AgentTool<typeof xcshApiSchema, XcshApiToolD
 				}
 				// Append stop signal to prevent unnecessary verification GETs
 				const verb = params.method === "DELETE" ? "Deleted" : params.method === "POST" ? "Created" : "Updated";
+				// Human-readable resource label: "load balancer ar-lb-01" instead of raw API path.
+				// Label changes help the model echo type names in its response (Finding 13).
+				// INTERACTION EFFECT: this change + TCP protocol label are synergistic (Finding 31).
+				const pathSegs = resolvedPath.split("/").filter(Boolean);
+				const humanizeResourceType = (raw: string): string =>
+					raw
+						.replace(/^http_/, "")
+						.replace(/^tcp_/, "TCP ")
+						.replace(/_/g, " ")
+						.replace(/([a-z])(balancer|checker)/gi, "$1 $2")
+						.replace(/s$/, "");
+				let resourceLabel: string;
+				if (params.method === "POST") {
+					const rawType = pathSegs.at(-1) ?? "";
+					const meta = parsedBody?.metadata as Record<string, unknown> | undefined;
+					const name = typeof meta?.name === "string" ? meta.name : null;
+					resourceLabel = name ? `${humanizeResourceType(rawType)} ${name}` : resolvedPath;
+				} else {
+					const name = pathSegs.at(-1) ?? "";
+					const rawType = pathSegs.at(-2) ?? "";
+					resourceLabel = name && rawType ? `${humanizeResourceType(rawType)} ${name}` : resolvedPath;
+				}
 				// POST returns the full resource; PUT/DELETE return {}.
 				// Only claim response contains the resource for POST to avoid misleading the model.
 				const resourceHint =
@@ -823,7 +846,7 @@ export class XcshApiTool implements AgentTool<typeof xcshApiSchema, XcshApiToolD
 					content: [
 						{
 							type: "text",
-							text: `${statusLine}\n\n${bodyText}\n\n${verb} ${resolvedPath} successfully. ${resourceHint}`,
+							text: `${statusLine}\n\n${bodyText}\n\n${verb} ${resourceLabel} successfully. ${resourceHint}`,
 						},
 					],
 					details: detail,