@evantahler/mcpx 0.15.4 → 0.15.9

package/src/output/formatter.ts

@@ -3,6 +3,8 @@ import type { Tool, Resource, Prompt } from "../config/schemas.ts";
 import type { ToolWithServer, ResourceWithServer, PromptWithServer } from "../client/manager.ts";
 import type { ValidationError } from "../validation/schema.ts";
 import type { SearchResult } from "../search/index.ts";
+import { formatOutput } from "./format-output.ts";
+import { formatTable } from "./format-table.ts";
 
 export interface FormatOptions {
   json?: boolean;
@@ -109,133 +111,104 @@ const KNOWN_CAPABILITIES = ["tools", "resources", "prompts", "logging", "complet
 
 /** Format a full server overview (version, capabilities, tools, counts) */
 export function formatServerOverview(overview: ServerOverview, options: FormatOptions): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify(
-      {
-        server: overview.serverName,
-        version: overview.version ?? null,
-        capabilities: overview.capabilities ?? null,
-        instructions: overview.instructions ?? null,
-        tools: overview.tools.map((t) => ({ name: t.name, description: t.description ?? "" })),
-        resourceCount: overview.resourceCount,
-        promptCount: overview.promptCount,
-      },
-      null,
-      2,
-    );
-  }
-
-  const lines: string[] = [];
-
-  // Header: server name + version
-  const header = cyan.bold(overview.serverName);
-  if (overview.version) {
-    lines.push(
-      `${header}  ${dim(`v${overview.version.version}`)}  ${dim(`(${overview.version.name})`)}`,
-    );
-  } else {
-    lines.push(header);
-  }
+  return formatOutput(
+    {
+      server: overview.serverName,
+      version: overview.version ?? null,
+      capabilities: overview.capabilities ?? null,
+      instructions: overview.instructions ?? null,
+      tools: overview.tools.map((t) => ({ name: t.name, description: t.description ?? "" })),
+      resourceCount: overview.resourceCount,
+      promptCount: overview.promptCount,
+    },
+    () => {
+      const lines: string[] = [];
+
+      // Header: server name + version
+      const header = cyan.bold(overview.serverName);
+      if (overview.version) {
+        lines.push(
+          `${header}  ${dim(`v${overview.version.version}`)}  ${dim(`(${overview.version.name})`)}`,
+        );
+      } else {
+        lines.push(header);
+      }
 
-  // Capabilities
-  if (overview.capabilities) {
-    lines.push("");
-    lines.push(bold("Capabilities:"));
-    const caps = overview.capabilities;
-    const present = KNOWN_CAPABILITIES.filter((k) => k in caps);
-    const absent = KNOWN_CAPABILITIES.filter((k) => !(k in caps));
-    const capLines: string[] = [];
-    for (const k of present) capLines.push(`  ${green("✓")} ${k}`);
-    for (const k of absent) capLines.push(`  ${dim("✗")} ${dim(k)}`);
-    lines.push(...capLines);
-  }
+      // Capabilities
+      if (overview.capabilities) {
+        lines.push("");
+        lines.push(bold("Capabilities:"));
+        const caps = overview.capabilities;
+        const present = KNOWN_CAPABILITIES.filter((k) => k in caps);
+        const absent = KNOWN_CAPABILITIES.filter((k) => !(k in caps));
+        for (const k of present) lines.push(`  ${green("✓")} ${k}`);
+        for (const k of absent) lines.push(`  ${dim("✗")} ${dim(k)}`);
+      }
 
-  // Instructions
-  if (overview.instructions) {
-    lines.push("");
-    lines.push(bold("Instructions:"));
-    lines.push(`  ${dim(overview.instructions)}`);
-  }
+      // Instructions
+      if (overview.instructions) {
+        lines.push("");
+        lines.push(bold("Instructions:"));
+        lines.push(`  ${dim(overview.instructions)}`);
+      }
 
-  // Tools
-  lines.push("");
-  if (overview.tools.length === 0) {
-    lines.push(bold("Tools:") + " " + dim("none"));
-  } else {
-    lines.push(bold(`Tools (${overview.tools.length}):`));
-    const maxName = Math.max(...overview.tools.map((t) => t.name.length));
-    const termWidth = getTerminalWidth();
-    for (let i = 0; i < overview.tools.length; i++) {
-      const t = overview.tools[i];
-      if (i > 0) lines.push("");
-      const name = `  ${bold(t.name.padEnd(maxName))}`;
-      if (t.description) {
-        const pw = visibleLength(name) + 2;
-        const desc =
-          termWidth != null ? wrapDescription(t.description, pw, termWidth) : dim(t.description);
-        lines.push(`${name}  ${desc}`);
+      // Tools
+      lines.push("");
+      if (overview.tools.length === 0) {
+        lines.push(bold("Tools:") + " " + dim("none"));
       } else {
-        lines.push(name);
+        lines.push(bold(`Tools (${overview.tools.length}):`));
+        const maxName = Math.max(...overview.tools.map((t) => t.name.length));
+        const termWidth = getTerminalWidth();
+        for (let i = 0; i < overview.tools.length; i++) {
+          const t = overview.tools[i];
+          if (i > 0) lines.push("");
+          const name = `  ${bold(t.name.padEnd(maxName))}`;
+          if (t.description) {
+            const pw = visibleLength(name) + 2;
+            const desc =
+              termWidth != null
+                ? wrapDescription(t.description, pw, termWidth)
+                : dim(t.description);
+            lines.push(`${name}  ${desc}`);
+          } else {
+            lines.push(name);
+          }
+        }
       }
-    }
-  }
-
-  // Resource/prompt counts
-  const counts: string[] = [];
-  counts.push(`Resources: ${overview.resourceCount}`);
-  counts.push(`Prompts: ${overview.promptCount}`);
-  lines.push("");
-  lines.push(dim(counts.join(" | ")));
 
-  return lines.join("\n");
+      // Resource/prompt counts
+      const counts: string[] = [];
+      counts.push(`Resources: ${overview.resourceCount}`);
+      counts.push(`Prompts: ${overview.promptCount}`);
+      lines.push("");
+      lines.push(dim(counts.join(" | ")));
+
+      return lines.join("\n");
+    },
+    options,
+  );
 }
 
 /** Format a list of tools with server names */
 export function formatToolList(tools: ToolWithServer[], options: FormatOptions): string {
-  if (!isInteractive(options)) {
-    if (options.withDescriptions) {
-      return JSON.stringify(
-        tools.map((t) => ({
-          server: t.server,
-          tool: t.tool.name,
-          description: t.tool.description ?? "",
-        })),
-        null,
-        2,
-      );
-    }
-    return JSON.stringify(
-      tools.map((t) => ({ server: t.server, tool: t.tool.name })),
-      null,
-      2,
-    );
-  }
-
-  if (tools.length === 0) {
-    return dim("No tools found");
-  }
-
-  // Calculate column widths
-  const maxServer = Math.max(...tools.map((t) => t.server.length));
-  const maxTool = Math.max(...tools.map((t) => t.tool.name.length));
-  const termWidth = getTerminalWidth();
-
-  return tools
-    .map((t) => {
-      const server = cyan(t.server.padEnd(maxServer));
-      const tool = bold(t.tool.name.padEnd(maxTool));
-      if (options.withDescriptions && t.tool.description) {
-        const prefix = `${server}  ${tool}`;
-        const pw = visibleLength(prefix) + 2;
-        const desc =
-          termWidth != null
-            ? wrapDescription(t.tool.description, pw, termWidth)
-            : dim(t.tool.description);
-        return `${prefix}  ${desc}`;
-      }
-      return `${server}  ${tool}`;
-    })
-    .join("\n");
+  return formatOutput(
+    tools.map((t) => ({
+      server: t.server,
+      tool: t.tool.name,
+      ...(options.withDescriptions ? { description: t.tool.description ?? "" } : {}),
+    })),
+    () =>
+      formatTable(tools, {
+        columns: [
+          { value: (t) => t.server, style: cyan },
+          { value: (t) => t.tool.name, style: bold },
+        ],
+        description: options.withDescriptions ? (t) => t.tool.description : undefined,
+        emptyMessage: "No tools found",
+      }),
+    options,
+  );
 }
 
 /** Format tools for a single server */
@@ -244,66 +217,46 @@ export function formatServerTools(
   tools: Tool[],
   options: FormatOptions,
 ): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify(
-      {
-        server: serverName,
-        tools: tools.map((t) => ({ name: t.name, description: t.description ?? "" })),
-      },
-      null,
-      2,
-    );
-  }
-
-  if (tools.length === 0) {
-    return dim(`No tools found for ${serverName}`);
-  }
-
-  const header = cyan.bold(serverName);
-  const maxName = Math.max(...tools.map((t) => t.name.length));
-  const termWidth = getTerminalWidth();
-
-  const lines = tools.map((t) => {
-    const name = `  ${bold(t.name.padEnd(maxName))}`;
-    if (t.description) {
-      const pw = visibleLength(name) + 2;
-      const desc =
-        termWidth != null ? wrapDescription(t.description, pw, termWidth) : dim(t.description);
-      return `${name}  ${desc}`;
-    }
-    return name;
-  });
-
-  return [header, ...lines].join("\n");
+  return formatOutput(
+    {
+      server: serverName,
+      tools: tools.map((t) => ({ name: t.name, description: t.description ?? "" })),
+    },
+    () => {
+      if (tools.length === 0) {
+        return dim(`No tools found for ${serverName}`);
+      }
+      const header = cyan.bold(serverName);
+      const body = formatTable(tools, {
+        columns: [{ value: (t) => `  ${t.name}`, style: bold }],
+        description: (t) => t.description,
+      });
+      return `${header}\n${body}`;
+    },
+    options,
+  );
 }
 
 /** Format a tool schema */
 export function formatToolSchema(serverName: string, tool: Tool, options: FormatOptions): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify(
-      {
-        server: serverName,
-        tool: tool.name,
-        description: tool.description ?? "",
-        inputSchema: tool.inputSchema,
-      },
-      null,
-      2,
-    );
-  }
-
-  const lines: string[] = [];
-  lines.push(`${cyan(serverName)}/${bold(tool.name)}`);
-
-  if (tool.description) {
-    lines.push(dim(tool.description));
-  }
-
-  lines.push("");
-  lines.push(bold("Input Schema:"));
-  lines.push(formatSchema(tool.inputSchema, 2));
-
-  return lines.join("\n");
+  return formatOutput(
+    {
+      server: serverName,
+      tool: tool.name,
+      description: tool.description ?? "",
+      inputSchema: tool.inputSchema,
+    },
+    () => {
+      const lines: string[] = [];
+      lines.push(`${cyan(serverName)}/${bold(tool.name)}`);
+      if (tool.description) lines.push(dim(tool.description));
+      lines.push("");
+      lines.push(bold("Input Schema:"));
+      lines.push(formatSchema(tool.inputSchema, 2));
+      return lines.join("\n");
+    },
+    options,
+  );
 }
 
 /** Format a JSON schema as a readable parameter list */
@@ -329,37 +282,29 @@ function formatSchema(schema: Tool["inputSchema"], indent: number): string {
 
 /** Format detailed tool help with example payload */
 export function formatToolHelp(serverName: string, tool: Tool, options: FormatOptions): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify(
-      {
-        server: serverName,
-        tool: tool.name,
-        description: tool.description ?? "",
-        inputSchema: tool.inputSchema,
-        example: generateExample(tool.inputSchema),
-      },
-      null,
-      2,
-    );
-  }
-
-  const lines: string[] = [];
-  lines.push(`${cyan(serverName)}/${bold(tool.name)}`);
-
-  if (tool.description) {
-    lines.push(dim(tool.description));
-  }
-
-  lines.push("");
-  lines.push(bold("Parameters:"));
-  lines.push(formatSchema(tool.inputSchema, 2));
-
-  const example = generateExample(tool.inputSchema);
-  lines.push("");
-  lines.push(bold("Example:"));
-  lines.push(dim(`  mcpx call ${serverName} ${tool.name} '${JSON.stringify(example)}'`));
-
-  return lines.join("\n");
+  return formatOutput(
+    {
+      server: serverName,
+      tool: tool.name,
+      description: tool.description ?? "",
+      inputSchema: tool.inputSchema,
+      example: generateExample(tool.inputSchema),
+    },
+    () => {
+      const lines: string[] = [];
+      lines.push(`${cyan(serverName)}/${bold(tool.name)}`);
+      if (tool.description) lines.push(dim(tool.description));
+      lines.push("");
+      lines.push(bold("Parameters:"));
+      lines.push(formatSchema(tool.inputSchema, 2));
+      const example = generateExample(tool.inputSchema);
+      lines.push("");
+      lines.push(bold("Example:"));
+      lines.push(dim(`  mcpx call ${serverName} ${tool.name} '${JSON.stringify(example)}'`));
+      return lines.join("\n");
+    },
+    options,
+  );
 }
 
 /** Generate an example payload from a JSON schema */
@@ -370,7 +315,6 @@ function generateExample(schema: Tool["inputSchema"]): Record<string, unknown> {
 
   for (const [name, prop] of Object.entries(properties)) {
     const p = prop as Record<string, unknown>;
-    // Include required fields and first few optional fields
     if (required.has(name) || Object.keys(example).length < 3) {
       example[name] = exampleValue(name, p);
     }
@@ -380,15 +324,8 @@ function generateExample(schema: Tool["inputSchema"]): Record<string, unknown> {
 }
 
 function exampleValue(name: string, prop: Record<string, unknown>): unknown {
-  // Use enum first choice if available
-  if (Array.isArray(prop.enum) && prop.enum.length > 0) {
-    return prop.enum[0];
-  }
-
-  // Use default if provided
-  if (prop.default !== undefined) {
-    return prop.default;
-  }
+  if (Array.isArray(prop.enum) && prop.enum.length > 0) return prop.enum[0];
+  if (prop.default !== undefined) return prop.default;
 
   const type = prop.type as string | undefined;
   switch (type) {
@@ -438,51 +375,46 @@ export function formatValidationErrors(
   errors: ValidationError[],
   options: FormatOptions,
 ): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify({
-      error: "validation",
-      server: serverName,
-      tool: toolName,
-      details: errors,
-    });
-  }
-
-  const header = `${red("error:")} invalid arguments for ${cyan(serverName)}/${bold(toolName)}`;
-  const details = errors.map((e) => `  ${yellow(e.path)}: ${e.message}`).join("\n");
-  return `${header}\n${details}`;
+  return formatOutput(
+    { error: "validation", server: serverName, tool: toolName, details: errors },
+    () => {
+      const header = `${red("error:")} invalid arguments for ${cyan(serverName)}/${bold(toolName)}`;
+      const details = errors.map((e) => `  ${yellow(e.path)}: ${e.message}`).join("\n");
+      return `${header}\n${details}`;
+    },
+    options,
+  );
 }
 
 /** Format search results */
 export function formatSearchResults(results: SearchResult[], options: FormatOptions): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify(results, null, 2);
-  }
-
-  if (results.length === 0) {
-    return dim("No matching tools found");
-  }
-
-  const termWidth = getTerminalWidth();
-  const descIndent = 2;
-
-  return results
-    .map((r) => {
-      const header = `${cyan(r.server)}  ${bold(r.tool)}  ${yellow(r.score.toFixed(2))}`;
-
-      // Join all description lines into a single string for wrapping
-      const fullDesc = r.description
-        .split("\n")
-        .map((l) => l.trim())
-        .filter((l) => l.length > 0)
-        .join(" ");
-
-      const indent = " ".repeat(descIndent);
-      const desc =
-        termWidth != null ? wrapDescription(fullDesc, descIndent, termWidth) : dim(fullDesc);
+  return formatOutput(
+    results,
+    () => {
+      if (results.length === 0) {
+        return dim("No matching tools found");
+      }
 
-      return `${header}\n${indent}${desc}`;
-    })
-    .join("\n\n");
+      const termWidth = getTerminalWidth();
+      const descIndent = 2;
+
+      return results
+        .map((r) => {
+          const header = `${cyan(r.server)}  ${bold(r.tool)}  ${yellow(r.score.toFixed(2))}`;
+          const fullDesc = r.description
+            .split("\n")
+            .map((l) => l.trim())
+            .filter((l) => l.length > 0)
+            .join(" ");
+          const indent = " ".repeat(descIndent);
+          const desc =
+            termWidth != null ? wrapDescription(fullDesc, descIndent, termWidth) : dim(fullDesc);
+          return `${header}\n${indent}${desc}`;
+        })
+        .join("\n\n");
+    },
+    options,
+  );
 }
 
 /** Format a list of resources with server names */
@@ -490,43 +422,24 @@ export function formatResourceList(
   resources: ResourceWithServer[],
   options: FormatOptions,
 ): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify(
-      resources.map((r) => ({
-        server: r.server,
-        uri: r.resource.uri,
-        name: r.resource.name,
-        ...(options.withDescriptions ? { description: r.resource.description ?? "" } : {}),
-      })),
-      null,
-      2,
-    );
-  }
-
-  if (resources.length === 0) {
-    return dim("No resources found");
-  }
-
-  const maxServer = Math.max(...resources.map((r) => r.server.length));
-  const maxUri = Math.max(...resources.map((r) => r.resource.uri.length));
-  const termWidth = getTerminalWidth();
-
-  return resources
-    .map((r) => {
-      const server = cyan(r.server.padEnd(maxServer));
-      const uri = bold(r.resource.uri.padEnd(maxUri));
-      if (options.withDescriptions && r.resource.description) {
-        const prefix = `${server}  ${uri}`;
-        const pw = visibleLength(prefix) + 2;
-        const desc =
-          termWidth != null
-            ? wrapDescription(r.resource.description, pw, termWidth)
-            : dim(r.resource.description);
-        return `${prefix}  ${desc}`;
-      }
-      return `${server}  ${uri}`;
-    })
-    .join("\n");
+  return formatOutput(
+    resources.map((r) => ({
+      server: r.server,
+      uri: r.resource.uri,
+      name: r.resource.name,
+      ...(options.withDescriptions ? { description: r.resource.description ?? "" } : {}),
+    })),
+    () =>
+      formatTable(resources, {
+        columns: [
+          { value: (r) => r.server, style: cyan },
+          { value: (r) => r.resource.uri, style: bold },
+        ],
+        description: options.withDescriptions ? (r) => r.resource.description : undefined,
+        emptyMessage: "No resources found",
+      }),
+    options,
+  );
 }
 
 /** Format resources for a single server */
@@ -535,42 +448,29 @@ export function formatServerResources(
   resources: Resource[],
   options: FormatOptions,
 ): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify(
-      {
-        server: serverName,
-        resources: resources.map((r) => ({
-          uri: r.uri,
-          name: r.name,
-          description: r.description ?? "",
-          mimeType: r.mimeType ?? "",
-        })),
-      },
-      null,
-      2,
-    );
-  }
-
-  if (resources.length === 0) {
-    return dim(`No resources found for ${serverName}`);
-  }
-
-  const header = cyan.bold(serverName);
-  const maxUri = Math.max(...resources.map((r) => r.uri.length));
-  const termWidth = getTerminalWidth();
-
-  const lines = resources.map((r) => {
-    const uri = `  ${bold(r.uri.padEnd(maxUri))}`;
-    if (r.description) {
-      const pw = visibleLength(uri) + 2;
-      const desc =
-        termWidth != null ? wrapDescription(r.description, pw, termWidth) : dim(r.description);
-      return `${uri}  ${desc}`;
-    }
-    return uri;
-  });
-
-  return [header, ...lines].join("\n");
+  return formatOutput(
+    {
+      server: serverName,
+      resources: resources.map((r) => ({
+        uri: r.uri,
+        name: r.name,
+        description: r.description ?? "",
+        mimeType: r.mimeType ?? "",
+      })),
+    },
+    () => {
+      if (resources.length === 0) {
+        return dim(`No resources found for ${serverName}`);
+      }
+      const header = cyan.bold(serverName);
+      const body = formatTable(resources, {
+        columns: [{ value: (r) => `  ${r.uri}`, style: bold }],
+        description: (r) => r.description,
+      });
+      return `${header}\n${body}`;
+    },
+    options,
+  );
 }
 
 /** Format resource contents */
@@ -580,74 +480,53 @@ export function formatResourceContents(
   result: unknown,
   options: FormatOptions,
 ): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify(
-      { server: serverName, uri, contents: (result as { contents: unknown })?.contents ?? result },
-      null,
-      2,
-    );
-  }
-
-  const contents =
-    (result as { contents?: Array<{ text?: string; blob?: string; mimeType?: string }> })
-      ?.contents ?? [];
-  const lines: string[] = [];
-  lines.push(`${cyan(serverName)}/${bold(uri)}`);
-  lines.push("");
-
-  if (contents.length === 0) {
-    lines.push(dim("(empty)"));
-  } else {
-    for (const item of contents) {
-      if (item.text !== undefined) {
-        lines.push(item.text);
-      } else if (item.blob !== undefined) {
-        lines.push(dim(`<binary blob, ${item.blob.length} bytes base64>`));
+  return formatOutput(
+    { server: serverName, uri, contents: (result as { contents: unknown })?.contents ?? result },
+    () => {
+      const contents =
+        (result as { contents?: Array<{ text?: string; blob?: string; mimeType?: string }> })
+          ?.contents ?? [];
+      const lines: string[] = [];
+      lines.push(`${cyan(serverName)}/${bold(uri)}`);
+      lines.push("");
+
+      if (contents.length === 0) {
+        lines.push(dim("(empty)"));
+      } else {
+        for (const item of contents) {
+          if (item.text !== undefined) {
+            lines.push(item.text);
+          } else if (item.blob !== undefined) {
+            lines.push(dim(`<binary blob, ${item.blob.length} bytes base64>`));
+          }
+        }
       }
-    }
-  }
 
-  return lines.join("\n");
+      return lines.join("\n");
+    },
+    options,
+  );
 }
 
 /** Format a list of prompts with server names */
 export function formatPromptList(prompts: PromptWithServer[], options: FormatOptions): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify(
-      prompts.map((p) => ({
-        server: p.server,
-        name: p.prompt.name,
-        ...(options.withDescriptions ? { description: p.prompt.description ?? "" } : {}),
-      })),
-      null,
-      2,
-    );
-  }
-
-  if (prompts.length === 0) {
-    return dim("No prompts found");
-  }
-
-  const maxServer = Math.max(...prompts.map((p) => p.server.length));
-  const maxName = Math.max(...prompts.map((p) => p.prompt.name.length));
-  const termWidth = getTerminalWidth();
-
-  return prompts
-    .map((p) => {
-      const server = cyan(p.server.padEnd(maxServer));
-      const name = bold(p.prompt.name.padEnd(maxName));
-      if (options.withDescriptions && p.prompt.description) {
-        const prefix = `${server}  ${name}`;
-        const pw = visibleLength(prefix) + 2;
-        const desc =
-          termWidth != null
-            ? wrapDescription(p.prompt.description, pw, termWidth)
-            : dim(p.prompt.description);
-        return `${prefix}  ${desc}`;
-      }
-      return `${server}  ${name}`;
-    })
-    .join("\n");
+  return formatOutput(
+    prompts.map((p) => ({
+      server: p.server,
+      name: p.prompt.name,
+      ...(options.withDescriptions ? { description: p.prompt.description ?? "" } : {}),
+    })),
+    () =>
+      formatTable(prompts, {
+        columns: [
+          { value: (p) => p.server, style: cyan },
+          { value: (p) => p.prompt.name, style: bold },
+        ],
+        description: options.withDescriptions ? (p) => p.prompt.description : undefined,
+        emptyMessage: "No prompts found",
+      }),
+    options,
+  );
 }
 
 /** Format prompts for a single server */
@@ -656,47 +535,44 @@ export function formatServerPrompts(
   prompts: Prompt[],
   options: FormatOptions,
 ): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify(
-      {
-        server: serverName,
-        prompts: prompts.map((p) => ({
-          name: p.name,
-          description: p.description ?? "",
-          arguments: p.arguments ?? [],
-        })),
-      },
-      null,
-      2,
-    );
-  }
-
-  if (prompts.length === 0) {
-    return dim(`No prompts found for ${serverName}`);
-  }
-
-  const header = cyan.bold(serverName);
-  const maxName = Math.max(...prompts.map((p) => p.name.length));
-
-  const termWidth = getTerminalWidth();
-
-  const lines = prompts.map((p) => {
-    const name = `  ${bold(p.name.padEnd(maxName))}`;
-    const args =
-      p.arguments && p.arguments.length > 0
-        ? `  ${dim(`(${p.arguments.map((a) => (a.required ? a.name : `[${a.name}]`)).join(", ")})`)}`
-        : "";
-    if (p.description) {
-      const prefix = `${name}${args}`;
-      const pw = visibleLength(prefix) + 2;
-      const desc =
-        termWidth != null ? wrapDescription(p.description, pw, termWidth) : dim(p.description);
-      return `${prefix}  ${desc}`;
-    }
-    return `${name}${args}`;
-  });
+  return formatOutput(
+    {
+      server: serverName,
+      prompts: prompts.map((p) => ({
+        name: p.name,
+        description: p.description ?? "",
+        arguments: p.arguments ?? [],
+      })),
+    },
+    () => {
+      if (prompts.length === 0) {
+        return dim(`No prompts found for ${serverName}`);
+      }
 
-  return [header, ...lines].join("\n");
+      const header = cyan.bold(serverName);
+      const maxName = Math.max(...prompts.map((p) => p.name.length));
+      const termWidth = getTerminalWidth();
+
+      const lines = prompts.map((p) => {
+        const name = `  ${bold(p.name.padEnd(maxName))}`;
+        const args =
+          p.arguments && p.arguments.length > 0
+            ? `  ${dim(`(${p.arguments.map((a) => (a.required ? a.name : `[${a.name}]`)).join(", ")})`)}`
+            : "";
+        if (p.description) {
+          const prefix = `${name}${args}`;
+          const pw = visibleLength(prefix) + 2;
+          const desc =
+            termWidth != null ? wrapDescription(p.description, pw, termWidth) : dim(p.description);
+          return `${prefix}  ${desc}`;
+        }
+        return `${name}${args}`;
+      });
+
+      return [header, ...lines].join("\n");
+    },
+    options,
+  );
 }
 
 /** Format prompt messages */
@@ -706,80 +582,56 @@ export function formatPromptMessages(
   result: unknown,
   options: FormatOptions,
 ): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify({ server: serverName, prompt: name, ...(result as object) }, null, 2);
-  }
-
-  const r = result as {
-    description?: string;
-    messages?: Array<{ role: string; content: { type: string; text?: string } }>;
-  };
-  const lines: string[] = [];
-  lines.push(`${cyan(serverName)}/${bold(name)}`);
-
-  if (r.description) {
-    lines.push(dim(r.description));
-  }
-
-  lines.push("");
-
-  for (const msg of r.messages ?? []) {
-    lines.push(`${bold(msg.role)}:`);
-    if (msg.content.text !== undefined) {
-      lines.push(`  ${msg.content.text}`);
-    }
-  }
-
-  return lines.join("\n");
+  return formatOutput(
+    { server: serverName, prompt: name, ...(result as object) },
+    () => {
+      const r = result as {
+        description?: string;
+        messages?: Array<{ role: string; content: { type: string; text?: string } }>;
+      };
+      const lines: string[] = [];
+      lines.push(`${cyan(serverName)}/${bold(name)}`);
+      if (r.description) lines.push(dim(r.description));
+      lines.push("");
+      for (const msg of r.messages ?? []) {
+        lines.push(`${bold(msg.role)}:`);
+        if (msg.content.text !== undefined) {
+          lines.push(`  ${msg.content.text}`);
+        }
+      }
+      return lines.join("\n");
+    },
+    options,
+  );
 }
 
 /** Format a unified list of tools, resources, and prompts across servers */
 export function formatUnifiedList(items: UnifiedItem[], options: FormatOptions): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify(
-      items.map((i) => ({
-        server: i.server,
-        type: i.type,
-        name: i.name,
-        ...(options.withDescriptions ? { description: i.description ?? "" } : {}),
-      })),
-      null,
-      2,
-    );
-  }
-
-  if (items.length === 0) {
-    return dim("No tools, resources, or prompts found");
-  }
-
-  const maxServer = Math.max(...items.map((i) => i.server.length));
-  const maxType = 8; // "resource" is the longest at 8 chars
-  const maxName = Math.max(...items.map((i) => i.name.length));
-
-  const typeLabel = (t: UnifiedItem["type"]) => {
-    const padded = t.padEnd(maxType);
-    if (t === "tool") return green(padded);
-    if (t === "resource") return cyan(padded);
-    return yellow(padded);
+  const typeLabel = (t: string) => {
+    if (t === "tool") return green(t);
+    if (t === "resource") return cyan(t);
+    return yellow(t);
   };
 
-  const termWidth = getTerminalWidth();
-
-  return items
-    .map((i) => {
-      const server = cyan(i.server.padEnd(maxServer));
-      const type = typeLabel(i.type);
-      const name = bold(i.name.padEnd(maxName));
-      if (options.withDescriptions && i.description) {
-        const prefix = `${server}  ${type}  ${name}`;
-        const pw = visibleLength(prefix) + 2;
-        const desc =
-          termWidth != null ? wrapDescription(i.description, pw, termWidth) : dim(i.description);
-        return `${prefix}  ${desc}`;
-      }
-      return `${server}  ${type}  ${name}`;
-    })
-    .join("\n");
+  return formatOutput(
+    items.map((i) => ({
+      server: i.server,
+      type: i.type,
+      name: i.name,
+      ...(options.withDescriptions ? { description: i.description ?? "" } : {}),
+    })),
+    () =>
+      formatTable(items, {
+        columns: [
+          { value: (i) => i.server, style: cyan },
+          { value: (i) => i.type, style: typeLabel },
+          { value: (i) => i.name, style: bold },
+        ],
+        description: options.withDescriptions ? (i) => i.description : undefined,
+        emptyMessage: "No tools, resources, or prompts found",
+      }),
+    options,
+  );
 }
 
 /** Format a single task status */
@@ -787,36 +639,38 @@ export function formatTaskStatus(
   task: { taskId: string; status: string; [key: string]: unknown },
   options: FormatOptions,
 ): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify(task, null, 2);
-  }
-
-  const statusColor = (s: string) => {
-    switch (s) {
-      case "completed":
-        return green(s);
-      case "working":
-        return yellow(s);
-      case "failed":
-      case "cancelled":
-        return red(s);
-      case "input_required":
-        return yellow(s);
-      default:
-        return s;
-    }
-  };
-
-  const lines: string[] = [];
-  lines.push(`${bold("Task:")} ${cyan(task.taskId)}`);
-  lines.push(`${bold("Status:")} ${statusColor(task.status)}`);
-  if (task.statusMessage) lines.push(`${bold("Message:")} ${dim(String(task.statusMessage))}`);
-  if (task.createdAt) lines.push(`${bold("Created:")} ${dim(String(task.createdAt))}`);
-  if (task.lastUpdatedAt) lines.push(`${bold("Updated:")} ${dim(String(task.lastUpdatedAt))}`);
-  if (task.ttl != null) lines.push(`${bold("TTL:")} ${dim(String(task.ttl) + "ms")}`);
-  if (task.pollInterval != null)
-    lines.push(`${bold("Poll interval:")} ${dim(String(task.pollInterval) + "ms")}`);
-  return lines.join("\n");
+  return formatOutput(
+    task,
+    () => {
+      const statusColor = (s: string) => {
+        switch (s) {
+          case "completed":
+            return green(s);
+          case "working":
+            return yellow(s);
+          case "failed":
+          case "cancelled":
+            return red(s);
+          case "input_required":
+            return yellow(s);
+          default:
+            return s;
+        }
+      };
+
+      const lines: string[] = [];
+      lines.push(`${bold("Task:")} ${cyan(task.taskId)}`);
+      lines.push(`${bold("Status:")} ${statusColor(task.status)}`);
+      if (task.statusMessage) lines.push(`${bold("Message:")} ${dim(String(task.statusMessage))}`);
+      if (task.createdAt) lines.push(`${bold("Created:")} ${dim(String(task.createdAt))}`);
+      if (task.lastUpdatedAt) lines.push(`${bold("Updated:")} ${dim(String(task.lastUpdatedAt))}`);
+      if (task.ttl != null) lines.push(`${bold("TTL:")} ${dim(String(task.ttl) + "ms")}`);
+      if (task.pollInterval != null)
+        lines.push(`${bold("Poll interval:")} ${dim(String(task.pollInterval) + "ms")}`);
+      return lines.join("\n");
+    },
+    options,
+  );
 }
 
 /** Format a list of tasks */
@@ -825,43 +679,45 @@ export function formatTasksList(
   nextCursor: string | undefined,
   options: FormatOptions,
 ): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify({ tasks, ...(nextCursor ? { nextCursor } : {}) }, null, 2);
-  }
-
-  if (tasks.length === 0) {
-    return dim("No tasks found");
-  }
-
-  const statusColor = (s: string) => {
-    switch (s) {
-      case "completed":
-        return green(s.padEnd(14));
-      case "working":
-        return yellow(s.padEnd(14));
-      case "failed":
-      case "cancelled":
-        return red(s.padEnd(14));
-      default:
-        return s.padEnd(14);
-    }
-  };
-
-  const maxId = Math.max(...tasks.map((t) => t.taskId.length));
-
-  const lines = tasks.map((t) => {
-    const id = cyan(t.taskId.padEnd(maxId));
-    const status = statusColor(t.status);
-    const updated = t.lastUpdatedAt ? dim(String(t.lastUpdatedAt)) : "";
-    return `${id}  ${status}  ${updated}`;
-  });
+  return formatOutput(
+    { tasks, ...(nextCursor ? { nextCursor } : {}) },
+    () => {
+      if (tasks.length === 0) {
+        return dim("No tasks found");
+      }
 
-  if (nextCursor) {
-    lines.push("");
-    lines.push(dim(`Next cursor: ${nextCursor}`));
-  }
+      const statusColor = (s: string) => {
+        switch (s) {
+          case "completed":
+            return green(s.padEnd(14));
+          case "working":
+            return yellow(s.padEnd(14));
+          case "failed":
+          case "cancelled":
+            return red(s.padEnd(14));
+          default:
+            return s.padEnd(14);
+        }
+      };
+
+      const maxId = Math.max(...tasks.map((t) => t.taskId.length));
+
+      const lines = tasks.map((t) => {
+        const id = cyan(t.taskId.padEnd(maxId));
+        const status = statusColor(t.status);
+        const updated = t.lastUpdatedAt ? dim(String(t.lastUpdatedAt)) : "";
+        return `${id}  ${status}  ${updated}`;
+      });
+
+      if (nextCursor) {
+        lines.push("");
+        lines.push(dim(`Next cursor: ${nextCursor}`));
+      }
 
-  return lines.join("\n");
+      return lines.join("\n");
+    },
+    options,
+  );
 }
 
 /** Format task creation output (for --no-wait) */
@@ -869,16 +725,14 @@ export function formatTaskCreated(
   task: { taskId: string; status: string; [key: string]: unknown },
   options: FormatOptions,
 ): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify({ task }, null, 2);
-  }
-  return `${green("Task created:")} ${cyan(task.taskId)} ${dim(`(status: ${task.status})`)}`;
+  return formatOutput(
+    { task },
+    () => `${green("Task created:")} ${cyan(task.taskId)} ${dim(`(status: ${task.status})`)}`,
+    options,
+  );
 }
 
 /** Format an error message */
 export function formatError(message: string, options: FormatOptions): string {
-  if (!isInteractive(options)) {
-    return JSON.stringify({ error: message });
-  }
-  return `${red("error:")} ${message}`;
+  return formatOutput({ error: message }, () => `${red("error:")} ${message}`, options);
 }