@xynogen/pix-ssh 0.2.1 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-ssh",
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"description": "Pi tool — ssh_run: run remote commands over SSH with password/key auth and remote sudo",
 	"type": "module",
 	"main": "src/index.ts",

package/src/index.ts

@@ -59,6 +59,7 @@ import {
 	MAX_OUTPUT_LINES,
 	parseHost,
 	probeKeyAuth,
+	resolveSshHost,
 	runSsh,
 	truncate,
 } from "./lib.ts";
@@ -268,9 +269,14 @@ export default function (pi: ExtensionAPI): void {
 					isError: true,
 				};
 			}
-			const host = hostTarget(spec);
-			const controlPath = controlPathFor(spec);
-			const key = cacheKey(spec);
+			// ponytail: let OpenSSH own config parsing; `ssh -G` handles aliases,
+			// Include, and Match rules without duplicating its config grammar.
+			const effectiveSpec = await resolveSshHost(spec, sig);
+			const host = hostTarget(effectiveSpec);
+			// Keep original target for execution so alias-specific IdentityFile,
+			// ProxyJump, and other SSH config options still apply.
+			const controlPath = controlPathFor(effectiveSpec);
+			const key = cacheKey(effectiveSpec);
 			const creds = credCache.get(key) ?? {};
 
 			const g = globalThis as { __pixAfk?: boolean; __pixYolo?: boolean };

package/src/lib.test.ts

@@ -10,6 +10,7 @@ import {
 	hostTarget,
 	isUnreachable,
 	parseHost,
+	parseSshConfig,
 	remoteCommand,
 	shellQuote,
 	truncate,
@@ -46,6 +47,20 @@ describe("parseHost", () => {
 	});
 });
 
+describe("parseSshConfig", () => {
+	it("reads effective user, hostname, and port from ssh -G output", () => {
+		expect(parseSshConfig("host orin\nuser jetson\nhostname 10.10.21.251\nport 2222\n")).toEqual({
+			user: "jetson",
+			host: "10.10.21.251",
+			port: 2222,
+		});
+	});
+
+	it("rejects incomplete ssh -G output", () => {
+		expect(parseSshConfig("hostname 10.10.21.251\n")).toBeUndefined();
+	});
+});
+
 describe("hostTarget", () => {
 	it("joins user and host", () => {
 		expect(hostTarget({ user: "a", host: "b" })).toBe("a@b");

package/src/lib.ts

@@ -108,6 +108,39 @@ function parsePort(value: string): number {
 	return n;
 }
 
+/** Parse effective destination fields emitted by OpenSSH's `ssh -G`. */
+export function parseSshConfig(output: string): HostSpec | undefined {
+	const values = new Map(
+		output
+			.split("\n")
+			.map((line) => line.trim().split(/\s+/, 2))
+			.filter((parts): parts is [string, string] => parts.length === 2),
+	);
+	const user = values.get("user");
+	const host = values.get("hostname");
+	const port = values.get("port");
+	if (!user || !host || !port) return undefined;
+	return { user, host, port: parsePort(port) };
+}
+
+/** Resolve aliases through OpenSSH config, including Include and Match rules. */
+export function resolveSshHost(spec: HostSpec, signal?: AbortSignal): Promise<HostSpec> {
+	const args = ["-G"];
+	if (spec.port !== undefined) args.push("-p", String(spec.port));
+	args.push(hostTarget(spec));
+
+	return new Promise((resolve) => {
+		let stdout = "";
+		const proc = spawn("ssh", args, { stdio: ["ignore", "pipe", "ignore"] });
+		proc.stdout.on("data", (chunk: Buffer) => {
+			stdout += chunk.toString();
+		});
+		proc.on("error", () => resolve(spec));
+		proc.on("close", (code) => resolve(code === 0 ? (parseSshConfig(stdout) ?? spec) : spec));
+		signal?.addEventListener("abort", () => proc.kill("SIGTERM"), { once: true });
+	});
+}
+
 /** Canonical `[user@]host` target string for ssh argv. */
 export function hostTarget(spec: HostSpec): string {
 	return spec.user ? `${spec.user}@${spec.host}` : spec.host;