tiny-stdio-mcp-server 0.1.15 → 0.1.17

package/README.md

@@ -58,7 +58,7 @@ server.tool("search", "Search for things", schema, async ({ query, limit }) => {
 });
 ```
 
-For structured-data tools, pass a root-object output schema. The server advertises it as MCP `Tool.outputSchema`, validates the handler result, returns it as `CallToolResult.structuredContent`, and also includes a JSON text backstop in `content[]` for older clients.
+For structured-data tools, pass a root-object output schema. The server advertises it as MCP `Tool.outputSchema`, validates successful handler results, and returns them as `CallToolResult.structuredContent`. Plain object returns receive a JSON text backstop in `content[]` for older clients. Explicit `CallToolResult` values keep their handler-supplied content blocks; the JSON text backstop is added only when `content` is empty.
 
 ```ts
 const input = defineSchema({
@@ -89,7 +89,11 @@ server.tool(
 );
 ```
 
-Output schemas must have `type: "object"` at the root. Tools whose natural result is prose, images, audio, files, or other content blocks should omit `outputSchema` and keep returning content.
+Output schemas must have `type: "object"` at the root because MCP structured content is an object. Otherwise, any schema accepted by Ajv is supported, including composition keywords, nullable type unions, and local `$defs`/`$ref` references. Input and output schemas compile synchronously during `.tool()` or `.registerTool()` registration, so malformed schemas throw immediately instead of failing on the first tool call.
+
+Successful structured results must satisfy `outputSchema`. Validation failures use JSON-RPC `-32602` for inputs and `-32603` for outputs, with Ajv's formatted error text in the message and the raw Ajv error array in `error.data`. Explicit handler results with `isError: true` are passed through unchanged and are exempt from structured-content and output-schema validation.
+
+Tools whose natural result is prose, images, audio, files, or other content blocks should omit `outputSchema` and keep returning content.
 
 ### `.listen()`
 
@@ -121,7 +125,7 @@ Dynamically add/remove tools at runtime and notify connected clients.
 
 ## Configuration Options
 
-- `createServer({ name, version })`: server identity sent during MCP initialization.
+- `createServer({ name, version, toolCallTimeoutMs? })`: server identity plus an optional positive-integer tool timeout in milliseconds. Timed-out calls return JSON-RPC error `-32603`; handlers continue running in the background.
 - `.tool(name, description, schema, handler, outputSchema?)`: tool metadata, input schema, handler, and optional structured output schema.
 - `.connect({ readable, writable })`: custom stream transport for tests or embedded hosts.
 

package/dist/server.js

@@ -3,15 +3,15 @@ import AjvModule from "ajv";
 import uriTemplateParser from "uri-template";
 import UriTemplate from "uri-template-lite";
 import { JSON_RPC_ERROR_CODES, ToolError } from "./types.js";
-import { parseMessage, formatSuccessResponse, formatErrorResponse, } from "./jsonrpc.js";
+import { parseMessage, formatSuccessResponse, formatErrorResponse } from "./jsonrpc.js";
 import { toContentBlocks } from "./content/convert.js";
 const PROTOCOL_VERSION = "2025-11-25";
-const SUPPORTED_PROTOCOL_VERSIONS = new Set([
-    "2025-03-26",
-    "2025-06-18",
-    PROTOCOL_VERSION,
-]);
+const SUPPORTED_PROTOCOL_VERSIONS = new Set(["2025-03-26", "2025-06-18", PROTOCOL_VERSION]);
 export function createServer(options) {
+    if (options.toolCallTimeoutMs !== undefined &&
+        (!Number.isInteger(options.toolCallTimeoutMs) || options.toolCallTimeoutMs <= 0)) {
+        throw new Error("toolCallTimeoutMs must be a positive integer.");
+    }
     const Ajv = "default" in AjvModule ? AjvModule.default : AjvModule;
     const jsonSchemaValidator = new Ajv({ strict: false });
     const supportNotifications = options.supportNotifications !== false;
@@ -26,7 +26,7 @@ export function createServer(options) {
         initialized: false,
         initializeAccepted: false,
         notificationReady: false,
-        resourceSubscriptions: new Set(),
+        resourceSubscriptions: new Set()
     };
     const messageLifecycles = new Set([defaultLifecycle]);
     const handleMessageWithLifecycle = async (method, lifecycle, params) => {
@@ -43,29 +43,27 @@ export function createServer(options) {
             lifecycle.initializeAccepted = true;
             lifecycle.initialized = true;
             lifecycle.notificationReady = false;
-            const requestedProtocol = typeof params?.protocolVersion === "string"
-                ? params.protocolVersion
-                : undefined;
+            const requestedProtocol = typeof params?.protocolVersion === "string" ? params.protocolVersion : undefined;
             const result = {
                 protocolVersion: requestedProtocol !== undefined && SUPPORTED_PROTOCOL_VERSIONS.has(requestedProtocol)
                     ? requestedProtocol
                     : PROTOCOL_VERSION,
                 capabilities: {
                     tools: {
-                        ...(supportNotifications ? { listChanged: true } : {}),
+                        ...(supportNotifications ? { listChanged: true } : {})
                     },
                     prompts: {
-                        ...(supportNotifications ? { listChanged: true } : {}),
+                        ...(supportNotifications ? { listChanged: true } : {})
                     },
                     resources: {
                         ...(supportNotifications ? { listChanged: true } : {}),
-                        ...(supportResourceSubscriptions ? { subscribe: true } : {}),
-                    },
+                        ...(supportResourceSubscriptions ? { subscribe: true } : {})
+                    }
                 },
                 serverInfo: {
                     name: options.name,
-                    version: options.version,
-                },
+                    version: options.version
+                }
             };
             return { result };
         }
@@ -74,8 +72,8 @@ export function createServer(options) {
                 return {
                     error: {
                         code: JSON_RPC_ERROR_CODES.INVALID_REQUEST,
-                        message: "Server not initialized",
-                    },
+                        message: "Server not initialized"
+                    }
                 };
             }
             lifecycle.notificationReady = true;
@@ -86,8 +84,8 @@ export function createServer(options) {
             return {
                 error: {
                     code: JSON_RPC_ERROR_CODES.INVALID_REQUEST,
-                    message: "Server not initialized",
-                },
+                    message: "Server not initialized"
+                }
             };
         }
         if (method === "tools/list") {
@@ -95,8 +93,10 @@ export function createServer(options) {
             for (const tool of tools.values()) {
                 const descriptor = { ...tool };
                 delete descriptor.handler;
+                delete descriptor.inputValidator;
+                delete descriptor.outputValidator;
                 toolList.push({
-                    ...descriptor,
+                    ...descriptor
                 });
             }
             return { result: { tools: toolList } };
@@ -107,8 +107,8 @@ export function createServer(options) {
                 return {
                     error: {
                         code: JSON_RPC_ERROR_CODES.INVALID_PARAMS,
-                        message: "Tool name required",
-                    },
+                        message: "Tool name required"
+                    }
                 };
             }
             const tool = tools.get(toolName);
@@ -116,24 +116,48 @@ export function createServer(options) {
                 return {
                     error: {
                         code: JSON_RPC_ERROR_CODES.INVALID_PARAMS,
-                        message: `Tool not found: ${toolName}`,
-                    },
+                        message: `Tool not found: ${toolName}`
+                    }
                 };
             }
             const toolArgs = (params?.arguments ?? {});
-            if (options.validateToolArguments !== false && !jsonSchemaValidator.validate(tool.inputSchema, toolArgs)) {
+            if (options.validateToolArguments !== false && !tool.inputValidator(toolArgs)) {
+                const errors = tool.inputValidator.errors ?? [];
                 return {
                     error: {
                         code: JSON_RPC_ERROR_CODES.INVALID_PARAMS,
-                        message: "Invalid tool arguments",
-                    },
+                        message: `Invalid tool arguments: ${jsonSchemaValidator.errorsText(errors)}`,
+                        data: errors
+                    }
                 };
             }
             try {
-                const handlerResult = await tool.handler(toolArgs);
+                let handlerResult;
+                if (options.toolCallTimeoutMs === undefined) {
+                    handlerResult = await tool.handler(toolArgs);
+                }
+                else {
+                    let timeout;
+                    const handlerPromise = Promise.resolve().then(() => tool.handler(toolArgs));
+                    handlerResult = await Promise.race([
+                        handlerPromise,
+                        new Promise((_resolve, reject) => {
+                            timeout = setTimeout(() => {
+                                reject(new ToolError(JSON_RPC_ERROR_CODES.INTERNAL_ERROR, `Tool call timed out: ${toolName}`));
+                            }, options.toolCallTimeoutMs);
+                        })
+                    ]).finally(() => {
+                        if (timeout !== undefined) {
+                            clearTimeout(timeout);
+                        }
+                    });
+                }
                 const result = normalizeToolResult(handlerResult, tool.outputSchema);
-                if (tool.outputSchema !== undefined && !jsonSchemaValidator.validate(tool.outputSchema, result.structuredContent)) {
-                    throw new ToolError(JSON_RPC_ERROR_CODES.INTERNAL_ERROR, "Invalid structured tool result");
+                if (result.isError !== true &&
+                    tool.outputValidator !== undefined &&
+                    !tool.outputValidator(result.structuredContent)) {
+                    const errors = tool.outputValidator.errors ?? [];
+                    throw new ToolError(JSON_RPC_ERROR_CODES.INTERNAL_ERROR, `Invalid structured tool result: ${jsonSchemaValidator.errorsText(errors)}`, errors);
                 }
                 return { result };
             }
@@ -143,14 +167,14 @@ export function createServer(options) {
                         error: {
                             code: err.code,
                             message: err.message,
-                            ...(err.data === undefined ? {} : { data: err.data }),
-                        },
+                            ...(err.data === undefined ? {} : { data: err.data })
+                        }
                     };
                 }
                 const errorMessage = err instanceof Error ? err.message : String(err);
                 const result = {
                     content: [{ type: "text", text: `Error: ${errorMessage}` }],
-                    isError: true,
+                    isError: true
                 };
                 return { result };
             }
@@ -158,8 +182,8 @@ export function createServer(options) {
         if (method === "prompts/list") {
             return {
                 result: {
-                    prompts: [...prompts.values()].map(({ handler: _handler, ...prompt }) => prompt),
-                },
+                    prompts: [...prompts.values()].map(({ handler: _handler, ...prompt }) => prompt)
+                }
             };
         }
         if (method === "prompts/get") {
@@ -189,15 +213,15 @@ export function createServer(options) {
         if (method === "resources/list") {
             return {
                 result: {
-                    resources: [...resources.values()].map(({ handler: _handler, ...resource }) => resource),
-                },
+                    resources: [...resources.values()].map(({ handler: _handler, ...resource }) => resource)
+                }
             };
         }
         if (method === "resources/templates/list") {
             return {
                 result: {
-                    resourceTemplates: [...resourceTemplates.values()].map(({ handler: _handler, ...resourceTemplate }) => resourceTemplate),
-                },
+                    resourceTemplates: [...resourceTemplates.values()].map(({ handler: _handler, ...resourceTemplate }) => resourceTemplate)
+                }
             };
         }
         if (method === "resources/read") {
@@ -225,16 +249,16 @@ export function createServer(options) {
                 return {
                     error: {
                         code: JSON_RPC_ERROR_CODES.METHOD_NOT_FOUND,
-                        message: "Method not found",
-                    },
+                        message: "Method not found"
+                    }
                 };
             }
             const uri = typeof params?.uri === "string" ? params.uri : undefined;
             if (uri === undefined || !isValidUri(uri)) {
                 return invalidParams("Resource URI required");
             }
-            if (method === "resources/subscribe"
-                && findReadableResource(uri, resources, resourceTemplates) === undefined) {
+            if (method === "resources/subscribe" &&
+                findReadableResource(uri, resources, resourceTemplates) === undefined) {
                 return resourceNotFound(uri);
             }
             if (method === "resources/subscribe") {
@@ -248,8 +272,8 @@ export function createServer(options) {
         return {
             error: {
                 code: JSON_RPC_ERROR_CODES.METHOD_NOT_FOUND,
-                message: "Method not found",
-            },
+                message: "Method not found"
+            }
         };
     };
     const createMessageSession = (listener) => {
@@ -257,7 +281,7 @@ export function createServer(options) {
             initialized: false,
             initializeAccepted: false,
             notificationReady: false,
-            resourceSubscriptions: new Set(),
+            resourceSubscriptions: new Set()
         };
         messageLifecycles.add(lifecycle);
         if (listener !== undefined) {
@@ -270,7 +294,7 @@ export function createServer(options) {
                     connectionNotificationListeners.delete(listener);
                 }
                 messageLifecycles.delete(lifecycle);
-            },
+            }
         };
     };
     const handleMessage = (method, params) => handleMessageWithLifecycle(method, defaultLifecycle, params);
@@ -288,7 +312,7 @@ export function createServer(options) {
             const requestWithId = request;
             write(formatErrorResponse(requestWithId.id, {
                 code: JSON_RPC_ERROR_CODES.INVALID_REQUEST,
-                message: "Invalid Request",
+                message: "Invalid Request"
             }) + "\n");
             return;
         }
@@ -301,7 +325,7 @@ export function createServer(options) {
                 const requestWithId = request;
                 write(formatErrorResponse(requestWithId.id, {
                     code: JSON_RPC_ERROR_CODES.INTERNAL_ERROR,
-                    message: "Internal error",
+                    message: "Internal error"
                 }) + "\n");
             }
             return;
@@ -322,7 +346,7 @@ export function createServer(options) {
         const notification = {
             jsonrpc: "2.0",
             method,
-            ...(params === undefined ? {} : { params }),
+            ...(params === undefined ? {} : { params })
         };
         for (const listener of notificationListeners) {
             listener(notification);
@@ -336,8 +360,11 @@ export function createServer(options) {
     const server = {
         tool(name, description, inputSchema, handler, outputSchema) {
             assertNonEmptyName(name, "Tool name required");
+            const inputValidator = jsonSchemaValidator.compile(inputSchema);
+            let outputValidator;
             if (outputSchema !== undefined) {
-                assertSupportedOutputSchema(outputSchema);
+                assertObjectRootSchema(outputSchema, "outputSchema");
+                outputValidator = jsonSchemaValidator.compile(outputSchema);
             }
             tools.set(name, {
                 name,
@@ -345,17 +372,24 @@ export function createServer(options) {
                 inputSchema: inputSchema,
                 ...(outputSchema === undefined ? {} : { outputSchema: outputSchema }),
                 handler: handler,
+                inputValidator,
+                ...(outputValidator === undefined ? {} : { outputValidator })
             });
             return server;
         },
         registerTool(definition, handler) {
             assertNonEmptyName(definition.name, "Tool name required");
+            const inputValidator = jsonSchemaValidator.compile(definition.inputSchema);
+            let outputValidator;
             if (definition.outputSchema !== undefined) {
-                assertSupportedOutputSchema(definition.outputSchema);
+                assertObjectRootSchema(definition.outputSchema, "outputSchema");
+                outputValidator = jsonSchemaValidator.compile(definition.outputSchema);
             }
             tools.set(definition.name, {
                 ...definition,
                 handler: handler,
+                inputValidator,
+                ...(outputValidator === undefined ? {} : { outputValidator })
             });
             return server;
         },
@@ -396,17 +430,20 @@ export function createServer(options) {
             return resourceTemplates.delete(uriTemplate);
         },
         async notifyToolsChanged() {
-            if (supportNotifications && [...messageLifecycles].some((lifecycle) => lifecycle.notificationReady)) {
+            if (supportNotifications &&
+                [...messageLifecycles].some((lifecycle) => lifecycle.notificationReady)) {
                 await broadcastNotification("notifications/tools/list_changed");
             }
         },
         async notifyPromptsChanged() {
-            if (supportNotifications && [...messageLifecycles].some((lifecycle) => lifecycle.notificationReady)) {
+            if (supportNotifications &&
+                [...messageLifecycles].some((lifecycle) => lifecycle.notificationReady)) {
                 await broadcastNotification("notifications/prompts/list_changed");
             }
         },
         async notifyResourcesChanged() {
-            if (supportNotifications && [...messageLifecycles].some((lifecycle) => lifecycle.notificationReady)) {
+            if (supportNotifications &&
+                [...messageLifecycles].some((lifecycle) => lifecycle.notificationReady)) {
                 await broadcastNotification("notifications/resources/list_changed");
             }
         },
@@ -421,7 +458,7 @@ export function createServer(options) {
         async listen() {
             return server.connect({
                 readable: process.stdin,
-                writable: process.stdout,
+                writable: process.stdout
             });
         },
         async connect(transport) {
@@ -432,7 +469,7 @@ export function createServer(options) {
                 const session = server.createMessageSession(listener);
                 const rl = readline.createInterface({
                     input: transport.readable,
-                    crlfDelay: Infinity,
+                    crlfDelay: Infinity
                 });
                 const pendingMessages = new Set();
                 rl.on("line", (line) => {
@@ -477,8 +514,8 @@ export function createServer(options) {
                             id: message.id,
                             error: {
                                 code: JSON_RPC_ERROR_CODES.INVALID_REQUEST,
-                                message: "Invalid Request",
-                            },
+                                message: "Invalid Request"
+                            }
                         });
                         return;
                     }
@@ -493,8 +530,8 @@ export function createServer(options) {
                             id: request.id,
                             error: {
                                 code: JSON_RPC_ERROR_CODES.INTERNAL_ERROR,
-                                message: "Internal error",
-                            },
+                                message: "Internal error"
+                            }
                         });
                         return;
                     }
@@ -503,7 +540,7 @@ export function createServer(options) {
                         const response = {
                             jsonrpc: "2.0",
                             id: request.id,
-                            error,
+                            error
                         };
                         await transport.send(response);
                     }
@@ -511,7 +548,7 @@ export function createServer(options) {
                         const response = {
                             jsonrpc: "2.0",
                             id: request.id,
-                            result,
+                            result
                         };
                         await transport.send(response);
                     }
@@ -525,7 +562,7 @@ export function createServer(options) {
                     reject(error);
                 });
             });
-        },
+        }
     };
     return server;
 }
@@ -533,24 +570,24 @@ function invalidParams(message) {
     return {
         error: {
             code: JSON_RPC_ERROR_CODES.INVALID_PARAMS,
-            message,
-        },
+            message
+        }
     };
 }
 function internalError(message) {
     return {
         error: {
             code: JSON_RPC_ERROR_CODES.INTERNAL_ERROR,
-            message,
-        },
+            message
+        }
     };
 }
 function resourceNotFound(uri) {
     return {
         error: {
             code: JSON_RPC_ERROR_CODES.RESOURCE_NOT_FOUND,
-            message: `Resource not found: ${uri}`,
-        },
+            message: `Resource not found: ${uri}`
+        }
     };
 }
 function toErrorMessage(error) {
@@ -573,7 +610,7 @@ function assertNonEmptyName(name, message) {
 function assertReadableUriTemplate(uriTemplate) {
     const parsed = uriTemplateParser.parse(uriTemplate);
     const expanded = parsed.expand(new Proxy({}, {
-        get: (_target, property) => typeof property === "string" ? "value" : undefined,
+        get: (_target, property) => (typeof property === "string" ? "value" : undefined)
     }));
     if (typeof expanded !== "string" || !isValidUri(expanded)) {
         throw new Error(`Invalid resource URI template: ${uriTemplate}`);
@@ -617,14 +654,14 @@ function isCallToolResult(value) {
     if (!hasContentArray(value) || !value.content.every(isContentItem)) {
         return false;
     }
-    if (hasOwnProperty(value, "structuredContent")
-        && value.structuredContent !== undefined
-        && !isJsonObject(value.structuredContent)) {
+    if (hasOwnProperty(value, "structuredContent") &&
+        value.structuredContent !== undefined &&
+        !isJsonObject(value.structuredContent)) {
         return false;
     }
-    return !(hasOwnProperty(value, "isError")
-        && value.isError !== undefined
-        && typeof value.isError !== "boolean");
+    return !(hasOwnProperty(value, "isError") &&
+        value.isError !== undefined &&
+        typeof value.isError !== "boolean");
 }
 function normalizeToolResult(handlerResult, outputSchema) {
     if (hasContentArray(handlerResult) && !isCallToolResult(handlerResult)) {
@@ -639,102 +676,27 @@ function normalizeToolResult(handlerResult, outputSchema) {
         }
         return result;
     }
-    const structuredContent = isCallToolResult(handlerResult)
-        ? handlerResult.structuredContent
-        : handlerResult;
+    if (isCallToolResult(handlerResult) && handlerResult.isError === true) {
+        return handlerResult;
+    }
+    const callToolResult = isCallToolResult(handlerResult) ? handlerResult : undefined;
+    const structuredContent = callToolResult ? callToolResult.structuredContent : handlerResult;
     if (!isJsonObject(structuredContent)) {
         throw new ToolError(JSON_RPC_ERROR_CODES.INTERNAL_ERROR, "Structured tool result must be an object");
     }
     return {
-        content: [{ type: "text", text: JSON.stringify(structuredContent) }],
-        ...(isCallToolResult(handlerResult) && handlerResult.isError !== undefined
-            ? { isError: handlerResult.isError }
-            : {}),
-        structuredContent,
+        content: callToolResult !== undefined && callToolResult.content.length > 0
+            ? callToolResult.content
+            : [{ type: "text", text: JSON.stringify(structuredContent) }],
+        ...(callToolResult?.isError !== undefined ? { isError: callToolResult.isError } : {}),
+        structuredContent
     };
 }
-function assertSupportedOutputSchema(schema) {
-    assertObjectRootSchema(schema, "outputSchema");
-    assertSupportedJsonSchema(schema, "outputSchema");
-}
 function assertObjectRootSchema(schema, path) {
     if (schema.type !== "object") {
         throw new Error(`${path} root type must be "object"`);
     }
 }
-function assertSupportedJsonSchema(schema, path) {
-    for (const keyword of ["anyOf", "allOf", "not", "if", "then", "else", "contains", "prefixItems"]) {
-        if (schema[keyword] !== undefined) {
-            throw new Error(`${path} uses unsupported keyword "${keyword}"`);
-        }
-    }
-    const type = schema.type;
-    if (Array.isArray(type)) {
-        const supported = new Set(["string", "number", "integer", "boolean", "object", "array", "null"]);
-        for (const item of type) {
-            if (!supported.has(item)) {
-                throw new Error(`${path} uses unsupported type "${item}"`);
-            }
-        }
-    }
-    else if (type !== undefined &&
-        type !== "string" &&
-        type !== "number" &&
-        type !== "integer" &&
-        type !== "boolean" &&
-        type !== "object" &&
-        type !== "array") {
-        throw new Error(`${path} uses unsupported type "${type}"`);
-    }
-    if (isJsonObject(schema.properties)) {
-        for (const [key, child] of Object.entries(schema.properties)) {
-            if (isJsonObject(child)) {
-                assertSupportedJsonSchema(child, `${path}.properties.${key}`);
-            }
-            else {
-                throw new Error(`${path}.properties.${key} must be an object schema`);
-            }
-        }
-    }
-    else if (schema.properties !== undefined) {
-        throw new Error(`${path}.properties must be an object`);
-    }
-    const additionalProperties = schema.additionalProperties;
-    if (typeof additionalProperties === "object" && additionalProperties !== null) {
-        if (Array.isArray(additionalProperties)) {
-            throw new Error(`${path}.additionalProperties must be an object schema or boolean`);
-        }
-        assertSupportedJsonSchema(additionalProperties, `${path}.additionalProperties`);
-    }
-    else if (additionalProperties !== undefined
-        && typeof additionalProperties !== "boolean") {
-        throw new Error(`${path}.additionalProperties must be an object schema or boolean`);
-    }
-    const items = schema.items;
-    if (Array.isArray(items)) {
-        throw new Error(`${path}.items uses unsupported tuple array schemas`);
-    }
-    if (typeof items === "object" && items !== null && !Array.isArray(items)) {
-        assertSupportedJsonSchema(items, `${path}.items`);
-    }
-    else if (items !== undefined && typeof items !== "boolean") {
-        throw new Error(`${path}.items must be an object schema or boolean`);
-    }
-    const oneOf = schema.oneOf;
-    if (Array.isArray(oneOf)) {
-        for (const [index, child] of oneOf.entries()) {
-            if (typeof child === "object" && child !== null && !Array.isArray(child)) {
-                assertSupportedJsonSchema(child, `${path}.oneOf[${index}]`);
-            }
-            else {
-                throw new Error(`${path}.oneOf[${index}] must be an object schema`);
-            }
-        }
-    }
-    else if (oneOf !== undefined) {
-        throw new Error(`${path}.oneOf must be an array`);
-    }
-}
 function isJsonObject(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -742,25 +704,28 @@ function isGetPromptResult(value) {
     if (typeof value !== "object" || value === null || !hasOwnProperty(value, "messages")) {
         return false;
     }
-    return (!hasOwnProperty(value, "description") || value.description === undefined || typeof value.description === "string")
-        && Array.isArray(value.messages)
-        && value.messages.every((message) => typeof message === "object"
-            && message !== null
-            && hasOwnProperty(message, "role")
-            && (message.role === "user" || message.role === "assistant")
-            && hasOwnProperty(message, "content")
-            && isPromptContentItem(message.content));
+    return ((!hasOwnProperty(value, "description") ||
+        value.description === undefined ||
+        typeof value.description === "string") &&
+        Array.isArray(value.messages) &&
+        value.messages.every((message) => typeof message === "object" &&
+            message !== null &&
+            hasOwnProperty(message, "role") &&
+            (message.role === "user" || message.role === "assistant") &&
+            hasOwnProperty(message, "content") &&
+            isPromptContentItem(message.content)));
 }
 function isReadResourceResult(value) {
     if (typeof value !== "object" || value === null || !hasOwnProperty(value, "contents")) {
         return false;
     }
-    return Array.isArray(value.contents)
-        && value.contents.every(isResourceContents);
+    return Array.isArray(value.contents) && value.contents.every(isResourceContents);
 }
 function hasContentArray(value) {
-    return typeof value === "object" && value !== null && hasOwnProperty(value, "content")
-        && Array.isArray(value.content);
+    return (typeof value === "object" &&
+        value !== null &&
+        hasOwnProperty(value, "content") &&
+        Array.isArray(value.content));
 }
 function isContentItem(value) {
     if (typeof value !== "object" || value === null || !hasOwnProperty(value, "type")) {
@@ -774,44 +739,52 @@ function isContentItem(value) {
         return hasOwnProperty(block, "text") && typeof block.text === "string";
     }
     if (block.type === "image" || block.type === "audio") {
-        return hasOwnProperty(block, "data")
-            && typeof block.data === "string"
-            && isBase64(block.data)
-            && hasOwnProperty(block, "mimeType")
-            && typeof block.mimeType === "string";
+        return (hasOwnProperty(block, "data") &&
+            typeof block.data === "string" &&
+            isBase64(block.data) &&
+            hasOwnProperty(block, "mimeType") &&
+            typeof block.mimeType === "string");
     }
     if (block.type === "resource_link") {
-        return hasOwnProperty(block, "uri")
-            && typeof block.uri === "string"
-            && isValidUri(block.uri)
-            && hasOwnProperty(block, "name")
-            && typeof block.name === "string"
-            && (!hasOwnProperty(block, "title") || block.title === undefined || typeof block.title === "string")
-            && (!hasOwnProperty(block, "description") || block.description === undefined || typeof block.description === "string")
-            && (!hasOwnProperty(block, "mimeType") || block.mimeType === undefined || typeof block.mimeType === "string")
-            && (!hasOwnProperty(block, "size") || block.size === undefined || typeof block.size === "number");
-    }
-    if (block.type !== "resource"
-        || !hasOwnProperty(block, "resource")
-        || typeof block.resource !== "object"
-        || block.resource === null) {
+        return (hasOwnProperty(block, "uri") &&
+            typeof block.uri === "string" &&
+            isValidUri(block.uri) &&
+            hasOwnProperty(block, "name") &&
+            typeof block.name === "string" &&
+            (!hasOwnProperty(block, "title") ||
+                block.title === undefined ||
+                typeof block.title === "string") &&
+            (!hasOwnProperty(block, "description") ||
+                block.description === undefined ||
+                typeof block.description === "string") &&
+            (!hasOwnProperty(block, "mimeType") ||
+                block.mimeType === undefined ||
+                typeof block.mimeType === "string") &&
+            (!hasOwnProperty(block, "size") || block.size === undefined || typeof block.size === "number"));
+    }
+    if (block.type !== "resource" ||
+        !hasOwnProperty(block, "resource") ||
+        typeof block.resource !== "object" ||
+        block.resource === null) {
         return false;
     }
     return isResourceContents(block.resource);
 }
 function isResourceContents(value) {
-    if (typeof value !== "object"
-        || value === null
-        || !hasOwnProperty(value, "uri")
-        || typeof value.uri !== "string"
-        || !isValidUri(value.uri)) {
+    if (typeof value !== "object" ||
+        value === null ||
+        !hasOwnProperty(value, "uri") ||
+        typeof value.uri !== "string" ||
+        !isValidUri(value.uri)) {
         return false;
     }
-    if (hasOwnProperty(value, "mimeType") && value.mimeType !== undefined && typeof value.mimeType !== "string") {
+    if (hasOwnProperty(value, "mimeType") &&
+        value.mimeType !== undefined &&
+        typeof value.mimeType !== "string") {
         return false;
     }
-    return (hasOwnProperty(value, "text") && typeof value.text === "string")
-        || (hasOwnProperty(value, "blob") && typeof value.blob === "string" && isBase64(value.blob));
+    return ((hasOwnProperty(value, "text") && typeof value.text === "string") ||
+        (hasOwnProperty(value, "blob") && typeof value.blob === "string" && isBase64(value.blob)));
 }
 function hasValidContentAnnotations(value) {
     if (!hasOwnProperty(value, "annotations") || value.annotations === undefined) {
@@ -821,9 +794,11 @@ function hasValidContentAnnotations(value) {
         return false;
     }
     const { audience, priority, lastModified } = value.annotations;
-    return (audience === undefined || (Array.isArray(audience) && audience.every((item) => item === "user" || item === "assistant")))
-        && (priority === undefined || typeof priority === "number")
-        && (lastModified === undefined || typeof lastModified === "string");
+    return ((audience === undefined ||
+        (Array.isArray(audience) &&
+            audience.every((item) => item === "user" || item === "assistant"))) &&
+        (priority === undefined || typeof priority === "number") &&
+        (lastModified === undefined || typeof lastModified === "string"));
 }
 function isBase64(value) {
     if (value.length === 0) {
@@ -848,7 +823,10 @@ function isPromptContentItem(value) {
     if (!isContentItem(value)) {
         return false;
     }
-    return !(typeof value === "object" && value !== null && hasOwnProperty(value, "type") && value.type === "resource_link");
+    return !(typeof value === "object" &&
+        value !== null &&
+        hasOwnProperty(value, "type") &&
+        value.type === "resource_link");
 }
 function hasOwnProperty(value, name) {
     return Object.prototype.hasOwnProperty.call(value, name);

package/dist/types.d.ts

@@ -164,10 +164,7 @@ export interface ResourceTemplateDefinition extends ResourceTemplate {
 }
 export interface HandleResult {
     result?: unknown;
-    error?: {
-        code: number;
-        message: string;
-    };
+    error?: JSONRPCError;
 }
 export type PromptContentItem = {
     type: "text";
@@ -211,6 +208,7 @@ export interface JSONSchemaProperty extends Record<string, unknown> {
 export interface ServerOptions {
     name: string;
     version: string;
+    toolCallTimeoutMs?: number;
     validateToolArguments?: boolean;
     supportNotifications?: boolean;
     supportResourceSubscriptions?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiny-stdio-mcp-server",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "bugs": {
     "url": "https://github.com/poe-platform/poe-code/issues"
   },