@f5xc-salesdemos/xcsh 19.43.0 → 19.43.1

package/package.json

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

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

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "19.43.0",
-	"commit": "d8fefbb60bd96f414bb9c21da7df270bd10876eb",
-	"shortCommit": "d8fefbb",
+	"version": "19.43.1",
+	"commit": "5b36c788a2d9ad0fb4a7da83458621d0e995a05a",
+	"shortCommit": "5b36c78",
 	"branch": "main",
-	"tag": "v19.43.0",
-	"commitDate": "2026-06-24T04:38:55Z",
-	"buildDate": "2026-06-24T05:01:00.600Z",
+	"tag": "v19.43.1",
+	"commitDate": "2026-06-24T15:09:09Z",
+	"buildDate": "2026-06-24T15:34:16.139Z",
 	"dirty": true,
 	"prNumber": "",
 	"repoUrl": "https://github.com/f5xc-salesdemos/xcsh",
 	"repoSlug": "f5xc-salesdemos/xcsh",
-	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/d8fefbb60bd96f414bb9c21da7df270bd10876eb",
-	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v19.43.0"
+	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/5b36c788a2d9ad0fb4a7da83458621d0e995a05a",
+	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v19.43.1"
 };

package/src/modes/theme/theme.ts

@@ -10,13 +10,15 @@ import {
 	supportsLanguage as nativeSupportsLanguage,
 } from "@f5xc-salesdemos/pi-natives";
 import type { EditorTheme, MarkdownTheme, SelectListTheme, SymbolTheme } from "@f5xc-salesdemos/pi-tui";
-import { adjustHsv, getCustomThemesDir, isEnoent, logger } from "@f5xc-salesdemos/pi-utils";
+import { adjustHsv, detectDiagramType, getCustomThemesDir, isEnoent, logger } from "@f5xc-salesdemos/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import { TypeCompiler } from "@sinclair/typebox/compiler";
 import chalk from "chalk";
+import { buildMermaidBlockOptions, diagramTypeLabel } from "../../tools/mermaid-renderer";
+import { renderOutputBlock } from "../../tui";
 // Embed theme JSON files at build time
 import { defaultThemes } from "./defaults";
-import { getMermaidAscii, mermaidThemeSignature } from "./mermaid-cache";
+import { getMermaidAscii, mermaidThemeSignature, renderMermaidThemed } from "./mermaid-cache";
 
 export { getLanguageFromPath } from "../../utils/lang-from-path";
 
@@ -2510,6 +2512,14 @@ export function getMarkdownTheme(): MarkdownTheme {
 		strikethrough: (text: string) => chalk.strikethrough(text),
 		symbols: getSymbolTheme(),
 		getMermaidAscii: (hash: bigint | number) => getMermaidAscii(hash, mermaidThemeSignature(theme)),
+		renderMermaidBlock: (source: string, width: number): string[] | null => {
+			const diagram = renderMermaidThemed(source, theme);
+			if (!diagram) return null;
+			return renderOutputBlock(
+				buildMermaidBlockOptions(diagram, { width, theme, typeLabel: diagramTypeLabel(detectDiagramType(source)) }),
+				theme,
+			);
+		},
 		highlightCode: (code: string, lang?: string): string[] => {
 			const validLang = lang && nativeSupportsLanguage(lang) ? lang : undefined;
 			try {

package/src/tools/mermaid-renderer.ts

@@ -1,18 +1,18 @@
-/** TUI renderer for the render_mermaid tool — bordered, themed, colorized diagram output. */
+/** TUI renderer for the render_mermaid tool — single F5-framed, themed, colorized diagram. */
 import type { Component } from "@f5xc-salesdemos/pi-tui";
-import { Text } from "@f5xc-salesdemos/pi-tui";
+import { Text, visibleWidth } from "@f5xc-salesdemos/pi-tui";
 import { detectDiagramType, type MermaidDiagramType } from "@f5xc-salesdemos/pi-utils";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import { renderMermaidThemed } from "../modes/theme/mermaid-cache";
 import type { Theme } from "../modes/theme/theme";
-import { CachedOutputBlock, F5_TOOL_BORDER_COLOR, renderStatusLine } from "../tui";
+import { CachedOutputBlock, F5_TOOL_BORDER_COLOR, type OutputBlockOptions, renderStatusLine } from "../tui";
 import type { RenderMermaidToolDetails } from "./render-mermaid";
-import { addSection, formatErrorMessage, replaceTabs } from "./render-utils";
+import { formatErrorMessage, replaceTabs } from "./render-utils";
 
 const TOOL_TITLE = "Mermaid";
 
-/** Human-friendly caption for the diagram-type badge in the block header. */
-function diagramTypeLabel(type: MermaidDiagramType): string {
+/** Human-friendly caption for the diagram type, shown in the F5 frame header. */
+export function diagramTypeLabel(type: MermaidDiagramType): string {
 	switch (type) {
 		case "flowchart":
 			return "flowchart";
@@ -31,6 +31,41 @@ function diagramTypeLabel(type: MermaidDiagramType): string {
 	}
 }
 
+/**
+ * Build the F5 output-block options that frame a themed/colored mermaid diagram.
+ * Shared by the render_mermaid tool result AND inline ```mermaid markdown blocks, so
+ * every mermaid render gets the SAME single F5 frame — and the diagram is clipped
+ * (wrapContent: false), never wrapped, so a wide diagram can't reflow or overflow.
+ */
+export function buildMermaidBlockOptions(
+	diagramText: string,
+	opts: { width: number; theme: Theme; typeLabel: string; artifactId?: string },
+): OutputBlockOptions {
+	// Unlabeled section: the header already reads "Mermaid · <type>", so a "Diagram"
+	// bar would be redundant. The diagram keeps its own colors; we only normalize tabs.
+	const lines = diagramText.split("\n").map(line => replaceTabs(line));
+	const meta = opts.artifactId ? [opts.theme.fg("dim", `artifact:${opts.artifactId.slice(0, 8)}`)] : undefined;
+	const header = renderStatusLine(
+		{ title: TOOL_TITLE, titleColor: "dim", description: opts.theme.fg("muted", opts.typeLabel), meta },
+		opts.theme,
+	);
+	// Size the frame SNUGLY to the diagram (+ one space of padding each side), capped at
+	// the available width and kept wide enough for the header caption — so the diagram
+	// feels enclosed in a small padded frame instead of spanning the whole terminal
+	// (tiny diagram) or clipping against the right border (wide diagram).
+	const maxDiagramWidth = lines.reduce((max, line) => Math.max(max, visibleWidth(line)), 0);
+	const desired = Math.max(maxDiagramWidth + 4, visibleWidth(header) + 8);
+	const width = Math.min(opts.width, Math.max(1, desired));
+	return {
+		header,
+		state: "success",
+		sections: [{ lines }],
+		width,
+		borderColor: F5_TOOL_BORDER_COLOR,
+		wrapContent: false,
+	};
+}
+
 type MermaidRenderArgs = {
 	mermaid?: string;
 };
@@ -50,63 +85,36 @@ export const mermaidRenderer = {
 			details?: RenderMermaidToolDetails;
 			isError?: boolean;
 		},
-		options: RenderResultOptions,
+		_options: RenderResultOptions,
 		uiTheme: Theme,
 		args?: MermaidRenderArgs,
 	): Component {
-		const isError = result.isError === true;
-
-		if (isError) {
+		if (result.isError === true) {
 			const errorText = result.content?.find(c => c.type === "text")?.text;
 			return new Text(formatErrorMessage(errorText, uiTheme), 0, 0);
 		}
 
-		const sections: Array<{ label?: string; lines: string[] }> = [];
-		const meta: string[] = [];
 		const rawText = result.content?.find(c => c.type === "text")?.text ?? "";
-
 		// Strip artifact reference from the plain result text (fallback path).
 		const artifactIdx = rawText.indexOf("\n\nSaved artifact:");
 		const plainText = artifactIdx >= 0 ? rawText.slice(0, artifactIdx) : rawText;
 
-		// Prefer re-rendering from the original source: this yields the themed,
-		// per-role-colored, node-tinted diagram. Fall back to the plain result text.
+		// Prefer re-rendering from the original source: themed, per-node-tinted, colored.
 		const source = args?.mermaid?.trim();
 		const diagramText = (source ? renderMermaidThemed(source, uiTheme) : null) ?? plainText;
-		const caption = source ? diagramTypeLabel(detectDiagramType(source)) : "diagram";
-
-		// Keep the diagram's own colors — do NOT recolor each line a flat tool color.
-		// Show the FULL diagram: truncating a diagram with "… N more lines" defeats the purpose.
-		const diagramLines = diagramText.split("\n").map(line => replaceTabs(line));
-		addSection(sections, "Diagram", diagramLines, uiTheme);
-
-		if (result.details?.artifactId) {
-			meta.push(uiTheme.fg("dim", `artifact:${result.details.artifactId.slice(0, 8)}`));
-		}
-
-		const header = renderStatusLine(
-			{
-				title: TOOL_TITLE,
-				titleColor: "dim",
-				description: uiTheme.fg("muted", caption),
-				meta: meta.length > 0 ? meta : undefined,
-			},
-			uiTheme,
-		);
+		const typeLabel = source ? diagramTypeLabel(detectDiagramType(source)) : "diagram";
+		const artifactId = result.details?.artifactId;
 
-		const outputBlock = new CachedOutputBlock();
+		const block = new CachedOutputBlock();
 		return {
 			render(width: number): string[] {
-				const state = options.isPartial ? "pending" : "success";
-				return outputBlock.render(
-					// Clip, don't wrap: a diagram is a fixed grid — word-wrapping reflows it
-					// and breaks alignment. Wide diagrams are truncated to the block width.
-					{ header, state, sections, width, borderColor: F5_TOOL_BORDER_COLOR, wrapContent: false },
+				return block.render(
+					buildMermaidBlockOptions(diagramText, { width, theme: uiTheme, typeLabel, artifactId }),
 					uiTheme,
 				);
 			},
 			invalidate() {
-				outputBlock.invalidate();
+				block.invalidate();
 			},
 		};
 	},