pi-soly 1.9.3 → 1.11.0

package/mcp/tool-metadata.ts

@@ -0,0 +1,216 @@
+import { getToolUiResourceUri } from "@modelcontextprotocol/ext-apps/app-bridge";
+import type { McpExtensionState } from "./state.ts";
+import type { ToolMetadata, McpTool, McpResource, ServerEntry } from "./types.ts";
+import { formatToolName, isToolExcluded } from "./types.ts";
+import { resourceNameToToolName } from "./resource-tools.ts";
+import { extractToolUiStreamMode } from "./utils.ts";
+
+export function buildToolMetadata(
+  tools: McpTool[],
+  resources: McpResource[],
+  definition: ServerEntry,
+  serverName: string,
+  prefix: "server" | "none" | "short"
+): { metadata: ToolMetadata[]; failedTools: string[] } {
+  const metadata: ToolMetadata[] = [];
+  const failedTools: string[] = [];
+
+  for (const tool of tools) {
+    if (!tool?.name) {
+      failedTools.push("(unnamed)");
+      continue;
+    }
+    if (isToolExcluded(tool.name, serverName, prefix, definition.excludeTools)) {
+      continue;
+    }
+
+    let uiResourceUri: string | undefined;
+    try {
+      uiResourceUri = getToolUiResourceUri({ _meta: tool._meta });
+    } catch {
+      failedTools.push(tool.name);
+    }
+    metadata.push({
+      name: formatToolName(tool.name, serverName, prefix),
+      originalName: tool.name,
+      description: tool.description ?? "",
+      inputSchema: tool.inputSchema,
+      uiResourceUri,
+      uiStreamMode: extractToolUiStreamMode(tool._meta),
+    });
+  }
+
+  if (definition.exposeResources !== false) {
+    for (const resource of resources) {
+      const baseName = `get_${resourceNameToToolName(resource.name)}`;
+      if (isToolExcluded(baseName, serverName, prefix, definition.excludeTools)) {
+        continue;
+      }
+
+      metadata.push({
+        name: formatToolName(baseName, serverName, prefix),
+        originalName: baseName,
+        description: resource.description ?? `Read resource: ${resource.uri}`,
+        resourceUri: resource.uri,
+      });
+    }
+  }
+
+  return { metadata, failedTools };
+}
+
+export function getToolNames(state: McpExtensionState, serverName: string): string[] {
+  return state.toolMetadata.get(serverName)?.map(m => m.name) ?? [];
+}
+
+export function totalToolCount(state: McpExtensionState): number {
+  let count = 0;
+  for (const metadata of state.toolMetadata.values()) {
+    count += metadata.length;
+  }
+  return count;
+}
+
+export function findToolByName(metadata: ToolMetadata[] | undefined, toolName: string): ToolMetadata | undefined {
+  if (!metadata) return undefined;
+  const exact = metadata.find(m => m.name === toolName);
+  if (exact) return exact;
+  const normalized = toolName.replace(/-/g, "_");
+  return metadata.find(m => m.name.replace(/-/g, "_") === normalized);
+}
+
+export function formatSchema(schema: unknown, indent = "  "): string {
+  if (!schema || typeof schema !== "object" || Array.isArray(schema)) {
+    return `${indent}(no schema)`;
+  }
+
+  const s = schema as Record<string, unknown>;
+
+  if (s.type === "object" && s.properties && typeof s.properties === "object" && !Array.isArray(s.properties)) {
+    const props = s.properties as Record<string, unknown>;
+    const required = Array.isArray(s.required) ? s.required.filter((name): name is string => typeof name === "string") : [];
+
+    if (Object.keys(props).length === 0) {
+      return `${indent}(no parameters)`;
+    }
+
+    const lines: string[] = [];
+    for (const [name, propSchema] of Object.entries(props)) {
+      lines.push(...formatProperty(name, propSchema, required.includes(name), indent));
+    }
+    return lines.join("\n");
+  }
+
+  const lines = formatNestedSchema(s, indent);
+  if (lines.length > 0) {
+    return lines.join("\n");
+  }
+
+  const typeStr = formatType(s);
+  if (typeStr) {
+    return `${indent}(${typeStr})`;
+  }
+
+  return `${indent}(complex schema)`;
+}
+
+function formatProperty(name: string, schema: unknown, required: boolean, indent: string): string[] {
+  if (!schema || typeof schema !== "object" || Array.isArray(schema)) {
+    return [`${indent}${name}${required ? " *required*" : ""}`];
+  }
+
+  const s = schema as Record<string, unknown>;
+  const parts = [`${indent}${name}`];
+  const typeStr = formatType(s);
+  if (typeStr) parts.push(`(${typeStr})`);
+  if (required) parts.push("*required*");
+  appendSchemaAnnotations(parts, s);
+
+  return [parts.join(" "), ...formatNestedSchema(s, `${indent}  `)];
+}
+
+function formatNestedSchema(schema: Record<string, unknown>, indent: string): string[] {
+  const lines: string[] = [];
+
+  if (Array.isArray(schema.anyOf)) {
+    lines.push(...formatVariants("anyOf", schema.anyOf, indent));
+  }
+  if (Array.isArray(schema.oneOf)) {
+    lines.push(...formatVariants("oneOf", schema.oneOf, indent));
+  }
+  if (schema.items !== undefined) {
+    lines.push(...formatProperty("items", schema.items, false, indent));
+  }
+  if (schema.properties && typeof schema.properties === "object" && !Array.isArray(schema.properties)) {
+    const required = Array.isArray(schema.required) ? schema.required.filter((name): name is string => typeof name === "string") : [];
+    for (const [name, propSchema] of Object.entries(schema.properties as Record<string, unknown>)) {
+      lines.push(...formatProperty(name, propSchema, required.includes(name), indent));
+    }
+  }
+
+  return lines;
+}
+
+function formatVariants(keyword: "anyOf" | "oneOf", variants: unknown[], indent: string): string[] {
+  const lines = [`${indent}${keyword}:`];
+
+  for (const variant of variants) {
+    if (!variant || typeof variant !== "object" || Array.isArray(variant)) {
+      lines.push(`${indent}  - ${JSON.stringify(variant)}`);
+      continue;
+    }
+
+    const s = variant as Record<string, unknown>;
+    const typeStr = formatType(s) || "schema";
+    const parts = [`${indent}  - ${typeStr}`];
+    appendSchemaAnnotations(parts, s);
+    lines.push(parts.join(" "));
+    lines.push(...formatNestedSchema(s, `${indent}    `));
+  }
+
+  return lines;
+}
+
+function formatType(schema: Record<string, unknown>): string {
+  if (Object.hasOwn(schema, "const")) {
+    return `const ${JSON.stringify(schema.const)}`;
+  }
+
+  if (Array.isArray(schema.enum)) {
+    return `enum: ${schema.enum.map(v => JSON.stringify(v)).join(", ")}`;
+  }
+
+  if (Array.isArray(schema.type)) {
+    return schema.type.map(type => String(type)).join(" | ");
+  }
+
+  if (schema.type) {
+    return String(schema.type);
+  }
+
+  if (schema.properties && typeof schema.properties === "object" && !Array.isArray(schema.properties)) {
+    return "object";
+  }
+
+  if (schema.items !== undefined) {
+    return "array";
+  }
+
+  return "";
+}
+
+function appendSchemaAnnotations(parts: string[], schema: Record<string, unknown>): void {
+  if (schema.description && typeof schema.description === "string") {
+    parts.push(`- ${schema.description}`);
+  }
+
+  for (const key of ["minLength", "maxLength", "minimum", "maximum", "minItems", "maxItems", "format", "pattern"] as const) {
+    if (schema[key] !== undefined) {
+      parts.push(`[${key}: ${JSON.stringify(schema[key])}]`);
+    }
+  }
+
+  if (schema.default !== undefined) {
+    parts.push(`[default: ${JSON.stringify(schema.default)}]`);
+  }
+}

package/mcp/tool-registrar.ts

@@ -0,0 +1,46 @@
+// 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) };
+  });
+}

package/mcp/tool-result-renderer.ts

@@ -0,0 +1,161 @@
+import type { AgentToolResult, ToolRenderResultOptions } from "@earendil-works/pi-coding-agent";
+import { Text } from "@earendil-works/pi-tui";
+
+type McpToolResultDetails = Record<string, unknown> & { error?: unknown };
+type McpToolContentBlock = AgentToolResult<McpToolResultDetails>["content"][number];
+
+interface RenderTheme {
+  fg: (name: string, text: string) => string;
+  bold?: (text: string) => string;
+}
+
+export interface McpProxyToolCallInput {
+  tool?: string;
+  args?: string;
+  connect?: string;
+  describe?: string;
+  search?: string;
+  regex?: boolean;
+  includeSchemas?: boolean;
+  server?: string;
+  action?: string;
+}
+
+interface McpToolRenderContext {
+  isError: boolean;
+}
+
+export interface McpToolResultDisplay {
+  lines: string[];
+  truncated: boolean;
+}
+
+const DEFAULT_MAX_CALL_INPUT_CHARS = 1500;
+
+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.regex === true) line += " (regex)";
+    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 [title = "mcp", ...rest] = lines;
+  const styledTitle = theme.fg("toolTitle", theme.bold ? theme.bold(title) : title);
+  const styledRest = rest.map(line => theme.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}]`];
+}
+
+export function formatMcpToolResultLines(
+  result: Pick<AgentToolResult<McpToolResultDetails>, "content">,
+  expanded: boolean,
+  maxCollapsedLines = 3,
+): McpToolResultDisplay {
+  const allLines = result.content.flatMap(blockToLines);
+  const lines = allLines.length > 0 ? allLines : ["(empty result)"];
+
+  if (expanded || lines.length <= maxCollapsedLines) {
+    return { lines, truncated: false };
+  }
+
+  return {
+    lines: [...lines.slice(0, maxCollapsedLines), "…"],
+    truncated: true,
+  };
+}
+
+export function renderMcpToolResult(
+  result: AgentToolResult<McpToolResultDetails>,
+  options: ToolRenderResultOptions,
+  theme: RenderTheme,
+  context?: McpToolRenderContext,
+) {
+  if (options.isPartial) {
+    return new Text(theme.fg("warning", "Running MCP tool..."), 0, 0);
+  }
+
+  const hasErrorDetails = Boolean(result.details.error);
+  const display = formatMcpToolResultLines(result, options.expanded || context?.isError === true || hasErrorDetails);
+  const output = display.lines
+    .map((line) => line === "…" ? theme.fg("muted", line) : theme.fg("toolOutput", line))
+    .join("\n");
+  const hint = display.truncated && !options.expanded
+    ? `\n${theme.fg("muted", "(Ctrl+O to expand)")}`
+    : "";
+
+  return new Text(`${output}${hint}`, 0, 0);
+}