@evantahler/mcpx 0.20.1 → 0.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@evantahler/mcpx",
-	"version": "0.20.1",
+	"version": "0.21.0",
 	"description": "A command-line interface for MCP servers. curl for MCP.",
 	"type": "module",
 	"exports": {

package/src/client/elicitation.ts

@@ -283,16 +283,35 @@ async function promptMultiSelect(
 // URL mode
 // ---------------------------------------------------------------------------
 
-async function handleUrlElicitation(
+export async function handleUrlElicitation(
 	params: ElicitRequestURLParams,
 	options: ElicitationOptions,
 ): Promise<ElicitResult> {
 	if (options.json) {
 		return handleUrlJson(params);
 	}
+	if (options.noInteractive) {
+		printUrlElicitation(params);
+		return { action: "decline" };
+	}
 	return handleUrlInteractive(params);
 }
 
+function printUrlElicitation(params: ElicitRequestURLParams): void {
+	const domain = (() => {
+		try {
+			return new URL(params.url).hostname;
+		} catch {
+			return "unknown";
+		}
+	})();
+
+	logger.writeRaw(`\n${ansis.bold("Server requests URL interaction:")}\n`);
+	logger.writeRaw(`  ${params.message}\n`);
+	logger.writeRaw(`  ${ansis.yellow("Domain:")} ${domain}\n`);
+	logger.writeRaw(`  ${ansis.yellow("URL:")} ${params.url}\n`);
+}
+
 async function handleUrlJson(params: ElicitRequestURLParams): Promise<ElicitResult> {
 	const request = {
 		type: "elicitation",
@@ -313,32 +332,70 @@ async function handleUrlJson(params: ElicitRequestURLParams): Promise<ElicitResu
 }
 
 async function handleUrlInteractive(params: ElicitRequestURLParams): Promise<ElicitResult> {
-	const rl = createInterface({ input: process.stdin, output: process.stderr });
-	const question = (prompt: string): Promise<string> => new Promise((resolve) => rl.question(prompt, resolve));
-
-	try {
-		const domain = (() => {
-			try {
-				return new URL(params.url).hostname;
-			} catch {
-				return "unknown";
-			}
-		})();
+	printUrlElicitation(params);
 
-		logger.writeRaw(`\n${ansis.bold("Server requests URL interaction:")}\n`);
-		logger.writeRaw(`  ${params.message}\n`);
-		logger.writeRaw(`  ${ansis.yellow("Domain:")} ${domain}\n`);
-		logger.writeRaw(`  ${ansis.yellow("URL:")} ${params.url}\n`);
+	const yes = await promptYesNo(`  Open in browser? [y/n]: `);
+	if (yes) {
+		await openBrowser(params.url);
+		return { action: "accept" };
+	}
+	return { action: "decline" };
+}
 
-		const answer = await question(`  Open in browser? [y/n]: `);
-		if (["y", "yes"].includes(answer.toLowerCase())) {
-			await openBrowser(params.url);
-			return { action: "accept" };
-		}
-		return { action: "decline" };
-	} finally {
-		rl.close();
+/**
+ * Prompt for a yes/no answer.
+ * On a TTY, accepts a single keypress (y/Y/n/N/Enter/Esc) without requiring Enter.
+ * Off a TTY, falls back to line-buffered input so piped tests still work.
+ */
+function promptYesNo(prompt: string): Promise<boolean> {
+	logger.writeRaw(prompt);
+	const stdin = process.stdin;
+
+	if (!stdin.isTTY) {
+		return new Promise((resolve) => {
+			const rl = createInterface({ input: stdin });
+			rl.once("line", (line) => {
+				rl.close();
+				const ch = line.trim().toLowerCase();
+				resolve(ch === "y" || ch === "yes");
+			});
+			rl.once("close", () => resolve(false));
+		});
 	}
+
+	return new Promise((resolve) => {
+		stdin.setRawMode(true);
+		stdin.resume();
+
+		const cleanup = () => {
+			stdin.removeListener("data", onData);
+			stdin.setRawMode(false);
+			stdin.pause();
+		};
+
+		const onData = (data: Buffer) => {
+			const key = data.toString();
+			// Ctrl+C
+			if (key === "\u0003") {
+				cleanup();
+				logger.writeRaw("\n");
+				process.exit(130);
+			}
+			const ch = key.toLowerCase();
+			if (ch === "y") {
+				cleanup();
+				logger.writeRaw("y\n");
+				resolve(true);
+			} else if (ch === "n" || key === "\u001b") {
+				cleanup();
+				logger.writeRaw("n\n");
+				resolve(false);
+			}
+			// Ignore other keys
+		};
+
+		stdin.on("data", onData);
+	});
 }
 
 // ---------------------------------------------------------------------------

package/src/client/manager.ts

@@ -13,6 +13,7 @@ import {
 	CallToolResultSchema,
 	ElicitRequestSchema,
 	LoggingMessageNotificationSchema,
+	UrlElicitationRequiredError,
 } from "@modelcontextprotocol/sdk/types.js";
 import picomatch from "picomatch";
 import pkg from "../../package.json";
@@ -305,6 +306,8 @@ export class ServerManager {
 				return await fn();
 			} catch (err) {
 				lastError = err instanceof Error ? err : new Error(String(err));
+				// Don't retry auth challenges — the user needs to authorize first
+				if (err instanceof UrlElicitationRequiredError) throw lastError;
 				if (attempt < this.maxRetries && serverName) {
 					// Clear cached client so next attempt reconnects fresh
 					try {

package/src/commands/exec.ts

@@ -1,4 +1,6 @@
+import { UrlElicitationRequiredError } from "@modelcontextprotocol/sdk/types.js";
 import type { Command } from "commander";
+import { handleUrlElicitation } from "../client/elicitation.ts";
 import type { ServerManager } from "../client/manager.ts";
 import { DEFAULTS } from "../constants.ts";
 import { getContext } from "../context.ts";
@@ -108,7 +110,7 @@ export function registerExecCommand(program: Command) {
 				trailing: string[],
 				options: { file?: string; wait: boolean; ttl: string },
 			) => {
-				const { manager, formatOptions } = await getContext(program);
+				const { manager, formatOptions, noInteractive } = await getContext(program);
 
 				let resolved: ResolvedArgs;
 				try {
@@ -252,11 +254,22 @@ export function registerExecCommand(program: Command) {
 					} else {
 						// Standard synchronous tool call
 						const spinner = logger.startSpinner(`Executing ${server}/${tool}...`, formatOptions);
-						const result = await manager.callTool(server, tool, args);
-						spinner.stop();
+						let result: unknown;
+						try {
+							result = await manager.callTool(server, tool, args);
+						} finally {
+							spinner.stop();
+						}
 						console.log(formatCallResult(result, formatOptions));
 					}
 				} catch (err) {
+					if (err instanceof UrlElicitationRequiredError) {
+						const elicitOptions = { noInteractive, json: !!formatOptions.json };
+						for (const elicitation of err.elicitations) {
+							await handleUrlElicitation(elicitation, elicitOptions);
+						}
+						process.exit(1);
+					}
 					console.error(formatError(String(err), formatOptions));
 					process.exit(1);
 				} finally {

package/src/context.ts

@@ -10,6 +10,7 @@ export interface AppContext {
 	config: Config;
 	manager: ServerManager;
 	formatOptions: FormatOptions;
+	noInteractive: boolean;
 }
 
 /** Build the app context from the root commander program options */
@@ -67,5 +68,5 @@ export async function getContext(program: Command): Promise<AppContext> {
 
 	logger.configure(formatOptions);
 
-	return { config, manager, formatOptions };
+	return { config, manager, formatOptions, noInteractive };
 }

package/src/output/formatter.ts

@@ -363,16 +363,25 @@ function formatCallResultAsMarkdown(result: unknown): string {
 			mimeType?: string;
 			uri?: string;
 		}>;
+		structuredContent?: unknown;
+		_meta?: unknown;
 		isError?: boolean;
 	};
 
-	if (!r.content || !Array.isArray(r.content) || r.content.length === 0) {
+	const hasContent = Array.isArray(r.content) && r.content.length > 0;
+	const hasStructured = r.structuredContent !== undefined && r.structuredContent !== null;
+	const hasMeta =
+		r._meta !== undefined &&
+		r._meta !== null &&
+		!(typeof r._meta === "object" && Object.keys(r._meta as object).length === 0);
+
+	if (!hasContent && !hasStructured && !hasMeta) {
 		return renderMarkdownToAnsi(jsonToMarkdown(result));
 	}
 
 	const parts: string[] = [];
 
-	for (const block of r.content) {
+	for (const block of r.content ?? []) {
 		switch (block.type) {
 			case "text":
 				if (block.text !== undefined) {
@@ -390,15 +399,31 @@ function formatCallResultAsMarkdown(result: unknown): string {
 					`[image: ${block.mimeType ?? "unknown type"}, ${block.data ? Math.ceil((block.data.length * 3) / 4) : 0} bytes]`,
 				);
 				break;
+			case "audio":
+				parts.push(
+					`[audio: ${block.mimeType ?? "unknown type"}, ${block.data ? Math.ceil((block.data.length * 3) / 4) : 0} bytes]`,
+				);
+				break;
 			case "resource":
 				parts.push(`[resource: ${block.uri ?? "unknown"}]`);
 				break;
+			case "resource_link":
+				parts.push(`[resource_link: ${block.uri ?? "unknown"}]`);
+				break;
 			default:
-				parts.push(`[${block.type}]`);
+				parts.push(`[${block.type}]\n\n\`\`\`json\n${JSON.stringify(block, null, 2)}\n\`\`\``);
 				break;
 		}
 	}
 
+	if (hasStructured) {
+		parts.push(`**Structured Content:**\n\n${jsonToMarkdown(r.structuredContent)}`);
+	}
+
+	if (hasMeta) {
+		parts.push(`**Meta:**\n\n${jsonToMarkdown(r._meta)}`);
+	}
+
 	let output = parts.join("\n\n");
 	if (r.isError) {
 		output = `**error:** ${output}`;