@graphorin/mcp 0.5.0 → 0.6.1

package/CHANGELOG.md

@@ -1,5 +1,62 @@
 # @graphorin/mcp
 
+## 0.6.1
+
+### Patch Changes
+
+- [#142](https://github.com/o-stepper/graphorin/pull/142) [`436d6ca`](https://github.com/o-stepper/graphorin/commit/436d6ca5ebbd16df094e915682d3915c279a8430) Thanks [@o-stepper](https://github.com/o-stepper)! - Version constants and version-bearing strings now derive from each package's manifest at build time (`VERSION = pkg.version`; writer ids, client/server info, OTLP framework attributes, build-info metrics interpolate it). No behavioral change at the current version: the rendered strings are byte-identical. A release bump no longer edits source; the new `check-version-consistency` gate fails any reintroduced hardcoded framework version.
+
+- Updated dependencies [[`826ee59`](https://github.com/o-stepper/graphorin/commit/826ee5933ad38693b0dd2f20a110abfecba7d23d), [`436d6ca`](https://github.com/o-stepper/graphorin/commit/436d6ca5ebbd16df094e915682d3915c279a8430)]:
+  - @graphorin/observability@0.6.1
+  - @graphorin/core@0.6.1
+  - @graphorin/security@0.6.1
+  - @graphorin/tools@0.6.1
+
+## 0.6.0
+
+### Minor Changes
+
+- [#136](https://github.com/o-stepper/graphorin/pull/136) [`17a2d30`](https://github.com/o-stepper/graphorin/commit/17a2d30564154ca2ab87473335cdef43a5089c84) Thanks [@o-stepper](https://github.com/o-stepper)! - Deterministic security adoptions (audit 2026-07-04 Wave C, cluster C6).
+
+  - Derived-taint propagation: opt-in `dataFlowPolicy.derivedTaint: 'strict'` fires the paraphrase-robust `derived-untrusted-to-sink` flow for every model-driven sink call once untrusted content entered the run (CaMeL-style control-flow integrity); the agent also records each tainted step's assistant text as `llm-derived` spans so model-echoed phrasing trips the verbatim probe.
+  - Taint into memory (cross-session MINJA leg): `ToolReturn` gains a widen-only `taint` override honoured through the executor record path; `fact_search` / `deep_recall` / `recall_episodes` attach it when any returned item is quarantined or foreign-provenance, re-arming the ledger at recall. `RunState.taintSummary` additionally carries one-way FNV-1a span-tile hashes (no plaintext), so a resumed run re-detects pre-suspend verbatim copies.
+  - MCP pinning completed: `toTools({ pinStore })` records fingerprints on first use and REJECTS drift by default when a store is present (rug-pull defense; `onPinMismatch: 'warn'` downgrades); tool-description injection hits at registration are counted (`mcp.tool-description.injection-flagged.total`).
+  - Signal-only heuristics + Unicode pre-pass: shared `normalizeForMatching` (NFKC + zero-width strip) applied in the guardrails injection catalogue and the memory quarantine heuristics; security.md repositions all pattern catalogues as best-effort signal, never a sole gate. `TaintLabel.sourceKind` widened to `string` for the new descriptive kinds.
+
+### Patch Changes
+
+- [#134](https://github.com/o-stepper/graphorin/pull/134) [`32f20c1`](https://github.com/o-stepper/graphorin/commit/32f20c110f184f8cef7eec85bf39f5f07c886cb6) Thanks [@o-stepper](https://github.com/o-stepper)! - `listTools`/`listResources`/`listPrompts` now follow `nextCursor` and drain the full cursor chain (mcp-skills-02). MCP list operations are paginated since protocol 2024-11-05 and the SDK does not auto-paginate, so a paginating server's catalogue was silently truncated to page 1 - tools beyond it never reached `toTools()`, defer-loading thresholds counted a partial catalogue, and pin fingerprints covered a partial catalogue. A defensive 100-page cap (with a WARN) bounds buggy or adversarial servers that never terminate the chain.
+
+- [#134](https://github.com/o-stepper/graphorin/pull/134) [`32f20c1`](https://github.com/o-stepper/graphorin/commit/32f20c110f184f8cef7eec85bf39f5f07c886cb6) Thanks [@o-stepper](https://github.com/o-stepper)! - Fix critical tool-schema wire bug (tools-01): plain Zod schemas were never converted to JSON Schema, so OpenAI-shaped/Ollama/vercel providers received `{"_def":...}` internals as tool `parameters` and MCP tools serialized to `{}`. Adds a shared structural Zod v3/v4 to JSON Schema converter (`@graphorin/tools/schema`, no new dependencies) used by the agent's `toolToDefinition`, the code-mode signature projection, and `ToolSearchMatch`; MCP's `buildJsonSchemaValidator` now retains the source JSON Schema and exposes it via `toJSON()`. Unprojectable schemas degrade loudly (WARN + permissive `{}`) instead of shipping serialized validator internals.
+
+- [#135](https://github.com/o-stepper/graphorin/pull/135) [`4f850d9`](https://github.com/o-stepper/graphorin/commit/4f850d9bc0a05d6256c59c5117b010336fcb41d3) Thanks [@o-stepper](https://github.com/o-stepper)! - MCP correctness tail (audit 2026-07-04 Wave B, cluster B8).
+
+  - mcp-skills-05: a `sampling/createMessage` carrying `tools` / `toolChoice` is rejected with an `McpError` (the 2025-11-25 MUST - the client does not declare `sampling.tools`; previously it silently answered as a plain completion). URL-mode elicitation is declined honestly instead of being surfaced as an empty form with the URL invisible.
+  - mcp-skills-06: MCP resource handles are scoped to their originating server (`mcp:<serverId>:<uri>`); `createMcpResourceReader` consults ONLY the matching client, closing the cross-server confused-deputy hop where server A's link (or a prompt-injected model) fetched a resource from trusted server B. Bare URIs are refused unless `allowCrossServer: true` is opted in.
+  - mcp-skills-07: server-supplied JSON-Schema `pattern`s are guarded before compilation - pattern/tested-string length caps plus a nested-quantifier heuristic (`(a+)+`-class) - so a malicious server can no longer stall the event loop with catastrophic backtracking; guarded-out patterns degrade to permissive like malformed ones.
+  - mcp-skills-10: new `onTransportClose` / `onTransportError` callbacks (plus `mcp.transport.closed|error.total` counters and a WARN log) surface a dead stdio child / dropped HTTP session; previously a disconnect was observable only as protocol errors on later calls.
+  - mcp-skills-11: new `MCPClient.readResourceContents(uri)` returns every content item; the single-content `readResource` convenience now WARNs + counts when it truncates a multi-content response.
+  - mcp-skills-04 (adjusted): a same-source tool re-registration increments `tool.registry.same-source-replaced.total`, so two server instances colliding on one identity are observable churn instead of a silent swap.
+  - mcp-skills-09 (F-10): the documented NESTED `metadata.graphorin` frontmatter form now actually resolves (flat dotted keys still win when both are present); skills.md fixes `sandboxTier` to `sandbox` and the `parseSlashCommand` output shape.
+  - mcp-skills-08 (F-9): mcp-client.md rewritten to the real observability surface (counters, no `mcp.tool.invoke` span, no per-call audit rows), the real executor error mapping, and the `.`-namespaced `sideEffectClassByTool` keys; sampling-with-tools / tasks / icons documented as known-unsupported.
+
+- [#138](https://github.com/o-stepper/graphorin/pull/138) [`6293a25`](https://github.com/o-stepper/graphorin/commit/6293a2531c5c9265294da22fb365a08f2bdf445a) Thanks [@o-stepper](https://github.com/o-stepper)! - Documentation-truth sweep (audit 2026-07-04 Wave E, cluster E10): stale npm package descriptions rewritten (cli "Phase 14a three commands", mcp "upcoming auth CLI", store-sqlite's nonexistent WorkerPool), the store-sqlite WorkerPool TSDoc and the cipher-pragma ordering comment corrected, the executor timeout-precedence JSDoc fixed to the real `inlineToolTimeoutMs > tier timeoutMs > default` order, the `rrf.<label>` explain signals documented, and the skills spec-snapshot wording no longer claims a CI cron refreshes it (the diff is a manual `--upstream` pass; the release gate only parses the bundled snapshot).
+
+- Updated dependencies [[`32f20c1`](https://github.com/o-stepper/graphorin/commit/32f20c110f184f8cef7eec85bf39f5f07c886cb6), [`32f20c1`](https://github.com/o-stepper/graphorin/commit/32f20c110f184f8cef7eec85bf39f5f07c886cb6), [`32f20c1`](https://github.com/o-stepper/graphorin/commit/32f20c110f184f8cef7eec85bf39f5f07c886cb6), [`32f20c1`](https://github.com/o-stepper/graphorin/commit/32f20c110f184f8cef7eec85bf39f5f07c886cb6), [`4f850d9`](https://github.com/o-stepper/graphorin/commit/4f850d9bc0a05d6256c59c5117b010336fcb41d3), [`4f850d9`](https://github.com/o-stepper/graphorin/commit/4f850d9bc0a05d6256c59c5117b010336fcb41d3), [`4f850d9`](https://github.com/o-stepper/graphorin/commit/4f850d9bc0a05d6256c59c5117b010336fcb41d3), [`4f850d9`](https://github.com/o-stepper/graphorin/commit/4f850d9bc0a05d6256c59c5117b010336fcb41d3), [`17a2d30`](https://github.com/o-stepper/graphorin/commit/17a2d30564154ca2ab87473335cdef43a5089c84), [`17a2d30`](https://github.com/o-stepper/graphorin/commit/17a2d30564154ca2ab87473335cdef43a5089c84), [`17a2d30`](https://github.com/o-stepper/graphorin/commit/17a2d30564154ca2ab87473335cdef43a5089c84), [`17a2d30`](https://github.com/o-stepper/graphorin/commit/17a2d30564154ca2ab87473335cdef43a5089c84), [`17a2d30`](https://github.com/o-stepper/graphorin/commit/17a2d30564154ca2ab87473335cdef43a5089c84), [`ce06b47`](https://github.com/o-stepper/graphorin/commit/ce06b472af9e30ac5d0792f7a8b6f42170a94627), [`ce06b47`](https://github.com/o-stepper/graphorin/commit/ce06b472af9e30ac5d0792f7a8b6f42170a94627), [`ce06b47`](https://github.com/o-stepper/graphorin/commit/ce06b472af9e30ac5d0792f7a8b6f42170a94627), [`ce06b47`](https://github.com/o-stepper/graphorin/commit/ce06b472af9e30ac5d0792f7a8b6f42170a94627), [`ce06b47`](https://github.com/o-stepper/graphorin/commit/ce06b472af9e30ac5d0792f7a8b6f42170a94627), [`ce06b47`](https://github.com/o-stepper/graphorin/commit/ce06b472af9e30ac5d0792f7a8b6f42170a94627), [`6293a25`](https://github.com/o-stepper/graphorin/commit/6293a2531c5c9265294da22fb365a08f2bdf445a), [`6293a25`](https://github.com/o-stepper/graphorin/commit/6293a2531c5c9265294da22fb365a08f2bdf445a)]:
+  - @graphorin/tools@0.6.0
+  - @graphorin/core@0.6.0
+  - @graphorin/security@0.6.0
+  - @graphorin/observability@0.6.0
+
+## 0.5.0
+
+First version published to the npm registry (with Sigstore build
+provenance). The 0.2.0, 0.3.0, and 0.4.0 versions were internal lockstep
+milestones and were never published. All `@graphorin/*` packages release
+lockstep at the same version; the full release notes for 0.2.0-0.5.0 live
+in the repository-level
+[CHANGELOG](https://github.com/o-stepper/graphorin/blob/main/CHANGELOG.md).
+
 ## 0.1.0
 
 ### Minor Changes

package/README.md

@@ -26,8 +26,15 @@ the existing outbound OAuth subsystem in `@graphorin/security`.
   that have not migrated yet (the runtime emits one WARN per
   process on selection).
 - **Typed `MCPClient` surface.** `listTools` / `listResources` /
-  `listPrompts` / `callTool` / `readResource` / `getPrompt` /
+  `listPrompts` / `callTool` / `readResource` /
+  `readResourceContents` (multi-content resources) / `getPrompt` /
   `close` plus the strategy-aware `toTools(...)` adapter.
+- **Tool pinning (TOFU rug-pull defense).** `toTools({ pinStore })`
+  records a fingerprint of each tool's name / description / schema on
+  first use and, when a pin store is present, **rejects** silent drift
+  by default (`onPinMismatch: 'warn'` downgrades to a warning);
+  description-injection heuristics at registration feed the
+  `mcp.tool-description.injection-flagged.total` counter.
 - **Strict default for MCP-derived tools.** Every `Tool` produced
   by `MCPClient.toTools()` defaults to the
   `'detect-and-strip-and-wrap'` inbound prompt-injection
@@ -65,7 +72,7 @@ the existing outbound OAuth subsystem in `@graphorin/security`.
 - **Streamable HTTP sessions.** The client persists the assigned
   `Mcp-Session-Id` and the SDK transport auto-reconnects with
   `Last-Event-ID` after a transient disconnect. Event replay is the
-  SERVER's responsibility per the Streamable HTTP spec — the client
+  SERVER's responsibility per the Streamable HTTP spec - the client
   surfaces `sessionIdPresent` (stateful routing detected; not a
   replay guarantee).
 
@@ -182,7 +189,7 @@ const issues = await createMCPClient({
   // `authProvider.resolveHeader()` on every outgoing request, so the
   // refresh-ahead window fires automatically and a long-lived session
   // survives token expiry without re-creating the client. Do **not**
-  // resolve the token once into static `headers` — that pins a single
+  // resolve the token once into static `headers` - that pins a single
   // token and defeats the refresh.
   authProvider,
 });
@@ -207,7 +214,7 @@ client persists it for stateful routing and exposes
 alias). A session id is **not** a replay guarantee: per the
 Streamable HTTP spec, event replay is the **server's**
 responsibility, and the SDK transport already auto-reconnects with
-the `Last-Event-ID` header after a transient disconnect — no client
+the `Last-Event-ID` header after a transient disconnect - no client
 configuration needed. (The former client-side `eventStore` option
 was removed: a client-held store cannot drive replay; passing the
 legacy option logs a warning.)
@@ -256,19 +263,19 @@ Every error class extends `GraphorinMCPError` and carries a
 stable lowercase `kind` discriminator and an actionable `hint`
 field where applicable:
 
-- `MCPConnectionError`               — transport could not be established or was dropped.
-- `MCPProtocolError`                 — JSON-RPC / MCP protocol-level error.
-- `MCPAuthError`                     — authentication / authorization failure.
-- `MCPToolNotFoundError`             — the requested tool is not registered with the server.
-- `MCPCallTimeoutError`              — tool call exceeded the configured timeout (variant `'session-lost'` for the resume-handshake-lost path).
-- `MCPCancelledError`                — call was cancelled by an `AbortSignal`.
-- `MCPInvalidConfigError`            — the supplied `MCPTransportConfig` is invalid.
-- `MCPTransportNotSupportedError`    — the supplied configuration requested an unsupported transport / capability combination (variant `'transport-resumable-not-supported'` for resumable sessions on `'stdio'` / `'sse'`).
+- `MCPConnectionError`               - transport could not be established or was dropped.
+- `MCPProtocolError`                 - JSON-RPC / MCP protocol-level error.
+- `MCPAuthError`                     - authentication / authorization failure.
+- `MCPToolNotFoundError`             - the requested tool is not registered with the server.
+- `MCPCallTimeoutError`              - tool call exceeded the configured timeout (variant `'session-lost'` for the resume-handshake-lost path).
+- `MCPCancelledError`                - call was cancelled by an `AbortSignal`.
+- `MCPInvalidConfigError`            - the supplied `MCPTransportConfig` is invalid.
+- `MCPTransportNotSupportedError`    - the supplied configuration requested an unsupported transport / capability combination (variant `'transport-resumable-not-supported'` for resumable sessions on `'stdio'` / `'sse'`).
 
 ## Acceptance & testing
 
-- 109 unit + integration + property tests run under Vitest with
-  no network calls (verified by the workspace
+- The package's unit + integration + property tests run under Vitest
+  with no network calls (verified by the workspace
   `pnpm run check-no-network` script).
 - Integration tests use the SDK's `InMemoryTransport` linked-pair
   + a configurable in-process `Server` fixture; no child
@@ -289,8 +296,8 @@ field where applicable:
 
 ## License
 
-MIT — © 2026 Oleksiy Stepurenko.
+MIT - © 2026 Oleksiy Stepurenko.
 
 ---
 
-**Project Graphorin** · v0.5.0 · MIT License · © 2026 Oleksiy Stepurenko · <https://github.com/o-stepper/graphorin>
+**Project Graphorin** · v0.6.1 · MIT License · © 2026 Oleksiy Stepurenko · <https://github.com/o-stepper/graphorin>

package/dist/client/adapt-result.js

@@ -27,9 +27,9 @@ function adaptCallResult(args) {
 				server: serverIdentity.id,
 				tool: toolName
 			});
-			resourceLinkPreviews.push(formatResourceLinkPreview(part));
+			resourceLinkPreviews.push(formatResourceLinkPreview(part, serverIdentity.id));
 		}
-		const messagePart = mcpContentToMessageContent(part);
+		const messagePart = mcpContentToMessageContent(part, serverIdentity.id);
 		if (messagePart !== void 0) contentParts.push(messagePart);
 	}
 	const textParts = (result.content ?? []).filter((p) => p.type === "text");
@@ -44,7 +44,7 @@ function adaptCallResult(args) {
 			break;
 		case "resource":
 			if (part.resource.text !== void 0) outputSegments.push(part.resource.text);
-			else if (part.resource.blob !== void 0) outputSegments.push(`[resource ${part.resource.uri} ${part.resource.mimeType ?? "application/octet-stream"}, ~${approxDecodedSize(part.resource.blob)} — full payload in contentParts]`);
+			else if (part.resource.blob !== void 0) outputSegments.push(`[resource ${part.resource.uri} ${part.resource.mimeType ?? "application/octet-stream"}, ~${approxDecodedSize(part.resource.blob)} - full payload in contentParts]`);
 			else outputSegments.push(`Resource ${part.resource.uri}`);
 			break;
 		case "resource_link": break;
@@ -104,7 +104,7 @@ function adaptCallResult(args) {
 		contentParts: Object.freeze(contentParts)
 	});
 }
-function mcpContentToMessageContent(part) {
+function mcpContentToMessageContent(part, serverId) {
 	switch (part.type) {
 		case "text": return {
 			type: "text",
@@ -139,22 +139,34 @@ function mcpContentToMessageContent(part) {
 		}
 		case "resource_link": return {
 			type: "text",
-			text: formatResourceLinkPreview(part)
+			text: formatResourceLinkPreview(part, serverId)
 		};
 	}
 }
 /**
 * Render the compact, model-facing preview for a `resource_link`. The
-* `uri` doubles as the `read_result` handle — an
+* handle is SCOPED to the originating server (mcp-skills-06):
+* `mcp:<serverId>:<uri>` - an
 * {@link import('./mcp-resource-reader.js').createMcpResourceReader}
-* resolves it on demand via {@link MCPClient.readResource}.
+* parses the prefix and consults ONLY that server, so a malicious
+* server's link (or a prompt-injected model) cannot fetch a resource
+* from a different, more-trusted server through the handle.
 */
-function formatResourceLinkPreview(part) {
+function formatResourceLinkPreview(part, serverId) {
 	const label = part.title === void 0 || part.title.length === 0 ? part.name : part.title;
 	const meta = [];
 	if (part.mimeType !== void 0) meta.push(part.mimeType);
 	if (part.size !== void 0) meta.push(`${part.size} bytes`);
-	return `[resource_link] ${label}${meta.length === 0 ? "" : ` (${meta.join(", ")})`}${part.description === void 0 || part.description.length === 0 ? "" : ` — ${part.description}`}\nFetch the full contents on demand with read_result, handle: ${part.uri}`;
+	return `[resource_link] ${label}${meta.length === 0 ? "" : ` (${meta.join(", ")})`}${part.description === void 0 || part.description.length === 0 ? "" : ` - ${part.description}`}\nFetch the full contents on demand with read_result, handle: ${scopedResourceHandle(serverId, part.uri)}`;
+}
+/**
+* Build the server-scoped `read_result` handle for an MCP resource
+* (mcp-skills-06): `mcp:<serverId>:<uri>`.
+*
+* @stable
+*/
+function scopedResourceHandle(serverId, uri) {
+	return `mcp:${serverId}:${uri}`;
 }
 /** Human-readable size of a base64 payload's decoded bytes (MC-8). */
 function approxDecodedSize(base64) {
@@ -163,7 +175,7 @@ function approxDecodedSize(base64) {
 }
 /** Text descriptor for a non-text content part (MC-8). */
 function describeBinaryPart(kind, mimeType, data) {
-	return `[${kind} ${mimeType}, ~${approxDecodedSize(data)} — full payload in contentParts]`;
+	return `[${kind} ${mimeType}, ~${approxDecodedSize(data)} - full payload in contentParts]`;
 }
 function decodeBase64(value) {
 	return Uint8Array.from(Buffer.from(value, "base64"));

package/dist/client/adapt-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapt-result.js","names":["contentParts: MessageContent[]","resourceLinkPreviews: string[]","outputSegments: string[]","meta: string[]"],"sources":["../../src/client/adapt-result.ts"],"sourcesContent":["/**\n * Result adaptation for the `toTools()` adapter (extracted from\n * `to-tools.ts` per F-MCP-001).\n *\n * Converts an MCP `CallToolResult` into a typed Graphorin `ToolReturn`,\n * handling the structured-content + outputSchema round-trip and the\n * backward-compatible TextContent mirror, and mapping each MCP content\n * part onto a Graphorin {@link MessageContent}.\n *\n * @packageDocumentation\n */\n\nimport type { MessageContent, ToolReturn, ZodLikeSchema } from '@graphorin/core';\nimport { incrementCounter } from '@graphorin/tools/audit';\nimport { MCPToolExecutionError } from '../errors/index.js';\nimport type { ServerIdentity } from '../transport/types.js';\nimport type { MCPCallToolResult, MCPContentPart } from './types.js';\n\n/** Arguments for {@link adaptCallResult}. */\nexport interface AdaptCallResultArgs {\n  readonly result: MCPCallToolResult;\n  readonly outputSchema?: ZodLikeSchema<unknown> | undefined;\n  readonly serverIdentity: ServerIdentity;\n  readonly toolName: string;\n  readonly logger?: (\n    level: 'debug' | 'info' | 'warn' | 'error',\n    message: string,\n    fields?: Record<string, unknown>,\n  ) => void;\n}\n\n/**\n * Convert an MCP `CallToolResult` into a typed Graphorin `ToolReturn`,\n * handling the structured-content + outputSchema round-trip and the\n * backward-compatible TextContent mirror.\n *\n * @internal\n */\nexport function adaptCallResult(args: AdaptCallResultArgs): ToolReturn<unknown> {\n  const { result, outputSchema, serverIdentity, toolName } = args;\n  // MC-4: the SDK deliberately does NOT throw on isError results — the\n  // failure marker must not launder into a successful ToolReturn. Throw\n  // the typed error so the executor records a real failure; the server's\n  // text rides in the message for model self-correction.\n  if (result.isError === true) {\n    const errorText = (result.content ?? [])\n      .filter((p): p is { type: 'text'; text: string } => p.type === 'text')\n      .map((p) => p.text)\n      .join('\\n');\n    incrementCounter('mcp.call.tool-error.total', {\n      server: serverIdentity.id,\n      tool: toolName,\n    });\n    throw new MCPToolExecutionError(\n      errorText.length > 0 ? errorText : `MCP tool '${toolName}' reported an error result.`,\n      { metadata: { tool: toolName } },\n    );\n  }\n  const contentParts: MessageContent[] = [];\n  // `resource_link` parts are NOT inlined: each contributes a compact\n  // preview (carrying the `uri` as a result handle) so the model fetches\n  // the body on demand via `read_result` instead of inflating context.\n  const resourceLinkPreviews: string[] = [];\n  for (const part of result.content) {\n    if (part.type === 'resource_link') {\n      incrementCounter('mcp.resource-link.emitted.total', {\n        server: serverIdentity.id,\n        tool: toolName,\n      });\n      resourceLinkPreviews.push(formatResourceLinkPreview(part));\n    }\n    const messagePart = mcpContentToMessageContent(part);\n    if (messagePart !== undefined) contentParts.push(messagePart);\n  }\n  const textParts = (result.content ?? []).filter(\n    (p): p is { type: 'text'; text: string } => p.type === 'text',\n  );\n  // MC-8: the typed `output` is the ONLY channel the agent loop\n  // serialises into the tool message — non-text parts must leave a\n  // text trace there (the full payloads stay in `contentParts`), and\n  // embedded resource TEXT joins the concatenation outright.\n  const outputSegments: string[] = [];\n  for (const part of result.content ?? []) {\n    switch (part.type) {\n      case 'text':\n        outputSegments.push(part.text);\n        break;\n      case 'image':\n      case 'audio':\n        outputSegments.push(describeBinaryPart(part.type, part.mimeType, part.data));\n        break;\n      case 'resource': {\n        if (part.resource.text !== undefined) {\n          outputSegments.push(part.resource.text);\n        } else if (part.resource.blob !== undefined) {\n          outputSegments.push(\n            `[resource ${part.resource.uri} ${part.resource.mimeType ?? 'application/octet-stream'}, ~${approxDecodedSize(part.resource.blob)} — full payload in contentParts]`,\n          );\n        } else {\n          outputSegments.push(`Resource ${part.resource.uri}`);\n        }\n        break;\n      }\n      case 'resource_link':\n        // Joined below via the read_result preview.\n        break;\n    }\n  }\n  const concatenatedText = [...outputSegments, ...resourceLinkPreviews].join('\\n');\n\n  if (result.structuredContent !== undefined) {\n    if (outputSchema !== undefined) {\n      const validation = outputSchema.safeParse(result.structuredContent);\n      if (validation.success) {\n        incrementCounter('mcp.structured-content.emitted.total', {\n          server: serverIdentity.id,\n          tool: toolName,\n        });\n        const finalParts = [...contentParts];\n        if (textParts.length === 0) {\n          finalParts.push({ type: 'text', text: JSON.stringify(result.structuredContent) });\n        }\n        return Object.freeze({\n          output: validation.data,\n          contentParts: Object.freeze(finalParts),\n        });\n      }\n      incrementCounter('mcp.structured-content.validation.failure.total', {\n        server: serverIdentity.id,\n        tool: toolName,\n      });\n      // MC-11: a schema mismatch must not silently drop the payload —\n      // log and mirror the structured content as JSON text, exactly\n      // like the no-schema branch does.\n      args.logger?.(\n        'warn',\n        'mcp.structured-content.validation.failed: payload mirrored as JSON text',\n        { server: serverIdentity.id, tool: toolName },\n      );\n      const fallbackParts = [...contentParts];\n      if (textParts.length === 0) {\n        fallbackParts.push({ type: 'text', text: JSON.stringify(result.structuredContent) });\n      }\n      return Object.freeze({\n        output:\n          concatenatedText.length > 0 ? concatenatedText : JSON.stringify(result.structuredContent),\n        contentParts: Object.freeze(fallbackParts),\n      });\n    } else {\n      incrementCounter('mcp.structured-content.emitted.total', {\n        server: serverIdentity.id,\n        tool: toolName,\n      });\n      const finalParts = [...contentParts];\n      if (textParts.length === 0) {\n        finalParts.push({ type: 'text', text: JSON.stringify(result.structuredContent) });\n      }\n      return Object.freeze({\n        output: result.structuredContent,\n        contentParts: Object.freeze(finalParts),\n      });\n    }\n  }\n\n  return Object.freeze({\n    output: concatenatedText,\n    contentParts: Object.freeze(contentParts),\n  });\n}\n\nfunction mcpContentToMessageContent(part: MCPContentPart): MessageContent | undefined {\n  switch (part.type) {\n    case 'text':\n      return { type: 'text', text: part.text };\n    case 'image':\n      return {\n        type: 'image',\n        image: decodeBase64(part.data),\n        mimeType: part.mimeType,\n      };\n    case 'audio':\n      return {\n        type: 'audio',\n        audio: decodeBase64(part.data),\n        mimeType: part.mimeType,\n      };\n    case 'resource': {\n      const text = part.resource.text;\n      if (text !== undefined) {\n        return { type: 'text', text };\n      }\n      const blob = part.resource.blob;\n      if (blob !== undefined) {\n        return {\n          type: 'file',\n          file: decodeBase64(blob),\n          mimeType: part.resource.mimeType ?? 'application/octet-stream',\n        };\n      }\n      return { type: 'text', text: `Resource ${part.resource.uri}` };\n    }\n    case 'resource_link':\n      return { type: 'text', text: formatResourceLinkPreview(part) };\n  }\n}\n\n/**\n * Render the compact, model-facing preview for a `resource_link`. The\n * `uri` doubles as the `read_result` handle — an\n * {@link import('./mcp-resource-reader.js').createMcpResourceReader}\n * resolves it on demand via {@link MCPClient.readResource}.\n */\nfunction formatResourceLinkPreview(\n  part: Extract<MCPContentPart, { type: 'resource_link' }>,\n): string {\n  const label = part.title === undefined || part.title.length === 0 ? part.name : part.title;\n  const meta: string[] = [];\n  if (part.mimeType !== undefined) meta.push(part.mimeType);\n  if (part.size !== undefined) meta.push(`${part.size} bytes`);\n  const metaStr = meta.length === 0 ? '' : ` (${meta.join(', ')})`;\n  const desc =\n    part.description === undefined || part.description.length === 0 ? '' : ` — ${part.description}`;\n  return `[resource_link] ${label}${metaStr}${desc}\\nFetch the full contents on demand with read_result, handle: ${part.uri}`;\n}\n\n/** Human-readable size of a base64 payload's decoded bytes (MC-8). */\nfunction approxDecodedSize(base64: string): string {\n  const bytes = Math.floor((base64.length * 3) / 4);\n  return bytes >= 1024 ? `${Math.round(bytes / 1024)}kB` : `${bytes}B`;\n}\n\n/** Text descriptor for a non-text content part (MC-8). */\nfunction describeBinaryPart(kind: 'image' | 'audio', mimeType: string, data: string): string {\n  return `[${kind} ${mimeType}, ~${approxDecodedSize(data)} — full payload in contentParts]`;\n}\n\nfunction decodeBase64(value: string): Uint8Array {\n  return Uint8Array.from(Buffer.from(value, 'base64'));\n}\n"],"mappings":";;;;;;;;;;;AAsCA,SAAgB,gBAAgB,MAAgD;CAC9E,MAAM,EAAE,QAAQ,cAAc,gBAAgB,aAAa;AAK3D,KAAI,OAAO,YAAY,MAAM;EAC3B,MAAM,aAAa,OAAO,WAAW,EAAE,EACpC,QAAQ,MAA2C,EAAE,SAAS,OAAO,CACrE,KAAK,MAAM,EAAE,KAAK,CAClB,KAAK,KAAK;AACb,mBAAiB,6BAA6B;GAC5C,QAAQ,eAAe;GACvB,MAAM;GACP,CAAC;AACF,QAAM,IAAI,sBACR,UAAU,SAAS,IAAI,YAAY,aAAa,SAAS,8BACzD,EAAE,UAAU,EAAE,MAAM,UAAU,EAAE,CACjC;;CAEH,MAAMA,eAAiC,EAAE;CAIzC,MAAMC,uBAAiC,EAAE;AACzC,MAAK,MAAM,QAAQ,OAAO,SAAS;AACjC,MAAI,KAAK,SAAS,iBAAiB;AACjC,oBAAiB,mCAAmC;IAClD,QAAQ,eAAe;IACvB,MAAM;IACP,CAAC;AACF,wBAAqB,KAAK,0BAA0B,KAAK,CAAC;;EAE5D,MAAM,cAAc,2BAA2B,KAAK;AACpD,MAAI,gBAAgB,OAAW,cAAa,KAAK,YAAY;;CAE/D,MAAM,aAAa,OAAO,WAAW,EAAE,EAAE,QACtC,MAA2C,EAAE,SAAS,OACxD;CAKD,MAAMC,iBAA2B,EAAE;AACnC,MAAK,MAAM,QAAQ,OAAO,WAAW,EAAE,CACrC,SAAQ,KAAK,MAAb;EACE,KAAK;AACH,kBAAe,KAAK,KAAK,KAAK;AAC9B;EACF,KAAK;EACL,KAAK;AACH,kBAAe,KAAK,mBAAmB,KAAK,MAAM,KAAK,UAAU,KAAK,KAAK,CAAC;AAC5E;EACF,KAAK;AACH,OAAI,KAAK,SAAS,SAAS,OACzB,gBAAe,KAAK,KAAK,SAAS,KAAK;YAC9B,KAAK,SAAS,SAAS,OAChC,gBAAe,KACb,aAAa,KAAK,SAAS,IAAI,GAAG,KAAK,SAAS,YAAY,2BAA2B,KAAK,kBAAkB,KAAK,SAAS,KAAK,CAAC,kCACnI;OAED,gBAAe,KAAK,YAAY,KAAK,SAAS,MAAM;AAEtD;EAEF,KAAK,gBAEH;;CAGN,MAAM,mBAAmB,CAAC,GAAG,gBAAgB,GAAG,qBAAqB,CAAC,KAAK,KAAK;AAEhF,KAAI,OAAO,sBAAsB,OAC/B,KAAI,iBAAiB,QAAW;EAC9B,MAAM,aAAa,aAAa,UAAU,OAAO,kBAAkB;AACnE,MAAI,WAAW,SAAS;AACtB,oBAAiB,wCAAwC;IACvD,QAAQ,eAAe;IACvB,MAAM;IACP,CAAC;GACF,MAAM,aAAa,CAAC,GAAG,aAAa;AACpC,OAAI,UAAU,WAAW,EACvB,YAAW,KAAK;IAAE,MAAM;IAAQ,MAAM,KAAK,UAAU,OAAO,kBAAkB;IAAE,CAAC;AAEnF,UAAO,OAAO,OAAO;IACnB,QAAQ,WAAW;IACnB,cAAc,OAAO,OAAO,WAAW;IACxC,CAAC;;AAEJ,mBAAiB,mDAAmD;GAClE,QAAQ,eAAe;GACvB,MAAM;GACP,CAAC;AAIF,OAAK,SACH,QACA,2EACA;GAAE,QAAQ,eAAe;GAAI,MAAM;GAAU,CAC9C;EACD,MAAM,gBAAgB,CAAC,GAAG,aAAa;AACvC,MAAI,UAAU,WAAW,EACvB,eAAc,KAAK;GAAE,MAAM;GAAQ,MAAM,KAAK,UAAU,OAAO,kBAAkB;GAAE,CAAC;AAEtF,SAAO,OAAO,OAAO;GACnB,QACE,iBAAiB,SAAS,IAAI,mBAAmB,KAAK,UAAU,OAAO,kBAAkB;GAC3F,cAAc,OAAO,OAAO,cAAc;GAC3C,CAAC;QACG;AACL,mBAAiB,wCAAwC;GACvD,QAAQ,eAAe;GACvB,MAAM;GACP,CAAC;EACF,MAAM,aAAa,CAAC,GAAG,aAAa;AACpC,MAAI,UAAU,WAAW,EACvB,YAAW,KAAK;GAAE,MAAM;GAAQ,MAAM,KAAK,UAAU,OAAO,kBAAkB;GAAE,CAAC;AAEnF,SAAO,OAAO,OAAO;GACnB,QAAQ,OAAO;GACf,cAAc,OAAO,OAAO,WAAW;GACxC,CAAC;;AAIN,QAAO,OAAO,OAAO;EACnB,QAAQ;EACR,cAAc,OAAO,OAAO,aAAa;EAC1C,CAAC;;AAGJ,SAAS,2BAA2B,MAAkD;AACpF,SAAQ,KAAK,MAAb;EACE,KAAK,OACH,QAAO;GAAE,MAAM;GAAQ,MAAM,KAAK;GAAM;EAC1C,KAAK,QACH,QAAO;GACL,MAAM;GACN,OAAO,aAAa,KAAK,KAAK;GAC9B,UAAU,KAAK;GAChB;EACH,KAAK,QACH,QAAO;GACL,MAAM;GACN,OAAO,aAAa,KAAK,KAAK;GAC9B,UAAU,KAAK;GAChB;EACH,KAAK,YAAY;GACf,MAAM,OAAO,KAAK,SAAS;AAC3B,OAAI,SAAS,OACX,QAAO;IAAE,MAAM;IAAQ;IAAM;GAE/B,MAAM,OAAO,KAAK,SAAS;AAC3B,OAAI,SAAS,OACX,QAAO;IACL,MAAM;IACN,MAAM,aAAa,KAAK;IACxB,UAAU,KAAK,SAAS,YAAY;IACrC;AAEH,UAAO;IAAE,MAAM;IAAQ,MAAM,YAAY,KAAK,SAAS;IAAO;;EAEhE,KAAK,gBACH,QAAO;GAAE,MAAM;GAAQ,MAAM,0BAA0B,KAAK;GAAE;;;;;;;;;AAUpE,SAAS,0BACP,MACQ;CACR,MAAM,QAAQ,KAAK,UAAU,UAAa,KAAK,MAAM,WAAW,IAAI,KAAK,OAAO,KAAK;CACrF,MAAMC,OAAiB,EAAE;AACzB,KAAI,KAAK,aAAa,OAAW,MAAK,KAAK,KAAK,SAAS;AACzD,KAAI,KAAK,SAAS,OAAW,MAAK,KAAK,GAAG,KAAK,KAAK,QAAQ;AAI5D,QAAO,mBAAmB,QAHV,KAAK,WAAW,IAAI,KAAK,KAAK,KAAK,KAAK,KAAK,CAAC,KAE5D,KAAK,gBAAgB,UAAa,KAAK,YAAY,WAAW,IAAI,KAAK,MAAM,KAAK,cACnC,gEAAgE,KAAK;;;AAIxH,SAAS,kBAAkB,QAAwB;CACjD,MAAM,QAAQ,KAAK,MAAO,OAAO,SAAS,IAAK,EAAE;AACjD,QAAO,SAAS,OAAO,GAAG,KAAK,MAAM,QAAQ,KAAK,CAAC,MAAM,GAAG,MAAM;;;AAIpE,SAAS,mBAAmB,MAAyB,UAAkB,MAAsB;AAC3F,QAAO,IAAI,KAAK,GAAG,SAAS,KAAK,kBAAkB,KAAK,CAAC;;AAG3D,SAAS,aAAa,OAA2B;AAC/C,QAAO,WAAW,KAAK,OAAO,KAAK,OAAO,SAAS,CAAC"}
+{"version":3,"file":"adapt-result.js","names":["contentParts: MessageContent[]","resourceLinkPreviews: string[]","outputSegments: string[]","meta: string[]"],"sources":["../../src/client/adapt-result.ts"],"sourcesContent":["/**\n * Result adaptation for the `toTools()` adapter (extracted from\n * `to-tools.ts` per F-MCP-001).\n *\n * Converts an MCP `CallToolResult` into a typed Graphorin `ToolReturn`,\n * handling the structured-content + outputSchema round-trip and the\n * backward-compatible TextContent mirror, and mapping each MCP content\n * part onto a Graphorin {@link MessageContent}.\n *\n * @packageDocumentation\n */\n\nimport type { MessageContent, ToolReturn, ZodLikeSchema } from '@graphorin/core';\nimport { incrementCounter } from '@graphorin/tools/audit';\nimport { MCPToolExecutionError } from '../errors/index.js';\nimport type { ServerIdentity } from '../transport/types.js';\nimport type { MCPCallToolResult, MCPContentPart } from './types.js';\n\n/** Arguments for {@link adaptCallResult}. */\nexport interface AdaptCallResultArgs {\n  readonly result: MCPCallToolResult;\n  readonly outputSchema?: ZodLikeSchema<unknown> | undefined;\n  readonly serverIdentity: ServerIdentity;\n  readonly toolName: string;\n  readonly logger?: (\n    level: 'debug' | 'info' | 'warn' | 'error',\n    message: string,\n    fields?: Record<string, unknown>,\n  ) => void;\n}\n\n/**\n * Convert an MCP `CallToolResult` into a typed Graphorin `ToolReturn`,\n * handling the structured-content + outputSchema round-trip and the\n * backward-compatible TextContent mirror.\n *\n * @internal\n */\nexport function adaptCallResult(args: AdaptCallResultArgs): ToolReturn<unknown> {\n  const { result, outputSchema, serverIdentity, toolName } = args;\n  // MC-4: the SDK deliberately does NOT throw on isError results - the\n  // failure marker must not launder into a successful ToolReturn. Throw\n  // the typed error so the executor records a real failure; the server's\n  // text rides in the message for model self-correction.\n  if (result.isError === true) {\n    const errorText = (result.content ?? [])\n      .filter((p): p is { type: 'text'; text: string } => p.type === 'text')\n      .map((p) => p.text)\n      .join('\\n');\n    incrementCounter('mcp.call.tool-error.total', {\n      server: serverIdentity.id,\n      tool: toolName,\n    });\n    throw new MCPToolExecutionError(\n      errorText.length > 0 ? errorText : `MCP tool '${toolName}' reported an error result.`,\n      { metadata: { tool: toolName } },\n    );\n  }\n  const contentParts: MessageContent[] = [];\n  // `resource_link` parts are NOT inlined: each contributes a compact\n  // preview (carrying the `uri` as a result handle) so the model fetches\n  // the body on demand via `read_result` instead of inflating context.\n  const resourceLinkPreviews: string[] = [];\n  for (const part of result.content) {\n    if (part.type === 'resource_link') {\n      incrementCounter('mcp.resource-link.emitted.total', {\n        server: serverIdentity.id,\n        tool: toolName,\n      });\n      resourceLinkPreviews.push(formatResourceLinkPreview(part, serverIdentity.id));\n    }\n    const messagePart = mcpContentToMessageContent(part, serverIdentity.id);\n    if (messagePart !== undefined) contentParts.push(messagePart);\n  }\n  const textParts = (result.content ?? []).filter(\n    (p): p is { type: 'text'; text: string } => p.type === 'text',\n  );\n  // MC-8: the typed `output` is the ONLY channel the agent loop\n  // serialises into the tool message - non-text parts must leave a\n  // text trace there (the full payloads stay in `contentParts`), and\n  // embedded resource TEXT joins the concatenation outright.\n  const outputSegments: string[] = [];\n  for (const part of result.content ?? []) {\n    switch (part.type) {\n      case 'text':\n        outputSegments.push(part.text);\n        break;\n      case 'image':\n      case 'audio':\n        outputSegments.push(describeBinaryPart(part.type, part.mimeType, part.data));\n        break;\n      case 'resource': {\n        if (part.resource.text !== undefined) {\n          outputSegments.push(part.resource.text);\n        } else if (part.resource.blob !== undefined) {\n          outputSegments.push(\n            `[resource ${part.resource.uri} ${part.resource.mimeType ?? 'application/octet-stream'}, ~${approxDecodedSize(part.resource.blob)} - full payload in contentParts]`,\n          );\n        } else {\n          outputSegments.push(`Resource ${part.resource.uri}`);\n        }\n        break;\n      }\n      case 'resource_link':\n        // Joined below via the read_result preview.\n        break;\n    }\n  }\n  const concatenatedText = [...outputSegments, ...resourceLinkPreviews].join('\\n');\n\n  if (result.structuredContent !== undefined) {\n    if (outputSchema !== undefined) {\n      const validation = outputSchema.safeParse(result.structuredContent);\n      if (validation.success) {\n        incrementCounter('mcp.structured-content.emitted.total', {\n          server: serverIdentity.id,\n          tool: toolName,\n        });\n        const finalParts = [...contentParts];\n        if (textParts.length === 0) {\n          finalParts.push({ type: 'text', text: JSON.stringify(result.structuredContent) });\n        }\n        return Object.freeze({\n          output: validation.data,\n          contentParts: Object.freeze(finalParts),\n        });\n      }\n      incrementCounter('mcp.structured-content.validation.failure.total', {\n        server: serverIdentity.id,\n        tool: toolName,\n      });\n      // MC-11: a schema mismatch must not silently drop the payload -\n      // log and mirror the structured content as JSON text, exactly\n      // like the no-schema branch does.\n      args.logger?.(\n        'warn',\n        'mcp.structured-content.validation.failed: payload mirrored as JSON text',\n        { server: serverIdentity.id, tool: toolName },\n      );\n      const fallbackParts = [...contentParts];\n      if (textParts.length === 0) {\n        fallbackParts.push({ type: 'text', text: JSON.stringify(result.structuredContent) });\n      }\n      return Object.freeze({\n        output:\n          concatenatedText.length > 0 ? concatenatedText : JSON.stringify(result.structuredContent),\n        contentParts: Object.freeze(fallbackParts),\n      });\n    } else {\n      incrementCounter('mcp.structured-content.emitted.total', {\n        server: serverIdentity.id,\n        tool: toolName,\n      });\n      const finalParts = [...contentParts];\n      if (textParts.length === 0) {\n        finalParts.push({ type: 'text', text: JSON.stringify(result.structuredContent) });\n      }\n      return Object.freeze({\n        output: result.structuredContent,\n        contentParts: Object.freeze(finalParts),\n      });\n    }\n  }\n\n  return Object.freeze({\n    output: concatenatedText,\n    contentParts: Object.freeze(contentParts),\n  });\n}\n\nfunction mcpContentToMessageContent(\n  part: MCPContentPart,\n  serverId: string,\n): MessageContent | undefined {\n  switch (part.type) {\n    case 'text':\n      return { type: 'text', text: part.text };\n    case 'image':\n      return {\n        type: 'image',\n        image: decodeBase64(part.data),\n        mimeType: part.mimeType,\n      };\n    case 'audio':\n      return {\n        type: 'audio',\n        audio: decodeBase64(part.data),\n        mimeType: part.mimeType,\n      };\n    case 'resource': {\n      const text = part.resource.text;\n      if (text !== undefined) {\n        return { type: 'text', text };\n      }\n      const blob = part.resource.blob;\n      if (blob !== undefined) {\n        return {\n          type: 'file',\n          file: decodeBase64(blob),\n          mimeType: part.resource.mimeType ?? 'application/octet-stream',\n        };\n      }\n      return { type: 'text', text: `Resource ${part.resource.uri}` };\n    }\n    case 'resource_link':\n      return { type: 'text', text: formatResourceLinkPreview(part, serverId) };\n  }\n}\n\n/**\n * Render the compact, model-facing preview for a `resource_link`. The\n * handle is SCOPED to the originating server (mcp-skills-06):\n * `mcp:<serverId>:<uri>` - an\n * {@link import('./mcp-resource-reader.js').createMcpResourceReader}\n * parses the prefix and consults ONLY that server, so a malicious\n * server's link (or a prompt-injected model) cannot fetch a resource\n * from a different, more-trusted server through the handle.\n */\nfunction formatResourceLinkPreview(\n  part: Extract<MCPContentPart, { type: 'resource_link' }>,\n  serverId: string,\n): string {\n  const label = part.title === undefined || part.title.length === 0 ? part.name : part.title;\n  const meta: string[] = [];\n  if (part.mimeType !== undefined) meta.push(part.mimeType);\n  if (part.size !== undefined) meta.push(`${part.size} bytes`);\n  const metaStr = meta.length === 0 ? '' : ` (${meta.join(', ')})`;\n  const desc =\n    part.description === undefined || part.description.length === 0 ? '' : ` - ${part.description}`;\n  return `[resource_link] ${label}${metaStr}${desc}\\nFetch the full contents on demand with read_result, handle: ${scopedResourceHandle(serverId, part.uri)}`;\n}\n\n/**\n * Build the server-scoped `read_result` handle for an MCP resource\n * (mcp-skills-06): `mcp:<serverId>:<uri>`.\n *\n * @stable\n */\nexport function scopedResourceHandle(serverId: string, uri: string): string {\n  return `mcp:${serverId}:${uri}`;\n}\n\n/** Human-readable size of a base64 payload's decoded bytes (MC-8). */\nfunction approxDecodedSize(base64: string): string {\n  const bytes = Math.floor((base64.length * 3) / 4);\n  return bytes >= 1024 ? `${Math.round(bytes / 1024)}kB` : `${bytes}B`;\n}\n\n/** Text descriptor for a non-text content part (MC-8). */\nfunction describeBinaryPart(kind: 'image' | 'audio', mimeType: string, data: string): string {\n  return `[${kind} ${mimeType}, ~${approxDecodedSize(data)} - full payload in contentParts]`;\n}\n\nfunction decodeBase64(value: string): Uint8Array {\n  return Uint8Array.from(Buffer.from(value, 'base64'));\n}\n"],"mappings":";;;;;;;;;;;AAsCA,SAAgB,gBAAgB,MAAgD;CAC9E,MAAM,EAAE,QAAQ,cAAc,gBAAgB,aAAa;AAK3D,KAAI,OAAO,YAAY,MAAM;EAC3B,MAAM,aAAa,OAAO,WAAW,EAAE,EACpC,QAAQ,MAA2C,EAAE,SAAS,OAAO,CACrE,KAAK,MAAM,EAAE,KAAK,CAClB,KAAK,KAAK;AACb,mBAAiB,6BAA6B;GAC5C,QAAQ,eAAe;GACvB,MAAM;GACP,CAAC;AACF,QAAM,IAAI,sBACR,UAAU,SAAS,IAAI,YAAY,aAAa,SAAS,8BACzD,EAAE,UAAU,EAAE,MAAM,UAAU,EAAE,CACjC;;CAEH,MAAMA,eAAiC,EAAE;CAIzC,MAAMC,uBAAiC,EAAE;AACzC,MAAK,MAAM,QAAQ,OAAO,SAAS;AACjC,MAAI,KAAK,SAAS,iBAAiB;AACjC,oBAAiB,mCAAmC;IAClD,QAAQ,eAAe;IACvB,MAAM;IACP,CAAC;AACF,wBAAqB,KAAK,0BAA0B,MAAM,eAAe,GAAG,CAAC;;EAE/E,MAAM,cAAc,2BAA2B,MAAM,eAAe,GAAG;AACvE,MAAI,gBAAgB,OAAW,cAAa,KAAK,YAAY;;CAE/D,MAAM,aAAa,OAAO,WAAW,EAAE,EAAE,QACtC,MAA2C,EAAE,SAAS,OACxD;CAKD,MAAMC,iBAA2B,EAAE;AACnC,MAAK,MAAM,QAAQ,OAAO,WAAW,EAAE,CACrC,SAAQ,KAAK,MAAb;EACE,KAAK;AACH,kBAAe,KAAK,KAAK,KAAK;AAC9B;EACF,KAAK;EACL,KAAK;AACH,kBAAe,KAAK,mBAAmB,KAAK,MAAM,KAAK,UAAU,KAAK,KAAK,CAAC;AAC5E;EACF,KAAK;AACH,OAAI,KAAK,SAAS,SAAS,OACzB,gBAAe,KAAK,KAAK,SAAS,KAAK;YAC9B,KAAK,SAAS,SAAS,OAChC,gBAAe,KACb,aAAa,KAAK,SAAS,IAAI,GAAG,KAAK,SAAS,YAAY,2BAA2B,KAAK,kBAAkB,KAAK,SAAS,KAAK,CAAC,kCACnI;OAED,gBAAe,KAAK,YAAY,KAAK,SAAS,MAAM;AAEtD;EAEF,KAAK,gBAEH;;CAGN,MAAM,mBAAmB,CAAC,GAAG,gBAAgB,GAAG,qBAAqB,CAAC,KAAK,KAAK;AAEhF,KAAI,OAAO,sBAAsB,OAC/B,KAAI,iBAAiB,QAAW;EAC9B,MAAM,aAAa,aAAa,UAAU,OAAO,kBAAkB;AACnE,MAAI,WAAW,SAAS;AACtB,oBAAiB,wCAAwC;IACvD,QAAQ,eAAe;IACvB,MAAM;IACP,CAAC;GACF,MAAM,aAAa,CAAC,GAAG,aAAa;AACpC,OAAI,UAAU,WAAW,EACvB,YAAW,KAAK;IAAE,MAAM;IAAQ,MAAM,KAAK,UAAU,OAAO,kBAAkB;IAAE,CAAC;AAEnF,UAAO,OAAO,OAAO;IACnB,QAAQ,WAAW;IACnB,cAAc,OAAO,OAAO,WAAW;IACxC,CAAC;;AAEJ,mBAAiB,mDAAmD;GAClE,QAAQ,eAAe;GACvB,MAAM;GACP,CAAC;AAIF,OAAK,SACH,QACA,2EACA;GAAE,QAAQ,eAAe;GAAI,MAAM;GAAU,CAC9C;EACD,MAAM,gBAAgB,CAAC,GAAG,aAAa;AACvC,MAAI,UAAU,WAAW,EACvB,eAAc,KAAK;GAAE,MAAM;GAAQ,MAAM,KAAK,UAAU,OAAO,kBAAkB;GAAE,CAAC;AAEtF,SAAO,OAAO,OAAO;GACnB,QACE,iBAAiB,SAAS,IAAI,mBAAmB,KAAK,UAAU,OAAO,kBAAkB;GAC3F,cAAc,OAAO,OAAO,cAAc;GAC3C,CAAC;QACG;AACL,mBAAiB,wCAAwC;GACvD,QAAQ,eAAe;GACvB,MAAM;GACP,CAAC;EACF,MAAM,aAAa,CAAC,GAAG,aAAa;AACpC,MAAI,UAAU,WAAW,EACvB,YAAW,KAAK;GAAE,MAAM;GAAQ,MAAM,KAAK,UAAU,OAAO,kBAAkB;GAAE,CAAC;AAEnF,SAAO,OAAO,OAAO;GACnB,QAAQ,OAAO;GACf,cAAc,OAAO,OAAO,WAAW;GACxC,CAAC;;AAIN,QAAO,OAAO,OAAO;EACnB,QAAQ;EACR,cAAc,OAAO,OAAO,aAAa;EAC1C,CAAC;;AAGJ,SAAS,2BACP,MACA,UAC4B;AAC5B,SAAQ,KAAK,MAAb;EACE,KAAK,OACH,QAAO;GAAE,MAAM;GAAQ,MAAM,KAAK;GAAM;EAC1C,KAAK,QACH,QAAO;GACL,MAAM;GACN,OAAO,aAAa,KAAK,KAAK;GAC9B,UAAU,KAAK;GAChB;EACH,KAAK,QACH,QAAO;GACL,MAAM;GACN,OAAO,aAAa,KAAK,KAAK;GAC9B,UAAU,KAAK;GAChB;EACH,KAAK,YAAY;GACf,MAAM,OAAO,KAAK,SAAS;AAC3B,OAAI,SAAS,OACX,QAAO;IAAE,MAAM;IAAQ;IAAM;GAE/B,MAAM,OAAO,KAAK,SAAS;AAC3B,OAAI,SAAS,OACX,QAAO;IACL,MAAM;IACN,MAAM,aAAa,KAAK;IACxB,UAAU,KAAK,SAAS,YAAY;IACrC;AAEH,UAAO;IAAE,MAAM;IAAQ,MAAM,YAAY,KAAK,SAAS;IAAO;;EAEhE,KAAK,gBACH,QAAO;GAAE,MAAM;GAAQ,MAAM,0BAA0B,MAAM,SAAS;GAAE;;;;;;;;;;;;AAa9E,SAAS,0BACP,MACA,UACQ;CACR,MAAM,QAAQ,KAAK,UAAU,UAAa,KAAK,MAAM,WAAW,IAAI,KAAK,OAAO,KAAK;CACrF,MAAMC,OAAiB,EAAE;AACzB,KAAI,KAAK,aAAa,OAAW,MAAK,KAAK,KAAK,SAAS;AACzD,KAAI,KAAK,SAAS,OAAW,MAAK,KAAK,GAAG,KAAK,KAAK,QAAQ;AAI5D,QAAO,mBAAmB,QAHV,KAAK,WAAW,IAAI,KAAK,KAAK,KAAK,KAAK,KAAK,CAAC,KAE5D,KAAK,gBAAgB,UAAa,KAAK,YAAY,WAAW,IAAI,KAAK,MAAM,KAAK,cACnC,gEAAgE,qBAAqB,UAAU,KAAK,IAAI;;;;;;;;AAS3J,SAAgB,qBAAqB,UAAkB,KAAqB;AAC1E,QAAO,OAAO,SAAS,GAAG;;;AAI5B,SAAS,kBAAkB,QAAwB;CACjD,MAAM,QAAQ,KAAK,MAAO,OAAO,SAAS,IAAK,EAAE;AACjD,QAAO,SAAS,OAAO,GAAG,KAAK,MAAM,QAAQ,KAAK,CAAC,MAAM,GAAG,MAAM;;;AAIpE,SAAS,mBAAmB,MAAyB,UAAkB,MAAsB;AAC3F,QAAO,IAAI,KAAK,GAAG,SAAS,KAAK,kBAAkB,KAAK,CAAC;;AAG3D,SAAS,aAAa,OAA2B;AAC/C,QAAO,WAAW,KAAK,OAAO,KAAK,OAAO,SAAS,CAAC"}

package/dist/client/client-handlers.js

@@ -1,5 +1,5 @@
 import { incrementCounter } from "@graphorin/tools/audit";
-import { CreateMessageRequestSchema, ElicitRequestSchema } from "@modelcontextprotocol/sdk/types.js";
+import { CreateMessageRequestSchema, ElicitRequestSchema, ErrorCode, McpError } from "@modelcontextprotocol/sdk/types.js";
 
 //#region src/client/client-handlers.ts
 /**
@@ -11,7 +11,7 @@ import { CreateMessageRequestSchema, ElicitRequestSchema } from "@modelcontextpr
 * handler *only* when the operator supplies the matching callback on
 * {@link CreateMCPClientOptions}. A conforming server will not issue a
 * request for an un-advertised capability, so the default client is inert
-* (no implicit prompting, no implicit model calls — R4).
+* (no implicit prompting, no implicit model calls - R4).
 *
 * The SDK request/result schemas are kept inside this module; the public
 * surface speaks only the Graphorin-typed {@link MCPElicitationRequest} /
@@ -44,6 +44,13 @@ function registerClientRequestHandlers(sdkClient, opts) {
 		sdkClient.setRequestHandler(ElicitRequestSchema, async (request, extra) => {
 			incrementCounter("mcp.elicitation.requested.total", { server: serverIdRef.current });
 			const params = request.params;
+			if (params.mode === "url") {
+				incrementCounter("mcp.elicitation.declined.total", {
+					server: serverIdRef.current,
+					action: "decline"
+				});
+				throw new McpError(ErrorCode.InvalidRequest, "URL-mode elicitation is not supported by this client (only 'form' is advertised).");
+			}
 			const requestedSchema = "requestedSchema" in params && params.requestedSchema !== void 0 ? params.requestedSchema : {
 				type: "object",
 				properties: {}
@@ -71,6 +78,8 @@ function registerClientRequestHandlers(sdkClient, opts) {
 		sdkClient.setRequestHandler(CreateMessageRequestSchema, async (request, extra) => {
 			incrementCounter("mcp.sampling.requested.total", { server: serverIdRef.current });
 			const p = request.params;
+			const withTools = p;
+			if (withTools.tools !== void 0 || withTools.toolChoice !== void 0) throw new McpError(ErrorCode.InvalidRequest, "sampling with tools is not supported by this client (ClientCapabilities.sampling.tools is not declared).");
 			const mp = p.modelPreferences;
 			const result = await handler({
 				messages: p.messages.map((m) => ({

package/dist/client/client-handlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"client-handlers.js","names":[],"sources":["../../src/client/client-handlers.ts"],"sourcesContent":["/**\n * Client-side request handlers for server-initiated MCP requests\n * (WI-13 / P2-2): **elicitation** (`elicitation/create`) and **sampling**\n * (`sampling/createMessage`).\n *\n * Both are gated: the client advertises a capability and registers a\n * handler *only* when the operator supplies the matching callback on\n * {@link CreateMCPClientOptions}. A conforming server will not issue a\n * request for an un-advertised capability, so the default client is inert\n * (no implicit prompting, no implicit model calls — R4).\n *\n * The SDK request/result schemas are kept inside this module; the public\n * surface speaks only the Graphorin-typed {@link MCPElicitationRequest} /\n * {@link MCPSamplingRequest} boundary.\n *\n * @packageDocumentation\n */\n\nimport { incrementCounter } from '@graphorin/tools/audit';\nimport type { Client } from '@modelcontextprotocol/sdk/client/index.js';\nimport {\n  type ClientCapabilities,\n  CreateMessageRequestSchema,\n  ElicitRequestSchema,\n} from '@modelcontextprotocol/sdk/types.js';\nimport type {\n  MCPElicitationHandler,\n  MCPSamplingContent,\n  MCPSamplingHandler,\n  MCPSamplingRequest,\n} from './types.js';\n\n/** Mutable holder so handlers can label counters with the server id. */\nexport interface ServerIdRef {\n  current: string;\n}\n\n/** Options for {@link registerClientRequestHandlers}. */\nexport interface ClientRequestHandlerOptions {\n  readonly elicitation?: MCPElicitationHandler;\n  readonly sampling?: MCPSamplingHandler;\n  readonly serverIdRef: ServerIdRef;\n}\n\n/**\n * Compute the {@link ClientCapabilities} to advertise on `initialize`,\n * based on which server-initiated handlers the operator supplied.\n * Returns `undefined` when none are configured (advertise nothing).\n */\nexport function computeClientCapabilities(opts: {\n  readonly elicitation?: unknown;\n  readonly sampling?: unknown;\n}): ClientCapabilities | undefined {\n  if (opts.elicitation === undefined && opts.sampling === undefined) return undefined;\n  return {\n    ...(opts.elicitation === undefined ? {} : { elicitation: {} }),\n    ...(opts.sampling === undefined ? {} : { sampling: {} }),\n  };\n}\n\n/**\n * Register the elicitation / sampling request handlers on `sdkClient`,\n * one per supplied callback. Must be called **before** `connect(...)` so\n * the handlers are in place when the session begins delivering\n * server-initiated requests.\n */\nexport function registerClientRequestHandlers(\n  sdkClient: Client,\n  opts: ClientRequestHandlerOptions,\n): void {\n  const { serverIdRef } = opts;\n\n  if (opts.elicitation !== undefined) {\n    const handler = opts.elicitation;\n    sdkClient.setRequestHandler(ElicitRequestSchema, async (request, extra) => {\n      incrementCounter('mcp.elicitation.requested.total', { server: serverIdRef.current });\n      const params = request.params;\n      const requestedSchema =\n        'requestedSchema' in params && params.requestedSchema !== undefined\n          ? (params.requestedSchema as Readonly<Record<string, unknown>>)\n          : { type: 'object', properties: {} };\n      const result = await handler(\n        { message: params.message, requestedSchema },\n        { signal: extra.signal },\n      );\n      if (result.action === 'accept') {\n        incrementCounter('mcp.elicitation.accepted.total', { server: serverIdRef.current });\n        return result.content === undefined\n          ? { action: 'accept' }\n          : { action: 'accept', content: result.content };\n      }\n      incrementCounter('mcp.elicitation.declined.total', {\n        server: serverIdRef.current,\n        action: result.action,\n      });\n      return { action: result.action };\n    });\n  }\n\n  if (opts.sampling !== undefined) {\n    const handler = opts.sampling;\n    sdkClient.setRequestHandler(CreateMessageRequestSchema, async (request, extra) => {\n      incrementCounter('mcp.sampling.requested.total', { server: serverIdRef.current });\n      const p = request.params;\n      const mp = p.modelPreferences;\n      const samplingRequest: MCPSamplingRequest = {\n        messages: p.messages.map((m) => ({\n          role: m.role,\n          // MC-13: keep EVERY block — a text+image message must reach the\n          // operator's handler whole, not truncated to its first block.\n          content: contentBlocks(m.content).map((block) => toGraphorinContent(block)),\n        })),\n        maxTokens: p.maxTokens,\n        ...(p.systemPrompt === undefined ? {} : { systemPrompt: p.systemPrompt }),\n        ...(p.temperature === undefined ? {} : { temperature: p.temperature }),\n        ...(p.stopSequences === undefined ? {} : { stopSequences: p.stopSequences }),\n        ...(mp === undefined\n          ? {}\n          : {\n              modelPreferences: {\n                ...(mp.hints === undefined\n                  ? {}\n                  : { hints: mp.hints.map((h) => (h.name === undefined ? {} : { name: h.name })) }),\n                ...(mp.costPriority === undefined ? {} : { costPriority: mp.costPriority }),\n                ...(mp.speedPriority === undefined ? {} : { speedPriority: mp.speedPriority }),\n                ...(mp.intelligencePriority === undefined\n                  ? {}\n                  : { intelligencePriority: mp.intelligencePriority }),\n              },\n            }),\n        ...(p.includeContext === undefined ? {} : { includeContext: p.includeContext }),\n      };\n      const result = await handler(samplingRequest, { signal: extra.signal });\n      incrementCounter('mcp.sampling.completed.total', { server: serverIdRef.current });\n      return {\n        role: result.role,\n        content: result.content,\n        model: result.model,\n        ...(result.stopReason === undefined ? {} : { stopReason: result.stopReason }),\n      };\n    });\n  }\n}\n\n/** Normalise SDK message content (block | block[]) to a block array (MC-13). */\nfunction contentBlocks(\n  content: unknown,\n): ReadonlyArray<{ readonly type?: unknown; [k: string]: unknown }> {\n  const raw = Array.isArray(content) ? content : [content];\n  const blocks = raw.filter(\n    (b): b is { readonly type?: unknown; [k: string]: unknown } =>\n      b !== null && typeof b === 'object',\n  );\n  return blocks.length > 0 ? blocks : [{ type: 'text', text: '' }];\n}\n\n/** Map an SDK content block to the Graphorin sampling-content union. */\nfunction toGraphorinContent(block: {\n  readonly type?: unknown;\n  [k: string]: unknown;\n}): MCPSamplingContent {\n  if (block.type === 'image') {\n    return {\n      type: 'image',\n      data: String(block.data ?? ''),\n      mimeType: String(block.mimeType ?? 'application/octet-stream'),\n    };\n  }\n  if (block.type === 'audio') {\n    return {\n      type: 'audio',\n      data: String(block.data ?? ''),\n      mimeType: String(block.mimeType ?? 'application/octet-stream'),\n    };\n  }\n  if (block.type === 'text') {\n    return { type: 'text', text: String(block.text ?? '') };\n  }\n  return { type: 'text', text: JSON.stringify(block) };\n}\n"],"mappings":"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"}
+{"version":3,"file":"client-handlers.js","names":[],"sources":["../../src/client/client-handlers.ts"],"sourcesContent":["/**\n * Client-side request handlers for server-initiated MCP requests\n * (WI-13 / P2-2): **elicitation** (`elicitation/create`) and **sampling**\n * (`sampling/createMessage`).\n *\n * Both are gated: the client advertises a capability and registers a\n * handler *only* when the operator supplies the matching callback on\n * {@link CreateMCPClientOptions}. A conforming server will not issue a\n * request for an un-advertised capability, so the default client is inert\n * (no implicit prompting, no implicit model calls - R4).\n *\n * The SDK request/result schemas are kept inside this module; the public\n * surface speaks only the Graphorin-typed {@link MCPElicitationRequest} /\n * {@link MCPSamplingRequest} boundary.\n *\n * @packageDocumentation\n */\n\nimport { incrementCounter } from '@graphorin/tools/audit';\nimport type { Client } from '@modelcontextprotocol/sdk/client/index.js';\nimport {\n  type ClientCapabilities,\n  CreateMessageRequestSchema,\n  ElicitRequestSchema,\n  ErrorCode,\n  McpError,\n} from '@modelcontextprotocol/sdk/types.js';\nimport type {\n  MCPElicitationHandler,\n  MCPSamplingContent,\n  MCPSamplingHandler,\n  MCPSamplingRequest,\n} from './types.js';\n\n/** Mutable holder so handlers can label counters with the server id. */\nexport interface ServerIdRef {\n  current: string;\n}\n\n/** Options for {@link registerClientRequestHandlers}. */\nexport interface ClientRequestHandlerOptions {\n  readonly elicitation?: MCPElicitationHandler;\n  readonly sampling?: MCPSamplingHandler;\n  readonly serverIdRef: ServerIdRef;\n}\n\n/**\n * Compute the {@link ClientCapabilities} to advertise on `initialize`,\n * based on which server-initiated handlers the operator supplied.\n * Returns `undefined` when none are configured (advertise nothing).\n */\nexport function computeClientCapabilities(opts: {\n  readonly elicitation?: unknown;\n  readonly sampling?: unknown;\n}): ClientCapabilities | undefined {\n  if (opts.elicitation === undefined && opts.sampling === undefined) return undefined;\n  return {\n    ...(opts.elicitation === undefined ? {} : { elicitation: {} }),\n    ...(opts.sampling === undefined ? {} : { sampling: {} }),\n  };\n}\n\n/**\n * Register the elicitation / sampling request handlers on `sdkClient`,\n * one per supplied callback. Must be called **before** `connect(...)` so\n * the handlers are in place when the session begins delivering\n * server-initiated requests.\n */\nexport function registerClientRequestHandlers(\n  sdkClient: Client,\n  opts: ClientRequestHandlerOptions,\n): void {\n  const { serverIdRef } = opts;\n\n  if (opts.elicitation !== undefined) {\n    const handler = opts.elicitation;\n    sdkClient.setRequestHandler(ElicitRequestSchema, async (request, extra) => {\n      incrementCounter('mcp.elicitation.requested.total', { server: serverIdRef.current });\n      const params = request.params;\n      // mcp-skills-05 (SEP-1036): URL-mode elicitation carries a URL,\n      // not a form schema. The old handler surfaced it as an\n      // empty-schema FORM with the URL invisible - decline it honestly\n      // until URL elicitation is supported. (We advertise the `form`\n      // sub-capability only, so a conforming server never sends this.)\n      if ((params as { readonly mode?: unknown }).mode === 'url') {\n        incrementCounter('mcp.elicitation.declined.total', {\n          server: serverIdRef.current,\n          action: 'decline',\n        });\n        throw new McpError(\n          ErrorCode.InvalidRequest,\n          \"URL-mode elicitation is not supported by this client (only 'form' is advertised).\",\n        );\n      }\n      const requestedSchema =\n        'requestedSchema' in params && params.requestedSchema !== undefined\n          ? (params.requestedSchema as Readonly<Record<string, unknown>>)\n          : { type: 'object', properties: {} };\n      const result = await handler(\n        { message: params.message, requestedSchema },\n        { signal: extra.signal },\n      );\n      if (result.action === 'accept') {\n        incrementCounter('mcp.elicitation.accepted.total', { server: serverIdRef.current });\n        return result.content === undefined\n          ? { action: 'accept' }\n          : { action: 'accept', content: result.content };\n      }\n      incrementCounter('mcp.elicitation.declined.total', {\n        server: serverIdRef.current,\n        action: result.action,\n      });\n      return { action: result.action };\n    });\n  }\n\n  if (opts.sampling !== undefined) {\n    const handler = opts.sampling;\n    sdkClient.setRequestHandler(CreateMessageRequestSchema, async (request, extra) => {\n      incrementCounter('mcp.sampling.requested.total', { server: serverIdRef.current });\n      const p = request.params;\n      // mcp-skills-05: protocol 2025-11-25 - \"The client MUST return an\n      // error if this field is provided but\n      // ClientCapabilities.sampling.tools is not declared\". We do not\n      // declare it; pre-fix a tools-carrying request was silently\n      // answered as a plain completion.\n      const withTools = p as { readonly tools?: unknown; readonly toolChoice?: unknown };\n      if (withTools.tools !== undefined || withTools.toolChoice !== undefined) {\n        throw new McpError(\n          ErrorCode.InvalidRequest,\n          'sampling with tools is not supported by this client (ClientCapabilities.sampling.tools is not declared).',\n        );\n      }\n      const mp = p.modelPreferences;\n      const samplingRequest: MCPSamplingRequest = {\n        messages: p.messages.map((m) => ({\n          role: m.role,\n          // MC-13: keep EVERY block - a text+image message must reach the\n          // operator's handler whole, not truncated to its first block.\n          content: contentBlocks(m.content).map((block) => toGraphorinContent(block)),\n        })),\n        maxTokens: p.maxTokens,\n        ...(p.systemPrompt === undefined ? {} : { systemPrompt: p.systemPrompt }),\n        ...(p.temperature === undefined ? {} : { temperature: p.temperature }),\n        ...(p.stopSequences === undefined ? {} : { stopSequences: p.stopSequences }),\n        ...(mp === undefined\n          ? {}\n          : {\n              modelPreferences: {\n                ...(mp.hints === undefined\n                  ? {}\n                  : { hints: mp.hints.map((h) => (h.name === undefined ? {} : { name: h.name })) }),\n                ...(mp.costPriority === undefined ? {} : { costPriority: mp.costPriority }),\n                ...(mp.speedPriority === undefined ? {} : { speedPriority: mp.speedPriority }),\n                ...(mp.intelligencePriority === undefined\n                  ? {}\n                  : { intelligencePriority: mp.intelligencePriority }),\n              },\n            }),\n        ...(p.includeContext === undefined ? {} : { includeContext: p.includeContext }),\n      };\n      const result = await handler(samplingRequest, { signal: extra.signal });\n      incrementCounter('mcp.sampling.completed.total', { server: serverIdRef.current });\n      return {\n        role: result.role,\n        content: result.content,\n        model: result.model,\n        ...(result.stopReason === undefined ? {} : { stopReason: result.stopReason }),\n      };\n    });\n  }\n}\n\n/** Normalise SDK message content (block | block[]) to a block array (MC-13). */\nfunction contentBlocks(\n  content: unknown,\n): ReadonlyArray<{ readonly type?: unknown; [k: string]: unknown }> {\n  const raw = Array.isArray(content) ? content : [content];\n  const blocks = raw.filter(\n    (b): b is { readonly type?: unknown; [k: string]: unknown } =>\n      b !== null && typeof b === 'object',\n  );\n  return blocks.length > 0 ? blocks : [{ type: 'text', text: '' }];\n}\n\n/** Map an SDK content block to the Graphorin sampling-content union. */\nfunction toGraphorinContent(block: {\n  readonly type?: unknown;\n  [k: string]: unknown;\n}): MCPSamplingContent {\n  if (block.type === 'image') {\n    return {\n      type: 'image',\n      data: String(block.data ?? ''),\n      mimeType: String(block.mimeType ?? 'application/octet-stream'),\n    };\n  }\n  if (block.type === 'audio') {\n    return {\n      type: 'audio',\n      data: String(block.data ?? ''),\n      mimeType: String(block.mimeType ?? 'application/octet-stream'),\n    };\n  }\n  if (block.type === 'text') {\n    return { type: 'text', text: String(block.text ?? '') };\n  }\n  return { type: 'text', text: JSON.stringify(block) };\n}\n"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","names":[],"sources":["../../src/client/client.ts"],"sourcesContent":[],"mappings":";;;;;;;;;;;iBAsEgB,4BAAA,CAAA;;;;;;iBASM,eAAA,UAAyB,yBAAyB,QAAQ"}
+{"version":3,"file":"client.d.ts","names":[],"sources":["../../src/client/client.ts"],"sourcesContent":[],"mappings":";;;;;;;AAuEA;AASA;;;AAAwE,iBATxD,4BAAA,CAAA,CASwD,EAAA,IAAA;;;;;;iBAAlD,eAAA,UAAyB,yBAAyB,QAAQ"}

package/dist/client/client.js

@@ -1,3 +1,4 @@
+import { version } from "../package.js";
 import { MCPCallTimeoutError, MCPCancelledError, MCPConnectionError, MCPInvalidConfigError, MCPProtocolError, MCPToolNotFoundError, MCPToolPinningError } from "../errors/index.js";
 import { deriveServerIdentity } from "../helpers/identity.js";
 import { validateMCPServerConfig } from "../helpers/validate-config.js";
@@ -10,7 +11,7 @@ import { ToolListChangedNotificationSchema } from "@modelcontextprotocol/sdk/typ
 
 //#region src/client/client.ts
 const DEFAULT_CLIENT_NAME = "graphorin-mcp-client";
-const DEFAULT_CLIENT_VERSION = "0.5.0";
+const DEFAULT_CLIENT_VERSION = version;
 /**
 * Process-scoped dedup flag for the deprecated SSE transport WARN.
 * Once set, subsequent {@link createMCPClient} calls with the SSE
@@ -51,7 +52,9 @@ async function createMCPClient(options) {
 		...options.clientName === void 0 ? {} : { clientName: options.clientName },
 		...options.clientVersion === void 0 ? {} : { clientVersion: options.clientVersion },
 		...options.elicitation === void 0 ? {} : { elicitation: options.elicitation },
-		...options.sampling === void 0 ? {} : { sampling: options.sampling }
+		...options.sampling === void 0 ? {} : { sampling: options.sampling },
+		...options.onTransportClose === void 0 ? {} : { onTransportClose: options.onTransportClose },
+		...options.onTransportError === void 0 ? {} : { onTransportError: options.onTransportError }
 	});
 }
 /**
@@ -79,7 +82,7 @@ async function createMCPClientFromSdkTransport(options) {
 	});
 	sdkClient.setNotificationHandler(ToolListChangedNotificationSchema, async () => {
 		incrementCounter("mcp.tools.list-changed.total", { server: serverIdRef.current ?? "unknown" });
-		options.logger?.("warn", "mcp.tools.list_changed received — re-run toTools() to refresh + re-sanitize the catalogue", { server: serverIdRef.current });
+		options.logger?.("warn", "mcp.tools.list_changed received - re-run toTools() to refresh + re-sanitize the catalogue", { server: serverIdRef.current });
 	});
 	try {
 		await sdkClient.connect(options.transport);
@@ -95,6 +98,15 @@ async function createMCPClientFromSdkTransport(options) {
 	};
 	const serverIdentity = deriveServerIdentity(options.transportConfig, options.serverInfoName ?? serverInfo.name);
 	serverIdRef.current = serverIdentity.id;
+	sdkClient.onclose = () => {
+		incrementCounter("mcp.transport.closed.total", { server: serverIdentity.id });
+		options.logger?.("warn", "MCP transport closed - rebuild the client to reconnect", { server: serverIdentity.id });
+		options.onTransportClose?.({ server: serverIdentity.id });
+	};
+	sdkClient.onerror = (error) => {
+		incrementCounter("mcp.transport.error.total", { server: serverIdentity.id });
+		options.onTransportError?.(error, { server: serverIdentity.id });
+	};
 	const collisionStrategy = options.collisionStrategy ?? "auto-prefix";
 	if (options.eventStore !== void 0) options.logger?.("warn", "the client 'eventStore' option was removed (MC-1): event replay is a server responsibility; the SDK transport auto-reconnects with Last-Event-ID. Remove the option.", { server: serverIdentity.id });
 	const sessionIdPresent = isStreamableHttp(options.transport) && options.transport.sessionId !== void 0;
@@ -105,15 +117,40 @@ async function createMCPClientFromSdkTransport(options) {
 		source: sessionIdPresent ? "session-id-present" : "transport-default"
 	});
 	let structuredContentSeenLogged = false;
+	/**
+	* mcp-skills-02: MCP list operations are cursor-paginated (protocol
+	* 2024-11-05+) and the SDK does NOT auto-paginate - a single call
+	* returns page 1 only. Ignoring `nextCursor` silently truncated the
+	* catalogue: tools beyond the first page never reached `toTools()`,
+	* defer-loading thresholds counted a partial catalogue, pin
+	* fingerprints covered a partial catalogue, and resources/prompts were
+	* under-listed. Every list surface now drains the cursor chain, with a
+	* defensive page cap against buggy/adversarial servers that never
+	* terminate it.
+	*/
+	const MAX_LIST_PAGES = 100;
+	function warnListPageCap(what, collected) {
+		options.logger?.("warn", `mcp.list.${what}.page-cap-reached: server kept returning nextCursor after ${MAX_LIST_PAGES} pages; the ${what} catalogue is truncated at ${collected} entries.`, { server: serverIdentity.id });
+	}
 	async function listTools(opts) {
 		const requestOptions = opts?.signal === void 0 ? {} : { signal: opts.signal };
-		let result;
-		try {
-			result = await sdkClient.listTools({}, requestOptions);
-		} catch (cause) {
-			throw mapSdkError(cause, {});
+		const tools = [];
+		let cursor;
+		for (let page = 0;; page++) {
+			if (page >= MAX_LIST_PAGES) {
+				warnListPageCap("tools", tools.length);
+				break;
+			}
+			let result;
+			try {
+				result = await sdkClient.listTools(cursor === void 0 ? {} : { cursor }, requestOptions);
+			} catch (cause) {
+				throw mapSdkError(cause, {});
+			}
+			tools.push(...result.tools ?? []);
+			cursor = result.nextCursor;
+			if (cursor === void 0) break;
 		}
-		const tools = result.tools ?? [];
 		if (!structuredContentSeenLogged && tools.some((t) => t.outputSchema !== void 0)) {
 			structuredContentSeenLogged = true;
 			if (options.logger !== void 0) options.logger("info", "mcp.server.structured-content.detected", { server: serverIdentity.id });
@@ -128,13 +165,23 @@ async function createMCPClientFromSdkTransport(options) {
 	}
 	async function listResources(opts) {
 		const requestOptions = opts?.signal === void 0 ? {} : { signal: opts.signal };
-		let result;
-		try {
-			result = await sdkClient.listResources({}, requestOptions);
-		} catch (cause) {
-			throw mapSdkError(cause, {});
+		const items = [];
+		let cursor;
+		for (let page = 0;; page++) {
+			if (page >= MAX_LIST_PAGES) {
+				warnListPageCap("resources", items.length);
+				break;
+			}
+			let result;
+			try {
+				result = await sdkClient.listResources(cursor === void 0 ? {} : { cursor }, requestOptions);
+			} catch (cause) {
+				throw mapSdkError(cause, {});
+			}
+			items.push(...result.resources ?? []);
+			cursor = result.nextCursor;
+			if (cursor === void 0) break;
 		}
-		const items = result.resources ?? [];
 		return Object.freeze(items.map((r) => Object.freeze({
 			uri: r.uri,
 			...r.name === void 0 ? {} : { name: r.name },
@@ -144,13 +191,23 @@ async function createMCPClientFromSdkTransport(options) {
 	}
 	async function listPrompts(opts) {
 		const requestOptions = opts?.signal === void 0 ? {} : { signal: opts.signal };
-		let result;
-		try {
-			result = await sdkClient.listPrompts({}, requestOptions);
-		} catch (cause) {
-			throw mapSdkError(cause, {});
+		const items = [];
+		let cursor;
+		for (let page = 0;; page++) {
+			if (page >= MAX_LIST_PAGES) {
+				warnListPageCap("prompts", items.length);
+				break;
+			}
+			let result;
+			try {
+				result = await sdkClient.listPrompts(cursor === void 0 ? {} : { cursor }, requestOptions);
+			} catch (cause) {
+				throw mapSdkError(cause, {});
+			}
+			items.push(...result.prompts ?? []);
+			cursor = result.nextCursor;
+			if (cursor === void 0) break;
 		}
-		const items = result.prompts ?? [];
 		return Object.freeze(items.map((p) => Object.freeze({
 			name: p.name,
 			...p.description === void 0 ? {} : { description: p.description },
@@ -198,7 +255,7 @@ async function createMCPClientFromSdkTransport(options) {
 			...result.isError === void 0 ? {} : { isError: Boolean(result.isError) }
 		});
 	}
-	async function readResource(uri, opts) {
+	async function readResourceContents(uri, opts) {
 		const requestOptions = opts?.signal === void 0 ? {} : { signal: opts.signal };
 		let result;
 		try {
@@ -206,9 +263,17 @@ async function createMCPClientFromSdkTransport(options) {
 		} catch (cause) {
 			throw mapSdkError(cause, {});
 		}
-		const first = (result.contents ?? [])[0];
-		if (first === void 0) throw new MCPProtocolError(`MCP server returned no contents for resource '${uri}'.`, { metadata: { server: serverIdentity.id } });
-		return Object.freeze(first);
+		const contents = result.contents ?? [];
+		if (contents.length === 0) throw new MCPProtocolError(`MCP server returned no contents for resource '${uri}'.`, { metadata: { server: serverIdentity.id } });
+		return Object.freeze(contents.map((c) => Object.freeze(c)));
+	}
+	async function readResource(uri, opts) {
+		const contents = await readResourceContents(uri, opts);
+		if (contents.length > 1) {
+			incrementCounter("mcp.resource.multi-content-truncated.total", { server: serverIdentity.id });
+			options.logger?.("warn", `resource '${uri}' returned ${contents.length} content items; readResource() surfaces only the first - use readResourceContents() for all of them`, { server: serverIdentity.id });
+		}
+		return contents[0];
 	}
 	async function getPrompt(name, args, opts) {
 		const requestOptions = opts?.signal === void 0 ? {} : { signal: opts.signal };
@@ -252,11 +317,29 @@ async function createMCPClientFromSdkTransport(options) {
 			}
 		}
 		lastToolFingerprints = adapted.fingerprints;
-		const pins = toolsOpts?.pinnedFingerprints;
+		let pins = toolsOpts?.pinnedFingerprints;
+		let mismatchAction = toolsOpts?.onPinMismatch ?? "warn";
+		const pinStore = toolsOpts?.pinStore;
+		if (pins === void 0 && pinStore !== void 0) {
+			const stored = await pinStore.get(serverIdentity.id);
+			if (stored === void 0) {
+				const recorded = {};
+				for (const [name, hash] of adapted.fingerprints) recorded[name] = hash;
+				await pinStore.set(serverIdentity.id, recorded);
+				incrementCounter("mcp.tools.pins-recorded.total", { server: serverIdentity.id });
+				options.logger?.("info", "mcp.tools.pins-recorded: first-use fingerprints stored", {
+					server: serverIdentity.id,
+					tools: Object.keys(recorded).length
+				});
+			} else {
+				pins = stored;
+				mismatchAction = toolsOpts?.onPinMismatch ?? "reject";
+			}
+		}
 		if (pins !== void 0) for (const [name, pinned] of Object.entries(pins)) {
 			const current = adapted.fingerprints.get(name);
 			if (current !== void 0 && current !== pinned) {
-				if (toolsOpts?.onPinMismatch === "reject") throw new MCPToolPinningError(`MCP tool '${name}' no longer matches its pinned definition fingerprint — the server changed the definition behind an approved name.`, { metadata: {
+				if (mismatchAction === "reject") throw new MCPToolPinningError(`MCP tool '${name}' no longer matches its pinned definition fingerprint - the server changed the definition behind an approved name.`, { metadata: {
 					server: serverIdentity.id,
 					tool: name
 				} });
@@ -299,6 +382,7 @@ async function createMCPClientFromSdkTransport(options) {
 		listPrompts,
 		callTool,
 		readResource,
+		readResourceContents,
 		getPrompt,
 		toTools,
 		close