@namzu/sdk 2.0.0 → 3.0.0

package/dist/connector/mcp/adapter.js

@@ -1,40 +1,263 @@
 import { z } from 'zod';
 import { zodToJsonSchema } from 'zod-to-json-schema';
+import { inlineSchemaRefs } from './schema-refs.js';
+/**
+ * Convert an MCP server's declared input schema into the Zod type namzu
+ * validates and re-renders with.
+ *
+ * The re-render is why fidelity matters here. A bridged tool's schema makes
+ * a round trip — server JSON Schema → Zod → JSON Schema on the wire — and
+ * whatever this function drops is dropped from what the MODEL is shown. The
+ * previous version collapsed `array` to `z.array(z.unknown())` and `object`
+ * to `z.record(z.unknown())`, so every MCP tool taking a structured
+ * argument was presented as "an array of anything" or "an object with any
+ * keys". Nested properties, item types, enums, and descriptions all
+ * vanished, and the model was left guessing at a shape the server had
+ * spelled out precisely.
+ */
 export function mcpJsonSchemaToZod(schema) {
-    if (!schema.properties || Object.keys(schema.properties).length === 0) {
-        return z.object({}).passthrough();
+    // Pointers first: a `$ref` is invisible to every branch below, and a
+    // schema whose main argument is a `$ref` was rendered to the model as
+    // "anything" — and, because the result is inherently optional in Zod,
+    // stopped being required as well.
+    const inlined = inlineSchemaRefs(schema);
+    return objectToZod(inlined, 0);
+}
+/**
+ * Ceiling on the `objectToZod` / `jsonSchemaPropertyToZod` mutual recursion.
+ *
+ * Ref inlining already refuses to expand a cycle, but a schema can nest
+ * deeply without any `$ref` at all, and a remote server's schema is
+ * untrusted input. Past the ceiling the node is left permissive rather than
+ * the process being taken down by a stack overflow.
+ */
+const MAX_CONVERSION_DEPTH = 32;
+function objectToZod(rawSchema, depth) {
+    // Flatten `allOf` here rather than only in the type switch: a root
+    // schema is converted through this function directly, so a tool whose
+    // whole input is `allOf: [...]` never reached the switch at all and was
+    // rendered as an object with no properties.
+    const allOf = rawSchema.allOf;
+    const schema = Array.isArray(allOf) && allOf.length > 0 ? mergeAllOf(allOf, rawSchema) : rawSchema;
+    const properties = schema.properties;
+    if (!properties || Object.keys(properties).length === 0) {
+        return closeOrOpen(z.object({}), schema);
     }
+    if (depth >= MAX_CONVERSION_DEPTH)
+        return z.record(z.unknown());
     const shape = {};
     const required = new Set(schema.required ?? []);
-    for (const [key, propSchema] of Object.entries(schema.properties)) {
-        let field = jsonSchemaPropertyToZod(propSchema);
-        if (!required.has(key)) {
-            field = field.optional();
-        }
-        shape[key] = field;
+    for (const [key, propSchema] of Object.entries(properties)) {
+        const field = jsonSchemaPropertyToZod(propSchema, depth + 1);
+        shape[key] = required.has(key) ? field : field.optional();
     }
-    return z.object(shape).passthrough();
+    return closeOrOpen(z.object(shape), schema);
+}
+/**
+ * Honor the server's `additionalProperties`, defaulting to closed.
+ *
+ * The old default was `.passthrough()`, which renders as
+ * `additionalProperties: true` — telling the model it may invent arguments
+ * the server never declared. Zod's default `.strip()` renders `false` and
+ * silently drops undeclared keys rather than rejecting them, so the
+ * contract shown to the model tightens without turning a server's
+ * incomplete schema into a hard validation failure.
+ */
+function closeOrOpen(obj, schema) {
+    return schema.additionalProperties === true ? obj.passthrough() : obj;
 }
-function jsonSchemaPropertyToZod(prop) {
+function jsonSchemaPropertyToZod(prop, depth = 0) {
     if (typeof prop !== 'object' || prop === null)
         return z.unknown();
     const schema = prop;
-    switch (schema.type) {
+    let base = applyConstraints(baseTypeToZod(schema, depth), schema);
+    // `type: ['string', 'null']` is how a JSON Schema says nullable.
+    if (Array.isArray(schema.type) && schema.type.includes('null')) {
+        base = base.nullable();
+    }
+    const description = schema.description;
+    if (typeof description === 'string' && description.length > 0) {
+        base = base.describe(description);
+    }
+    if (schema.default !== undefined) {
+        base = base.default(schema.default);
+    }
+    return base;
+}
+const num = (value) => typeof value === 'number' && Number.isFinite(value) ? value : undefined;
+/**
+ * Carry the server's validation keywords onto the converted node.
+ *
+ * Only `description` and `default` used to survive, so `pattern`, the
+ * length and range bounds, `format` and `multipleOf` were all dropped —
+ * from what the model is SHOWN as much as from what is enforced. A server
+ * that carefully said "an ISO date, 10 characters, matching this pattern"
+ * had the model told "a string", and then namzu accepted whatever the model
+ * invented and let the server reject it a round trip later.
+ */
+function applyConstraints(base, schema) {
+    if (base instanceof z.ZodString) {
+        let out = base;
+        const minLength = num(schema.minLength);
+        const maxLength = num(schema.maxLength);
+        if (minLength !== undefined)
+            out = out.min(minLength);
+        if (maxLength !== undefined)
+            out = out.max(maxLength);
+        if (typeof schema.pattern === 'string') {
+            try {
+                out = out.regex(new RegExp(schema.pattern));
+            }
+            catch {
+                // A server may use a regex dialect this engine cannot compile
+                // (named groups, lookbehind, POSIX classes). An unenforced
+                // pattern is a smaller loss than a tool that fails to register.
+            }
+        }
+        return applyStringFormat(out, schema.format);
+    }
+    if (base instanceof z.ZodNumber) {
+        let out = base;
+        const minimum = num(schema.minimum);
+        const maximum = num(schema.maximum);
+        const exclusiveMinimum = num(schema.exclusiveMinimum);
+        const exclusiveMaximum = num(schema.exclusiveMaximum);
+        const multipleOf = num(schema.multipleOf);
+        if (minimum !== undefined)
+            out = out.min(minimum);
+        if (maximum !== undefined)
+            out = out.max(maximum);
+        if (exclusiveMinimum !== undefined)
+            out = out.gt(exclusiveMinimum);
+        if (exclusiveMaximum !== undefined)
+            out = out.lt(exclusiveMaximum);
+        if (multipleOf !== undefined && multipleOf > 0)
+            out = out.multipleOf(multipleOf);
+        return out;
+    }
+    if (base instanceof z.ZodArray) {
+        let out = base;
+        const minItems = num(schema.minItems);
+        const maxItems = num(schema.maxItems);
+        if (minItems !== undefined)
+            out = out.min(minItems);
+        if (maxItems !== undefined)
+            out = out.max(maxItems);
+        return out;
+    }
+    return base;
+}
+function applyStringFormat(base, format) {
+    switch (format) {
+        case 'email':
+            return base.email();
+        case 'uri':
+        case 'url':
+            return base.url();
+        case 'uuid':
+            return base.uuid();
+        case 'date-time':
+            return base.datetime({ offset: true });
+        default:
+            // Every other `format` is advisory in JSON Schema. The description
+            // already carries it to the model; inventing a validator for it
+            // would reject payloads the server would have accepted.
+            return base;
+    }
+}
+function baseTypeToZod(schema, depth = 0) {
+    // An `enum` pins the value more tightly than `type` does, so it wins.
+    const enumValues = schema.enum;
+    if (Array.isArray(enumValues) && enumValues.length > 0) {
+        return enumToZod(enumValues);
+    }
+    if (schema.const !== undefined) {
+        return z.literal(schema.const);
+    }
+    const composite = (schema.anyOf ?? schema.oneOf);
+    if (Array.isArray(composite) && composite.length > 0) {
+        const members = composite.map((member) => jsonSchemaPropertyToZod(member, depth + 1));
+        return members.length === 1
+            ? members[0]
+            : z.union(members);
+    }
+    // `allOf` is how a schema generator says "this shape, plus that one".
+    // It reached the permissive branch, so an intersection of two fully
+    // described objects was shown to the model as "anything". Merged rather
+    // than intersected: an intersection re-renders as `allOf`, and a flat
+    // object is what a model can actually read.
+    const allOf = schema.allOf;
+    if (Array.isArray(allOf) && allOf.length > 0) {
+        return objectToZod(mergeAllOf(allOf, schema), depth);
+    }
+    // A union type (`['string','null']`) resolves through its non-null half;
+    // `jsonSchemaPropertyToZod` adds `.nullable()` back on top.
+    const type = Array.isArray(schema.type)
+        ? schema.type.find((t) => t !== 'null')
+        : schema.type;
+    switch (type) {
         case 'string':
             return z.string();
         case 'number':
-        case 'integer':
             return z.number();
+        case 'integer':
+            return z.number().int();
         case 'boolean':
             return z.boolean();
-        case 'array':
-            return z.array(z.unknown());
+        case 'null':
+            return z.null();
+        case 'array': {
+            const items = schema.items;
+            // A tuple (`items` as an array) is rare in tool schemas; treat it
+            // as a heterogeneous list rather than pretending to model it.
+            if (Array.isArray(items))
+                return z.array(z.unknown());
+            return z.array(items === undefined ? z.unknown() : jsonSchemaPropertyToZod(items));
+        }
         case 'object':
-            return z.record(z.unknown());
+            return objectToZod(schema, depth);
         default:
             return z.unknown();
     }
 }
+/**
+ * Flatten `allOf` members into one object schema.
+ *
+ * Only `properties` and `required` are merged, which is what the keyword
+ * is used for in practice (a base shape plus an extension). A member that
+ * describes something else is skipped rather than approximated. On a
+ * property collision the later member wins, matching the reading order.
+ */
+function mergeAllOf(members, parent) {
+    const properties = { ...(parent.properties ?? {}) };
+    const required = new Set(parent.required ?? []);
+    let additionalProperties = parent.additionalProperties;
+    for (const member of members) {
+        if (typeof member !== 'object' || member === null)
+            continue;
+        const part = member;
+        Object.assign(properties, part.properties ?? {});
+        for (const key of part.required ?? [])
+            required.add(key);
+        if (part.additionalProperties !== undefined)
+            additionalProperties = part.additionalProperties;
+    }
+    return {
+        type: 'object',
+        properties,
+        required: [...required],
+        ...(additionalProperties !== undefined ? { additionalProperties } : {}),
+    };
+}
+function enumToZod(values) {
+    if (values.every((v) => typeof v === 'string')) {
+        return z.enum(values);
+    }
+    const literals = values.map((v) => z.literal(v));
+    return literals.length === 1
+        ? literals[0]
+        : z.union(literals);
+}
 export function zodToMCPJsonSchema(zodSchema) {
     const jsonSchema = zodToJsonSchema(zodSchema, { target: 'openApi3' });
     return {
@@ -51,6 +274,11 @@ export function mcpToolToToolDefinition(tool, client, serverName) {
             ? `[MCP:${serverName}] ${tool.description}`
             : `[MCP:${serverName}] ${tool.name}`,
         inputSchema,
+        // Carried as the server wrote it. It is shown to the model, never
+        // validated here, so rebuilding it would only lose fidelity.
+        ...(tool.outputSchema
+            ? { outputSchema: inlineSchemaRefs(tool.outputSchema) }
+            : {}),
         category: 'network',
         permissions: ['network_access'],
         isReadOnly: () => tool.annotations?.readOnlyHint ?? false,
@@ -78,13 +306,59 @@ export function mcpToolResultToToolResult(result) {
         .filter((block) => block.type === 'text')
         .map((block) => block.text)
         .join('\n');
+    // Non-text blocks used to be filtered out and never seen again: a
+    // bridged MCP server returning a chart, a screenshot or a PDF had that
+    // content silently discarded, even though `types/connector/mcp.ts`
+    // modelled `image` and `resource` blocks all along. Pass them through
+    // as model-visible content when any are present.
+    const blocks = [];
+    for (const block of result.content) {
+        if (block.type === 'text') {
+            blocks.push({ type: 'text', text: block.text });
+        }
+        else if (block.type === 'image' && block.data && block.mimeType) {
+            blocks.push({ type: 'image', data: block.data, mediaType: block.mimeType });
+        }
+        else if (block.type === 'resource' && block.resource?.text) {
+            // A resource with inline text is readable content; one that is
+            // only a URI is a pointer the model cannot dereference, so it is
+            // named rather than pretended to be present.
+            blocks.push({ type: 'text', text: block.resource.text });
+        }
+    }
+    const hasRichContent = blocks.some((b) => b.type !== 'text');
+    // A server may answer with a structured payload and skip the
+    // compatibility text block. Serializing it is the difference between
+    // the model reading the answer and reading nothing at all — the call
+    // succeeded, so no error path would have caught it either. Text wins
+    // when both are present: the server wrote it for the model.
+    const output = textContent.length > 0 || result.structuredContent === undefined
+        ? textContent
+        : stringifyStructured(result.structuredContent);
     return {
         success: !result.isError,
-        output: textContent,
-        data: result.content,
-        error: result.isError ? textContent : undefined,
+        output,
+        ...(hasRichContent ? { content: blocks } : {}),
+        // `data` is the host-side escape hatch, so it must carry what the
+        // server actually sent, not just the blocks half of it.
+        data: result.structuredContent === undefined
+            ? result.content
+            : { content: result.content, structuredContent: result.structuredContent },
+        error: result.isError ? output : undefined,
     };
 }
+function stringifyStructured(value) {
+    if (typeof value === 'string')
+        return value;
+    try {
+        return JSON.stringify(value, null, 2) ?? '';
+    }
+    catch {
+        // Cyclic or otherwise unserializable. Naming it beats an empty
+        // result the model cannot distinguish from "nothing was found".
+        return '[structured result could not be serialized]';
+    }
+}
 export function toolResultToMCPToolResult(result) {
     const content = [];
     if (result.output) {

package/dist/connector/mcp/adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/connector/mcp/adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../../src/connector/mcp/adapter.ts"],"names":[],"mappings":"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"}

package/dist/connector/mcp/client.d.ts

@@ -23,9 +23,47 @@ export declare class MCPClient {
     listResources(): Promise<MCPResource[]>;
     readResource(uri: string): Promise<MCPContentBlock[]>;
     listResourceTemplates(): Promise<MCPResourceTemplate[]>;
+    /**
+     * Read a paged list to the end.
+     *
+     * The three list calls each sent an empty params object and returned
+     * the first page, never sending a cursor and never reading the one
+     * that came back. A server that pages its catalogue therefore
+     * contributed only its first page: the rest were never registered,
+     * never namespaced, never advertised — with no error, no warning and
+     * no drift signal, because drift compares page one against page one.
+     * The symptom is a model that does not use a tool it was told about,
+     * which reads as model incompetence rather than a client bug.
+     *
+     * The page cap is a runaway guard, not a limit anyone should reach: a
+     * server that keeps returning a cursor forever would otherwise loop
+     * until the process dies. Hitting it is loud, because a silently
+     * truncated catalogue is the failure being fixed here.
+     */
+    private listAllPages;
     onNotification(handler: (method: string, params?: Record<string, unknown>) => void): void;
     private createTransport;
+    /**
+     * Send a JSON-RPC request and wait for its reply, bounded by a timer.
+     *
+     * There was no timer at all. On `streamable_http` the pending promise
+     * happened to be bounded because `send()` awaits the fetch inside an
+     * aborted scope, but on **stdio** — the default for local servers —
+     * and on `http_sse` (whose reply arrives on a separate channel) a
+     * server that wedged left the promise pending forever. Combined with
+     * an executor that awaited tools unbounded, one unresponsive MCP
+     * server hung the whole run with no error and no `run_failed`: not a
+     * crash, just a process that stopped.
+     */
     private request;
+    /**
+     * Fail every in-flight request with the same reason.
+     *
+     * Previously only `disconnect()` did this, so a transport that dropped
+     * on its own — process exit, socket reset, server crash — left callers
+     * waiting on promises that could never settle.
+     */
+    private rejectAllPending;
     private notify;
     private handleMessage;
     private requireConnected;

package/dist/connector/mcp/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/connector/mcp/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,eAAe,EACf,cAAc,EAEd,eAAe,EACf,mBAAmB,EAEnB,WAAW,EACX,mBAAmB,EAEnB,iBAAiB,EACjB,aAAa,EAGb,MAAM,gCAAgC,CAAA;AACvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAa3D,qBAAa,SAAS;IACrB,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAA;IACxB,OAAO,CAAC,SAAS,CAAc;IAC/B,OAAO,CAAC,MAAM,CAAsC;IACpD,OAAO,CAAC,UAAU,CAAC,CAAoC;IACvD,OAAO,CAAC,kBAAkB,CAAC,CAAuB;IAClD,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,KAAK,CAAC,CAAQ;IACtB,OAAO,CAAC,eAAe,CAMpB;IACH,OAAO,CAAC,aAAa,CAAI;IACzB,OAAO,CAAC,oBAAoB,CACzB;IACH,OAAO,CAAC,GAAG,CAAQ;IACnB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;gBAE5B,MAAM,EAAE,eAAe;IAO7B,OAAO,IAAI,OAAO,CAAC,mBAAmB,CAAC;IA6CvC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAcjC,WAAW,IAAI,OAAO;IAItB,QAAQ,IAAI,cAAc;IAYpB,SAAS,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAMzC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;IAS9E,aAAa,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAMvC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAQrD,qBAAqB,IAAI,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAQ7D,cAAc,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,GAAG,IAAI;IAIzF,OAAO,CAAC,eAAe;YAcT,OAAO;YAkBP,MAAM;IASpB,OAAO,CAAC,aAAa;IAqBrB,OAAO,CAAC,gBAAgB;CAOxB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/connector/mcp/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,eAAe,EACf,cAAc,EAEd,eAAe,EACf,mBAAmB,EAEnB,WAAW,EACX,mBAAmB,EAEnB,iBAAiB,EACjB,aAAa,EAGb,MAAM,gCAAgC,CAAA;AACvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAqB3D,qBAAa,SAAS;IACrB,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAA;IACxB,OAAO,CAAC,SAAS,CAAc;IAC/B,OAAO,CAAC,MAAM,CAAsC;IACpD,OAAO,CAAC,UAAU,CAAC,CAAoC;IACvD,OAAO,CAAC,kBAAkB,CAAC,CAAuB;IAClD,OAAO,CAAC,WAAW,CAAC,CAAQ;IAC5B,OAAO,CAAC,KAAK,CAAC,CAAQ;IACtB,OAAO,CAAC,eAAe,CAMpB;IACH,OAAO,CAAC,aAAa,CAAI;IACzB,OAAO,CAAC,oBAAoB,CACzB;IACH,OAAO,CAAC,GAAG,CAAQ;IACnB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;gBAE5B,MAAM,EAAE,eAAe;IAO7B,OAAO,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAiEvC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAWjC,WAAW,IAAI,OAAO;IAItB,QAAQ,IAAI,cAAc;IAYpB,SAAS,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAKzC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;IAS9E,aAAa,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAKvC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAQrD,qBAAqB,IAAI,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAK7D;;;;;;;;;;;;;;;;OAgBG;YACW,YAAY;IAwB1B,cAAc,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,GAAG,IAAI;IAIzF,OAAO,CAAC,eAAe;IAcvB;;;;;;;;;;;OAWG;YACW,OAAO;IA4CrB;;;;;;OAMG;IACH,OAAO,CAAC,gBAAgB;YAaV,MAAM;IASpB,OAAO,CAAC,aAAa;IAiDrB,OAAO,CAAC,gBAAgB;CAOxB"}