@fitchmultz/pi-mcp-adapter 5.0.0 → 7.0.0

package/tool-registrar.ts

@@ -1,69 +0,0 @@
-// tool-registrar.ts - MCP content transformation
-// NOTE: Tools are NOT registered with Pi - only the unified `mcp` proxy tool is registered.
-// This keeps the LLM context small (1 tool instead of 100s).
-
-import type { McpContent, ContentBlock } from "./types.ts";
-
-/**
- * Transform MCP content types to Pi content blocks.
- */
-export function transformMcpContent(content: McpContent[]): ContentBlock[] {
-  return content.map(c => {
-    if (c.type === "text") {
-      return { type: "text" as const, text: c.text ?? "" };
-    }
-    if (c.type === "image") {
-      return {
-        type: "image" as const,
-        data: c.data ?? "",
-        mimeType: c.mimeType ?? "image/png",
-      };
-    }
-    if (c.type === "resource") {
-      const resourceUri = c.resource?.uri ?? "(no URI)";
-      const resourceContent = c.resource?.text ?? (c.resource ? JSON.stringify(c.resource) : "(no content)");
-      return {
-        type: "text" as const,
-        text: `[Resource: ${resourceUri}]\n${resourceContent}`,
-      };
-    }
-    if (c.type === "resource_link") {
-      const linkName = c.name ?? c.uri ?? "unknown";
-      const linkUri = c.uri ?? "(no URI)";
-      return {
-        type: "text" as const,
-        text: `[Resource Link: ${linkName}]\nURI: ${linkUri}`,
-      };
-    }
-    if (c.type === "audio") {
-      return {
-        type: "text" as const,
-        text: `[Audio content: ${c.mimeType ?? "audio/*"}]`,
-      };
-    }
-    return { type: "text" as const, text: JSON.stringify(c) };
-  });
-}
-
-/**
- * Resolve a tool result's content blocks, falling back to structuredContent
- * when content is empty.
- */
-export function resolveMcpResultContent(result: Record<string, unknown>): ContentBlock[] {
-  const blocks = transformMcpContent((Array.isArray(result.content) ? result.content : []) as McpContent[]);
-  if (blocks.length > 0) return blocks;
-
-  if (result.structuredContent !== undefined) {
-    return [{ type: "text" as const, text: stringifyStructuredContent(result.structuredContent) }];
-  }
-
-  return [];
-}
-
-function stringifyStructuredContent(value: unknown): string {
-  try {
-    return JSON.stringify(value, null, 2) ?? String(value);
-  } catch {
-    return String(value);
-  }
-}

package/tool-result-renderer.ts

@@ -1,286 +0,0 @@
-import { keyHint, type AgentToolResult, type Theme, type ToolRenderResultOptions } from "@earendil-works/pi-coding-agent";
-import { type Component, Text } from "@earendil-works/pi-tui";
-
-type McpToolResultDetails = Record<string, unknown> & { error?: unknown };
-type McpToolContentBlock = AgentToolResult<McpToolResultDetails>["content"][number];
-
-type RenderTheme = Pick<Theme, "fg" | "bold">;
-
-const plainTheme: RenderTheme = {
-  fg: (_name, text) => text,
-  bold: (text) => text,
-};
-
-export interface McpProxyToolCallInput {
-  tool?: string;
-  args?: string | object;
-  connect?: string;
-  describe?: string;
-  search?: string;
-  includeSchemas?: boolean;
-  server?: string;
-  action?: string;
-}
-
-interface McpToolRenderContext {
-  isError: boolean;
-}
-
-export interface McpToolResultDisplay {
-  lines: string[];
-  truncated: boolean;
-}
-
-const DEFAULT_MAX_CALL_INPUT_CHARS = 1500;
-const DEFAULT_MAX_COLLAPSED_LINES = 3;
-const DEFAULT_MAX_COLLAPSED_CHARS = 8000;
-const COLLAPSED_RENDER_CHAR_SLACK = 8;
-
-class CollapsibleText implements Component {
-  private readonly fullText: Text;
-  private readonly footerText: Text;
-  private collapsedText: { charBudget: number; fullyIncluded: boolean; text: Text } | null = null;
-
-  constructor(
-    private readonly text: string,
-    private readonly expanded: boolean,
-    private readonly maxCollapsedLines: number,
-    private readonly ellipsis: string,
-    private readonly expandHint: string,
-    private readonly preTruncated = false,
-  ) {
-    this.fullText = new Text(text, 0, 0);
-    this.footerText = new Text(`${ellipsis}\n${expandHint}`, 0, 0);
-  }
-
-  render(width: number): string[] {
-    if (this.expanded) {
-      return this.fullText.render(width);
-    }
-
-    const safeWidth = Math.max(1, Math.floor(width));
-    const charBudget = safeWidth * (this.maxCollapsedLines + 1) * COLLAPSED_RENDER_CHAR_SLACK;
-    if (!this.collapsedText || this.collapsedText.charBudget !== charBudget) {
-      const prefix = this.text.length > charBudget
-        ? this.text.slice(0, charBudget)
-        : this.text;
-      this.collapsedText = {
-        charBudget,
-        fullyIncluded: prefix === this.text,
-        text: new Text(prefix, 0, 0),
-      };
-    }
-
-    const lines = this.collapsedText.text.render(width);
-    if (!this.preTruncated && this.collapsedText.fullyIncluded && lines.length <= this.maxCollapsedLines) return lines;
-
-    return [
-      ...lines.slice(0, this.maxCollapsedLines),
-      ...this.footerText.render(width),
-    ];
-  }
-
-  invalidate(): void {}
-}
-
-function truncateText(value: string, maxChars: number): string {
-  if (value.length <= maxChars) return value;
-  return `${value.slice(0, Math.max(0, maxChars - 1))}…`;
-}
-
-function formatJsonish(value: unknown, maxChars: number): string {
-  if (typeof value === "string") {
-    try {
-      return truncateText(JSON.stringify(JSON.parse(value), null, 2), maxChars);
-    } catch {
-      return truncateText(value, maxChars);
-    }
-  }
-
-  try {
-    return truncateText(JSON.stringify(value, null, 2), maxChars);
-  } catch {
-    return truncateText(String(value), maxChars);
-  }
-}
-
-function hasUsefulObjectContent(value: unknown): boolean {
-  return typeof value === "object" && value !== null && !Array.isArray(value) && Object.keys(value).length > 0;
-}
-
-export function formatMcpProxyToolCallLines(
-  args: McpProxyToolCallInput,
-  maxInputChars = DEFAULT_MAX_CALL_INPUT_CHARS,
-): string[] {
-  if (args.action === "ui-messages") return [`mcp ${args.action}`];
-
-  if (args.tool) {
-    const target = args.server ? `${args.tool} @ ${args.server}` : args.tool;
-    const lines = [`mcp call ${target}`];
-    if (args.args) lines.push(formatJsonish(args.args, maxInputChars));
-    return lines;
-  }
-
-  if (args.connect) return [`mcp connect ${args.connect}`];
-  if (args.describe) return [`mcp describe ${args.describe}`];
-
-  if (args.search) {
-    let line = `mcp search ${args.search}`;
-    if (args.server) line += ` @ ${args.server}`;
-    if (args.includeSchemas === false) line += " (schemas hidden)";
-    return [line];
-  }
-
-  if (args.server) return [`mcp list ${args.server}`];
-  if (args.action) return [`mcp ${args.action}`];
-
-  return ["mcp status"];
-}
-
-export function formatMcpDirectToolCallLines(
-  displayName: string,
-  args: Record<string, unknown>,
-  maxInputChars = DEFAULT_MAX_CALL_INPUT_CHARS,
-): string[] {
-  if (!hasUsefulObjectContent(args)) return [displayName];
-  return [displayName, formatJsonish(args, maxInputChars)];
-}
-
-function renderToolCallLines(lines: string[], theme?: RenderTheme) {
-  const activeTheme = theme ?? plainTheme;
-  const [title = "mcp", ...rest] = lines;
-  const styledTitle = activeTheme.fg("toolTitle", activeTheme.bold(title));
-  const styledRest = rest.map(line => activeTheme.fg("muted", line));
-  return new Text([styledTitle, ...styledRest].join("\n"), 0, 0);
-}
-
-export function renderMcpProxyToolCall(args: McpProxyToolCallInput, theme?: RenderTheme) {
-  return renderToolCallLines(formatMcpProxyToolCallLines(args), theme);
-}
-
-export function createMcpDirectToolCallRenderer(displayName: string) {
-  return (args: Record<string, unknown>, theme?: RenderTheme) => {
-    return renderToolCallLines(formatMcpDirectToolCallLines(displayName, args), theme);
-  };
-}
-
-function blockToLines(block: McpToolContentBlock): string[] {
-  if (block.type === "text") {
-    return block.text.split("\n");
-  }
-  return [`[image: ${block.mimeType}]`];
-}
-
-function collectCollapsedResultLines(
-  content: AgentToolResult<McpToolResultDetails>["content"],
-  maxLines: number,
-  maxChars: number,
-): McpToolResultDisplay {
-  if (content.length === 0) return { lines: ["(empty result)"], truncated: false };
-
-  const lines: string[] = [];
-  let remainingChars = maxChars;
-  let truncated = false;
-
-  const appendLine = (line: string) => {
-    if (lines.length >= maxLines || remainingChars <= 0) {
-      truncated = true;
-      return false;
-    }
-
-    if (line.length > remainingChars) {
-      lines.push(line.slice(0, remainingChars));
-      truncated = true;
-      remainingChars = 0;
-      return false;
-    }
-
-    lines.push(line);
-    remainingChars -= line.length + 1;
-    return true;
-  };
-
-  for (const block of content) {
-    if (block.type !== "text") {
-      if (!appendLine(`[image: ${block.mimeType}]`)) break;
-      continue;
-    }
-
-    let start = 0;
-    while (start <= block.text.length) {
-      const newline = block.text.indexOf("\n", start);
-      const line = newline === -1 ? block.text.slice(start) : block.text.slice(start, newline);
-      if (!appendLine(line)) break;
-      if (newline === -1) break;
-      start = newline + 1;
-    }
-
-    if (truncated) break;
-  }
-
-  if (lines.length === 0) lines.push("");
-  if (truncated && lines.length >= maxLines) lines.push("…");
-  return { lines, truncated };
-}
-
-export function formatMcpToolResultIdentity(details: McpToolResultDetails | undefined): string | null {
-  if (details?.mode !== "call") return null;
-  const server = typeof details.server === "string"
-    ? details.server
-    : typeof details.hintServer === "string"
-      ? details.hintServer
-      : null;
-  if (!server) return null;
-  if (typeof details.tool === "string") return `MCP ${server}/${details.tool}`;
-  if (typeof details.resourceUri === "string") return `MCP ${server} resource ${details.resourceUri}`;
-  if (typeof details.requestedTool === "string") return `MCP ${server}/${details.requestedTool}`;
-  return null;
-}
-
-export function formatMcpToolResultLines(
-  result: Pick<AgentToolResult<McpToolResultDetails>, "content">,
-  expanded: boolean,
-  maxCollapsedLines = 3,
-  maxCollapsedChars = DEFAULT_MAX_COLLAPSED_CHARS,
-): McpToolResultDisplay {
-  if (!expanded) {
-    return collectCollapsedResultLines(result.content, maxCollapsedLines, maxCollapsedChars);
-  }
-
-  const allLines = result.content.flatMap(blockToLines);
-  const lines = allLines.length > 0 ? allLines : ["(empty result)"];
-  return { lines, truncated: false };
-}
-
-export function renderMcpToolResult(
-  result: AgentToolResult<unknown>,
-  options: ToolRenderResultOptions,
-  theme?: RenderTheme,
-  context?: McpToolRenderContext,
-) {
-  const activeTheme = theme ?? plainTheme;
-  if (options.isPartial) {
-    return new Text(activeTheme.fg("warning", "Running MCP tool..."), 0, 0);
-  }
-
-  const details = typeof result.details === "object" && result.details !== null
-    ? result.details as McpToolResultDetails
-    : {};
-  const hasErrorDetails = Boolean(details.error);
-  const expanded = options.expanded || context?.isError === true || hasErrorDetails;
-  const display = formatMcpToolResultLines(result, expanded);
-  const identity = formatMcpToolResultIdentity(details);
-  const output = [
-    ...(identity ? [activeTheme.fg("muted", identity)] : []),
-    ...display.lines.map((line) => activeTheme.fg("toolOutput", line)),
-  ].join("\n");
-
-  return new CollapsibleText(
-    output,
-    expanded,
-    DEFAULT_MAX_COLLAPSED_LINES + (identity ? 1 : 0),
-    activeTheme.fg("muted", "…"),
-    activeTheme.fg("muted", `(${keyHint("app.tools.expand", "to expand")})`),
-    display.truncated,
-  );
-}

package/ts-shape.ts

@@ -1,145 +0,0 @@
-type Schema = Record<string, unknown>;
-
-const UNSUPPORTED_KEYWORDS = ["if", "then", "else", "allOf", "not", "patternProperties", "additionalProperties"];
-
-/** Renders the useful JSON Schema subset as TypeScript, or null for unsupported schemas. */
-export function renderTsShape(inputSchema: unknown): string | null {
-  try {
-    if (!isSchema(inputSchema)) return null;
-
-    const definitions = new Map<string, Schema>();
-    for (const key of ["$defs", "definitions"]) {
-      const rawDefinitions = inputSchema[key];
-      if (rawDefinitions === undefined) continue;
-      if (!isSchema(rawDefinitions)) return null;
-      for (const [name, definition] of Object.entries(rawDefinitions)) {
-        if (!isSchema(definition)) return null;
-        definitions.set(`${key}/${decodePointerToken(name)}`, definition);
-      }
-    }
-
-    const aliases = new Map<string, string>();
-    const usedAliases = new Set<string>();
-    let aliasIndex = 0;
-    const aliasFor = (definitionKey: string) => {
-      let alias = aliases.get(definitionKey);
-      if (alias) return alias;
-      const name = definitionKey.slice(definitionKey.indexOf("/") + 1);
-      alias = /^[A-Za-z_$][\w$]*$/.test(name) && !usedAliases.has(name) ? name : `Definition${++aliasIndex}`;
-      while (usedAliases.has(alias)) alias = `Definition${++aliasIndex}`;
-      aliases.set(definitionKey, alias);
-      usedAliases.add(alias);
-      return alias;
-    };
-
-    const render = (schema: unknown): string | null => {
-      if (!isSchema(schema) || hasUnsupportedKeyword(schema)) return null;
-
-      if ("$ref" in schema) {
-        if (typeof schema.$ref !== "string") return null;
-        const match = schema.$ref.match(/^#\/(\$defs|definitions)\/([^/]+)$/);
-        if (!match) return null;
-        const definitionGroup = match[1];
-        const definitionName = match[2];
-        if (definitionGroup === undefined || definitionName === undefined) return null;
-        const definitionKey = `${definitionGroup}/${decodePointerToken(definitionName)}`;
-        if (!definitions.has(definitionKey)) return null;
-        return aliasFor(definitionKey);
-      }
-
-      if (Array.isArray(schema.enum)) {
-        const values = schema.enum.map(renderLiteral);
-        return values.every((value): value is string => value !== null) ? values.join(" | ") : null;
-      }
-      if (Object.hasOwn(schema, "const")) return renderLiteral(schema.const);
-
-      if (Array.isArray(schema.anyOf) || Array.isArray(schema.oneOf)) {
-        const variants = (schema.anyOf ?? schema.oneOf) as unknown[];
-        if (variants.length === 0) return null;
-        const rendered = variants.map(render);
-        return rendered.every((value): value is string => value !== null) ? rendered.join(" | ") : null;
-      }
-
-      if (schema.type === "object" || schema.properties !== undefined) {
-        if (schema.properties === undefined) return "{}";
-        if (!isSchema(schema.properties)) return null;
-        const required = new Set(Array.isArray(schema.required)
-          ? schema.required.filter((name): name is string => typeof name === "string")
-          : []);
-        const properties: string[] = [];
-        for (const [name, property] of Object.entries(schema.properties)) {
-          const rendered = render(property);
-          if (rendered === null) return null;
-          properties.push(`${formatPropertyName(name)}${required.has(name) ? "" : "?"}: ${rendered};`);
-        }
-        return properties.length === 0 ? "{}" : `{ ${properties.join(" ")} }`;
-      }
-
-      if (schema.type === "array") {
-        if (schema.items === undefined) return "unknown[]";
-        const item = render(schema.items);
-        return item === null ? null : `${needsParentheses(item) ? `(${item})` : item}[]`;
-      }
-
-      if (Array.isArray(schema.type)) {
-        const types = schema.type.map(renderType);
-        return types.every((type): type is string => type !== null) ? types.join(" | ") : null;
-      }
-      if (typeof schema.type === "string") return renderType(schema.type);
-      return "unknown";
-    };
-
-    const root = render(inputSchema);
-    if (root === null) return null;
-
-    const definitionsText: string[] = [];
-    for (const [key, alias] of aliases) {
-      const definition = definitions.get(key);
-      if (!definition) return null;
-      const rendered = render(definition);
-      if (rendered === null) return null;
-      definitionsText.push(`type ${alias} = ${rendered};`);
-    }
-    return definitionsText.length > 0 ? `${definitionsText.join("\n")}\n\n${root}` : root;
-  } catch {
-    return null;
-  }
-}
-
-function isSchema(value: unknown): value is Schema {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
-function hasUnsupportedKeyword(schema: Schema): boolean {
-  return UNSUPPORTED_KEYWORDS.some(keyword => Object.hasOwn(schema, keyword));
-}
-
-function decodePointerToken(token: string): string {
-  return token.replace(/~1/g, "/").replace(/~0/g, "~");
-}
-
-function renderType(type: unknown): string | null {
-  switch (type) {
-    case "string": return "string";
-    case "number":
-    case "integer": return "number";
-    case "boolean": return "boolean";
-    case "null": return "null";
-    case "object": return "{}";
-    case "array": return "unknown[]";
-    default: return null;
-  }
-}
-
-function renderLiteral(value: unknown): string | null {
-  if (value === null || typeof value === "string" || typeof value === "boolean") return JSON.stringify(value);
-  return typeof value === "number" && Number.isFinite(value) ? String(value) : null;
-}
-
-function formatPropertyName(name: string): string {
-  return /^[A-Za-z_$][\w$]*$/.test(name) ? name : JSON.stringify(name);
-}
-
-function needsParentheses(type: string): boolean {
-  return type.includes(" | ");
-}

package/tsconfig.build.json

@@ -1,13 +0,0 @@
-{
-	"extends": "./tsconfig.json",
-	"compilerOptions": {
-		"noEmit": false,
-		"declaration": true,
-		"rewriteRelativeImportExtensions": true,
-		"outDir": "dist",
-		"rootDir": ".",
-		"sourceMap": false
-	},
-	"include": ["*.ts"],
-	"exclude": ["*.test.ts", "vitest.config.ts", "dist", "node_modules"]
-}

package/tsconfig.json

@@ -1,16 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "NodeNext",
-    "moduleResolution": "NodeNext",
-    "allowImportingTsExtensions": true,
-    "esModuleInterop": true,
-    "strict": true,
-    "exactOptionalPropertyTypes": true,
-    "noUncheckedIndexedAccess": true,
-    "skipLibCheck": true,
-    "noEmit": true,
-    "resolveJsonModule": true
-  },
-  "include": ["*.ts"]
-}