pi-mcp-extension 1.3.0 → 1.3.1

package/README.md

@@ -1,11 +1,11 @@
-# pi-mcp
+# pi-mcp-extension
 
-[![npm version](https://img.shields.io/npm/v/pi-mcp.svg)](https://www.npmjs.com/package/pi-mcp)
-[![license](https://img.shields.io/npm/l/pi-mcp.svg)](https://github.com/irahardianto/pi-mcp/blob/main/LICENSE)
+[![npm version](https://img.shields.io/npm/v/pi-mcp-extension.svg)](https://www.npmjs.com/package/pi-mcp-extension)
+[![license](https://img.shields.io/npm/l/pi-mcp-extension.svg)](https://github.com/irahardianto/pi-mcp-extension/blob/main/LICENSE)
 
 **Connect [Pi](https://pi.dev) to any MCP server.** Supabase, DeepSource, Playwright, Context7, filesystem, databases — if it speaks [MCP](https://modelcontextprotocol.io), Pi can use it.
 
-`pi-mcp` is a production-ready [Model Context Protocol](https://modelcontextprotocol.io/) client extension for the [Pi coding agent](https://pi.dev). It manages server connections, discovers tools, and bridges them into Pi so the LLM can call them directly.
+`pi-mcp-extension` is a production-ready [Model Context Protocol](https://modelcontextprotocol.io/) client extension for the [Pi coding agent](https://pi.dev). It manages server connections, discovers tools, and bridges them into Pi so the LLM can call them directly.
 
 ## Features
 
@@ -25,20 +25,20 @@
 ## Installation
 
 ```bash
-pi install npm:pi-mcp
+pi install npm:pi-mcp-extension
 ```
 
 Or try without installing:
 
 ```bash
-pi -e npm:pi-mcp
+pi -e npm:pi-mcp-extension
 ```
 
 ## Quick Start
 
 1. Install the extension:
    ```bash
-   pi install npm:pi-mcp
+   pi install npm:pi-mcp-extension
    ```
 
 2. Create a config file at `~/.pi/agent/mcp.json` (global) or `.pi/mcp.json` (project-level):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-mcp-extension",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "MCP (Model Context Protocol) client extension for the Pi coding agent — connect Pi to any MCP server",
   "type": "module",
   "keywords": [
@@ -16,11 +16,11 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/irahardianto/pi-mcp.git"
+    "url": "git+https://github.com/irahardianto/pi-mcp-extension.git"
   },
-  "homepage": "https://github.com/irahardianto/pi-mcp",
+  "homepage": "https://github.com/irahardianto/pi-mcp-extension",
   "bugs": {
-    "url": "https://github.com/irahardianto/pi-mcp/issues"
+    "url": "https://github.com/irahardianto/pi-mcp-extension/issues"
   },
   "files": [
     "src/",

package/src/tool-bridge.ts

@@ -30,13 +30,20 @@ export type PiExtensionAPI = Pick<ExtensionAPI, "registerTool" | "getActiveTools
 
 /**
  * Convert a JSON Schema object to a TypeBox schema.
- * Handles the common subset used by real-world MCP servers.
- * Falls back to Type.Any() for unsupported constructs ($ref, oneOf, etc.)
- * and logs a warning so users can report gaps.
+ * Handles the common subset used by real-world MCP servers:
+ *   - Primitives (string, number, integer, boolean, null)
+ *   - Arrays, objects (with required/optional/additionalProperties)
+ *   - Enums (string enums → Union of Literals)
+ *   - Nullable types ("type": ["string", "null"])
+ *   - $ref (local #/$defs/ and #/definitions/ references)
+ *   - oneOf / anyOf → TypeBox Union
+ *   - allOf → TypeBox Intersect
+ * Falls back to Type.Any() for unresolvable $ref or missing type.
  */
 export function convertJsonSchemaToTypebox(
   schema: unknown,
   depth = 0,
+  defs?: Record<string, unknown>,
 ): TSchema {
   // Guard against infinite recursion and malformed schemas
   if (!schema || typeof schema !== "object" || Array.isArray(schema) || depth > 10) {
@@ -47,6 +54,71 @@ export function convertJsonSchemaToTypebox(
   const description = typeof s["description"] === "string" ? s["description"] : undefined;
   const opts = description ? { description } : {};
 
+  // Extract $defs / definitions for $ref resolution (carried through recursive calls)
+  const resolvedDefs: Record<string, unknown> = {
+    ...((s["$defs"] ?? s["definitions"]) as Record<string, unknown> | undefined),
+    ...defs,
+  };
+
+  // ── Handle $ref ──────────────────────────────────────────────────────────
+  if (typeof s["$ref"] === "string") {
+    const ref = s["$ref"] as string;
+    let resolved: unknown;
+
+    // Local references: #/$defs/Foo, #/definitions/Foo
+    if (ref.startsWith("#/")) {
+      const parts = ref.slice(2).split("/");
+      if (parts[0] === "$defs" || parts[0] === "definitions") {
+        const key = parts.slice(1).join("/");
+        resolved = resolvedDefs[key];
+      } else {
+        // Fallback: try walking the defs map by the last part
+        const key = parts[parts.length - 1]!;
+        resolved = resolvedDefs[key];
+      }
+    } else {
+      // External $ref — cannot resolve, fall back
+      console.warn(
+        `[pi-mcp] Cannot resolve external $ref "${ref}", using Type.Any()`,
+      );
+      return Type.Any(opts);
+    }
+
+    if (!resolved) {
+      console.warn(
+        `[pi-mcp] Could not resolve $ref "${ref}", using Type.Any()`,
+      );
+      return Type.Any(opts);
+    }
+
+    // Merge description from referencing schema into resolved schema
+    const merged = { ...(resolved as Record<string, unknown>) };
+    if (description && !merged["description"]) {
+      merged["description"] = description;
+    }
+    return convertJsonSchemaToTypebox(merged, depth + 1, resolvedDefs);
+  }
+
+  // ── Handle oneOf / anyOf → TypeBox Union ─────────────────────────────────
+  if (Array.isArray(s["oneOf"])) {
+    const members = (s["oneOf"] as unknown[])
+      .map((sub) => convertJsonSchemaToTypebox(sub, depth + 1, resolvedDefs));
+    return members.length === 1 ? members[0]! : Type.Union(members, opts);
+  }
+
+  if (Array.isArray(s["anyOf"])) {
+    const members = (s["anyOf"] as unknown[])
+      .map((sub) => convertJsonSchemaToTypebox(sub, depth + 1, resolvedDefs));
+    return members.length === 1 ? members[0]! : Type.Union(members, opts);
+  }
+
+  // ── Handle allOf → TypeBox Intersect ─────────────────────────────────────
+  if (Array.isArray(s["allOf"])) {
+    const members = (s["allOf"] as unknown[])
+      .map((sub) => convertJsonSchemaToTypebox(sub, depth + 1, resolvedDefs));
+    return members.length === 1 ? members[0]! : Type.Intersect(members, opts);
+  }
+
   // Handle nullable types: { "type": ["string", "null"] }
   const rawType = s["type"];
   const type = Array.isArray(rawType)
@@ -84,7 +156,7 @@ export function convertJsonSchemaToTypebox(
     case "array": {
       const items = s["items"];
       base = Type.Array(
-        items ? convertJsonSchemaToTypebox(items, depth + 1) : Type.Unknown(),
+        items ? convertJsonSchemaToTypebox(items, depth + 1, resolvedDefs) : Type.Unknown(),
         opts,
       );
       break;
@@ -104,7 +176,7 @@ export function convertJsonSchemaToTypebox(
 
       const props: Record<string, TSchema> = {};
       for (const [key, value] of Object.entries(properties)) {
-        const converted = convertJsonSchemaToTypebox(value, depth + 1);
+        const converted = convertJsonSchemaToTypebox(value, depth + 1, resolvedDefs);
         props[key] = required.has(key) ? converted : Type.Optional(converted);
       }
 
@@ -117,12 +189,7 @@ export function convertJsonSchemaToTypebox(
       break;
     }
     default: {
-      // Unsupported: $ref, oneOf, anyOf, allOf, or missing type field
-      if (s["oneOf"] || s["anyOf"] || s["allOf"] || s["$ref"]) {
-        console.error(
-          `[pi-mcp] Unsupported JSON Schema construct (oneOf/anyOf/allOf/$ref), using Type.Any(). Schema: ${JSON.stringify(s).slice(0, 200)}`,
-        );
-      }
+      // Truly unsupported or missing type field
       base = Type.Any(opts);
       break;
     }