@xynogen/pix-ssh 0.3.0 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-ssh",
-	"version": "0.3.0",
+	"version": "0.3.3",
 	"description": "Pi tool — ssh_run: run remote commands over SSH with password/key auth and remote sudo",
 	"type": "module",
 	"main": "src/index.ts",
@@ -37,7 +37,7 @@
 	},
 	"dependencies": {
 		"typebox": "^1.1.38",
-		"@xynogen/pix-pretty": "^1.16.0",
+		"@xynogen/pix-pretty": "^1.19.0",
 		"@xynogen/pix-runtime": "^0.8.0"
 	},
 	"peerDependencies": {

package/src/index.ts

@@ -35,6 +35,7 @@ import type { RenderContextLike, ThemeLike, ToolResultLike } from "@xynogen/pix-
 import {
 	dotJoin,
 	fillToolBackground,
+	frameToolResult,
 	getTextContent,
 	hideCollapsedToolCall,
 	normalizeLineEndings,
@@ -43,6 +44,7 @@ import {
 	ruleFrame,
 	sectionRule,
 	termW,
+	unframeToolResult,
 } from "@xynogen/pix-pretty/utils";
 import { SPINNER } from "@xynogen/pix-pretty/widget-format";
 import { getUnattendedMode, withAgentBlock } from "@xynogen/pix-runtime";
@@ -310,14 +312,7 @@ export default function (pi: ExtensionAPI): void {
 			"`destination`, and optional `recursive`. Transfers may overwrite the destination. Always provide a clear `reason`.",
 		promptSnippet: "Run a remote command or transfer files over SSH",
 		promptGuidelines: [
-			"ssh_run sends commands or transfers files/directories over SSH. Basic cmd, PowerShell, or " +
-				"pwsh commands may work, but treat Windows shells as best-effort. Back away and tell the user " +
-				"when correctness depends on explicit shell selection, complex quoting, PowerShell error/stream/encoding " +
-				"semantics, interactive prompts, or Windows administrator/UAC elevation. `sudo` covers POSIX sudo " +
-				'only. Provide `host` as `[user@]host[:port]`. For file transfer, use `action: "file"`, ' +
-				'`direction: "upload" | "download"`, `source`, `destination`, and optional `recursive`. ' +
-				"Transfers may overwrite the destination and are warning-level: AFK/YOLO auto-approve when " +
-				"no login password is missing. Always explain the intent in `reason`.",
+			'ssh_run: `host` as `[user@]host[:port]`; `sudo` covers POSIX sudo only. For transfer use `action: "file"` with `direction: "upload"|"download"`, `source`, `destination`, optional `recursive` (may overwrite). Always set `reason`.',
 		],
 
 		renderShell: "self",
@@ -486,7 +481,7 @@ export default function (pi: ExtensionAPI): void {
 				hostApproved(approvedHosts, key) &&
 				promptFor.length === 0;
 			if (alreadyApproved) {
-				ctx.ui.notify(`🔐 ssh_run auto-approved — ${host} allowed this session`, "warning");
+				ctx.ui.notify(`ssh_run: reused session approval for ${host}`, "info");
 			} else if (transferDecision === "allow") {
 				ctx.ui.notify(
 					`⚠ ssh_run file transfer auto-approved — ${mode.toUpperCase()} warning policy`,
@@ -737,21 +732,24 @@ export default function (pi: ExtensionAPI): void {
 			renderCtx: RenderContextLike,
 		) => {
 			resolveBaseBackground(theme);
-			const text = renderCtx.lastComponent ?? new Text("", 0, 0);
+			const text = unframeToolResult(renderCtx.lastComponent ?? new Text("", 0, 0));
 			const details = result.details as SshResultDetails | undefined;
+			const isPartial = (_opt as { isPartial?: boolean } | undefined)?.isPartial === true;
+			const completed = (isError: boolean) => frameToolResult(text, theme, isError);
 
 			if (details?._type !== "sshResult") {
 				if (renderCtx.isError) {
 					text.setText(renderToolError(getTextContent(result) || "Error", theme));
 				} else {
 					text.setText(
-						fillToolBackground(`  ${theme.fg("dim", getTextContent(result) || "done")}`),
+						fillToolBackground(`  ${theme.fg("muted", getTextContent(result) || "done")}`),
 					);
 				}
-				return text;
+				return isPartial ? text : completed(renderCtx.isError);
 			}
 
 			if (
+				!isPartial &&
 				isTerminal(details) &&
 				tickCollapse(
 					"ssh",
@@ -760,12 +758,7 @@ export default function (pi: ExtensionAPI): void {
 					renderCtx.expanded,
 				)
 			) {
-				const status =
-					details.outcome === "success"
-						? "success"
-						: details.outcome === "error"
-							? "error"
-							: "warning";
+				const status = details.outcome === "success" ? "success" : "error";
 				text.setText(
 					renderCollapsedToolRow(
 						theme,
@@ -780,7 +773,7 @@ export default function (pi: ExtensionAPI): void {
 
 			if (details.outcome === "awaiting-approval" || details.outcome === "running") {
 				text.setText(
-					fillToolBackground(`  ${theme.fg("dim", getTextContent(result) || "working")}`),
+					fillToolBackground(`  ${theme.fg("muted", getTextContent(result) || "working")}`),
 				);
 				return text;
 			}
@@ -792,7 +785,7 @@ export default function (pi: ExtensionAPI): void {
 						? renderToolError(diagnostic, theme)
 						: fillToolBackground(`  ${theme.fg("warning", diagnostic)}`),
 				);
-				return text;
+				return isPartial ? text : completed(true);
 			}
 
 			const code = typeof details.exitCode === "number" ? details.exitCode : null;
@@ -803,22 +796,18 @@ export default function (pi: ExtensionAPI): void {
 
 			if (!rendered) {
 				text.setText(fillToolBackground(`  ${summary}`));
-				return text;
+				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 statusKey = code === null ? "dim" : code === 0 ? "success" : "error";
+			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 out = ruleFrame(
-				show.map((line) => `  ${sectionRule(line, theme, sw) ?? line}`),
-				footer,
-				termW(),
-				paint,
-			);
+			const body = show.map((line) => `  ${sectionRule(line, theme, sw) ?? line}`);
+			const out = isPartial ? [...body, ...footer] : ruleFrame(body, footer, termW(), paint);
 			text.setText(fillToolBackground(out.join("\n")));
 			return text;
 		}) as never,

package/src/lib.test.ts

@@ -1,4 +1,6 @@
 import { describe, expect, it } from "bun:test";
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import registerSsh from "./index.ts";
 import {
 	baseScpArgs,
 	baseSshArgs,
@@ -251,3 +253,68 @@ describe("truncate", () => {
 		expect(out.text.split("\n").length).toBe(2000);
 	});
 });
+
+describe("ssh result renderer", () => {
+	const theme = {
+		fg: (key: string, text: string) => `[${key}]${text}[/]`,
+		bold: (text: string) => text,
+	};
+	const register = () => {
+		let renderer: ((...args: unknown[]) => { render(width: number): string[] }) | undefined;
+		registerSsh({
+			registerTool(tool: unknown) {
+				renderer = (tool as { renderResult: typeof renderer }).renderResult;
+			},
+		} as unknown as ExtensionAPI);
+		if (!renderer) throw new Error("renderResult not registered");
+		return renderer;
+	};
+	const render = (
+		renderer: (...args: unknown[]) => { render(width: number): string[] },
+		details: Record<string, unknown> | undefined,
+		isError = false,
+		isPartial = false,
+		state: Record<string, unknown> = {},
+		expanded = true,
+	) =>
+		renderer(
+			{ content: [{ type: "text", text: String(details?.outcome ?? "done") }], details },
+			{ isPartial },
+			theme,
+			{ expanded, isError, invalidate: () => {}, state },
+		)
+			.render(24)
+			.join("\n");
+
+	it("frames open terminal outcomes and generic results by status", () => {
+		const renderer = register();
+		expect(render(renderer, undefined)).toContain("[success]─");
+		expect(render(renderer, undefined, true)).toContain("[error]─");
+		for (const outcome of ["denied", "timed-out", "cancelled", "error"]) {
+			expect(
+				render(renderer, {
+					_type: "sshResult",
+					command: "id",
+					host: "host",
+					sudo: false,
+					outcome,
+				}),
+			).toContain("[error]─");
+		}
+	});
+
+	it("leaves partial, running, and collapsed rows unframed", () => {
+		const renderer = register();
+		const running = {
+			_type: "sshResult",
+			command: "id",
+			host: "host",
+			sudo: false,
+			outcome: "running",
+		};
+		expect(render(renderer, running, false, true)).not.toContain("[success]─");
+		expect(render(renderer, running)).not.toContain("[success]─");
+		const success = { ...running, outcome: "success", exitCode: 0, _render: "done" };
+		expect(render(renderer, success, false, false, { collapsed: true }, false)).not.toContain("─");
+	});
+});