@cyanheads/mcp-ts-core 0.13.8 → 0.13.10

package/dist/mcp-server/inputRequired.js

@@ -15,11 +15,16 @@
  * returns against 2025-era clients by issuing real `elicitation/create` /
  * `sampling/createMessage` / `roots/list` requests and re-entering the handler.
  *
+ * What a handler reads back is bounded by what its client declared: the
+ * per-request capability view (#580) decides which responses reach
+ * `ctx.inputs` (#496), and an opt-in key seals the `requestState` a handler
+ * returns so a retry can only echo what this server minted.
+ *
  * @see {@link https://modelcontextprotocol.io/specification/2026-07-28/basic/patterns/mrtr | MCP Multi-Round-Trip Requests}
  * @module src/mcp-server/inputRequired
  */
-import { acceptedContent, inputRequired, inputResponse, } from '@modelcontextprotocol/server';
-import { JsonRpcErrorCode, McpError } from '../types-global/errors.js';
+import { acceptedContent, CLIENT_CAPABILITIES_META_KEY, createRequestStateCodec, inputRequired, inputResponse, } from '@modelcontextprotocol/server';
+import { configurationError, internalError, JsonRpcErrorCode, McpError, } from '../types-global/errors.js';
 /**
  * Thrown by `ctx.requestInput(...)` and caught by the handler factories, which
  * return the carried `input_required` result to the SDK instead of a normal
@@ -45,6 +50,23 @@ export function isInputRequiredSignal(error) {
             error !== null &&
             error.isInputRequiredSignal === true));
 }
+/**
+ * The view for one instance: on a 2025-era instance the `initialize`-declared
+ * value, read through the instance on every call so an `initialize` that lands
+ * after registration is seen; on a 2026-07-28 instance the request's own
+ * `io.modelcontextprotocol/clientCapabilities` envelope key, which the SDK has
+ * validated before dispatch. `getClientCapabilities()` is not used there — a
+ * 2026-07-28 stdio instance never has it backfilled.
+ */
+export function clientCapabilityView(era, server) {
+    if (era === 'modern') {
+        return {
+            era,
+            capabilities: (mcpReq) => mcpReq?.envelope?.[CLIENT_CAPABILITIES_META_KEY],
+        };
+    }
+    return { era, capabilities: () => server.server.getClientCapabilities() };
+}
 // ---------------------------------------------------------------------------
 // Client-capability gate (#379)
 // ---------------------------------------------------------------------------
@@ -54,7 +76,7 @@ export function isInputRequiredSignal(error) {
  * declare it in `errors[]`, because it names a property of the connection
  * rather than a domain outcome.
  */
-const CLIENT_CAPABILITY_MISSING_REASON = 'client_capability_missing';
+export const CLIENT_CAPABILITY_MISSING_REASON = 'client_capability_missing';
 /**
  * What an embedded request kind requires, mode-aware where the capability is:
  * URL-mode elicitation needs `elicitation.url`, form-mode (or mode-omitted)
@@ -103,7 +125,9 @@ function capabilityPath({ capability, member }) {
     return member === undefined ? capability : `${capability}.${member}`;
 }
 /**
- * Builds the gate for one connection from its declared client capabilities.
+ * Builds the gate for one request from the capabilities its client declared —
+ * the value the instance's {@link ClientCapabilityView} resolved, which
+ * `ctx.clientCapabilities` carries too.
  *
  * Only the 2025-era arm needs it. There the refusal is produced by the SDK's
  * legacy shim, which runs *above* the handler callback on the result that
@@ -115,16 +139,20 @@ function capabilityPath({ capability, member }) {
  * the SDK itself, which raises `MissingRequiredClientCapabilityError`
  * (`-32021`) — that arm takes no gate.
  *
- * `clientCapabilities()` returning `undefined` is the per-request legacy case:
- * an instance that never saw an `initialize` holds no capability view, so every
- * embedded request is refused, and the message and hint say so.
+ * `declared` being `undefined` is the per-request legacy case: an instance that
+ * never saw an `initialize` holds no capability view, so every embedded
+ * request is refused, and the message and hint say so.
+ *
+ * The hint ends at reconnecting (#495). Whether the caller could instead
+ * supply the answer as an argument is the handler's knowledge, not the gate's:
+ * a consent gate deliberately has no such field, so the gate appends a
+ * fallback only when the handler passed one.
  */
-export function createInputRequiredGate(clientCapabilities) {
-    return (result) => {
+export function createInputRequiredGate(declared) {
+    return (result, fallbackHint) => {
         const requests = result.inputRequests;
         if (requests === undefined)
             return;
-        const declared = clientCapabilities();
         for (const [key, entry] of Object.entries(requests)) {
             const requirement = capabilityRequirement(entry);
             if (requirement === undefined || isDeclared(requirement, declared))
@@ -132,15 +160,14 @@ export function createInputRequiredGate(clientCapabilities) {
             const path = capabilityPath(requirement);
             const method = entry.method;
             const blind = declared === undefined;
+            const reconnect = blind
+                ? `No client capabilities are visible on a per-request connection, so \`${path}\` cannot be requested here. Reconnect over a stateful session whose client declares it.`
+                : `Reconnect with a client that declares the \`${path}\` capability.`;
             return new McpError(JsonRpcErrorCode.InvalidRequest, `Cannot request input '${key}' (${method}): the client on this 2025-era connection did not declare the \`${path}\` capability${blind
                 ? ' (this request is served per-request, so no client capabilities are available and no server-to-client round trip can be made)'
                 : ''}`, {
                 reason: CLIENT_CAPABILITY_MISSING_REASON,
-                recovery: {
-                    hint: blind
-                        ? `No client capabilities are visible on a per-request connection, so \`${path}\` cannot be requested here. Reconnect over a stateful session whose client declares it, or call again supplying the value this request would have asked for.`
-                        : `Reconnect with a client that declares the \`${path}\` capability, or call again supplying the value this request would have asked for.`,
-                },
+                recovery: { hint: fallbackHint ? `${reconnect} ${fallbackHint}` : reconnect },
             });
         }
         return;
@@ -158,24 +185,94 @@ export function createInputRequiredGate(clientCapabilities) {
  * error path shapes it. Resolving it any later — in a factory's catch, after
  * the measured region has closed — would record a refused call as a successful
  * input-required round while the client is told the call failed.
+ *
+ * `options.fallbackHint` goes to the gate alone; it never enters the
+ * `input_required` result.
  */
 export function createRequestInput(gate) {
-    return (spec) => {
+    return (spec, options) => {
         const result = inputRequired(spec);
-        const refusal = gate?.(result);
+        const refusal = gate?.(result, options?.fallbackHint);
         if (refusal !== undefined)
             throw refusal;
         throw new InputRequiredSignal(result);
     };
 }
+// ---------------------------------------------------------------------------
+// ctx.inputs — responses filtered by declared capability (#496)
+// ---------------------------------------------------------------------------
+/** Content block types only a tool-enabled sampling result carries. */
+const TOOL_BLOCK_TYPES = new Set(['tool_use', 'tool_result']);
+/** Whether sampling content — one block or an array — holds a tool block. */
+function carriesToolBlock(content) {
+    return (Array.isArray(content) ? content : [content]).some((block) => typeof block === 'object' &&
+        block !== null &&
+        TOOL_BLOCK_TYPES.has(block.type));
+}
+/**
+ * What one response requires — the response-side twin of
+ * {@link capabilityRequirement}, so an answer needs whatever the request it
+ * answers would have needed. An elicit result carrying `content` is a
+ * form-mode answer and needs `elicitation.form`; one without (a URL-mode
+ * accept, a decline, a cancel) needs `elicitation` in any mode. A sampling
+ * result holding a `tool_use` or `tool_result` block answers a tool-enabled
+ * request and needs `sampling.tools`; any other needs `sampling`. A roots
+ * result needs `roots`. `undefined` for an entry the SDK's classifier reads as
+ * no kind.
+ *
+ * `content` is read off the raw `entry`, not the view: the view keeps it only
+ * when it is an object, while `ctx.inputs.responses` exposes the entry as sent.
+ */
+function responseRequirement(view, entry) {
+    switch (view.kind) {
+        case 'elicit':
+            return entry.content === undefined
+                ? { capability: 'elicitation' }
+                : { capability: 'elicitation', member: 'form' };
+        case 'sampling':
+            return carriesToolBlock(view.result.content)
+                ? { capability: 'sampling', member: 'tools' }
+                : { capability: 'sampling' };
+        case 'roots':
+            return { capability: 'roots' };
+        default:
+            return;
+    }
+}
 /**
- * Builds the `ctx.inputs` reader over a retried request's `inputResponses`.
+ * The entries of `responses` the client's declared capabilities cover, at the
+ * same mode level the gate applies to requests ({@link responseRequirement},
+ * {@link isDeclared}), or `undefined` when none survives.
+ *
+ * The SDK lifts `inputResponses` off every client request, a first call and a
+ * 2025-era request included, so a client can arrive pre-answered with no
+ * `input_required` result ever sent. An answer the client's modes do not cover
+ * cannot have come from a round this server asked for: on the 2025 arm the
+ * legacy shim only issues requests the connection declared, and on 2026-07-28
+ * the SDK refuses an embedded request the envelope does not cover. Dropping
+ * those closes the pre-answered consent-gate bypass — a URL-only client's form
+ * answer included — without touching a legitimate round. With no view
+ * (`declared` undefined) nothing survives, and an entry the SDK's classifier
+ * cannot read as any kind has no capability to justify it either.
+ */
+export function declaredResponses(responses, declared) {
+    if (responses === undefined || declared === undefined)
+        return;
+    const kept = Object.entries(responses).filter(([key, entry]) => {
+        const requirement = responseRequirement(inputResponse(responses, key), entry);
+        return requirement !== undefined && isDeclared(requirement, declared);
+    });
+    return kept.length > 0 ? Object.fromEntries(kept) : undefined;
+}
+/**
+ * Builds the `ctx.inputs` reader over a retried request's `inputResponses`,
+ * keeping only the answers `declared` covers ({@link declaredResponses}).
  *
  * Values arrive from the client and are never re-validated by the SDK — pass a
  * schema to `accepted()` wherever the content matters.
  */
-export function createContextInputs(mcpReq) {
-    return contextInputsFrom(mcpReq?.inputResponses, mcpReq?.droppedInputResponseKeys ?? [], () => mcpReq?.requestState());
+export function createContextInputs(mcpReq, declared) {
+    return contextInputsFrom(declaredResponses(mcpReq?.inputResponses, declared), mcpReq?.droppedInputResponseKeys ?? [], () => mcpReq?.requestState());
 }
 /**
  * The `ctx.inputs` reader over an explicit set of responses — what
@@ -194,4 +291,79 @@ export function contextInputsFrom(responses, dropped, state) {
         view: (key) => inputResponse(responses, key),
     };
 }
+// ---------------------------------------------------------------------------
+// requestState sealing (MCP_REQUEST_STATE_KEY)
+// ---------------------------------------------------------------------------
+/**
+ * How long a sealed `requestState` verifies, in seconds. Longer than the SDK
+ * legacy shim's 600 s per-round timeout, so a 2025-era round the shim holds
+ * open never outlives its own state; the codec's 600 s default leaves no
+ * margin.
+ */
+const REQUEST_STATE_TTL_SECONDS = 900;
+/** The shortest key the SDK codec accepts, in UTF-8 bytes. */
+const REQUEST_STATE_KEY_MIN_BYTES = 32;
+/**
+ * The principal a sealed state is bound to: the request's authenticated
+ * `clientId`, `subject`, and `tenantId`, each empty when absent — as they all
+ * are on stdio and under `MCP_AUTH_MODE=none`. The codec stores an HMAC tag of
+ * it, never the value.
+ */
+function principalOf(ctx) {
+    const auth = ctx.http?.authInfo;
+    return JSON.stringify([auth?.clientId ?? '', auth?.subject ?? '', auth?.tenantId ?? '']);
+}
+/**
+ * The process's sealer, or `undefined` when no key is configured — in which
+ * case nothing reaches the SDK and handlers read the raw wire string, exactly
+ * as before the option existed. There is deliberately no per-process random
+ * key: a 2026-07-28 retry can land on another instance or outlive a restart,
+ * and every instance that may receive an echoed state needs the same key.
+ *
+ * @throws {McpError} `ConfigurationError` naming `MCP_REQUEST_STATE_KEY` when
+ *   the key is shorter than 32 UTF-8 bytes. The key itself is never included.
+ */
+export function createRequestStateSealer(key) {
+    if (key === undefined)
+        return;
+    if (new TextEncoder().encode(key).byteLength < REQUEST_STATE_KEY_MIN_BYTES) {
+        throw configurationError(`MCP_REQUEST_STATE_KEY must be at least ${REQUEST_STATE_KEY_MIN_BYTES} bytes. Set a longer random secret, shared by every instance that serves this server, or unset it.`, { variable: 'MCP_REQUEST_STATE_KEY', minimumBytes: REQUEST_STATE_KEY_MIN_BYTES });
+    }
+    const codec = createRequestStateCodec({
+        key,
+        ttlSeconds: REQUEST_STATE_TTL_SECONDS,
+        bind: principalOf,
+    });
+    return {
+        async seal(result, ctx) {
+            if (typeof result.requestState !== 'string')
+                return result;
+            return { ...result, requestState: await codec.mint(result.requestState, ctx) };
+        },
+        verify: (state, ctx) => codec.verify(state, ctx),
+    };
+}
+/**
+ * What a handler factory rethrows for a value its handler threw: an
+ * input-required signal carrying its `requestState` sealed when `sealer` is
+ * configured, anything else unchanged.
+ *
+ * The factories call it inside the measured region, where the signal is
+ * rethrown. Minting can reject — WebCrypto failing, or no request context for
+ * the principal binding — and a rejection there would escape the factory with
+ * no error envelope, no failure record, and no request id. It resolves to an
+ * `InternalError` instead, so the call fails through the family's ordinary
+ * error path; the codec's error rides as `cause` into the server log only, and
+ * no part of the key reaches it.
+ */
+export async function sealThrown(thrown, sealer, ctx) {
+    if (sealer === undefined || !isInputRequiredSignal(thrown))
+        return thrown;
+    try {
+        return new InputRequiredSignal(await sealer.seal(thrown.result, ctx));
+    }
+    catch (error) {
+        return internalError('Could not seal the requestState of an input_required result.', undefined, { cause: error });
+    }
+}
 //# sourceMappingURL=inputRequired.js.map

package/dist/mcp-server/inputRequired.js.map

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

package/dist/mcp-server/prompts/prompt-registration.d.ts

@@ -6,16 +6,24 @@
  * @module src/mcp-server/prompts/prompt-registration
  */
 import type { McpServer } from '@modelcontextprotocol/server';
+import { type RequestStateSealer } from '../inputRequired.js';
 import type { AnyPromptDefinition } from './utils/promptDefinition.js';
 import type { logger as defaultLogger } from '../../utils/internal/logger.js';
 export declare class PromptRegistry {
     private promptDefs;
     private logger;
+    private requestState?;
     /** Tracks registered prompt names to detect duplicates at startup. */
     private readonly registeredNames;
-    constructor(promptDefs: AnyPromptDefinition[], logger: typeof defaultLogger);
     /**
-     * Registers all prompts on the given MCP server.
+     * @param requestState - The process's `requestState` sealer, present when
+     *   `MCP_REQUEST_STATE_KEY` is set; an `input_required` result leaves with
+     *   its state sealed, as a tool's and a resource's do.
+     */
+    constructor(promptDefs: AnyPromptDefinition[], logger: typeof defaultLogger, requestState?: RequestStateSealer | undefined);
+    /**
+     * Registers all prompts on the given MCP server. Registration logs under one
+     * context; each `prompts/get` call logs under its own.
      */
     registerAll(server: McpServer): Promise<void>;
     /** Throws at startup if a prompt with the same name was already registered. */

package/dist/mcp-server/prompts/prompt-registration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-registration.d.ts","sourceRoot":"","sources":["../../../src/mcp-server/prompts/prompt-registration.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAwC,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAGpG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAG1F,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAI1E,qBAAa,cAAc;IAKvB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;IALhB,sEAAsE;IACtE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;IAErD,YACU,UAAU,EAAE,mBAAmB,EAAE,EACjC,MAAM,EAAE,OAAO,aAAa,EAClC;IAEJ;;OAEG;IACG,WAAW,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBlD;IAED,+EAA+E;IAC/E,OAAO,CAAC,gBAAgB;YAUV,cAAc;CAwE7B"}
+{"version":3,"file":"prompt-registration.d.ts","sourceRoot":"","sources":["../../../src/mcp-server/prompts/prompt-registration.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAGV,SAAS,EAEV,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAEL,KAAK,kBAAkB,EAExB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAG1F,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAI1E,qBAAa,cAAc;IAUvB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,YAAY,CAAC;IAXvB,sEAAsE;IACtE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;IAErD;;;;OAIG;IACH,YACU,UAAU,EAAE,mBAAmB,EAAE,EACjC,MAAM,EAAE,OAAO,aAAa,EAC5B,YAAY,CAAC,EAAE,kBAAkB,YAAA,EACvC;IAEJ;;;OAGG;IACG,WAAW,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBlD;IAED,+EAA+E;IAC/E,OAAO,CAAC,gBAAgB;YAUV,cAAc;CAsG7B"}

package/dist/mcp-server/prompts/prompt-registration.js

@@ -1,4 +1,5 @@
-import { isInputRequiredSignal } from '../inputRequired.js';
+import { handlerParentContext } from '../handlerContext.js';
+import { isInputRequiredSignal, sealThrown, } from '../inputRequired.js';
 import { JsonRpcErrorCode, McpError } from '../../types-global/errors.js';
 import { ErrorHandler } from '../../utils/internal/error-handler/errorHandler.js';
 import { measurePromptGeneration } from '../../utils/internal/performance.js';
@@ -6,14 +7,22 @@ import { requestContextService } from '../../utils/internal/requestContext.js';
 export class PromptRegistry {
     promptDefs;
     logger;
+    requestState;
     /** Tracks registered prompt names to detect duplicates at startup. */
     registeredNames = new Set();
-    constructor(promptDefs, logger) {
+    /**
+     * @param requestState - The process's `requestState` sealer, present when
+     *   `MCP_REQUEST_STATE_KEY` is set; an `input_required` result leaves with
+     *   its state sealed, as a tool's and a resource's do.
+     */
+    constructor(promptDefs, logger, requestState) {
         this.promptDefs = promptDefs;
         this.logger = logger;
+        this.requestState = requestState;
     }
     /**
-     * Registers all prompts on the given MCP server.
+     * Registers all prompts on the given MCP server. Registration logs under one
+     * context; each `prompts/get` call logs under its own.
      */
     async registerAll(server) {
         this.registeredNames.clear();
@@ -52,10 +61,34 @@ export class PromptRegistry {
                 ...(promptDef.args && {
                     argsSchema: promptDef.args,
                 }),
-            }, async (args) => {
+            }, async (...params) => {
+                // The SDK calls a prompt registered with `argsSchema` as
+                // `(args, ctx)` and one without as `(ctx)` alone (#581).
+                const [args, serverContext] = (promptDef.args ? params : [undefined, params[0]]);
+                // Per call, as for tools and resources, not the registration `context`:
+                // its `requestId` is the one the call's records carry and its error
+                // `data` returns (#576).
+                const requestContext = requestContextService.createRequestContext({
+                    parentContext: handlerParentContext(serverContext),
+                    operation: 'HandlePromptGet',
+                    additionalContext: { promptName: promptDef.name },
+                });
                 try {
-                    const validatedArgs = promptDef.args ? promptDef.args.parse(args) : args;
-                    const messages = await measurePromptGeneration(() => Promise.resolve(promptDef.generate(validatedArgs)), { ...context, promptName: promptDef.name }, validatedArgs);
+                    // An argless prompt's `generate` is typed to receive `{}`; its
+                    // input measures as nothing.
+                    const validatedArgs = promptDef.args ? promptDef.args.parse(args) : {};
+                    const messages = await measurePromptGeneration(async () => {
+                        try {
+                            return await promptDef.generate(validatedArgs);
+                        }
+                        catch (error) {
+                            // Inside the measurement, as for tools and resources: an
+                            // input-required signal leaves with its `requestState`
+                            // sealed when a key is configured, so a sealing failure
+                            // is a failed call like any other.
+                            throw await sealThrown(error, this.requestState, serverContext);
+                        }
+                    }, { ...requestContext, promptName: promptDef.name }, promptDef.args ? validatedArgs : undefined);
                     return { messages };
                 }
                 catch (error) {
@@ -65,15 +98,20 @@ export class PromptRegistry {
                     if (isInputRequiredSignal(error))
                         return error.result;
                     /**
-                     * `handleError` logs the stack and cause chain; the client gets
-                     * the classified code and message, plus only the `data` a thrown
-                     * `McpError` declared — the same wire shape as tools and resources.
+                     * `handleError` writes the call's one `error` record, with the
+                     * stack and cause chain; the completion record stays at `info`
+                     * (#582). The client gets the classified code and message, plus
+                     * only the `data` a thrown `McpError` declared and the call's
+                     * `requestId` (#576) — the same wire shape as tools and resources.
                      */
                     const handled = ErrorHandler.handleError(error, {
                         operation: `prompt:${promptDef.name}`,
-                        context,
+                        context: requestContext,
                     });
-                    throw new McpError(handled instanceof McpError ? handled.code : JsonRpcErrorCode.InternalError, handled.message, error instanceof McpError ? error.data : undefined, { cause: error });
+                    throw new McpError(handled instanceof McpError ? handled.code : JsonRpcErrorCode.InternalError, handled.message, {
+                        ...(error instanceof McpError ? error.data : undefined),
+                        requestId: requestContext.requestId,
+                    }, { cause: error });
                 }
             });
             this.logger.debug(`Registered prompt: ${promptDef.name}`, context);

package/dist/mcp-server/prompts/prompt-registration.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-registration.js","sourceRoot":"","sources":["../../../src/mcp-server/prompts/prompt-registration.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,gDAAgD,CAAC;AAE9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAE3E,MAAM,OAAO,cAAc;IAKf,UAAU;IACV,MAAM;IALhB,sEAAsE;IACrD,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IAErD,YACU,UAAiC,EACjC,MAA4B;0BAD5B,UAAU;sBACV,MAAM;IACb,CAAC;IAEJ;;OAEG;IACH,KAAK,CAAC,WAAW,CAAC,MAAiB;QACjC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QAE7B,MAAM,OAAO,GAAG,qBAAqB,CAAC,oBAAoB,CAAC;YACzD,SAAS,EAAE,4BAA4B;SACxC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,IAAI,CAAC,UAAU,CAAC,MAAM,eAAe,EAAE,OAAO,CAAC,CAAC;QAEjF,qEAAqE;QACrE,2EAA2E;QAC3E,2DAA2D;QAC3D,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACxC,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QACxD,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,IAAI,CAAC,UAAU,CAAC,MAAM,UAAU,EAAE,OAAO,CAAC,CAAC;IAC1F,CAAC;IAED,+EAA+E;IACvE,gBAAgB,CAAC,IAAY;QACnC,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CACb,0BAA0B,IAAI,oDAAoD;gBAChF,sCAAsC,CACzC,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAEO,KAAK,CAAC,cAAc,CAC1B,MAAiB,EACjB,SAA8B,EAC9B,OAAsE;QAEtE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,SAAS,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QAEpE,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAEtC,MAAM,YAAY,CAAC,QAAQ,CACzB,GAAG,EAAE;YACH,MAAM,CAAC,cAAc,CACnB,SAAS,CAAC,IAAI,EACd;gBACE,GAAG,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,KAAK,EAAE,CAAC;gBAClD,WAAW,EAAE,SAAS,CAAC,WAAW;gBAClC,6DAA6D;gBAC7D,mEAAmE;gBACnE,iEAAiE;gBACjE,8DAA8D;gBAC9D,iCAAiC;gBACjC,GAAG,CAAC,SAAS,CAAC,IAAI,IAAI;oBACpB,UAAU,EAAE,SAAS,CAAC,IAAI;iBAC3B,CAAC;aACH,EACD,KAAK,EAAE,IAA6B,EAAkD,EAAE;gBACtF,IAAI,CAAC;oBACH,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;oBACzE,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAC5C,GAAG,EAAE,CACH,OAAO,CAAC,OAAO,CACb,SAAS,CAAC,QAAQ,CAAC,aAAyD,CAAC,CAC9E,EACH,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC,IAAI,EAAE,EAC1C,aAAa,CACd,CAAC;oBACF,OAAO,EAAE,QAAQ,EAAE,CAAC;gBACtB,CAAC;gBAAC,OAAO,KAAc,EAAE,CAAC;oBACxB,kEAAkE;oBAClE,4DAA4D;oBAC5D,YAAY;oBACZ,IAAI,qBAAqB,CAAC,KAAK,CAAC;wBAAE,OAAO,KAAK,CAAC,MAAM,CAAC;oBAEtD;;;;uBAIG;oBACH,MAAM,OAAO,GAAG,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE;wBAC9C,SAAS,EAAE,UAAU,SAAS,CAAC,IAAI,EAAE;wBACrC,OAAO;qBACR,CAAC,CAAC;oBACH,MAAM,IAAI,QAAQ,CAChB,OAAO,YAAY,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,aAAa,EAC3E,OAAO,CAAC,OAAO,EACf,KAAK,YAAY,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAClD,EAAE,KAAK,EAAE,KAAK,EAAE,CACjB,CAAC;gBACJ,CAAC;YACH,CAAC,CACF,CAAC;YAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,SAAS,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QACrE,CAAC,EACD;YACE,SAAS,EAAE,qBAAqB,SAAS,CAAC,IAAI,EAAE;YAChD,OAAO;YACP,SAAS,EAAE,gBAAgB,CAAC,oBAAoB;YAChD,QAAQ,EAAE,IAAI;SACf,CACF,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"prompt-registration.js","sourceRoot":"","sources":["../../../src/mcp-server/prompts/prompt-registration.ts"],"names":[],"mappings":"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"}

package/dist/mcp-server/resources/resource-registration.d.ts

@@ -3,7 +3,7 @@
  * @module src/mcp-server/resources/resource-registration
  */
 import { type McpServer, type ServerNotifier } from '@modelcontextprotocol/server';
-import type { InputRequiredGate } from '../inputRequired.js';
+import type { ClientCapabilityView } from '../inputRequired.js';
 import type { ResourceSubscriptions } from '../notifications.js';
 import type { AnyResourceDefinition } from './utils/resourceDefinition.js';
 import { type HandlerServices } from './utils/resourceHandlerFactory.js';
@@ -15,8 +15,10 @@ export declare class ResourceRegistry {
     constructor(resourceDefs: AnyResourceDefinition[], services: HandlerServices);
     /**
      * Registers all resolved resource definitions with the provided McpServer instance.
+     * `capabilities` is the instance's view of what its client declared (#580),
+     * which every handler context resolves per request.
      */
-    registerAll(server: McpServer, subscriptions?: ResourceSubscriptions, bus?: ServerNotifier, inputGate?: InputRequiredGate): Promise<void>;
+    registerAll(server: McpServer, subscriptions?: ResourceSubscriptions, bus?: ServerNotifier, capabilities?: ClientCapabilityView): Promise<void>;
     /** Throws at startup if a resource with the same name was already registered. */
     private assertUniqueName;
     private registerResource;

package/dist/mcp-server/resources/resource-registration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource-registration.d.ts","sourceRoot":"","sources":["../../../src/mcp-server/resources/resource-registration.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,cAAc,EACpB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAChG,OAAO,EAEL,KAAK,eAAe,EAErB,MAAM,wDAAwD,CAAC;AAUhE,qBAAa,gBAAgB;IAKzB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,QAAQ;IALlB,wEAAwE;IACxE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;IAErD,YACU,YAAY,EAAE,qBAAqB,EAAE,EACrC,QAAQ,EAAE,eAAe,EAC/B;IAEJ;;OAEG;IACU,WAAW,CACtB,MAAM,EAAE,SAAS,EACjB,aAAa,CAAC,EAAE,qBAAqB,EACrC,GAAG,CAAC,EAAE,cAAc,EACpB,SAAS,CAAC,EAAE,iBAAiB,GAC5B,OAAO,CAAC,IAAI,CAAC,CA4Bf;IAED,iFAAiF;IACjF,OAAO,CAAC,gBAAgB;YAUV,gBAAgB;CAyD/B"}
+{"version":3,"file":"resource-registration.d.ts","sourceRoot":"","sources":["../../../src/mcp-server/resources/resource-registration.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EACL,KAAK,SAAS,EAEd,KAAK,cAAc,EACpB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAChG,OAAO,EAEL,KAAK,eAAe,EAErB,MAAM,wDAAwD,CAAC;AAUhE,qBAAa,gBAAgB;IAKzB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,QAAQ;IALlB,wEAAwE;IACxE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;IAErD,YACU,YAAY,EAAE,qBAAqB,EAAE,EACrC,QAAQ,EAAE,eAAe,EAC/B;IAEJ;;;;OAIG;IACU,WAAW,CACtB,MAAM,EAAE,SAAS,EACjB,aAAa,CAAC,EAAE,qBAAqB,EACrC,GAAG,CAAC,EAAE,cAAc,EACpB,YAAY,CAAC,EAAE,oBAAoB,GAClC,OAAO,CAAC,IAAI,CAAC,CA4Bf;IAED,iFAAiF;IACjF,OAAO,CAAC,gBAAgB;YAUV,gBAAgB;CAyD/B"}

package/dist/mcp-server/resources/resource-registration.js

@@ -22,8 +22,10 @@ export class ResourceRegistry {
     }
     /**
      * Registers all resolved resource definitions with the provided McpServer instance.
+     * `capabilities` is the instance's view of what its client declared (#580),
+     * which every handler context resolves per request.
      */
-    async registerAll(server, subscriptions, bus, inputGate) {
+    async registerAll(server, subscriptions, bus, capabilities) {
         this.registeredNames.clear();
         // Per-server notifier closures targeting `server.send*ListChanged()`. Bound
         // once per registerAll() call — never mutated on a shared services object
@@ -45,7 +47,7 @@ export class ResourceRegistry {
         // declared `resources` capability, so a server with no resources still
         // answers `resources/list` with an empty array rather than `-32601`.
         for (const resourceDef of this.resourceDefs) {
-            await this.registerResource(server, resourceDef, notifiers, inputGate);
+            await this.registerResource(server, resourceDef, notifiers, capabilities);
         }
     }
     /** Throws at startup if a resource with the same name was already registered. */
@@ -56,7 +58,7 @@ export class ResourceRegistry {
         }
         this.registeredNames.add(name);
     }
-    async registerResource(server, def, notifiers, inputGate) {
+    async registerResource(server, def, notifiers, capabilities) {
         const resourceName = def.name ?? def.uriTemplate;
         const registrationContext = requestContextService.createRequestContext({
             operation: 'ResourceRegistry.registerResource',
@@ -65,7 +67,7 @@ export class ResourceRegistry {
         logger.debug(`Registering resource: '${resourceName}'`, registrationContext);
         this.assertUniqueName(resourceName);
         await ErrorHandler.tryCatch(() => {
-            const handler = createResourceHandler(def, this.services, notifiers, inputGate);
+            const handler = createResourceHandler(def, this.services, notifiers, capabilities);
             const title = def.title ?? resourceName;
             const mimeType = def.mimeType ?? 'application/json';
             const metadata = {

package/dist/mcp-server/resources/resource-registration.js.map

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

package/dist/mcp-server/resources/utils/resourceHandlerFactory.d.ts

@@ -5,7 +5,7 @@
  */
 import type { InputRequiredResult, ReadResourceResult, ServerContext, Variables } from '@modelcontextprotocol/server';
 import { type HandlerServices } from '../../handlerContext.js';
-import { type InputRequiredGate } from '../../inputRequired.js';
+import { type ClientCapabilityView } from '../../inputRequired.js';
 import type { NotifierSources } from '../../notifications.js';
 import type { AnyResourceDefinition } from './resourceDefinition.js';
 /** The factory's own contract, shared with the tool factory. */
@@ -30,7 +30,8 @@ export declare function defaultResponseFormatter(result: unknown, meta: {
  * - Checks inline `auth` scopes if defined
  * - Validates params via Zod schema
  * - Formats response via `format` or JSON default
- * - Catches errors and re-throws for the SDK
+ * - Catches errors and re-throws for the SDK, with the declared recovery filled
+ *   (#579) and the read's request id added (#576)
  */
-export declare function createResourceHandler(def: AnyResourceDefinition, services: HandlerServices, notifiers: NotifierSources, inputGate?: InputRequiredGate): (uri: URL, variables: Variables, ctx: ServerContext) => Promise<ReadResourceResult | InputRequiredResult>;
+export declare function createResourceHandler(def: AnyResourceDefinition, services: HandlerServices, notifiers: NotifierSources, capabilities?: ClientCapabilityView): (uri: URL, variables: Variables, ctx: ServerContext) => Promise<ReadResourceResult | InputRequiredResult>;
 //# sourceMappingURL=resourceHandlerFactory.d.ts.map

package/dist/mcp-server/resources/utils/resourceHandlerFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resourceHandlerFactory.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/resources/utils/resourceHandlerFactory.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,EACb,SAAS,EACV,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAEL,KAAK,eAAe,EAGrB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,KAAK,iBAAiB,EAAyB,MAAM,+BAA+B,CAAC;AAC9F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAWhG,gEAAgE;AAChE,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,YAAY,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAiBrE;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,OAAO,EACf,IAAI,EAAE;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACnC,kBAAkB,CAAC,UAAU,CAAC,CAShC;AAkBD;;;;;;;;;;;GAWG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,qBAAqB,EAC1B,QAAQ,EAAE,eAAe,EACzB,SAAS,EAAE,eAAe,EAC1B,SAAS,CAAC,EAAE,iBAAiB,GAC5B,CACD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,aAAa,KACf,OAAO,CAAC,kBAAkB,GAAG,mBAAmB,CAAC,CA8FrD"}
+{"version":3,"file":"resourceHandlerFactory.d.ts","sourceRoot":"","sources":["../../../../src/mcp-server/resources/utils/resourceHandlerFactory.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,EACb,SAAS,EACV,MAAM,8BAA8B,CAAC;AAGtC,OAAO,EAEL,KAAK,eAAe,EAGrB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,KAAK,oBAAoB,EAG1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAWhG,gEAAgE;AAChE,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,YAAY,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAiBrE;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,OAAO,EACf,IAAI,EAAE;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACnC,kBAAkB,CAAC,UAAU,CAAC,CAShC;AAkBD;;;;;;;;;;;;GAYG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,qBAAqB,EAC1B,QAAQ,EAAE,eAAe,EACzB,SAAS,EAAE,eAAe,EAC1B,YAAY,CAAC,EAAE,oBAAoB,GAClC,CACD,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,SAAS,EACpB,GAAG,EAAE,aAAa,KACf,OAAO,CAAC,kBAAkB,GAAG,mBAAmB,CAAC,CAgGrD"}