@plurnk/plurnk-mcp 1.6.0 → 1.7.0

package/dist/subscriptions.js

@@ -0,0 +1,188 @@
+const RETRY_FLOOR_MS = 250;
+const RETRY_CEILING_MS = 5_000;
+const asError = (cause) => cause instanceof Error
+    ? cause
+    : new Error(String(cause));
+const filterFor = (client, resources, tasks, tasksEnabled) => {
+    const capabilities = client.getDiscoverResult()?.capabilities;
+    return {
+        ...(capabilities?.tools?.listChanged === true
+            ? { toolsListChanged: true }
+            : {}),
+        ...(capabilities?.prompts?.listChanged === true
+            ? { promptsListChanged: true }
+            : {}),
+        ...(capabilities?.resources?.listChanged === true
+            ? { resourcesListChanged: true }
+            : {}),
+        ...(capabilities?.resources?.subscribe === true && resources.size > 0
+            ? { resourceSubscriptions: [...resources].toSorted() }
+            : {}),
+        ...(tasksEnabled && tasks.size > 0
+            ? { taskIds: [...tasks.keys()].toSorted() }
+            : {}),
+    };
+};
+const hasSelections = (filter) => Object.keys(filter).length > 0;
+/** Owns the one current modern subscription filter for a server connection. */
+export default class Subscriptions {
+    #client;
+    #options;
+    #resources = new Set();
+    #tasks = new Map();
+    #current;
+    #work = Promise.resolve();
+    #retryTimer;
+    #retryAttempt = 0;
+    #listenAbort;
+    #closed = false;
+    constructor(client, options) {
+        this.#client = client;
+        this.#options = options;
+        this.#current = client.autoOpenedSubscription;
+        if (this.#current === undefined) {
+            if (hasSelections(this.#filter()))
+                this.#scheduleRetry();
+        }
+        else {
+            this.#observe(this.#current);
+        }
+    }
+    async selectTask(taskId) {
+        if (this.#closed)
+            throw new Error("MCP subscriptions are closed.");
+        if (this.#options.tasks !== true)
+            return async () => undefined;
+        const count = this.#tasks.get(taskId) ?? 0;
+        this.#tasks.set(taskId, count + 1);
+        if (count === 0) {
+            this.#clearRetry();
+            await this.#enqueueReplacement();
+        }
+        let released = false;
+        return async () => {
+            if (released || this.#closed)
+                return;
+            released = true;
+            const current = this.#tasks.get(taskId);
+            if (current === undefined)
+                return;
+            if (current > 1) {
+                this.#tasks.set(taskId, current - 1);
+                return;
+            }
+            this.#tasks.delete(taskId);
+            this.#clearRetry();
+            await this.#enqueueReplacement();
+        };
+    }
+    #filter() {
+        return filterFor(this.#client, this.#resources, this.#tasks, this.#options.tasks === true);
+    }
+    async selectResource(uri) {
+        if (this.#closed)
+            throw new Error("MCP subscriptions are closed.");
+        if (this.#client.getDiscoverResult()?.capabilities.resources?.subscribe !== true)
+            return;
+        if (this.#resources.has(uri))
+            return;
+        this.#resources.add(uri);
+        this.#clearRetry();
+        await this.#enqueueReplacement();
+    }
+    #enqueueReplacement() {
+        const replacement = this.#work.then(() => this.#replace());
+        this.#work = replacement.catch(() => undefined);
+        return replacement;
+    }
+    async #replace() {
+        if (this.#closed)
+            return;
+        const filter = this.#filter();
+        if (!hasSelections(filter)) {
+            const prior = this.#current;
+            this.#current = undefined;
+            if (prior !== undefined)
+                await prior.close();
+            return;
+        }
+        const prior = this.#current;
+        const controller = new AbortController();
+        this.#listenAbort = controller;
+        let next;
+        try {
+            next = await this.#client.listen(filter, {
+                timeout: this.#options.timeout,
+                signal: controller.signal,
+            });
+        }
+        catch (cause) {
+            if (!this.#closed && !controller.signal.aborted) {
+                this.#report(cause);
+                this.#scheduleRetry();
+            }
+            return;
+        }
+        finally {
+            if (this.#listenAbort === controller)
+                this.#listenAbort = undefined;
+        }
+        if (this.#closed)
+            return;
+        this.#clearRetry();
+        this.#retryAttempt = 0;
+        this.#current = next;
+        this.#observe(next);
+        if (prior !== undefined && prior !== next) {
+            try {
+                await prior.close();
+            }
+            catch (cause) {
+                this.#report(cause);
+            }
+        }
+    }
+    #observe(subscription) {
+        void subscription.closed.then((reason) => {
+            if (this.#closed
+                || reason === "local"
+                || this.#current !== subscription)
+                return;
+            this.#current = undefined;
+            this.#scheduleRetry();
+        });
+    }
+    #scheduleRetry() {
+        if (this.#closed || this.#retryTimer !== undefined)
+            return;
+        const delay = Math.min(RETRY_FLOOR_MS * (2 ** this.#retryAttempt), RETRY_CEILING_MS);
+        this.#retryAttempt += 1;
+        this.#retryTimer = setTimeout(() => {
+            this.#retryTimer = undefined;
+            void this.#enqueueReplacement().catch((cause) => {
+                if (!this.#closed)
+                    this.#report(cause);
+            });
+        }, delay);
+        this.#retryTimer.unref();
+    }
+    #clearRetry() {
+        if (this.#retryTimer === undefined)
+            return;
+        clearTimeout(this.#retryTimer);
+        this.#retryTimer = undefined;
+    }
+    #report(cause) {
+        this.#options.onError?.(asError(cause));
+    }
+    retire() {
+        if (this.#closed)
+            return this.#work;
+        this.#closed = true;
+        this.#clearRetry();
+        this.#listenAbort = undefined;
+        this.#current = undefined;
+        return this.#work;
+    }
+}
+//# sourceMappingURL=subscriptions.js.map

package/dist/subscriptions.js.map

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

package/dist/tasks.d.ts

@@ -0,0 +1,19 @@
+import { type CallToolResult, type Progress, type Tool } from "@modelcontextprotocol/client";
+import ExtensionChannel from "./extensionChannel.ts";
+import { type ClientInteractionHandler } from "./inputRequired.ts";
+import Subscriptions from "./subscriptions.ts";
+export interface TaskCallOptions {
+    readonly server: string;
+    readonly name: string;
+    readonly args: Record<string, unknown>;
+    readonly tool: Tool;
+    readonly signal?: AbortSignal;
+    readonly onProgress?: (progress: Progress) => void;
+    readonly interact?: ClientInteractionHandler;
+    readonly timeout: number;
+    readonly channel: ExtensionChannel;
+    readonly subscriptions: Subscriptions;
+}
+export declare const serverSupportsTasks: (capabilities: unknown) => boolean;
+export declare const callToolWithTasks: (options: TaskCallOptions) => Promise<CallToolResult>;
+//# sourceMappingURL=tasks.d.ts.map

package/dist/tasks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../src/tasks.ts"],"names":[],"mappings":"AAAA,OAAO,EAQH,KAAK,cAAc,EAGnB,KAAK,QAAQ,EACb,KAAK,IAAI,EACZ,MAAM,8BAA8B,CAAC;AAEtC,OAAO,gBAAgB,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAGH,KAAK,wBAAwB,EAChC,MAAM,oBAAoB,CAAC;AAG5B,OAAO,aAAa,MAAM,oBAAoB,CAAC;AA0C/C,MAAM,WAAW,eAAe;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IACpB,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAC9B,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;IACnD,QAAQ,CAAC,QAAQ,CAAC,EAAE,wBAAwB,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,gBAAgB,CAAC;IACnC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;CACzC;AAgZD,eAAO,MAAM,mBAAmB,iBAAkB,OAAO,KAAG,OAG3D,CAAC;AAEF,eAAO,MAAM,iBAAiB,YAAmB,eAAe,KAAG,OAAO,CAAC,cAAc,CA2BxF,CAAC"}

package/dist/tasks.js

@@ -0,0 +1,334 @@
+import { ProtocolError, ProtocolErrorCode, SdkError, SdkErrorCode, fromJsonSchema, specTypeSchemas, } from "@modelcontextprotocol/client";
+import { setTimeout as delay } from "node:timers/promises";
+import { resolveInputRequests, runInputRequiredRequest, } from "./inputRequired.js";
+import { mcpParamHeaders } from "./protocolHeaders.js";
+import { MCP_TASKS_EXTENSION_ID } from "./protocol.js";
+const DEFAULT_POLL_INTERVAL_MS = 250;
+const MINIMUM_POLL_INTERVAL_MS = 10;
+const asRecord = (value) => value !== null && typeof value === "object" && !Array.isArray(value)
+    ? value
+    : undefined;
+const issueText = (issues) => issues.map((issue) => issue.path?.length
+    ? `${issue.path.map(String).join(".")}: ${issue.message}`
+    : issue.message).join(", ");
+const protocolShapeError = (surface, detail) => new ProtocolError(ProtocolErrorCode.InvalidRequest, `Invalid MCP Tasks ${surface}: ${detail}`);
+const requireString = (record, field, surface) => {
+    const value = record[field];
+    if (typeof value !== "string" || value.length === 0) {
+        throw protocolShapeError(surface, `'${field}' must be a non-empty string.`);
+    }
+    return value;
+};
+const parseTask = (value, surface, expectedTaskId) => {
+    const record = asRecord(value);
+    if (record === undefined)
+        throw protocolShapeError(surface, "expected an object.");
+    if (surface === "creation result" && record.resultType !== "task") {
+        throw protocolShapeError(surface, "expected resultType 'task'.");
+    }
+    if (surface === "tasks/get result" && record.resultType !== "complete") {
+        throw protocolShapeError(surface, "expected resultType 'complete'.");
+    }
+    if (surface === "notification" && record.resultType !== undefined) {
+        throw protocolShapeError(surface, "notifications do not carry resultType.");
+    }
+    const taskId = requireString(record, "taskId", surface);
+    if (expectedTaskId !== undefined && taskId !== expectedTaskId) {
+        throw protocolShapeError(surface, `taskId '${taskId}' does not match '${expectedTaskId}'.`);
+    }
+    const status = record.status;
+    if (![
+        "working",
+        "input_required",
+        "completed",
+        "failed",
+        "cancelled",
+    ].includes(String(status))) {
+        throw protocolShapeError(surface, `'status' is not a current Tasks status.`);
+    }
+    const statusMessage = record.statusMessage;
+    if (statusMessage !== undefined && typeof statusMessage !== "string") {
+        throw protocolShapeError(surface, "'statusMessage' must be a string.");
+    }
+    const createdAt = requireString(record, "createdAt", surface);
+    const lastUpdatedAt = requireString(record, "lastUpdatedAt", surface);
+    const ttlMs = record.ttlMs;
+    if (ttlMs !== null && (!Number.isSafeInteger(ttlMs) || ttlMs < 0)) {
+        throw protocolShapeError(surface, "'ttlMs' must be a non-negative integer or null.");
+    }
+    const pollIntervalMs = record.pollIntervalMs;
+    if (pollIntervalMs !== undefined
+        && (!Number.isSafeInteger(pollIntervalMs) || pollIntervalMs < 0)) {
+        throw protocolShapeError(surface, "'pollIntervalMs' must be a non-negative integer.");
+    }
+    return {
+        taskId,
+        status: status,
+        createdAt,
+        lastUpdatedAt,
+        ttlMs: ttlMs,
+        ...(statusMessage === undefined ? {} : { statusMessage }),
+        ...(pollIntervalMs === undefined ? {} : { pollIntervalMs: pollIntervalMs }),
+    };
+};
+const parseDetailedTask = (value, surface, expectedTaskId) => {
+    const task = parseTask(value, surface, expectedTaskId);
+    const record = asRecord(value);
+    if (task.status === "input_required") {
+        const inputRequests = asRecord(record.inputRequests);
+        if (inputRequests === undefined) {
+            throw protocolShapeError(surface, "input_required status omitted 'inputRequests'.");
+        }
+        return { ...task, status: "input_required", inputRequests };
+    }
+    if (task.status === "completed") {
+        if (!("result" in record)) {
+            throw protocolShapeError(surface, "completed status omitted 'result'.");
+        }
+        return { ...task, status: "completed", result: record.result };
+    }
+    if (task.status === "failed") {
+        const error = asRecord(record.error);
+        if (error === undefined
+            || !Number.isSafeInteger(error.code)
+            || typeof error.message !== "string") {
+            throw protocolShapeError(surface, "failed status omitted its JSON-RPC error.");
+        }
+        return {
+            ...task,
+            status: "failed",
+            error: {
+                code: error.code,
+                message: error.message,
+                ...(error.data === undefined ? {} : { data: error.data }),
+            },
+        };
+    }
+    return task;
+};
+const parseInputRequiredResult = (value) => {
+    const record = asRecord(value);
+    if (record?.resultType !== "input_required") {
+        throw protocolShapeError("tools/call result", "expected resultType 'input_required'.");
+    }
+    const inputRequests = record.inputRequests;
+    const requestState = record.requestState;
+    if (inputRequests !== undefined && asRecord(inputRequests) === undefined) {
+        throw protocolShapeError("tools/call result", "'inputRequests' must be an object.");
+    }
+    if (requestState !== undefined && typeof requestState !== "string") {
+        throw protocolShapeError("tools/call result", "'requestState' must be a string.");
+    }
+    if (inputRequests === undefined && requestState === undefined) {
+        throw protocolShapeError("tools/call result", "input_required requires inputRequests or requestState.");
+    }
+    return {
+        resultType: "input_required",
+        ...(inputRequests === undefined
+            ? {}
+            : { inputRequests: inputRequests }),
+        ...(requestState === undefined ? {} : { requestState }),
+    };
+};
+const parseCallToolResult = async (value) => {
+    const record = asRecord(value);
+    if (record?.resultType !== "complete") {
+        throw protocolShapeError("tools/call result", "expected resultType 'complete'.");
+    }
+    const parsed = specTypeSchemas.CallToolResult["~standard"].validate(value);
+    if (parsed.issues !== undefined) {
+        throw protocolShapeError("tools/call result", issueText(parsed.issues));
+    }
+    return parsed.value;
+};
+const validateToolInput = async (tool, args) => {
+    const validator = fromJsonSchema(tool.inputSchema);
+    const parsed = await validator["~standard"].validate(args);
+    if (parsed.issues !== undefined) {
+        throw new ProtocolError(ProtocolErrorCode.InvalidParams, `Invalid arguments for MCP tool '${tool.name}': ${issueText(parsed.issues)}.`);
+    }
+};
+const validateToolOutput = async (tool, value) => {
+    const result = await parseCallToolResult({
+        ...(asRecord(value) ?? {}),
+        resultType: "complete",
+    });
+    if (tool.outputSchema === undefined || result.isError === true)
+        return result;
+    if (result.structuredContent === undefined) {
+        throw new ProtocolError(ProtocolErrorCode.InvalidRequest, `Tool '${tool.name}' has an output schema but did not return structured content.`);
+    }
+    const validator = fromJsonSchema(tool.outputSchema);
+    const parsed = await validator["~standard"].validate(result.structuredContent);
+    if (parsed.issues !== undefined) {
+        throw new ProtocolError(ProtocolErrorCode.InvalidRequest, `Tool '${tool.name}' returned invalid structured content: ${issueText(parsed.issues)}.`);
+    }
+    return result;
+};
+const taskAwareToolLeg = async (channel, tool, params, signal, timeout, onProgress) => {
+    const value = await channel.request("tools/call", params, {
+        signal,
+        timeout,
+        onProgress,
+        cancelRequestOnSharedTransport: true,
+        headers: mcpParamHeaders(tool, params.arguments ?? {}),
+    });
+    const resultType = asRecord(value)?.resultType;
+    if (resultType === "task") {
+        return {
+            ...parseTask(value, "creation result"),
+            resultType: "task",
+        };
+    }
+    if (resultType === "input_required")
+        return parseInputRequiredResult(value);
+    return parseCallToolResult(value);
+};
+const remainingTimeout = (deadline, operation) => {
+    const remaining = deadline - Date.now();
+    if (remaining <= 0) {
+        throw new SdkError(SdkErrorCode.RequestTimeout, `MCP '${operation}' exceeded its operation timeout.`);
+    }
+    return remaining;
+};
+const taskRequest = async (channel, method, params, timeout, signal) => channel.request(method, params, { signal, timeout });
+const cancelTask = async (channel, taskId, timeout) => {
+    const result = asRecord(await taskRequest(channel, "tasks/cancel", { taskId }, timeout));
+    if (result?.resultType !== "complete") {
+        throw protocolShapeError("tasks/cancel result", "expected resultType 'complete'.");
+    }
+};
+class TaskInbox {
+    #taskId;
+    #queue = [];
+    #wake;
+    constructor(taskId) {
+        this.#taskId = taskId;
+    }
+    push(value) {
+        if (asRecord(value)?.taskId !== this.#taskId)
+            return;
+        this.#queue.push(value);
+        this.#wake?.();
+    }
+    async next(waitMs, signal) {
+        if (this.#queue.length > 0)
+            return this.#queue.shift();
+        const controller = new AbortController();
+        const wake = Promise.withResolvers();
+        this.#wake = wake.resolve;
+        const onAbort = () => controller.abort(signal?.reason);
+        signal?.addEventListener("abort", onAbort, { once: true });
+        try {
+            await Promise.race([
+                wake.promise,
+                delay(waitMs, undefined, { signal: controller.signal }).catch((cause) => {
+                    if (!controller.signal.aborted)
+                        throw cause;
+                }),
+            ]);
+        }
+        finally {
+            this.#wake = undefined;
+            signal?.removeEventListener("abort", onAbort);
+            controller.abort();
+        }
+        signal?.throwIfAborted();
+        return this.#queue.shift();
+    }
+}
+const driveTask = async (task, options, deadline) => {
+    const inbox = new TaskInbox(task.taskId);
+    const stopWatching = options.channel.onTaskNotification((value) => inbox.push(value));
+    const release = await options.subscriptions.selectTask(task.taskId);
+    const answered = new Set();
+    let state = task;
+    let terminal = false;
+    try {
+        while (true) {
+            options.signal?.throwIfAborted();
+            if (state.status === "completed" && "result" in state) {
+                terminal = true;
+                return validateToolOutput(options.tool, state.result);
+            }
+            if (state.status === "failed" && "error" in state) {
+                terminal = true;
+                throw ProtocolError.fromError(state.error.code, state.error.message, state.error.data);
+            }
+            if (state.status === "cancelled") {
+                terminal = true;
+                throw new Error(`MCP task '${state.taskId}' was cancelled${state.statusMessage === undefined ? "." : `: ${state.statusMessage}`}`);
+            }
+            if (state.status === "input_required" && "inputRequests" in state) {
+                const fresh = Object.fromEntries(Object.entries(state.inputRequests)
+                    .filter(([key]) => !answered.has(key)));
+                if (Object.keys(fresh).length > 0) {
+                    const responses = await resolveInputRequests({
+                        server: options.server,
+                        operation: "tasks/update",
+                        inputRequests: fresh,
+                        interact: options.interact,
+                        arguments: { taskId: task.taskId },
+                    });
+                    options.signal?.throwIfAborted();
+                    const update = asRecord(await taskRequest(options.channel, "tasks/update", { taskId: task.taskId, inputResponses: responses }, remainingTimeout(deadline, "tasks/update"), options.signal));
+                    if (update?.resultType !== "complete") {
+                        throw protocolShapeError("tasks/update result", "expected resultType 'complete'.");
+                    }
+                    for (const key of Object.keys(fresh))
+                        answered.add(key);
+                }
+            }
+            const interval = state.status === "working"
+                || (state.status === "input_required" && "inputRequests" in state)
+                ? Math.max(MINIMUM_POLL_INTERVAL_MS, state.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS)
+                : 0;
+            const remaining = remainingTimeout(deadline, "Task");
+            const notification = await inbox.next(Math.min(interval, remaining), options.signal);
+            if (notification !== undefined) {
+                state = parseDetailedTask(notification, "notification", task.taskId);
+                continue;
+            }
+            const result = await taskRequest(options.channel, "tasks/get", { taskId: task.taskId }, remainingTimeout(deadline, "tasks/get"), options.signal);
+            state = parseDetailedTask(result, "tasks/get result", task.taskId);
+        }
+    }
+    catch (cause) {
+        if (!terminal) {
+            try {
+                await cancelTask(options.channel, task.taskId, options.timeout);
+            }
+            catch (cancellationFailure) {
+                throw new AggregateError([cause, cancellationFailure], `MCP task '${task.taskId}' failed and cancellation also failed.`);
+            }
+        }
+        throw cause;
+    }
+    finally {
+        stopWatching();
+        await release();
+    }
+};
+export const serverSupportsTasks = (capabilities) => {
+    const extension = asRecord(asRecord(capabilities)?.extensions)?.[MCP_TASKS_EXTENSION_ID];
+    return asRecord(extension) !== undefined;
+};
+export const callToolWithTasks = async (options) => {
+    await validateToolInput(options.tool, options.args);
+    const startedAt = Date.now();
+    const initial = await runInputRequiredRequest({
+        server: options.server,
+        operation: "tools/call",
+        originalParams: { name: options.name, arguments: options.args },
+        signal: options.signal,
+        onProgress: options.onProgress,
+        interact: options.interact,
+        timeout: options.timeout,
+        requestLeg: (params, requestOptions) => taskAwareToolLeg(options.channel, options.tool, params, requestOptions.signal, requestOptions.timeout, requestOptions.onprogress),
+    });
+    if (initial.resultType === "task") {
+        return driveTask(initial, options, startedAt + options.timeout);
+    }
+    return validateToolOutput(options.tool, initial);
+};
+//# sourceMappingURL=tasks.js.map

package/dist/tasks.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@plurnk/plurnk-mcp",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "description": "Current Model Context Protocol host module for Plurnk.",
     "keywords": [
         "plurnk",
@@ -46,7 +46,8 @@
     "scripts": {
         "test:lint": "tsc --noEmit",
         "test:unit": "node --conditions=plurnk-dev --env-file-if-exists=../plurnk-execs/.env.defaults --test \"src/**/*.test.ts\"",
-        "test": "npm run test:lint && npm run test:unit",
+        "test:intg": "node --conditions=plurnk-dev --test \"test/intg/*.test.ts\"",
+        "test": "npm run test:lint && npm run test:unit && npm run test:intg",
         "build:clean": "rm -rf dist",
         "build:dist": "tsc -p tsconfig.build.json",
         "build": "npm run build:clean && npm run build:dist",
@@ -54,13 +55,16 @@
         "prepublishOnly": "npm audit --audit-level=moderate && npm test"
     },
     "dependencies": {
-        "@modelcontextprotocol/client": "2.0.0"
+        "@modelcontextprotocol/client": "2.0.0",
+        "@plurnk/plurnk-contracts": "1.7.0"
     },
     "devDependencies": {
-        "@modelcontextprotocol/server": "2.0.0"
+        "@modelcontextprotocol/conformance": "0.2.0-alpha.11",
+        "@modelcontextprotocol/server": "2.0.0",
+        "zod": "4.4.3"
     },
     "peerDependencies": {
-        "@plurnk/plurnk-execs": "^1.6.0",
-        "@plurnk/plurnk-schemes": "^1.6.0"
+        "@plurnk/plurnk-execs": "^1.7.0",
+        "@plurnk/plurnk-schemes": "^1.7.0"
     }
 }