pi-soly 1.9.3 → 1.11.0

package/mcp/__tests__/tool-metadata.upstream-test.ts

@@ -0,0 +1,111 @@
+import { describe, expect, it } from "vitest";
+import { formatSchema } from "../tool-metadata.ts";
+
+describe("formatSchema", () => {
+  it("keeps simple object schemas compact", () => {
+    const schema = {
+      type: "object",
+      properties: {
+        query: { type: "string", description: "Search term", default: "all" },
+        limit: { type: ["number", "null"] },
+        mode: { enum: ["fast", "safe"] },
+      },
+      required: ["query"],
+    };
+
+    expect(formatSchema(schema)).toBe([
+      "  query (string) *required* - Search term [default: \"all\"]",
+      "  limit (number | null)",
+      "  mode (enum: \"fast\", \"safe\")",
+    ].join("\n"));
+  });
+
+  it("expands union branches with const discriminator fields", () => {
+    const schema = {
+      type: "object",
+      properties: {
+        document: {
+          anyOf: [
+            {
+              type: "object",
+              properties: {
+                type: { const: "text" },
+                content: { type: "string", minLength: 1 },
+              },
+              required: ["type", "content"],
+            },
+            {
+              type: "object",
+              properties: {
+                type: { const: "file" },
+                path: { type: "string", minLength: 1 },
+              },
+              required: ["type", "path"],
+            },
+          ],
+        },
+      },
+      required: ["document"],
+    };
+
+    expect(formatSchema(schema)).toBe([
+      "  document *required*",
+      "    anyOf:",
+      "      - object",
+      "        type (const \"text\") *required*",
+      "        content (string) *required* [minLength: 1]",
+      "      - object",
+      "        type (const \"file\") *required*",
+      "        path (string) *required* [minLength: 1]",
+    ].join("\n"));
+  });
+
+  it("formats oneOf branches", () => {
+    const schema = {
+      type: "object",
+      properties: {
+        target: {
+          oneOf: [
+            { const: "draft" },
+            { const: "published" },
+          ],
+        },
+      },
+    };
+
+    expect(formatSchema(schema)).toBe([
+      "  target",
+      "    oneOf:",
+      "      - const \"draft\"",
+      "      - const \"published\"",
+    ].join("\n"));
+  });
+
+  it("formats nested object properties and array items", () => {
+    const schema = {
+      type: "object",
+      properties: {
+        config: {
+          type: "object",
+          properties: {
+            enabled: { type: "boolean" },
+            tags: {
+              type: "array",
+              items: { enum: ["alpha", "beta"] },
+              minItems: 1,
+            },
+          },
+          required: ["enabled"],
+        },
+      },
+      required: ["config"],
+    };
+
+    expect(formatSchema(schema)).toBe([
+      "  config (object) *required*",
+      "    enabled (boolean) *required*",
+      "    tags (array) [minItems: 1]",
+      "      items (enum: \"alpha\", \"beta\")",
+    ].join("\n"));
+  });
+});

package/mcp/__tests__/tool-result-renderer.upstream-test.ts

@@ -0,0 +1,147 @@
+import type { AgentToolResult, ToolRenderResultOptions } from "@earendil-works/pi-coding-agent";
+import { describe, expect, it } from "vitest";
+import {
+  formatMcpDirectToolCallLines,
+  formatMcpProxyToolCallLines,
+  formatMcpToolResultLines,
+  renderMcpToolResult,
+} from "../tool-result-renderer.ts";
+
+type TestDetails = Record<string, unknown> & { error?: unknown };
+type TestResult = AgentToolResult<TestDetails>;
+
+const collapsedOptions: ToolRenderResultOptions = { expanded: false, isPartial: false };
+const plainTheme = { fg: (_name: string, text: string) => text };
+
+function result(content: TestResult["content"], details: TestDetails = {}): TestResult {
+  return { content, details };
+}
+
+describe("MCP tool call renderer", () => {
+  it("shows proxy tool calls with parsed JSON arguments", () => {
+    const display = formatMcpProxyToolCallLines({
+      tool: "cf-portal_list_worker_tail_events",
+      server: "cf-portal",
+      args: JSON.stringify({ accountId: "abc", scriptName: "worker" }),
+    });
+
+    expect(display).toEqual([
+      "mcp call cf-portal_list_worker_tail_events @ cf-portal",
+      '{\n  "accountId": "abc",\n  "scriptName": "worker"\n}',
+    ]);
+  });
+
+  it("shows proxy discovery operations", () => {
+    expect(formatMcpProxyToolCallLines({ search: "tail events", server: "cf-portal", regex: true })).toEqual([
+      "mcp search tail events @ cf-portal (regex)",
+    ]);
+    expect(formatMcpProxyToolCallLines({ connect: "cf-portal" })).toEqual(["mcp connect cf-portal"]);
+    expect(formatMcpProxyToolCallLines({ server: "cf-portal" })).toEqual(["mcp list cf-portal"]);
+    expect(formatMcpProxyToolCallLines({})).toEqual(["mcp status"]);
+  });
+
+  it("renders ui-messages with execution precedence", () => {
+    expect(formatMcpProxyToolCallLines({ action: "ui-messages", server: "cf-portal" })).toEqual(["mcp ui-messages"]);
+  });
+
+  it("shows direct tool calls with JSON arguments", () => {
+    const display = formatMcpDirectToolCallLines("cf-portal_list_worker_tail_events", {
+      accountId: "abc",
+      scriptName: "worker",
+    });
+
+    expect(display).toEqual([
+      "cf-portal_list_worker_tail_events",
+      '{\n  "accountId": "abc",\n  "scriptName": "worker"\n}',
+    ]);
+  });
+
+  it("omits empty direct tool arguments", () => {
+    expect(formatMcpDirectToolCallLines("cf-portal_status", {})).toEqual(["cf-portal_status"]);
+  });
+});
+
+describe("MCP tool result renderer", () => {
+  it("shows the first three lines and an ellipsis for collapsed long text", () => {
+    const display = formatMcpToolResultLines(result([
+      { type: "text", text: "one\ntwo\nthree\nfour" },
+    ]), false);
+
+    expect(display).toEqual({
+      lines: ["one", "two", "three", "…"],
+      truncated: true,
+    });
+  });
+
+  it("does not add an ellipsis when collapsed text is three lines or fewer", () => {
+    const display = formatMcpToolResultLines(result([
+      { type: "text", text: "one\ntwo\nthree" },
+    ]), false);
+
+    expect(display).toEqual({
+      lines: ["one", "two", "three"],
+      truncated: false,
+    });
+  });
+
+  it("shows full text when expanded", () => {
+    const display = formatMcpToolResultLines(result([
+      { type: "text", text: "one\ntwo\nthree\nfour" },
+    ]), true);
+
+    expect(display).toEqual({
+      lines: ["one", "two", "three", "four"],
+      truncated: false,
+    });
+  });
+
+  it("uses placeholders for images", () => {
+    const display = formatMcpToolResultLines(result([
+      { type: "text", text: "before" },
+      { type: "image", mimeType: "image/png", data: "abc" },
+    ]), true);
+
+    expect(display.lines).toEqual(["before", "[image: image/png]"]);
+  });
+
+  it("uses an empty-result placeholder when content is empty", () => {
+    const display = formatMcpToolResultLines(result([]), false);
+
+    expect(display).toEqual({ lines: ["(empty result)"], truncated: false });
+  });
+
+  it("keeps error text visible", () => {
+    const display = formatMcpToolResultLines(result([
+      { type: "text", text: "Error: upstream failed\nExpected parameters:\n{}" },
+    ]), false);
+
+    expect(display.lines).toEqual(["Error: upstream failed", "Expected parameters:", "{}"]);
+    expect(display.truncated).toBe(false);
+  });
+
+  it("renders long error results expanded even when the row is collapsed", () => {
+    const output = renderMcpToolResult(
+      result([{ type: "text", text: "Error: failed\nline 2\nline 3\nline 4" }]),
+      collapsedOptions,
+      plainTheme,
+      { isError: true },
+    ).render(80).join("\n");
+
+    expect(output).toContain("line 4");
+    expect(output).not.toContain("Ctrl+O to expand");
+    expect(output).not.toContain("…");
+  });
+
+  it("renders adapter error details expanded even when Pi context is not marked as an error", () => {
+    const output = renderMcpToolResult(
+      result([{ type: "text", text: "Error: failed\nline 2\nline 3\nline 4" }], { error: "tool_error" }),
+      collapsedOptions,
+      plainTheme,
+      { isError: false },
+    ).render(80).join("\n");
+
+    expect(output).toContain("line 4");
+    expect(output).not.toContain("Ctrl+O to expand");
+    expect(output).not.toContain("…");
+  });
+});