@xynogen/pix-ssh 0.5.5 → 0.5.6

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@xynogen/pix-ssh",
-	"version": "0.5.5",
-	"description": "Pi tool — ssh_run: run remote commands over SSH with password/key auth and remote sudo",
+	"version": "0.5.6",
+	"description": "Pi tool \u2014 ssh_run: run remote commands over SSH with password/key auth and remote sudo",
 	"type": "module",
 	"main": "src/index.ts",
 	"scripts": {
@@ -37,8 +37,8 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@xynogen/pix-pretty": "^1.25.0",
-		"@xynogen/pix-runtime": "^0.12.2"
+		"@xynogen/pix-pretty": "^1.30.0",
+		"@xynogen/pix-runtime": "^0.13.0"
 	},
 	"peerDependencies": {
 		"typebox": "*",

package/src/index.ts

@@ -27,24 +27,28 @@
 
 import type { AgentToolUpdateCallback, ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
-import { FG_DIM, RST, resolveBaseBackground } from "@xynogen/pix-pretty/ansi";
+import { resolveBaseBackground } from "@xynogen/pix-pretty/ansi";
+import { collapsedCommandRow, commandPreview } from "@xynogen/pix-pretty/command-preview";
 import { MAX_PREVIEW_LINES } from "@xynogen/pix-pretty/config";
 import { type OverlayResult, showOverlay } from "@xynogen/pix-pretty/gate-overlay";
 import { icon } from "@xynogen/pix-pretty/icon-catalog";
 import { renderBashOutput } from "@xynogen/pix-pretty/renderers";
 import type { RenderContextLike, ThemeLike, ToolResultLike } from "@xynogen/pix-pretty/types";
 import {
+	BODY_PAD,
+	bodyLine,
 	dotJoin,
 	fillToolBackground,
+	formatCollapsedToolRow,
+	formatToolCallTitle,
 	frameToolResult,
 	getErrorMessage,
 	getTextContent,
 	hideCollapsedToolCall,
+	moreLines,
 	normalizeLineEndings,
-	renderCollapsedToolRow,
 	renderToolError,
 	ruleFrame,
-	sectionRule,
 	termW,
 	unframeToolResult,
 } from "@xynogen/pix-pretty/utils";
@@ -884,20 +888,23 @@ export default function (pi: ExtensionAPI): void {
 			if (args.action === "info") {
 				text.setText(
 					fillToolBackground(
-						`${theme.fg("toolTitle", theme.bold("ssh info"))} ${theme.fg("dim", host || "list aliases")}`,
+						`${formatToolCallTitle(theme, "ssh info", renderCtx)} ${theme.fg("dim", host || "list aliases")}`,
 					),
 				);
 				return text;
 			}
 			const operation = normalizeOperation(args);
-			const command = safeOneLine(operation.command) || "(empty command)";
+			const command = operation.command || "(empty command)";
 			const prefix = operation.sudo ? "sudo " : "";
-			text.setText(
-				fillToolBackground(
-					`${theme.fg("toolTitle", theme.bold(operation.action === "file" ? "ssh file" : "ssh"))} ${theme.fg("dim", host)} ${theme.fg("muted", prefix + command)}`,
-				),
+			return commandPreview(
+				`${formatToolCallTitle(theme, operation.action === "file" ? "ssh file" : "ssh", renderCtx)} ${theme.fg("dim", host)}`,
+				prefix + command,
+				"bash",
+				theme,
+				renderCtx.state,
+				renderCtx.invalidate,
+				renderCtx.expanded,
 			);
-			return text;
 		}) as never,
 
 		renderResult: ((
@@ -917,7 +924,7 @@ export default function (pi: ExtensionAPI): void {
 					text.setText(renderToolError(getTextContent(result) || "Error", theme));
 				} else {
 					text.setText(
-						fillToolBackground(`  ${theme.fg("muted", getTextContent(result) || "done")}`),
+						fillToolBackground(`${BODY_PAD}${theme.fg("muted", getTextContent(result) || "done")}`),
 					);
 				}
 				return isPartial ? text : completed(renderCtx.isError);
@@ -934,21 +941,24 @@ export default function (pi: ExtensionAPI): void {
 				)
 			) {
 				const status = details.outcome === "success" ? "success" : "error";
-				text.setText(
-					renderCollapsedToolRow(
+				return collapsedCommandRow(
+					formatCollapsedToolRow(
 						theme,
 						"ssh",
-						`${details.host}  ${safeOneLine(details.command)}`,
+						details.host,
 						terminalMeta(details),
 						status,
-					),
+					).trimEnd(),
+					safeOneLine(details.command),
+					theme,
 				);
-				return text;
 			}
 
 			if (details.outcome === "awaiting-approval" || details.outcome === "running") {
 				text.setText(
-					fillToolBackground(`  ${theme.fg("muted", getTextContent(result) || "working")}`),
+					fillToolBackground(
+						`${BODY_PAD}${theme.fg("muted", getTextContent(result) || "working")}`,
+					),
 				);
 				return text;
 			}
@@ -958,7 +968,7 @@ export default function (pi: ExtensionAPI): void {
 				text.setText(
 					details.outcome === "error"
 						? renderToolError(diagnostic, theme)
-						: fillToolBackground(`  ${theme.fg("warning", diagnostic)}`),
+						: fillToolBackground(`${BODY_PAD}${theme.fg("warning", diagnostic)}`),
 				);
 				return isPartial ? text : completed(true);
 			}
@@ -970,18 +980,16 @@ export default function (pi: ExtensionAPI): void {
 			const lineCount = lines.length;
 
 			if (!rendered) {
-				text.setText(fillToolBackground(`  ${summary}`));
+				text.setText(fillToolBackground(`${BODY_PAD}${summary}`));
 				return isPartial ? text : completed(details.outcome !== "success");
 			}
 
 			const maxShow = renderCtx.expanded ? lineCount : MAX_PREVIEW_LINES;
 			const show = lines.slice(0, maxShow);
-			const footer =
-				lineCount > maxShow ? [`${FG_DIM}  … ${lineCount - maxShow} more lines${RST}`] : [];
+			const footer = lineCount > maxShow ? [moreLines(lineCount - maxShow, theme)] : [];
 			const statusKey = details.outcome === "success" ? "success" : "error";
 			const paint = (s: string) => theme.fg(statusKey, s);
-			const sw = Math.max(8, termW() - 4); // section-rule width inside the 2-space indent
-			const body = show.map((line) => `  ${sectionRule(line, theme, sw) ?? line}`);
+			const body = show.map((line) => bodyLine(line, theme));
 			const out = isPartial ? [...body, ...footer] : ruleFrame(body, footer, termW(), paint);
 			text.setText(fillToolBackground(out.join("\n")));
 			return text;