@f5xc-salesdemos/xcsh 18.5.0 → 18.5.2

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5xc-salesdemos/xcsh",
-	"version": "18.5.0",
+	"version": "18.5.2",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/f5xc-salesdemos/xcsh",
 	"author": "Can Boluk",
@@ -47,12 +47,12 @@
 	"dependencies": {
 		"@agentclientprotocol/sdk": "0.16.1",
 		"@mozilla/readability": "^0.6",
-		"@f5xc-salesdemos/xcsh-stats": "18.5.0",
-		"@f5xc-salesdemos/pi-agent-core": "18.5.0",
-		"@f5xc-salesdemos/pi-ai": "18.5.0",
-		"@f5xc-salesdemos/pi-natives": "18.5.0",
-		"@f5xc-salesdemos/pi-tui": "18.5.0",
-		"@f5xc-salesdemos/pi-utils": "18.5.0",
+		"@f5xc-salesdemos/xcsh-stats": "18.5.2",
+		"@f5xc-salesdemos/pi-agent-core": "18.5.2",
+		"@f5xc-salesdemos/pi-ai": "18.5.2",
+		"@f5xc-salesdemos/pi-natives": "18.5.2",
+		"@f5xc-salesdemos/pi-tui": "18.5.2",
+		"@f5xc-salesdemos/pi-utils": "18.5.2",
 		"@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.5.0",
-	"commit": "50d87af3879c08179ba1f0bb790ec3928c3b41ea",
-	"shortCommit": "50d87af",
+	"version": "18.5.2",
+	"commit": "241bff6e524c48aacf4e14b31b8fc5b39d7f9047",
+	"shortCommit": "241bff6",
 	"branch": "main",
-	"tag": "v18.5.0",
-	"commitDate": "2026-04-21T07:29:16Z",
-	"buildDate": "2026-04-21T07:56:37.534Z",
+	"tag": "v18.5.2",
+	"commitDate": "2026-04-21T20:23:54Z",
+	"buildDate": "2026-04-21T20:47:19.277Z",
 	"dirty": false,
 	"prNumber": "",
 	"repoUrl": "https://github.com/f5xc-salesdemos/xcsh",
 	"repoSlug": "f5xc-salesdemos/xcsh",
-	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/50d87af3879c08179ba1f0bb790ec3928c3b41ea",
-	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v18.5.0"
+	"commitUrl": "https://github.com/f5xc-salesdemos/xcsh/commit/241bff6e524c48aacf4e14b31b8fc5b39d7f9047",
+	"releaseUrl": "https://github.com/f5xc-salesdemos/xcsh/releases/tag/v18.5.2"
 };

package/src/modes/components/assistant-message.ts

@@ -82,7 +82,7 @@ export class AssistantMessageComponent extends Container {
 				);
 				continue;
 			}
-			this.#contentContainer.addChild(new Text(theme.fg("toolOutput", `[Image: ${image.mimeType}]`), 1, 0));
+			this.#contentContainer.addChild(new Text(theme.fg("toolOutput", `[Image: ${image.mimeType}]`), 0, 0));
 		}
 	}
 	#triggerMermaidPrerender(message: AssistantMessage): void {
@@ -137,7 +137,7 @@ export class AssistantMessageComponent extends Container {
 			if (content.type === "text" && content.text.trim()) {
 				// Assistant text messages with no background - trim the text
 				// Set paddingY=0 to avoid extra spacing before tool executions
-				this.#contentContainer.addChild(new Markdown(content.text.trim(), 1, 0, getMarkdownTheme()));
+				this.#contentContainer.addChild(new Markdown(content.text.trim(), 0, 0, getMarkdownTheme()));
 			} else if (content.type === "thinking" && content.thinking.trim()) {
 				// Add spacing only when another visible assistant content block follows.
 				// This avoids a superfluous blank line before separately-rendered tool execution blocks.
@@ -147,14 +147,14 @@ export class AssistantMessageComponent extends Container {
 
 				if (this.hideThinkingBlock) {
 					// Show static "Thinking..." label when hidden
-					this.#contentContainer.addChild(new Text(theme.italic(theme.fg("thinkingText", "Thinking...")), 1, 0));
+					this.#contentContainer.addChild(new Text(theme.italic(theme.fg("thinkingText", "Thinking...")), 0, 0));
 					if (hasVisibleContentAfter) {
 						this.#contentContainer.addChild(new Spacer(1));
 					}
 				} else {
 					// Thinking traces in thinkingText color, italic
 					this.#contentContainer.addChild(
-						new Markdown(content.thinking.trim(), 1, 0, getMarkdownTheme(), {
+						new Markdown(content.thinking.trim(), 0, 0, getMarkdownTheme(), {
 							color: (text: string) => theme.fg("thinkingText", text),
 							italic: true,
 						}),
@@ -181,11 +181,11 @@ export class AssistantMessageComponent extends Container {
 				} else {
 					this.#contentContainer.addChild(new Spacer(1));
 				}
-				this.#contentContainer.addChild(new Text(theme.fg("error", abortMessage), 1, 0));
+				this.#contentContainer.addChild(new Text(theme.fg("error", abortMessage), 0, 0));
 			} else if (message.stopReason === "error") {
 				const errorMsg = message.errorMessage || "Unknown error";
 				this.#contentContainer.addChild(new Spacer(1));
-				this.#contentContainer.addChild(new Text(theme.fg("error", `Error: ${errorMsg}`), 1, 0));
+				this.#contentContainer.addChild(new Text(theme.fg("error", `Error: ${errorMsg}`), 0, 0));
 			}
 		}
 
@@ -200,7 +200,7 @@ export class AssistantMessageComponent extends Container {
 				parts.push(`cache: ${formatNumber(usage.cacheRead)}`);
 			}
 			this.#contentContainer.addChild(new Spacer(1));
-			this.#contentContainer.addChild(new Text(theme.fg("dim", parts.join("  ")), 1, 0));
+			this.#contentContainer.addChild(new Text(theme.fg("dim", parts.join("  ")), 0, 0));
 		}
 	}
 }

package/src/modes/components/user-message.ts

@@ -7,16 +7,22 @@ const CONTINUATION_BAR = "┃";
 // render output is 3 terminal cells. Anything narrower than prefix+3 would
 // overflow the requested width — bail out instead.
 const MIN_MARKDOWN_WIDTH = 3;
-// Leading gutter reserved for sibling GutterBlock indicators (● etc.) so the
-// π / ┃ accent bar aligns with content text rather than sitting at column 0.
+// Two-column layout: the gutter (col 0..GUTTER_WIDTH-1) stays outside the
+// userMessageBg painted region and holds the π icon on the first content
+// line / two spaces on continuations — mirroring how GutterBlock renders
+// its ● indicator at col 0. The painted region starts at col GUTTER_WIDTH
+// and hosts the ┃ accent bar on every content line (including the first).
 const GUTTER_WIDTH = 2;
 const GUTTER_PAD = "  ";
 
 /**
- * Renders a user message as an F5-branded admonition block: pi icon on the
- * first content line, heavy vertical bar on continuations (both in `border`
- * color), `userMessageBg` painted across the full requested width, and a
- * leading blank spacer separating the prompt from the preceding block.
+ * Renders a user message as an F5-branded admonition block with a two-column
+ * layout: the π icon sits in the gutter at col 0 on the first content line
+ * (outside the painted region, matching the `●` indicator pattern used by
+ * `GutterBlock`); the ┃ heavy vertical bar renders at col GUTTER_WIDTH inside
+ * `userMessageBg` on every content line including the first. Both glyphs use
+ * the `border` fg. The bg is painted across the full requested width, and a
+ * leading blank spacer separates the prompt from the preceding block.
  */
 export class UserMessageComponent extends Container {
 	constructor(text: string, synthetic = false) {
@@ -25,17 +31,14 @@ export class UserMessageComponent extends Container {
 			? (value: string) => theme.fg("dim", value)
 			: (value: string) => `\x1b[3m${theme.fg("userMessageText", value)}\x1b[23m`;
 		this.addChild(new Spacer(1));
-		this.addChild(new Markdown(text, 1, 0, getMarkdownTheme(), { color }));
+		this.addChild(new Markdown(text, 0, 0, getMarkdownTheme(), { color }));
 	}
 
 	override render(width: number): string[] {
-		const piPrefix = `${theme.icon.pi} `;
 		const contPrefix = `${CONTINUATION_BAR} `;
-		// Prefix width is theme-dependent — Unicode π is 1 col, Nerd Font
-		// glyph and ASCII "pi" are 2 cols. Measure both and reserve the
-		// larger so every content line leaves room for either shape.
-		const prefixWidth = Math.max(visibleWidth(piPrefix), visibleWidth(contPrefix));
-		const innerWidth = width - GUTTER_WIDTH - prefixWidth;
+		// π lives in the fixed-width gutter (see the content map below), so it
+		// does not factor into innerWidth. Only contPrefix eats content budget.
+		const innerWidth = width - GUTTER_WIDTH - visibleWidth(contPrefix);
 		if (innerWidth < MIN_MARKDOWN_WIDTH) {
 			return [];
 		}
@@ -52,12 +55,25 @@ export class UserMessageComponent extends Container {
 			return raw;
 		}
 
+		// First-line gutter: π icon padded to exactly GUTTER_WIDTH cells. The
+		// glyph width is theme-dependent (Unicode π = 1 col, Nerd Font PUA = 2
+		// cols, ASCII "pi" = 2 cols); right-pad with spaces so the gutter
+		// occupies a fixed slot and the ┃ bar at col GUTTER_WIDTH aligns across
+		// every content line.
+		const piIcon = theme.icon.pi;
+		const piPadSize = Math.max(0, GUTTER_WIDTH - visibleWidth(piIcon));
+		// Pad inside the theme.fg wrap so the border-fg escape, glyph, and
+		// pad space form one contiguous span (no intervening fg reset). This
+		// matches the shape the raw-escape assertion in test 6 looks for.
+		const piGutter = theme.fg("border", piIcon + " ".repeat(piPadSize));
+
 		const leading = raw.slice(0, firstContent);
 		const content = raw.slice(firstContent).map((line, i) => {
-			const prefix = theme.fg("border", i === 0 ? piPrefix : contPrefix);
+			const prefix = theme.fg("border", contPrefix);
 			const combined = prefix + line;
 			const pad = Math.max(0, width - GUTTER_WIDTH - visibleWidth(combined));
-			return GUTTER_PAD + theme.bg("userMessageBg", combined + padding(pad));
+			const gutter = i === 0 ? piGutter : GUTTER_PAD;
+			return gutter + theme.bg("userMessageBg", combined + padding(pad));
 		});
 
 		return [...leading, ...content];