From 83d82a1caa276908e299d15de925505823bdd0cc Mon Sep 17 00:00:00 2001 From: Mel Ludowise Date: Wed, 18 Mar 2026 06:47:47 -0700 Subject: [PATCH 001/107] fix(examples): improve mobile support for map, pdf, and threejs examples (#555) * Fix touch gesture conflicts in WebGL example apps on mobile * Format with prettier * fix(examples): improve mobile support for map, pdf, and threejs examples - map-server: fullscreen button respects safe area insets, hover/opacity pattern with always-visible on touch devices - pdf-server: fit-to-width scale for narrow viewports, responsive toolbar with compact controls on mobile, safe area in fullscreen toolbar via CSS custom properties - threejs-server: fullscreen button respects safe area and always visible on touch, ResizeObserver for responsive width, host containerDimensions for fullscreen height, no container padding in fullscreen, replace useHostStyles with inline style application to avoid overwriting onhostcontextchanged handler --- examples/map-server/mcp-app.html | 138 ++++++++++-------- examples/map-server/src/mcp-app.ts | 25 +++- examples/pdf-server/src/mcp-app.css | 48 +++++- examples/pdf-server/src/mcp-app.ts | 70 ++++++++- examples/shadertoy-server/src/mcp-app.css | 8 +- examples/threejs-server/src/global.css | 10 ++ .../threejs-server/src/mcp-app-wrapper.tsx | 31 +++- examples/threejs-server/src/threejs-app.tsx | 50 ++++++- examples/wiki-explorer-server/src/mcp-app.css | 1 + examples/wiki-explorer-server/src/mcp-app.ts | 12 ++ 10 files changed, 305 insertions(+), 88 deletions(-) diff --git a/examples/map-server/mcp-app.html b/examples/map-server/mcp-app.html index 473eb50..b19eed4 100644 --- a/examples/map-server/mcp-app.html +++ b/examples/map-server/mcp-app.html @@ -1,72 +1,90 @@ - + - - - + + + CesiumJS Globe - - + +
Loading globe...
- + diff --git a/examples/map-server/src/mcp-app.ts b/examples/map-server/src/mcp-app.ts index 1475d81..4fda132 100644 --- a/examples/map-server/src/mcp-app.ts +++ b/examples/map-server/src/mcp-app.ts @@ -397,6 +397,17 @@ async function initCesium(): Promise { // CesiumJS sets image-rendering: pixelated by default which looks bad on scaled displays // Setting to "auto" allows the browser to apply smooth interpolation cesiumViewer.canvas.style.imageRendering = "auto"; + // Prevent touch events from propagating to the parent scroll view. + // CesiumJS uses pointer events internally, which don't suppress native + // scroll gesture recognition on touch devices. Explicit non-passive touch + // listeners with preventDefault() are needed. + for (const eventName of ["touchstart", "touchmove"] as const) { + cesiumViewer.canvas.addEventListener( + eventName, + (e: TouchEvent) => e.preventDefault(), + { passive: false }, + ); + } // Note: DO NOT set resolutionScale = devicePixelRatio here! // When useBrowserRecommendedResolution: false, Cesium already uses devicePixelRatio. // Setting resolutionScale = devicePixelRatio would double the scaling (e.g., 2x2=4x on Retina) @@ -623,6 +634,16 @@ function updateFullscreenButton(): void { // Show button only if fullscreen is available btn.style.display = canFullscreen ? "flex" : "none"; + // Position button respecting safe area insets + const insets = context?.safeAreaInsets; + btn.style.top = `${10 + (insets?.top ?? 0)}px`; + btn.style.right = `${10 + (insets?.right ?? 0)}px`; + + // Always show button on touch devices (hover doesn't work on mobile) + if (context?.deviceCapabilities?.touch) { + btn.style.opacity = canFullscreen ? "0.7" : "0"; + } + // Toggle icons based on current mode const isFullscreen = currentDisplayMode === "fullscreen"; expandIcon.style.display = isFullscreen ? "none" : "block"; @@ -718,8 +739,8 @@ app.onhostcontextchanged = (params) => { ); } - // Update button if available modes changed - if (params.availableDisplayModes) { + // Update button if available modes or safe area changed + if (params.availableDisplayModes || params.safeAreaInsets) { updateFullscreenButton(); } }; diff --git a/examples/pdf-server/src/mcp-app.css b/examples/pdf-server/src/mcp-app.css index 008b22a..77e3757 100644 --- a/examples/pdf-server/src/mcp-app.css +++ b/examples/pdf-server/src/mcp-app.css @@ -103,13 +103,14 @@ body { display: flex; align-items: center; justify-content: space-between; - padding: 0.5rem 1rem; + padding: 0.5rem 0.5rem; background: var(--bg000); border-bottom: 1px solid var(--bg200); flex-shrink: 0; - gap: 0.5rem; - height: 48px; + gap: 0.25rem 0.5rem; + min-height: 48px; box-sizing: border-box; + flex-wrap: wrap; } .toolbar-left { @@ -261,7 +262,6 @@ body { --min-font-size-inv: calc(1 / var(--min-font-size, 1)); } - .text-layer :is(span, br) { color: transparent; position: absolute; @@ -306,7 +306,13 @@ body { overflow: hidden; /* No scrolling on main - only canvas-container scrolls */ border-radius: 0; border: none; - padding: 0 !important; /* Ignore safe area insets in fullscreen */ + padding: 0 !important; /* Background extends edge-to-edge */ +} + +.main.fullscreen .toolbar { + padding-top: calc(0.5rem + var(--safe-top, 0px)); + padding-left: calc(0.5rem + var(--safe-left, 0px)); + padding-right: calc(0.5rem + var(--safe-right, 0px)); } .main.fullscreen .viewer { @@ -468,3 +474,35 @@ body { .loading-indicator.error .loading-indicator-arc { stroke: #e74c3c; } + +/* Compact toolbar on narrow screens */ +@media (max-width: 480px) { + .toolbar-left { + display: none; + } + .toolbar { + justify-content: center; + } + .nav-btn, + .zoom-btn, + .search-btn, + .fullscreen-btn { + width: 28px; + height: 28px; + font-size: 0.85rem; + } + .page-input { + width: 40px; + padding: 0.2rem 0.3rem; + font-size: 0.8rem; + } + .total-pages, + .zoom-level { + font-size: 0.75rem; + min-width: 36px; + } + .toolbar-center, + .toolbar-right { + gap: 0.2rem; + } +} diff --git a/examples/pdf-server/src/mcp-app.ts b/examples/pdf-server/src/mcp-app.ts index 4278d92..8b06a36 100644 --- a/examples/pdf-server/src/mcp-app.ts +++ b/examples/pdf-server/src/mcp-app.ts @@ -109,6 +109,36 @@ const loadingIndicatorArc = loadingIndicatorEl.querySelector( // Track current display mode let currentDisplayMode: "inline" | "fullscreen" = "inline"; +// Whether the user has manually zoomed (disables auto fit-to-width) +let userHasZoomed = false; + +/** + * Compute a scale that fits the PDF page width to the available container width. + * Returns null if the container isn't visible or the page width is unavailable. + */ +async function computeFitToWidthScale(): Promise { + if (!pdfDocument) return null; + + try { + const page = await pdfDocument.getPage(currentPage); + const naturalViewport = page.getViewport({ scale: 1.0 }); + const pageWidth = naturalViewport.width; + + const container = canvasContainerEl as HTMLElement; + const containerStyle = getComputedStyle(container); + const paddingLeft = parseFloat(containerStyle.paddingLeft); + const paddingRight = parseFloat(containerStyle.paddingRight); + const availableWidth = container.clientWidth - paddingLeft - paddingRight; + + if (availableWidth <= 0 || pageWidth <= 0) return null; + if (availableWidth >= pageWidth) return null; // Already fits + + return availableWidth / pageWidth; + } catch { + return null; + } +} + /** * Request the host to resize the app to fit the current PDF page. * Only applies in inline mode - fullscreen mode uses scrolling. @@ -783,16 +813,19 @@ function nextPage() { } function zoomIn() { + userHasZoomed = true; scale = Math.min(scale + 0.25, 3.0); renderPage(); } function zoomOut() { + userHasZoomed = true; scale = Math.max(scale - 0.25, 0.5); renderPage(); } function resetZoom() { + userHasZoomed = false; scale = 1.0; renderPage(); } @@ -1281,6 +1314,14 @@ app.ontoolresult = async (result: CallToolResult) => { loadingIndicatorEl.style.display = "none"; showViewer(); + + // Compute fit-to-width scale for narrow containers (e.g. mobile) + const fitScale = await computeFitToWidthScale(); + if (fitScale !== null) { + scale = fitScale; + log.info("Fit-to-width scale:", scale); + } + renderPage(); // Start background preloading of all pages for text extraction startPreloading(); @@ -1308,17 +1349,30 @@ function handleHostContextChanged(ctx: McpUiHostContext) { applyHostStyleVariables(ctx.styles.variables); } - // Apply safe area insets + // Apply safe area insets — set CSS custom properties for use in both + // inline mode (padding on .main) and fullscreen mode (padding on .toolbar) if (ctx.safeAreaInsets) { - mainEl.style.paddingTop = `${ctx.safeAreaInsets.top}px`; - mainEl.style.paddingRight = `${ctx.safeAreaInsets.right}px`; - mainEl.style.paddingBottom = `${ctx.safeAreaInsets.bottom}px`; - mainEl.style.paddingLeft = `${ctx.safeAreaInsets.left}px`; + const { top, right, bottom, left } = ctx.safeAreaInsets; + mainEl.style.setProperty("--safe-top", `${top}px`); + mainEl.style.setProperty("--safe-right", `${right}px`); + mainEl.style.setProperty("--safe-bottom", `${bottom}px`); + mainEl.style.setProperty("--safe-left", `${left}px`); + mainEl.style.paddingTop = `${top}px`; + mainEl.style.paddingRight = `${right}px`; + mainEl.style.paddingBottom = `${bottom}px`; + mainEl.style.paddingLeft = `${left}px`; } - // Log containerDimensions for debugging - if (ctx.containerDimensions) { - log.info("Container dimensions:", ctx.containerDimensions); + // Recompute fit-to-width when container dimensions change + if (ctx.containerDimensions && pdfDocument && !userHasZoomed) { + log.info("Container dimensions changed:", ctx.containerDimensions); + computeFitToWidthScale().then((fitScale) => { + if (fitScale !== null && Math.abs(fitScale - scale) > 0.01) { + scale = fitScale; + log.info("Recomputed fit-to-width scale:", scale); + renderPage(); + } + }); } // Handle display mode changes diff --git a/examples/shadertoy-server/src/mcp-app.css b/examples/shadertoy-server/src/mcp-app.css index 0449ea5..0d5b6f1 100644 --- a/examples/shadertoy-server/src/mcp-app.css +++ b/examples/shadertoy-server/src/mcp-app.css @@ -1,4 +1,5 @@ -html, body { +html, +body { margin: 0; width: 100%; height: 100%; @@ -23,6 +24,7 @@ html, body { width: 100%; height: 100%; display: block; + touch-action: none; } #canvas.hidden { @@ -68,7 +70,9 @@ html, body { display: none; /* Hidden by default, shown when fullscreen available */ align-items: center; justify-content: center; - transition: background 0.2s, opacity 0.2s; + transition: + background 0.2s, + opacity 0.2s; opacity: 0; /* Initially invisible, shown on View hover */ z-index: 100; } diff --git a/examples/threejs-server/src/global.css b/examples/threejs-server/src/global.css index c969ccc..1542cec 100644 --- a/examples/threejs-server/src/global.css +++ b/examples/threejs-server/src/global.css @@ -92,6 +92,16 @@ body { opacity: 0.7; } +/* Always show button on touch devices */ +.threejs-container.touch-device .fullscreen-btn.available { + opacity: 0.7; +} + +/* In fullscreen, canvas goes edge-to-edge; only the button respects safe area */ +.threejs-container.fullscreen { + padding: 0 !important; +} + /* Fullscreen mode: swap icons and remove border radius */ .threejs-container.fullscreen .fullscreen-btn .expand-icon { display: none; diff --git a/examples/threejs-server/src/mcp-app-wrapper.tsx b/examples/threejs-server/src/mcp-app-wrapper.tsx index f9dd263..9ef24d2 100644 --- a/examples/threejs-server/src/mcp-app-wrapper.tsx +++ b/examples/threejs-server/src/mcp-app-wrapper.tsx @@ -5,7 +5,7 @@ * props to the actual view component. */ import type { App, McpUiHostContext } from "@modelcontextprotocol/ext-apps"; -import { useApp, useHostStyles } from "@modelcontextprotocol/ext-apps/react"; +import { useApp } from "@modelcontextprotocol/ext-apps/react"; import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js"; import { StrictMode, useState, useEffect } from "react"; import { createRoot } from "react-dom/client"; @@ -66,14 +66,39 @@ function McpAppWrapper() { setToolResult(params as CallToolResult); }; // Host context changes (theme, dimensions, etc.) + // Note: we handle styles here instead of using useHostStyles, + // because useHostStyles overwrites onhostcontextchanged. app.onhostcontextchanged = (params) => { + const root = document.documentElement; + if (params.theme) { + root.setAttribute("data-theme", params.theme); + root.style.colorScheme = params.theme; + } + if (params.styles?.variables) { + for (const [k, v] of Object.entries(params.styles.variables)) { + if (v !== undefined) root.style.setProperty(k, v as string); + } + } setHostContext((prev) => ({ ...prev, ...params })); }; }, }); - // Apply host styling (theme, CSS variables, fonts) - useHostStyles(app); + // Apply initial host styles + useEffect(() => { + if (!app) return; + const ctx = app.getHostContext(); + const root = document.documentElement; + if (ctx?.theme) { + root.setAttribute("data-theme", ctx.theme); + root.style.colorScheme = ctx.theme; + } + if (ctx?.styles?.variables) { + for (const [k, v] of Object.entries(ctx.styles.variables)) { + if (v !== undefined) root.style.setProperty(k, v as string); + } + } + }, [app]); // Get initial host context after connection useEffect(() => { diff --git a/examples/threejs-server/src/threejs-app.tsx b/examples/threejs-server/src/threejs-app.tsx index 2359316..1de585f 100644 --- a/examples/threejs-server/src/threejs-app.tsx +++ b/examples/threejs-server/src/threejs-app.tsx @@ -85,6 +85,7 @@ function LoadingShimmer({ height, code }: { height: number; code?: string }) { display: "flex", flexDirection: "column", overflow: "hidden", + touchAction: "none", background: "linear-gradient(135deg, var(--color-background-secondary, light-dark(#f0f0f5, #2a2a3c)) 0%, var(--color-background-tertiary, light-dark(#e5e5ed, #1e1e2e)) 100%)", }} @@ -226,6 +227,8 @@ export default function ThreeJSApp({ const canFullscreen = hostContext?.availableDisplayModes?.includes("fullscreen") ?? false; const isFullscreen = currentDisplayMode === "fullscreen"; + const dims = hostContext?.containerDimensions; + const hostHeight = dims && "height" in dims ? dims.height : 0; // Sync display mode from host context useEffect(() => { @@ -272,25 +275,51 @@ export default function ThreeJSApp({ return () => observer.disconnect(); }, []); + // Track container width for resize handling + const [containerWidth, setContainerWidth] = useState(0); + + useEffect(() => { + if (!containerRef.current) return; + const observer = new ResizeObserver((entries) => { + const w = Math.round(entries[0].contentRect.width); + if (w > 0) setContainerWidth(w); + }); + observer.observe(containerRef.current); + return () => observer.disconnect(); + }, []); + useEffect(() => { if (!code || !canvasRef.current || !containerRef.current) return; + // Prevent touch events from propagating to the parent scroll view. + // Three.js OrbitControls uses pointer events, which don't suppress native + // scroll gesture recognition on touch devices. + const canvas = canvasRef.current; + const preventDefault = (e: TouchEvent) => e.preventDefault(); + canvas.addEventListener("touchstart", preventDefault, { passive: false }); + canvas.addEventListener("touchmove", preventDefault, { passive: false }); + // Cleanup previous animation animControllerRef.current?.cleanup(); animControllerRef.current = createAnimationController(); setError(null); - const width = containerRef.current.offsetWidth || 800; + const w = containerWidth || containerRef.current.offsetWidth || 800; + const h = isFullscreen && hostHeight > 0 ? hostHeight : height; executeThreeCode( code, canvasRef.current, - width, - height, + w, + h, animControllerRef.current.visibilityAwareRAF, ).catch((e) => setError(e instanceof Error ? e.message : "Unknown error")); - return () => animControllerRef.current?.cleanup(); - }, [code, height]); + return () => { + canvas.removeEventListener("touchstart", preventDefault); + canvas.removeEventListener("touchmove", preventDefault); + animControllerRef.current?.cleanup(); + }; + }, [code, height, containerWidth, isFullscreen, hostHeight]); if (isStreaming || !code) { return ( @@ -303,7 +332,7 @@ export default function ThreeJSApp({ return (
0 ? hostHeight : height, + borderRadius: isFullscreen ? 0 : "var(--border-radius-lg, 8px)", display: "block", + touchAction: "none", }} /> {error &&
Error: {error}
} @@ -321,6 +351,10 @@ export default function ThreeJSApp({ className={`fullscreen-btn${canFullscreen ? " available" : ""}`} title={isFullscreen ? "Exit fullscreen" : "Toggle fullscreen"} onClick={toggleFullscreen} + style={{ + top: 10 + (safeAreaInsets?.top ?? 0), + right: 10 + (safeAreaInsets?.right ?? 0), + }} > (container) }) .graphData(graphData); +// Prevent touch events from propagating to the parent scroll view. +// force-graph uses pointer events, which don't suppress native scroll gesture +// recognition on touch devices. +const graphCanvas = container.querySelector("canvas"); +if (graphCanvas) { + for (const eventName of ["touchstart", "touchmove"] as const) { + graphCanvas.addEventListener(eventName, (e) => e.preventDefault(), { + passive: false, + }); + } +} + // Handle window resize function handleResize() { const { width, height } = container.getBoundingClientRect(); From 296b5921fb7e266fdd8919b507df18707a38527f Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Thu, 19 Mar 2026 17:41:55 +0000 Subject: [PATCH 002/107] pdf-server: annotations, interact tool, page extraction & prompt engineering (#506) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * pdf-server: add interact tool to allow model to modify existing view * pdf-server: add annotations, download, form fill, and highlight_text Add PDF annotation system with 7 annotation types (highlight, underline, strikethrough, note, rectangle, freetext, stamp), text-based highlighting, form filling, and annotated PDF download using pdf-lib. - Server: annotation Zod schemas, extended interact tool with add/update/remove annotations, highlight_text, and fill_form actions - Client: annotation layer rendering with PDF coordinate conversion, persistence via localStorage (using toolInfo.id key), pdf-lib-based download with embedded annotations and form fills, uses app.downloadFile() SDK with fallback - Model context includes annotation summary Co-Authored-By: Claude Opus 4.6 * pdf-server: add get_pages tool for batch text/screenshot extraction New tool `get_pages` lets the model get text and/or screenshots from arbitrary page ranges without navigating the visible viewer. - Server: `get_pages` tool with interval-based page ranges (optional start/end, open ranges supported), `getText`/`getScreenshots` flags, request-response bridge via `submit_page_data` app-only tool - Client: offscreen rendering (hidden canvas, no visual interference), text from cache or on-demand extraction, screenshots scaled to 768px max dimension, results submitted back to server - Max 20 pages per request, 60s timeout Co-Authored-By: Claude Opus 4.6 * pdf-server: move get_pages into interact tool as an action Fold get_pages into the interact tool to minimize tools requiring approval. Now accessed via `interact(action: "get_pages", ...)`. Co-Authored-By: Claude Opus 4.6 * pdf-server: improve interact tool annotation discoverability - Add concrete per-type schema docs with field names in tool description - Add JSON example showing add_annotations with highlight + stamp - Replace opaque z.record(z.string(), z.unknown()) with typed union of all annotation schemas (full + partial forms) so the model sees exact field names and types - Remove redundant manual safeParse since Zod inputSchema validates Co-Authored-By: Claude Opus 4.6 * pdf-server: improve annotation discoverability + add E2E tests - display_pdf result text now explicitly lists annotation capabilities (highlights, stamps, notes, etc.) instead of vague "navigate, search, zoom, etc." - Restructured interact tool description: annotations promoted to top, with clear type reference, JSON example, and bold section headers - Added pdf-annotations.spec.ts with 6 E2E tests covering: - Result text mentions annotation capabilities - interact tool available in dropdown - add_annotations renders highlight - Multiple annotation types render (highlight, note, stamp, freetext, rectangle) - remove_annotations removes from DOM - highlight_text finds and highlights text Co-Authored-By: Claude Opus 4.6 * pdf-server: add Claude API prompt discovery tests for annotations Tests that Claude can discover and use PDF annotation capabilities by calling the Anthropic Messages API with the tool schemas and simulated display_pdf result. Disabled by default — skipped unless ANTHROPIC_API_KEY is set: ANTHROPIC_API_KEY=sk-... npx playwright test tests/e2e/pdf-annotations-api.spec.ts 3 scenarios tested: - Model uses highlight_text when asked to highlight the title - Model discovers annotation capabilities when asked "can you annotate?" - Model uses interact (add_annotations or get_pages) when asked to add notes Co-Authored-By: Claude Opus 4.6 * pdf-server: add example prompts, testing docs, and updated tools table to README - Example prompts for annotations, navigation, page extraction, stamps, forms - Documents how to run E2E tests and API prompt discovery tests - Updated tools table to include interact tool - Updated key patterns table with annotations, command queue, file download - Added pdf-lib to dependencies list Co-Authored-By: Claude Opus 4.6 * pdf-server: simplify interact annotations schema (7802 → 2239 chars) The typed Zod union (14 anyOf variants: 7 full + 7 partial annotation types) produced a 5,817-char JSON schema for the annotations field alone. This bloated the interact tool schema to 7,802 chars, which may cause the model to struggle with or skip the tool. Replace with z.record(z.string(), z.any()) — annotation types are already fully documented in the tool description. Schema drops to 2,239 chars (71% reduction), annotations field to 254 chars (96% reduction). Co-Authored-By: Claude Opus 4.6 * pdf-server: enumerate all interact actions in display_pdf result The display_pdf result text now lists every action by name (navigate, search, find, search_navigate, zoom, add_annotations, update_annotations, remove_annotations, highlight_text, fill_form, get_pages) so the model knows exactly what commands are available without needing to inspect the interact tool schema. Co-Authored-By: Claude Opus 4.6 * pdf-server: validate viewUUID in interact, clarify in description The model was passing "pdf-viewer" instead of the actual UUID, causing get_pages to timeout (commands queued under wrong key, client never picks them up). - Add activeViewUUIDs set tracking UUIDs issued by display_pdf - Validate viewUUID at the top of interact handler with clear error - Add "IMPORTANT: viewUUID must be the exact UUID returned by display_pdf" to the interact tool description Co-Authored-By: Claude Opus 4.6 * pdf-server: fix annotation clickability and replace emoji icon with SVG - Raise annotation-layer z-index above text-layer so note annotations receive hover/click events (was z-index: 1, now 3; text-layer is 2) - Replace memo emoji (data-icon attr) with CSS mask SVG document icon that respects currentColor for consistent cross-platform rendering * pdf-server: add annotation side panel with bidirectional linking Right-side panel (250px) shows all annotations grouped by page with expand/collapse cards. Clicking a card navigates to the page and pulses the annotation; clicking a note icon on the PDF highlights its card in the panel. Panel auto-shows on first annotation, remembers user toggle preference via localStorage, and shows a badge count when collapsed. Co-Authored-By: Claude Opus 4.6 * pdf-server: replace 300ms interval polling with long-polling Server now holds poll_pdf_commands requests open (up to 30s) until commands arrive, waking waiters via enqueueCommand. Client loops sequentially instead of using setInterval, with 2s backoff on errors. Reduces idle RPC traffic from ~3 calls/sec to ~2 calls/min. Co-Authored-By: Claude Opus 4.6 * pdf-server: add interactive form filling via PDF.js AnnotationLayer Render PDF.js AnnotationLayer with renderForms:true so form fields appear as interactive HTML inputs. Build a fieldName→annotationID map via getFieldObjects() to bridge fill_form (which uses field names) with annotationStorage (which uses annotation IDs). Sync user input back to formFieldValues for persistence and PDF download. Co-Authored-By: Claude Opus 4.6 * pdf-server: add elicit_form_inputs to display_pdf for upfront form filling When enabled and the client supports elicitation, extracts form fields from the PDF via pdf-lib and prompts the user to fill them before the viewer loads. Elicited values are returned in content/structuredContent and enqueued as a fill_form command for the viewer. Co-Authored-By: Claude Opus 4.6 * pdf-server: replace pdf-lib with pdfjs-dist for server-side form field extraction Use pdfjs-dist's getDocument() + getFieldObjects() instead of pdf-lib's PDFDocument.load() + getForm().getFields() in extractFormSchema(). This removes the pdf-lib import from the server bundle (pdf-lib is still used client-side for PDF modification in downloadAnnotatedPdf). Uses the legacy pdfjs-dist build to avoid DOMMatrix dependency in Node.js. Co-Authored-By: Claude Opus 4.6 * pdf-server: fix form field font size and programmatic fill_form Set --scale-factor/--total-scale-factor CSS variables on the form layer so AnnotationLayer font-size rules resolve correctly instead of falling back to browser defaults. Also update live DOM elements directly in fill_form handler so values appear immediately without waiting for a full re-render. Co-Authored-By: Claude Opus 4.6 * pdf-server: fix listbox font size overflow in AnnotationLayer After rendering the annotation layer, shrink select[size] font to fit within the PDF rect height. The default AnnotationLayer CSS uses a fixed 9px * scale-factor which overflows when many options share a small rect. Co-Authored-By: Claude Opus 4.6 * pdf-server: add trash icon to annotation sidebar cards Show a delete button on each annotation card that appears on hover. Clicking it removes the annotation from the PDF and persists the change. Co-Authored-By: Claude Opus 4.6 * pdf-server: fix space key captured in form fields Skip keyboard navigation shortcuts (space, arrows, +/-) when any input, textarea, or select element is focused, not just the search/page inputs. Co-Authored-By: Claude Opus 4.6 * pdf-server: show form fields in annotation sidebar with clear buttons Form field values now appear in the sidebar under a "Form Fields" group, with trash icons to clear individual values. The badge count and auto-show logic include form fields. The panel open/close now calls requestFitToContent with width to avoid overflow in inline layout mode. Co-Authored-By: Claude Opus 4.6 * pdf-server: clarify Y coordinate system in interact tool description Explicitly state that Y=0 is the bottom edge and Y=792 is the top for US Letter, with concrete guidance on typical values for top/bottom placement to prevent models from using top-down screen coordinates. Co-Authored-By: Claude Opus 4.6 * pdf-server: validate fill_form field names and report valid fields Extract form field names during display_pdf and cache per viewer UUID. fill_form now soft-fails on unknown field names (applies valid ones, reports skipped ones). Both display_pdf and fill_form results include the list of valid field names so the model can self-correct. Co-Authored-By: Claude Opus 4.6 * pdf-server: add compact annotation strip for inline mode In inline mode, replace the 250px side panel with a slim bottom strip that shows one annotation/form-field at a time with prev/next navigation. The side panel is still used in fullscreen mode. - Strip shows item swatch, label, preview + counter (N of M · Page P) - Click item to navigate to its page; delete single or clear all - requestFitToContent includes strip height in size calculation - fieldNameToPage map built during init for form field page context - Display mode toggle switches between strip and panel automatically * pdf-server: improve display_pdf description for form/annotation use cases Add explicit guidance on when to use the tool: filling out forms (tax forms, applications), annotating PDFs, and interactive review. This helps models route user requests like 'help me fill out this form' to the display_pdf tool. * pdf-server: only show download button when host supports downloadFile * pdf-server: resizable sidebar + human-readable form field labels - Sidebar panel is now resizable by dragging its left edge (150px min, 50vw max). Width is persisted in localStorage. - Form fields show human-readable labels from PDF's TU (alternativeText) field when available. Mechanical names like ').F1_01[0]' are replaced with the generic label 'Field' when no TU text exists. - Empty values are no longer shown in the sidebar. * pdf-server: fix field label collection to use getAnnotations() API getFieldObjects() doesn't include alternativeText. Instead, iterate per-page annotations (only pages with known form fields) to collect the TU/alternativeText labels that PDF authors set as tooltips. * pdf-server: move strip below toolbar + follow form field focus - Strip is now positioned below the toolbar (above search bar) instead of at the bottom, for better visibility and proximity to the toolbar. - Form field focus changes automatically sync the strip to show the focused field's item. - Search bar top offset adjusts dynamically when strip is shown/hidden. * pdf-server: add Clear all to fullscreen sidebar + steer model to reuse views - Add 'Clear all' button in the fullscreen sidebar panel header - Update display_pdf description to instruct models to use the interact tool with existing viewUUID rather than calling display_pdf again for the same PDF (e.g. when user asks to annotate an already-open doc) * pdf-server: add page dimensions to model context + improve coordinate docs - Model context now includes 'Page size: 612x792pt (coordinates: origin at bottom-left, Y increases upward)' so the model knows actual page dimensions when placing annotations. - Interact tool description expanded with clearer coordinate guidance, margin hints, and a tip to use highlight_text for text annotations. - Download button temporarily shown unconditionally (capability check commented out with TODO for re-enabling). * pdf-server: auto-close panel when empty + stronger display_pdf reuse guidance - Sidebar/strip auto-closes when all items are cleared (via delete or Clear all), and the annotations toolbar button hides. - display_pdf description now uses CRITICAL warning to prevent models from re-calling it to add annotations to an already-open PDF. * pdf-server: skip elicitation when form fields have mechanical names Only use elicitation if all editable fields have human-readable names. Fields with brackets, dots, or ALL_CAPS_UNDERSCORE patterns (and no alternativeText label from the PDF) are considered mechanical and would be confusing in an elicitation form. Also use alternativeText as the elicitation field title when available. * pdf-server: paint annotations on screenshots + list coords in model context Screenshots sent to the model (both updateModelContext and get_pages) now include annotations drawn on top of the PDF canvas, so the model can visually verify placement. The text context also lists each annotation on the current page with its coordinates. * pdf-server: style multiselect/listbox form fields to match viewer theme * pdf-server: add command batching to interact tool Extract command processing into a helper function and accept an optional `commands` array for sequential batch execution. This lets the model send multiple actions (e.g. add annotations + get screenshot) in a single tool call, reducing round trips. Stops on first error in a batch. Co-Authored-By: Claude Opus 4.6 * pdf-server: fix multiselect rendering by removing font-size override The custom font-size: inherit on #form-layer select was conflicting with PDF.js AnnotationLayer's inline font-size, causing doubled/overlapping text in select options. Remove the override and keep only the checked-option highlight style. Co-Authored-By: Claude Opus 4.6 * pdf-server: fix form reset button by passing fieldObjects to AnnotationLayer PDF.js AnnotationLayer needs the fieldObjects parameter to bind reset form button actions. Cache the result of doc.getFieldObjects() and pass it through to annotationLayer.render(). Co-Authored-By: Claude Opus 4.6 * pdf-server: improve annotation labels in sidebar and strip Use human-readable labels instead of raw type names (e.g. "Rectangle" instead of "rectangle", "Stamp: APPROVED" instead of "stamp"). Remove redundant preview text for types that have no additional content (rectangle, underline, strikethrough, stamp) to avoid "rectangle Rectangle" duplication. Co-Authored-By: Claude Opus 4.6 * pdf-server: split get_pages into get_text and get_screenshot commands Replace the combined get_pages action (with getText/getScreenshots flags) with two focused commands: - get_text: extract text from pages (single page or intervals) - get_screenshot: capture a single page as PNG image This makes the API cleaner and returns each command's result as its own content block in batch mode. Also fix download function syntax error from earlier capability check commenting. Co-Authored-By: Claude Opus 4.6 * pdf-server: fix download by using pdfDocument.getData() instead of re-fetching The download was failing with "No PDF header found" because it re-fetched the PDF via read_pdf_bytes tool calls, but stateless MCP transport creates fresh server instances per request with empty caches. Using getData() from the already-loaded pdf.js document avoids the round-trip entirely. Co-Authored-By: Claude Opus 4.6 * pdf-server: increase express body limit to fix get_screenshot hang The submit_page_data tool sends base64 PNG screenshots that exceed the default 100KB express.json() body limit from createMcpExpressApp. This caused the request to silently fail, making waitForPageData timeout and the get_screenshot command hang. Replaced createMcpExpressApp with manual express setup using a 50MB body limit. Co-Authored-By: Claude Opus 4.6 * pdf-server: use JPEG for screenshots to fix get_screenshot hang Switch from PNG to JPEG (quality 0.85) for both offscreen screenshots (get_screenshot) and model context images. JPEG is much smaller than PNG for document pages, keeping the submit_page_data payload well within the MCP SDK's default 100KB express body limit. This also reverts the temporary workaround of replacing createMcpExpressApp with a custom express setup. Co-Authored-By: Claude Opus 4.6 * pdf-server: add ' - edited' suffix to download filename when modified Renames the download from '_annotated' to ' - edited' and also triggers the suffix when form fields have been filled, not just when annotations are present. Co-Authored-By: Claude Opus 4.6 * pdf-server: include viewUUID in display_pdf structuredContent The viewUUID was only in _meta but not in structuredContent, so the model couldn't retrieve it from the tool result to pass to interact. Co-Authored-By: Claude Opus 4.6 * pdf-server: move interact action list from display_pdf content to description The content response was bloated with static instructions about interact actions. Moved that to the tool description where it belongs, keeping only the dynamic PDF URL and viewUUID in the content. Co-Authored-By: Claude Opus 4.6 * pdf-server: fix form reset setting dropdowns to first item PDF.js resetform handler deselects all options but doesn't re-add the hidden empty placeholder, so the browser falls back to showing the first real option. Work around this by listening for resetform on combo selects and re-inserting a hidden blank option when nothing is selected. Co-Authored-By: Claude Opus 4.6 * pdf-server: sort form fields in sidebar/strip by intrinsic PDF order Fields are now sorted by page number then top-to-bottom Y position on the page, matching the visual reading order of the PDF form rather than the arbitrary insertion order of formFieldValues. Co-Authored-By: Claude Opus 4.6 * pdf-server: add viewUUID to display_pdf outputSchema The viewUUID was added to structuredContent but not to the outputSchema, causing MCP validation error -32602. Co-Authored-By: Claude Opus 4.6 * pdf-server: allow horizontal scrolling in inline mode When the PDF is zoomed or wider than the container, users can now scroll horizontally in inline mode instead of the content being clipped. Co-Authored-By: Claude Opus 4.6 * pdf-server: add viewUUID to model context, remove activeViewUUIDs validation Include viewUUID in the updateModelContext header so the model can reference it when calling interact. Remove the activeViewUUIDs set validation since it breaks after server restarts — command queue TTL pruning is sufficient cleanup. Also prune empty queues with no active pollers. Co-Authored-By: Claude Opus 4.6 * pdf-server: fix delete button alignment in sidebar annotation cards Annotations without preview text had the delete button hugging the type label instead of right-aligning. Add margin-left: auto so the button is consistently pushed to the right edge of the row. Co-Authored-By: Claude Opus 4.6 * pdf-server: add interactive annotations (select, drag, resize, rotate, undo/redo) Enable pointer-events on all annotation types so they can be clicked to select. Draggable types (rectangle, freetext, stamp, note) support smooth drag-to-move. Rectangles show corner resize handles, stamps show a rotate handle. Delete/Backspace removes the selected annotation, Ctrl+Z/Shift+Z provides unlimited undo/redo, and Escape deselects. Sidebar cards sync with on-canvas selection state. Co-Authored-By: Claude Opus 4.6 * pdf-server: clicking sidebar card focuses form field input and scrolls into view Sidebar annotation cards now scroll the annotation into view, and form field cards navigate to the correct page and focus the input element. Co-Authored-By: Claude Opus 4.6 * pdf-server: fix form widget double-text by making inputs opaque PDF.js AnnotationLayer renders interactive form inputs with a semi-transparent background, letting the canvas's static form appearance bleed through. Since the widget font (9px * scale, sans-serif) doesn't match the PDF's actual font metrics, this creates a "double text" misalignment at most zoom levels. Make text/choice widgets opaque so only the interactive layer's text is visible. Co-Authored-By: Claude Opus 4.6 * pdf-server: add selection/focus to model context, double-click to send messages, toggle resize/rotate - Model context now includes selected annotation ID and focused form field name so the model knows what the user is interacting with. - Double-clicking a sidebar annotation card sends a message prompting the model to change that annotation. - Double-clicking a sidebar form field card sends a message prompting the model to fill that field. - Double-clicking an annotation in the renderer toggles between resize and rotate handles (for rectangles and stamps). - Rectangles now support rotation via the rotate handle. Co-Authored-By: Claude Opus 4.6 * pdf-server: replace inline-mode strip with floating accordion sidebar Replace the compact horizontal annotation strip with a floating panel at top-right in inline mode. Uses accordion-style collapsible sections (per-page annotations + form fields) with at most one section open at a time. Refactors renderAnnotationPanel into reusable helpers (appendAccordionSection, createAnnotationCard, createFormFieldCard). Co-Authored-By: Claude Opus 4.6 * pdf-server: remove dead annotation strip code The compact horizontal annotation strip is no longer used since inline mode now uses a floating accordion sidebar. Remove all strip-related HTML, CSS, JS (DOM refs, StripItem type, buildStripItems, renderStrip, navigateToStripItem, deleteStripItem, event listeners, stripHeight calculations). Co-Authored-By: Claude Opus 4.6 * pdf-server: multi-select annotations, natural prompts, form reset sync - Convert selection from single ID to Set for multi-select (Shift+click) - Deselect annotations when focusing a form input field - Fix rotation to always use center origin (stamp was using left-bottom) - Simplify double-click sendMessage prompts (e.g. "update Notes: ") - Call updateModelContext before sendMessage to guarantee context is sent - Listen for PDF.js resetform events to clear formFieldValues, update sidebar badge/count, and hide icon when no items remain Co-Authored-By: Claude Opus 4.6 * pdf-server: draggable floating panel with magnetic corner anchoring - Reduce floating panel width (220→180px), add border-radius - Panel header is draggable; on drop, snaps to nearest corner - Persists corner preference to localStorage - Auto-docks to opposite side when overlapping selected annotations - Accordion chevron: ▶ when collapsed, ▼ when expanded - Slightly reduce section header size for compactness Co-Authored-By: Claude Opus 4.6 * pdf-server: allow all accordion sections to be collapsed Only auto-open the first section on initial render. Once the user has interacted with accordion headers, respect their choice to collapse all sections without forcing one back open. Co-Authored-By: Claude Opus 4.6 * pdf-server: polish interactions and UI details - Remove auto-show annotation panel; wait for user to open it - Badge color: blue (accent) instead of red - Search bar: offset floating panel below it when anchored top-right - Text selection deselects annotations and clears field focus - Click on text layer / empty area clears field focus too - Zoom keeps selected annotation visible (scrollIntoView after render) - Fullscreen button: distinct exit icon + tooltip with Esc hint Co-Authored-By: Claude Opus 4.6 * pdf-server: fix text deselect, stamp dblclick, rotation direction, export - Text selection and text-layer mousedown now deselect annotations - Add user-select: none on draggable annotations (prevents stamp text selection on double-click, allowing resize/rotate toggle to work) - Fix rotation direction: remove CSS transform negation so clockwise drag = clockwise rotation on screen - Fix stamp export: rotate around center (matching CSS transformOrigin) and negate rotation for PDF coordinate convention - Add rotation support to rectangle PDF export - Remove auto-show annotation panel; badge uses blue accent color Co-Authored-By: Claude Opus 4.6 * pdf-server: allow any text as stamp label, not just predefined enum The StampLabel was unnecessarily restricted to 6 predefined values (APPROVED, DRAFT, etc). The PDF format supports arbitrary stamp text, so open it up to z.string() while keeping common labels as examples in the schema description. Co-Authored-By: Claude Opus 4.6 * pdf-server: show resize + rotate handles simultaneously, dblclick sends message Remove the interactionMode toggle — instead show both corner resize handles and the rotate handle at the same time on selected annotations. Rectangle gets resize corners + rotate handle; stamp gets rotate handle only. Double-click on annotation elements now sends a message to modify the annotation (matching sidebar card behavior) instead of toggling modes. Co-Authored-By: Claude Opus 4.6 * pdf-server: SVG fullscreen icons, Y-coord docs, dirty flag - Replace Unicode fullscreen chars (⛶/⊠) with proper SVG expand/collapse icons - Add Cmd+Enter keyboard shortcut for fullscreen toggle - Improve coordinate system docs: emphasize rectangle x,y is BOTTOM-LEFT corner, add worked examples - Add isDirty state with * prefix on title for unsaved changes - Track dirty state through persistAnnotations, suppress during restore * pdf-server: diff-based annotation persistence, proper PDF annotation export, PDF annotation import Extract annotation logic into pdf-annotations.ts module with comprehensive tests. Replace content-stream drawing (drawRectangle/drawText) with proper PDF annotation dicts (/Type /Annot) that are editable in Acrobat/Preview. Persistence now stores only a diff (additions/removals) relative to the PDF's native annotations, keeping localStorage small. On load, annotations are imported from the PDF via pdf.js and merged with the user's diff. Co-Authored-By: Claude Opus 4.6 * pdf-server: enhance page shadow for better depth perception Co-Authored-By: Claude Opus 4.6 * pdf-server: use floating panel in fullscreen, respect insets, direction-aware resize Always use the floating annotations panel (both inline and fullscreen) instead of the sidebar in fullscreen mode. Panel anchorage now respects safe area insets (especially bottom). Resize handle repositions to the correct edge based on which corner the panel is anchored to. Initial width reduced from 180px to 135px. Co-Authored-By: Claude Opus 4.6 * pdf-server: add save_pdf tool and save button for local files Add server-side save_pdf tool that writes annotated PDF bytes back to the original local file. Client shows a save button (floppy disk icon) next to the download button for file:// URLs. Ctrl/Cmd+S shortcut saves when dirty. Saving clears the dirty flag and localStorage diff. Co-Authored-By: Claude Opus 4.6 * pdf-server: add circle and line annotation types synced with PDF.js Add circle (ellipse) and line annotation support across all layers: server Zod schemas, pdf-annotations module (import/export), client renderers, canvas painting for screenshots, CSS, drag/resize handling, and tool description documentation. Co-Authored-By: Claude Opus 4.6 * pdf-server: add searchability keywords to display_pdf tool description Include viewer, render, renderer, display, show, annotate, edit, and form keywords so the tool is easier to discover by models. Co-Authored-By: Claude Opus 4.6 * pdf-server: switch model-facing annotation API to top-left origin coordinates Convert Y coordinates at the command boundary (add/update_annotations) so the model uses intuitive top-left origin while internal storage stays in PDF's native bottom-left origin. Also converts coordinates back to model space in context strings for consistency. Co-Authored-By: Claude Opus 4.6 * pdf-server: fix stamp rotation in PDF export via appearance stream matrix Stamp rotation was a no-op (empty if-block with a comment). Now computes a proper rotation matrix around the bounding box center and applies it to the appearance stream. Also adds verification tests for rectangle stroke/fill colors and stamp color/rotation in exported PDF dicts. Co-Authored-By: Claude Opus 4.6 * pdf-server: fix screenshots to include filled form field values Screenshots sent to the model were missing form field values because the canvas render didn't use ENABLE_STORAGE mode. Now both offscreen renders (model context and get_pages) pass annotationStorage to PDF.js so filled fields appear in screenshots. Also reuses renderPageOffscreen for model context screenshots to deduplicate rendering logic. Co-Authored-By: Claude Opus 4.6 * pdf-server: list form fields with page, bounding box, and label in display_pdf result The model needs field locations to fill forms accurately, especially for fields with mechanical names or no name at all. Extracts per-page bounding boxes in model coordinates (top-left origin) and includes labels where available from PDF alternativeText. Co-Authored-By: Claude Opus 4.6 * pdf-server: include full field listing in fill_form result and update UI after fill fill_form results now include all form fields with names, types, pages, and bounding boxes so the model can self-correct on unknown field names. Also updates the annotation panel badge and visibility after programmatic fills. Co-Authored-By: Claude Opus 4.6 * pdf-server: add formFields to display_pdf structuredContent and output schema Programmatic consumers need structured access to form field metadata (names, types, pages, bounding boxes) without parsing text content. Co-Authored-By: Claude Opus 4.6 * pdf-server: add image annotation type with URL/base64 support, drag-drop, and PDF export Co-Authored-By: Claude Opus 4.6 * pdf-server: fix image annotation click/select, add Shift-resize for aspect ratio, add handle tooltips Co-Authored-By: Claude Opus 4.6 * pdf-server: fix image annotation to stretch to fill its bounding box Co-Authored-By: Claude Opus 4.6 * pdf-server: fix stamp PDF export to match on-screen appearance Use non-standard /Name to prevent Preview.app from substituting built-in stamp graphics, align padding with CSS (4pt/12pt), add ExtGState for 0.6 opacity, and fix text baseline positioning. Co-Authored-By: Claude Opus 4.6 * pdf-server: improve annotation panel UX and image resize behavior - Page accordion click navigates to that page - Form fields appear in their page's accordion section (before annotations) - Selecting annotation or focusing form field auto-expands page accordion - Image resize preserves aspect ratio by default (Shift for free resize) - Add aspect field ("preserve"|"ignore") to ImageAnnotation type - Fix selection UI regression: remove overflow:hidden that clipped handles Co-Authored-By: Claude Opus 4.6 * pdf-server: add signature/signing keywords and image example to tool descriptions - Add signing/signature keywords to display_pdf description for discoverability - Add image annotation example (signature placement) to interact tool description - Clarify that imageUrl supports file paths and HTTP URLs with auto-fetch Co-Authored-By: Claude Opus 4.6 * pdf-server: discourage base64 encoding in image annotation, clarify imageUrl accepts file paths Models tend to encode images as base64 themselves instead of passing file paths. Make the schema descriptions and tool docs explicit: prefer imageUrl with a file path, no data: URIs, don't encode images yourself. Co-Authored-By: Claude Opus 4.6 * pdf-server: remove imageData from image annotation API, require imageUrl Models were encoding images as base64 themselves instead of passing file paths. Remove imageData from the model-facing Zod schema entirely — only imageUrl (file path or HTTPS URL) is accepted. The server fetches and embeds the image automatically. imageData remains as an internal field for client-side rendering and drag-drop. Also mention drag-and-drop as an alternative in the tool description. Co-Authored-By: Claude Opus 4.6 * pdf-server: add clipboard support (copy/cut/paste annotations and images) - Request clipboardWrite permission in resource metadata - Ctrl/Cmd+C: copy selected annotations as JSON to clipboard - Ctrl/Cmd+X: cut (copy + delete) selected annotations - Ctrl/Cmd+V / paste event: paste annotations from clipboard JSON, or paste images from clipboard (e.g. screenshots, copied images) - Refactor drag-drop image creation into shared addImageFromFile() - Pasted annotations get new IDs and slight offset to avoid overlap - Pasted images are centered on the current page Co-Authored-By: Claude Opus 4.6 * pdf-server: add disableInteract option for distributed deployments Adds a `disableInteract` boolean to `createServer()` options that skips registering the `interact`, `poll_pdf_commands`, and `submit_page_data` tools (all relying on an in-memory command queue). Adjusts `display_pdf` description and schema accordingly when disabled. Co-Authored-By: Claude Opus 4.6 * pdf-server: flip interact to opt-in, enable only for --stdio Rename disableInteract → enableInteract (default false) so existing library consumers get read-only mode without code changes. The CLI entry point passes enableInteract: true only when running with --stdio. Co-Authored-By: Claude Opus 4.6 * pdf-server: log client-roots warning once at startup, not per request * pdf-server: fix form widget transparency, poll spam, and pdf.js warnings - Form widgets: PDF.js writes inline background-color (from the annotation /BC entry, typically 'transparent'), defeating our CSS. Force opaque with !important. Fixes double-text in listboxes and text inputs at any zoom. - Poll spam: view was calling poll_pdf_commands in a tight loop when interact is disabled (HTTP mode) — server returns isError, which doesn't throw, so the loop never backed off. Server now signals interactEnabled via _meta; view only polls when true, and stops entirely on isError results. - Silence Helvetica / inset-border warnings: set verbosity=ERRORS for server-side getDocument (only used for form introspection, no rendering, so font fallback warnings are noise). * pdf-server: set standardFontDataUrl for server-side pdf.js Resolve pdfjs-dist/standard_fonts/ at runtime via createRequire. Works from both source (bun main.ts) and bundled dist/ since pdfjs-dist is --external. NodeStandardFontDataFactory reads via fs.readFile, so a filesystem path with trailing separator is what's expected. Keep verbosity=ERRORS as backstop for unrelated warnings (e.g. 'Unimplemented border style: inset'). * pdf-server: use unpkg CDN for pdf.js standard fonts, add to CSP - Single CDN URL pinned to the bundled pdfjs-dist version, used in both server (Node) and viewer (browser) - Node: default NodeStandardFontDataFactory uses fs.readFile which can't fetch URLs — pass a minimal FetchStandardFontDataFactory - Browser: DOMStandardFontDataFactory already fetches, just pass the URL - Add https://unpkg.com to CSP connectDomains (pdf.js loads font binaries via fetch(), maps to connect-src) * pdf-server: guard against missing totalBytes in viewer Without this, an invalid totalBytes flows to PDFDataRangeTransport.length → worker ChunkedStream sized at 0 → opaque 'Bad end offset: N' error. The guard turns that into an actionable message (rebuild hint). * pdf-server: re-probe file size at load time, ignore stale totalBytes from history The display_pdf result (including totalBytes) is baked into conversation history. If the user saves the annotated PDF (grows the file) then reloads the conversation, the host replays the stale size. pdf.js initializes its ChunkedStream at that stale length, then the first live read_pdf_bytes returns the current (larger) file — every chunk fails the 'end === bytes.length' check with 'Bad end offset: N'. Fix: drop the fileSizeBytes param and always probe via a live 1-byte read_pdf_bytes call before setting up the range transport. * pdf-server: file watching, save confirmation, disk-change reload Server: - fs.watch on local files when interact is enabled; pushes file_changed via the poll_pdf_commands channel. Re-attaches on rename to survive atomic writes (vim/vscode). Debounced 150ms. Skips unchanged mtime. - save_pdf returns {filePath, mtimeMs} so the saving viewer can recognise its own write's echo. Other viewers on the same file still get notified (their content is genuinely stale). - stopFileWatch in pruneStaleQueues TTL sweep. Viewer: - In-app confirm dialog (no window.confirm — would block the iframe). - Save button: hidden until first edit, enabled while dirty, disabled (but still visible) after save, re-enabled on next edit. - savePdf() asks for confirmation, records lastSavedMtime. - loadGeneration counter invalidates stale fetchChunk results and aborts the preloader when the PDF is reloaded underneath them. - reloadPdf() clears all per-document state (byte cache, annotations, form fields, undo/redo, text caches, field maps, localStorage diff) and loads fresh. - file_changed handler: suppresses own-save echo via saveInProgress + mtime match; auto-reloads when clean; prompts Keep/Discard when dirty. * pdf-server: add file watching tests Covers: external write → file_changed enqueued via poll_pdf_commands; debounced rapid writes; stopFileWatch prevents further events; save_pdf returns mtimeMs; watcher survives atomic rename (vim/vscode pattern). * pdf-server: fix confirm-btn-primary hover, show filename only in save prompt - .confirm-btn:hover's background cascaded to primary buttons too (same specificity, primary has both classes) — turning the blue button light grey on hover. Re-assert background in primary:hover. - Save confirm: extract just the filename from pdfUrl (strip file:// prefix, take basename). * pdf-server: match confirm dialog to host's native style Use host-provided CSS variables (--color-*, --font-*, --border-radius-*, --shadow-*) from applyHostStyleVariables, with local fallbacks. - Larger border-radius (--border-radius-xl), softer shadow (--shadow-lg) - Larger bold title (--font-heading-md-size, --font-weight-bold) - Primary button uses inverse colors (dark bg + light text) like the host's downloadFile dialog, not blue - New .confirm-detail box: monospace bordered rect for filename - Button order: Cancel first, primary last (native convention) - Escape resolves to first non-primary button * pdf-server: derive dirty from diff — undoing all changes clears save button persistAnnotations() was unconditionally setDirty(true). It already computes the diff vs baseline — use isDiffEmpty(diff) to decide instead. Now undoing all the way back to the original state marks the viewer clean again (save button disables, title loses asterisk). * pdf-server: import saved form field values from PDF as baseline getFieldObjects() returns the PDF's stored form values but we were only reading field IDs/pages from it. After saving a filled form and reopening, the panel showed nothing and there was no way to see what was filled. - New pdfBaselineFormValues map, populated in buildFieldNameMap() from each field's .value (skipping empty/Off/button values). Seeds formFieldValues so the panel shows PDF-stored values on open. - computeDiff takes an optional baselineFormFields param and only includes values that differ — opening a filled PDF doesn't mark dirty, editing a field does, reverting to the PDF's value marks clean again. - importFieldValue() normalises radio-group value lookup (parent entry has value=undefined, children have the real export value), checkbox→ true, listbox array→joined string. * pdf-server: fix form Reset button; split panel into Reset vs Clear all Reset-button regression: buildFieldNameMap() now seeds formFieldValues from the PDF's stored values, but syncFormValuesToStorage() was pushing them back into annotationStorage in our normalised repr (checkbox→true, radio→export string). pdf.js's native repr may differ, and overwriting it breaks the form's Reset button. Fix: skip syncing values that match baseline — the PDF's own values are already in storage natively. Panel buttons: - Reset: revert to what's in the PDF file. Restores baseline annotations and form values, clears undo/redo. Empty diff → clean. Disabled when not dirty. - Clear all: removes EVERYTHING including PDF-native items. Non-empty diff (baseline items are 'removed') → dirty; saving writes stripped PDF. Disabled when nothing to clear. * pdf-server: fix Clear all to push defaultValue; gate save on writability Clear all regression: annotationStorage.remove(id) only drops our override — the widget reverts to the PDF's stored /V (the baseline value). To actually clear, push each field's defaultValue (/DV) via setValue instead, which is what the PDF's native Reset button does. Save button visibility: server now checks fs.access(path, W_OK) and reports via _meta.writable. Viewer gates save on that instead of just 'is this a local path'. Hides the button for read-only mounts and Claude Desktop's uploads directory. Removed dead isLocalFileUrl(). * pdf-server: fix annotationStorage keys — use widget annotation IDs Root cause: getFieldObjects() returns field-dictionary refs (the /T tree, e.g. '86R'), but annotationStorage is keyed by WIDGET annotation refs (what page.getAnnotations() returns, e.g. '9R'). These differ when a PDF's field and its widget /Kids are separate objects. fieldNameToIds was built from getFieldObjects().id, so EVERY storage write was keyed wrong and silently no-op'd: - syncFormValuesToStorage: wrote to dead keys - fill_form: setValue + querySelector([data-element-id=...]) both missed - individual field delete: remove() on wrong key - clearAllItems: setValue to wrong keys Fix: build fieldNameToIds from page.getAnnotations() which gives the correct widget IDs. Keep cachedFieldObjects only for type/value/ defaultValue metadata (matched by name, not id) and for passing to AnnotationLayer.render() where pdf.js uses it internally. Also extract clearFieldInStorage() helper — pushes defaultValue for a single field, used by both individual delete and Clear all. * pdf-server: remap fieldObjects IDs to widget IDs for pdf.js Reset pdf.js _bindResetFormAction iterates fieldObjects using each entry's .id to (a) key annotationStorage and (b) querySelector([data-element-id=...]). Both expect WIDGET annotation IDs. fieldObjects contains field-dict IDs. Works only when field and widget share a PDF object — which pdf-lib's save breaks (it splits merged objects on write). This is a latent pdf.js bug, not a regression from our changes — it was broken the moment the user first saved via save_pdf. Fix: rebuild cachedFieldObjects with widget IDs (from fieldNameToIds) before passing to AnnotationLayer.render({fieldObjects}). Skip parent entries with no concrete id (radio group /T tree root). Preserve type/defaultValue/exportValues which Reset needs. * pdf-server: fix combo reset, scope writability, drop flaky CI assert Combo reset: pdf.js's resetform handler sets all option.selected = (option.value === defaultFieldValue); when defaultFieldValue is null nothing matches. Chrome then synchronously normalises the non-multiple assignment Fixes CodeQL js/xss + js/client-side-unvalidated-url-redirection on line 1994 (renderImageAnnotation) and the canvas-paint fallback. The server resolves imageUrl to imageData before enqueueing, so def.imageUrl only survives to the client if the server-side fetch fails. safeImageSrc whitelists https/http/data/blob and returns undefined for javascript: et al. * pdf-server: fix get_pages timeout race; trim fill_form response get_pages round-trip (interact → enqueue → poll → render → submit): - GET_PAGES_TIMEOUT_MS 60s → 45s. The MCP SDK also defaults to 60s, so if the round-trip got close, the client timed out first and our error went nowhere. Server rejects first now. - waitForPageData wires extra.signal. If the client cancels interact (timeout/user abort), we clean up the pendingPageRequests entry immediately instead of leaking until our own timeout. Also simplified to a single settle callback instead of {resolve, reject, timer}. - handleGetPages .catch() → submit empty pages. Was fire-and-forget with no error path; any rejection before the inner try/catch meant no submit_page_data → server waited the full timeout. fill_form response: dropped the full field listing that was appended on every call. display_pdf already returns it; echoing it back after every successful fill is noise. Only list valid field names when the model got one wrong. * pdf-server: return URL.href from safeImageSrc so CodeQL sees sanitizer The previous attempt returned the raw input string after a scheme check, which CodeQL's taint tracker doesn't recognise as a sanitiser (it sees tainted in → tainted out). Now parse with the URL constructor and return the .href property — this is a canonical sanitiser pattern CodeQL models as a barrier for js/xss and unvalidated-url-redirection. Also folded the data: URI branch into safeImageSrc for a single call site responsible for producing the string. * feat(pdf-server): treat uploads-root dirs as read-only by default Dir roots whose basename is 'uploads' (e.g. Claude Desktop's attachment drop folder) are now treated as read-only unless --writeable-uploads-root is passed. This prevents the save button from appearing for attached PDFs that the client doesn't expect to be overwritten. Also gates the _debug diagnostic block on --debug and adds save/restore of writeFlags.allowUploadsRoot in test beforeEach/afterEach. * feat(pdf-server): add --debug flag, fix interact timeout, skip persist for read-only cmds - Wire --debug CLI flag through to createServer; _debug diagnostic block in display_pdf _meta is now only emitted when --debug is set. - Viewer: showDebugBubble renders _debug payload as a fixed overlay. - Fix interact get_pages timeout: await handleGetPages instead of fire-and-forget, so submit_page_data doesn't queue behind the next 30s long-poll on serialized host connections. - Skip persistAnnotations for read-only commands (get_pages, file_changed). * fix(pdf-server): rebase annotations baseline after save After a successful save_pdf, update pdfBaselineAnnotations and pdfBaselineFormValues to reflect what was written to disk. Without this, removing all annotations after a save produced an empty diff (compared to the stale pre-save baseline), incorrectly disabling the save button even though the file on disk still had annotations. * fix(pdf-server): sync annotation panel on canvas click, fix tooltip z-index Clicking an annotation on the canvas now re-renders the panel to expand the correct page section and scrolls the card into view. Previously only the selection class toggled without updating the accordion. Raise tooltip z-index to 100 within the annotation layer and promote the annotation layer above the form layer on note hover (:has selector) so tooltips aren't clipped by the form overlay. * debug(pdf-server): add __pdfDebug() helper + log skipped baseline annotations Adds window.__pdfDebug() that dumps annotationMap, baseline, layer children, and localStorage diff to diagnose ghost annotations (visible on canvas but not in panel, not selectable). Also logs when importPdfjsAnnotation returns null for non-widget annotations, and surfaces any thrown errors during baseline import instead of silently swallowing them. * debug(pdf-server): expose pdfDocument.annotationStorage + window.__pdf internals __pdfDebug() now also dumps PDF.js's annotationStorage contents (editor stamps live there, invisible to our tracking) and all localStorage keys matching pdf-annot pattern. After running __pdfDebug(), internals are exposed as window.__pdf.{pdfDocument, annotationMap, annotationLayerEl, formLayerEl} for interactive console poking. * fix(pdf-server): hide viewUUID when interact disabled, widen annotations panel - display_pdf result text no longer leaks viewUUID when the interact tool is not registered (model has no use for it). - Annotations panel default width: 250px -> 500px (max-width:50vw still caps on narrow viewports). * refactor(pdf-server): extract src/commands.ts, dedupe PdfCommand type PdfCommand was defined independently in server.ts and mcp-app.ts with no compiler check to keep them in sync. Extract to src/commands.ts as the single source of truth; both sides import the type. Uses the TS interfaces from pdf-annotations.ts (not Zod-inferred types) since those already describe the post-resolveImageAnnotation wire shape (imageData present, x/y/width/height non-optional). Also deletes ~150 lines of dead Zod schemas (PdfAnnotationDef and the 10 variant schemas that built it) -- they were never used as runtime validators, only for z.infer type inference. Input remains z.record(z.any()) for model-API forgiveness. * fix(pdf-server): correctness cleanup bundle - findTextRectsFromCache: return [] instead of a hardcoded placeholder rect when text-layer DOM isn't rendered. The placeholder was persisted as real coordinates; caller already guards on empty. - onteardown: bump loadGeneration to stop the preloader (reuses the reload-abort check) and clear searchDebounceTimer. - startPreloading: re-check loadGeneration inside the pause-wait loop so teardown mid-pause exits instead of spinning. - app.sendMessage calls: wrap in .catch(log.error) so host-unsupported doesn't throw an unhandled rejection. - Remove dead ternary (Highlight:Highlight), stale TODO and commented downloadBtn line. * docs(pdf-server): fix action names in example prompts, document all flags - Example prompts referenced get_pages with getText/getScreenshots params; actual model-facing actions are get_text (intervals) and get_screenshot (single page). Fixed 3 prompts. - Document --debug, --enable-interact, --writeable-uploads-root flags. - Add image annotation type to the Annotation Types table. - Note that interact is disabled in HTTP mode unless --enable-interact. - Add Deployment section (stdio vs HTTP single-instance vs stateless). * test(pdf-server): add interact tool unit tests New describe("interact tool") block with 7 tests covering: - enqueue -> poll_pdf_commands roundtrip - missing-arg error paths for navigate, fill_form, add_annotations - command queue isolation across distinct viewUUIDs - fill_form passthrough when viewFieldNames not registered - (skip) unknown-UUID poll (LONG_POLL_TIMEOUT_MS not exported, can't bypass the 30s wait without changing server.ts) Surprises found: - interact never validates viewUUID exists; enqueues to any string - batch-mode early-exits on first error, silently dropping later commands * style: auto-fix prettier formatting * refactor(pdf-server): extract annotation panel to src/annotation-panel.ts Split ~930 lines from mcp-app.ts into two new modules: - src/viewer-state.ts (50 lines): shared Maps/Sets/Arrays + types (annotationMap, formFieldValues, selectedAnnotationIds, fieldNameTo*, undoStack/redoStack, TrackedAnnotation, EditEntry). Only containers with stable bindings — both modules mutate contents, never reassign. - src/annotation-panel.ts (1084 lines): floating panel positioning, accordion rendering, annotation/form-field cards, reset/clear-all. Coupling to mcp-app flows through PanelDeps injected at init — scalars like currentPage/pdfDocument reach the panel via a state() getter so the ~100 use sites in mcp-app stay unwrapped. mcp-app.ts: 5666 → 4721 lines. panelState.open replaces annotationPanelOpen; panelState.openAccordionSection is written by selectAnnotation. syncSidebarSelection moved to the panel module. * style: auto-fix prettier formatting * test(pdf-server): document computeDiff same-id modification behavior Two new tests: - User-added annotation modification: captured in diff.added (id not in baseline, so latest content persists correctly). - Baseline annotation in-place modification: KNOWN LIMITATION. Same-id edit produces empty diff (id-set based), so the change vanishes on reload. Viewer's addAnnotation() works around via remove+add, but updateAnnotation() (interact tool's update_annotations) does not. * chore(pdf-server): revert unrelated screenshot regenerations Pre-commit hook runs build:all which regenerates all example screenshots. These 24 PNGs have no semantic change; reverting to keep the PR diff focused on pdf-server. * fix(pdf-server): gate resolveImageAnnotation on validateUrl (arbitrary file read) resolveImageAnnotation() did fs.readFile on whatever imageUrl the model sent, bypassing the allowedLocalFiles/allowedLocalDirs machinery that protects display_pdf and save_pdf. Model could request {imageUrl:"/Users/x/.ssh/id_rsa"}, server would base64 the bytes into the add_annotations command, iframe stores it, get_screenshot reads it back. Also: fetch() branch accepted plain http:// (SSRF to local network). Fix: call validateUrl(imageUrl) before touching the filesystem or network. Throws on rejection; caller converts to {isError:true} so the model sees a clear error instead of silent skip. 3 tests: reject local path outside roots, reject http://, accept path under allowed dir (with real readFile + imageData population). * fix(pdf-server): deleted-baseline zombies, clear-all form strip, height-only coord shift Three bugs from PR review, all in viewer state/coord handling: 1. Deleted baseline annotations zombied back on reload (mcp-app.ts:2512). restoreAnnotations' apply loop was add-only. loadBaselineAnnotations runs between the two restore calls and re-seeds annotationMap with every baseline id, including the ones in diff.removed. The zombie survives, and the next persistAnnotations sees it in currentIds -> computeDiff produces removed=[] -> deletion permanently lost. Fix: delete diff.removed ids after the merge loop. 2. Clear All didn't strip form values from the saved PDF (mcp-app.ts:2756). clearAllItems() empties formFieldValues, but buildAnnotatedPdfBytes gates on formFields.size > 0 and only writes entries present in the map. Empty map -> zero setText/uncheck calls -> pdf-lib keeps the original /V values. Fix: at getAnnotatedPdfBytes time, inject an explicit clearing sentinel ("" or false by baseline type) for every baseline field absent from formFieldValues. 3. update_annotations shifted rect/circle/image when patching height without y (mcp-app.ts:4161). The old code spread existing.def (internal coords, y = bottom edge) with update (model coords, y = top-left), then key-filtered back to only update keys. But internal y = pageHeight - modelY - height; patching height with top fixed requires rewriting internal y, which the key-filter discarded. Fix: convert existing to model coords, merge in model space, convert back, pass the full merged def. Also uses the target page height when update.page differs (fixes the low-severity page-move bug too). * fix(pdf-server): sweep aux maps independently of commandQueues; line annotations sort Two lower-severity findings from review: Leak (server.ts:265): pruneStaleQueues iterated commandQueues to clean up viewFieldNames/viewFieldInfo/viewFileWatches, but display_pdf populates those maps without creating a commandQueues entry (only enqueueCommand does), and dequeueCommands deletes the entry on every poll. Net: the sweep found nothing; aux maps leaked every display_pdf. viewFileWatches entries hold an fs.StatWatcher -> slow FD exhaustion on HTTP --enable-interact. Fix: new viewLastActivity heartbeat map, touched at display_pdf/enqueue/dequeue, swept on TTL. Dead second loop (entry.commands.length===0 was unreachable) removed. Line-annotation sort (annotation-panel.ts:400): getAnnotationY checked 'y' in def and 'rects' in def, but LineAnnotation has only x1/y1/x2/y2. Fell through to return 0 -> all line annotations sorted to panel bottom. Added y1 branch returning max(y1, y2). * feat(pdf-server): rewrite display_pdf prompts to steer model toward interact The model was calling display_pdf again to add annotations instead of using interact with the existing viewUUID. Root cause: the description's first two sentences invited exactly that -- 'Use this to display, annotate, edit, and fill form fields' 'when the user wants to ... annotate, edit, sign, stamp' -- then the CRITICAL warning arrived three paragraphs later, after the model had already pattern-matched 'user wants to sign' -> display_pdf. Three changes: - First sentence is now narrow: 'Open a PDF. Call this ONCE per PDF.' - Follow-up-actions-go-through-interact is sentence 2, not paragraph 3. - Result text is directive at the decision point: tells the model to call interact with the viewUUID, warns against re-calling display_pdf. * fix(pdf-server): correct the 'discards state' claim in display_pdf prompts Both viewers coexist; nothing is discarded. The actual failure mode is the model now holds a new viewUUID and addresses the wrong viewer -- interact calls land on the fresh empty one, not the one with the user's existing annotations. Rewording to say that. --------- Co-authored-by: Claude Opus 4.6 Co-authored-by: github-actions[bot] --- examples/pdf-server/README.md | 165 +- examples/pdf-server/grid-cell.png | Bin 30605 -> 25957 bytes examples/pdf-server/main.ts | 37 +- examples/pdf-server/mcp-app.html | 71 +- examples/pdf-server/package.json | 3 +- examples/pdf-server/screenshot.png | Bin 68443 -> 87852 bytes examples/pdf-server/server.test.ts | 609 +++ examples/pdf-server/server.ts | 1806 ++++++++- examples/pdf-server/src/annotation-panel.ts | 1087 ++++++ examples/pdf-server/src/commands.ts | 68 + examples/pdf-server/src/mcp-app.css | 714 +++- examples/pdf-server/src/mcp-app.ts | 3460 ++++++++++++++++- .../pdf-server/src/pdf-annotations.test.ts | 1458 +++++++ examples/pdf-server/src/pdf-annotations.ts | 1081 +++++ examples/pdf-server/src/viewer-state.ts | 50 + package-lock.json | 43 + tests/e2e/pdf-annotations-api.spec.ts | 333 ++ tests/e2e/pdf-annotations.spec.ts | 310 ++ 18 files changed, 11171 insertions(+), 124 deletions(-) create mode 100644 examples/pdf-server/src/annotation-panel.ts create mode 100644 examples/pdf-server/src/commands.ts create mode 100644 examples/pdf-server/src/pdf-annotations.test.ts create mode 100644 examples/pdf-server/src/pdf-annotations.ts create mode 100644 examples/pdf-server/src/viewer-state.ts create mode 100644 tests/e2e/pdf-annotations-api.spec.ts create mode 100644 tests/e2e/pdf-annotations.spec.ts diff --git a/examples/pdf-server/README.md b/examples/pdf-server/README.md index 5b518d5..cd265f8 100644 --- a/examples/pdf-server/README.md +++ b/examples/pdf-server/README.md @@ -149,6 +149,20 @@ bun examples/pdf-server/main.ts ./local.pdf https://arxiv.org/pdf/2401.00001.pdf bun examples/pdf-server/main.ts --stdio ./papers/ ``` +### Additional Flags + +- `--debug` — Enable verbose server-side logging. +- `--enable-interact` — Enable the `interact` tool in HTTP mode (see [Deployment](#deployment)). Not needed for stdio. +- `--writeable-uploads-root` — Allow saving annotated PDFs back to files under client roots named `uploads` (Claude Desktop mounts attachments there; writes are refused by default). + +## Deployment + +The `interact` tool relies on an in-memory command queue (server enqueues → viewer polls). This constrains how the server can be deployed: + +- **stdio** (Claude Desktop) — `interact` is always enabled. The server runs as a single long-lived process, so the in-memory queue works. +- **HTTP, single instance** — Pass `--enable-interact` to opt in. Works as long as all requests land on the same process. +- **HTTP, stateless / multi-instance** — `interact` will not work. Commands enqueued on one instance are invisible to viewers polling another. Leave the flag off; the tool will not be registered. + ## Security: Client Roots MCP clients may advertise **roots** — `file://` URIs pointing to directories on the client's file system. The server uses these to allow access to local files under those directories. @@ -174,34 +188,149 @@ When roots are ignored the server logs: ## Tools -| Tool | Visibility | Purpose | -| ---------------- | ---------- | -------------------------------------- | -| `list_pdfs` | Model | List available local files and origins | -| `display_pdf` | Model + UI | Display interactive viewer | -| `read_pdf_bytes` | App only | Stream PDF data in chunks | +| Tool | Visibility | Purpose | +| ---------------- | ---------- | ----------------------------------------------------- | +| `list_pdfs` | Model | List available local files and origins | +| `display_pdf` | Model + UI | Display interactive viewer | +| `interact`¹ | Model | Navigate, annotate, search, extract pages, fill forms | +| `read_pdf_bytes` | App only | Stream PDF data in chunks | +| `save_pdf` | App only | Save annotated PDF back to local file | + +¹ stdio only by default; in HTTP mode requires `--enable-interact` — see [Deployment](#deployment). + +## Example Prompts + +After the model calls `display_pdf`, it receives the `viewUUID` and a description of all capabilities. Here are example prompts and follow-ups that exercise annotation features: + +### Annotating + +> **User:** Show me the Attention Is All You Need paper +> +> _Model calls `display_pdf` → viewer opens_ +> +> **User:** Highlight the title and add an APPROVED stamp on the first page. +> +> _Model calls `interact` with `highlight_text` for the title and `add_annotations` with a stamp_ + +> **User:** Can you annotate this PDF? Mark important sections for me. +> +> _Model calls `interact` with `get_text` to read content first, then `add_annotations` with highlights/notes_ + +> **User:** Add a note on page 1 saying "Key contribution" at position (200, 500), and highlight the abstract. +> +> _Model calls `interact` with `add_annotations` containing a `note` and either `highlight_text` or a `highlight` annotation_ + +### Navigation & Search + +> **User:** Search for "self-attention" in the paper. +> +> _Model calls `interact` with action `search`, query `"self-attention"`_ + +> **User:** Go to page 5. +> +> _Model calls `interact` with action `navigate`, page `5`_ + +### Page Extraction + +> **User:** Give me the text of pages 1–3. +> +> _Model calls `interact` with action `get_text`, intervals `[{start:1, end:3}]`_ + +> **User:** Take a screenshot of the first page. +> +> _Model calls `interact` with action `get_screenshot`, page `1`_ + +### Stamps & Form Filling + +> **User:** Stamp this document as CONFIDENTIAL on every page. +> +> _Model calls `interact` with `add_annotations` containing `stamp` annotations on each page_ + +> **User:** Fill in the "Name" field with "Alice" and "Date" with "2026-02-26". +> +> _Model calls `interact` with action `fill_form`, fields `[{name:"Name", value:"Alice"}, {name:"Date", value:"2026-02-26"}]`_ + +## Testing + +### E2E Tests (Playwright) + +```bash +# Run annotation E2E tests (renders annotations in a real browser) +npx playwright test tests/e2e/pdf-annotations.spec.ts + +# Run all PDF server tests +npx playwright test -g "PDF Server" +``` + +### API Prompt Discovery Tests + +These tests verify that Claude can discover and use annotation capabilities by calling the Anthropic Messages API with the tool schemas. They are **disabled by default** — skipped unless `ANTHROPIC_API_KEY` is set: + +```bash +ANTHROPIC_API_KEY=sk-ant-... npx playwright test tests/e2e/pdf-annotations-api.spec.ts +``` + +The API tests simulate a conversation where `display_pdf` has already been called, then send a follow-up user message and verify the model uses annotation actions (or at least the `interact` tool). Three scenarios are tested: + +| Scenario | User prompt | Expected model behavior | +| -------------------- | ----------------------------------------------------------------- | ------------------------------------------ | +| Direct annotation | "Highlight the title and add an APPROVED stamp" | Uses `highlight_text` or `add_annotations` | +| Capability discovery | "Can you annotate this PDF?" | Uses interact or mentions annotations | +| Specific notes | "Add a note saying 'Key contribution' and highlight the abstract" | Uses `interact` tool | ## Architecture ``` -server.ts # MCP server + tools -main.ts # CLI entry point +server.ts # MCP server + tools +main.ts # CLI entry point src/ -└── mcp-app.ts # Interactive viewer UI (PDF.js) +├── mcp-app.ts # Interactive viewer UI (PDF.js) +├── pdf-annotations.ts # Annotation types, diff model, PDF import/export +└── pdf-annotations.test.ts # Unit tests for annotation module ``` ## Key Patterns Shown -| Pattern | Implementation | -| ----------------- | ------------------------------------------- | -| App-only tools | `_meta: { ui: { visibility: ["app"] } }` | -| Chunked responses | `hasMore` + `offset` pagination | -| Model context | `app.updateModelContext()` | -| Display modes | `app.requestDisplayMode()` | -| External links | `app.openLink()` | -| View persistence | `viewUUID` + localStorage | -| Theming | `applyDocumentTheme()` + CSS `light-dark()` | +| Pattern | Implementation | +| ----------------------------- | -------------------------------------------------------------- | +| App-only tools | `_meta: { ui: { visibility: ["app"] } }` | +| Chunked responses | `hasMore` + `offset` pagination | +| Model context | `app.updateModelContext()` | +| Display modes | `app.requestDisplayMode()` | +| External links | `app.openLink()` | +| View persistence | `viewUUID` + localStorage | +| Theming | `applyDocumentTheme()` + CSS `light-dark()` | +| Annotations | DOM overlays synced with proper PDF annotation dicts | +| Annotation import | Load existing PDF annotations via PDF.js `getAnnotations()` | +| Diff-based persistence | localStorage stores only additions/removals vs PDF baseline | +| Proper PDF export | pdf-lib low-level API creates real `/Type /Annot` dictionaries | +| Save to file | App-only `save_pdf` tool writes annotated bytes back to disk | +| Dirty flag | `*` prefix on title when unsaved local changes exist | +| Command queue | Server enqueues → client polls + processes | +| File download | `app.downloadFile()` for annotated PDF | +| Floating panel with anchoring | Magnetic corner-snapping panel for annotation list | +| Drag, resize, rotate | Interactive annotation handles with undo/redo | +| Keyboard shortcuts | Ctrl+Z/Y (undo/redo), Ctrl+S (save), Ctrl+F (search), ⌘Enter | + +### Annotation Types + +Supported annotation types (synced with PDF.js): + +| Type | Properties | PDF Subtype | +| --------------- | ------------------------------------------------------------------ | ------------ | +| `highlight` | `rects`, `color?`, `content?` | `/Highlight` | +| `underline` | `rects`, `color?` | `/Underline` | +| `strikethrough` | `rects`, `color?` | `/StrikeOut` | +| `note` | `x`, `y`, `content`, `color?` | `/Text` | +| `rectangle` | `x`, `y`, `width`, `height`, `color?`, etc. | `/Square` | +| `circle` | `x`, `y`, `width`, `height`, `color?`, etc. | `/Circle` | +| `line` | `x1`, `y1`, `x2`, `y2`, `color?` | `/Line` | +| `freetext` | `x`, `y`, `content`, `fontSize?`, `color?` | `/FreeText` | +| `stamp` | `x`, `y`, `label`, `color?`, `rotation?` | `/Stamp` | +| `image` | `x`, `y`, `width`, `height`, `imageData?`/`imageUrl?`, `rotation?` | `/Stamp` | ## Dependencies -- `pdfjs-dist`: PDF rendering (frontend only) +- `pdfjs-dist`: PDF rendering and annotation import (frontend only) +- `pdf-lib`: Client-side PDF modification — creates proper PDF annotation dictionaries for export - `@modelcontextprotocol/ext-apps`: MCP Apps SDK diff --git a/examples/pdf-server/grid-cell.png b/examples/pdf-server/grid-cell.png index 5acd222724ad01d430cf5eec34fc050f816e9c08..0e6e571d879e5c82dfd347bc464bb9ba20b86d01 100644 GIT binary patch literal 25957 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 NuBM?zjhbE9{{gmGUxEMt literal 30605 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 diff --git a/examples/pdf-server/main.ts b/examples/pdf-server/main.ts index 2ff4979..1ff848a 100644 --- a/examples/pdf-server/main.ts +++ b/examples/pdf-server/main.ts @@ -20,8 +20,10 @@ import { pathToFileUrl, fileUrlToPath, allowedLocalFiles, + cliLocalFiles, DEFAULT_PDF, allowedLocalDirs, + writeFlags, } from "./server.js"; /** @@ -93,17 +95,33 @@ function parseArgs(): { urls: string[]; stdio: boolean; useClientRoots: boolean; + enableInteract: boolean; + debug: boolean; } { const args = process.argv.slice(2); const urls: string[] = []; let stdio = false; let useClientRoots = false; + let enableInteract = false; + let debug = false; for (const arg of args) { if (arg === "--stdio") { stdio = true; } else if (arg === "--use-client-roots") { useClientRoots = true; + } else if (arg === "--enable-interact") { + // Force-enable interact for HTTP mode. Only use when running a + // single long-lived server process (e.g. the e2e test harness) — + // the command queue is in-memory per-process, so stateless + // multi-instance deployments will drop commands. + enableInteract = true; + } else if (arg === "--debug") { + debug = true; + } else if (arg === "--writeable-uploads-root") { + // Claude Desktop mounts attachments under a dir root named "uploads"; + // by default we refuse to write there. This flag opts back in. + writeFlags.allowUploadsRoot = true; } else if (!arg.startsWith("-")) { // Convert local paths to file:// URLs, normalize arxiv URLs let url = arg; @@ -124,11 +142,13 @@ function parseArgs(): { urls: urls.length > 0 ? urls : [DEFAULT_PDF], stdio, useClientRoots, + enableInteract, + debug, }; } async function main() { - const { urls, stdio, useClientRoots } = parseArgs(); + const { urls, stdio, useClientRoots, enableInteract, debug } = parseArgs(); // Register local files in whitelist for (const url of urls) { @@ -138,6 +158,7 @@ async function main() { const s = fs.statSync(filePath); if (s.isFile()) { allowedLocalFiles.add(filePath); + cliLocalFiles.add(filePath); console.error(`[pdf-server] Registered local file: ${filePath}`); } else if (s.isDirectory()) { allowedLocalDirs.add(filePath); @@ -153,10 +174,20 @@ async function main() { if (stdio) { // stdio → client is local (e.g. Claude Desktop), roots are safe - await startStdioServer(() => createServer({ useClientRoots: true })); + await startStdioServer(() => + createServer({ enableInteract: true, useClientRoots: true, debug }), + ); } else { // HTTP → client is remote, only honour roots with explicit opt-in - await startStreamableHTTPServer(() => createServer({ useClientRoots })); + if (!useClientRoots) { + console.error( + "[pdf-server] Client roots are ignored (default for remote transports). " + + "Pass --use-client-roots to allow the client to expose local directories.", + ); + } + await startStreamableHTTPServer(() => + createServer({ useClientRoots, enableInteract, debug }), + ); } } diff --git a/examples/pdf-server/mcp-app.html b/examples/pdf-server/mcp-app.html index c18345d..cf1545a 100644 --- a/examples/pdf-server/mcp-app.html +++ b/examples/pdf-server/mcp-app.html @@ -19,6 +19,16 @@

An error occurred

+ + + @@ -107,12 +143,31 @@ - -
-
- -
-
+ +
+ +
+
+ +
+
+
+
+
+
+ + +
diff --git a/examples/pdf-server/package.json b/examples/pdf-server/package.json index 09687ec..bbf13ad 100644 --- a/examples/pdf-server/package.json +++ b/examples/pdf-server/package.json @@ -16,7 +16,7 @@ "scripts": { "build": "tsc --noEmit && cross-env INPUT=mcp-app.html vite build && tsc -p tsconfig.server.json && bun build server.ts --outdir dist --target node --external pdfjs-dist && bun build main.ts --outfile dist/index.js --target node --external \"./server.js\" --external pdfjs-dist --banner \"#!/usr/bin/env node\"", "watch": "cross-env INPUT=mcp-app.html vite build --watch", - "serve": "bun --watch main.ts", + "serve": "bun --watch main.ts --enable-interact", "serve:stdio": "bun main.ts --stdio", "start": "cross-env NODE_ENV=development npm run build && npm run serve", "start:stdio": "cross-env NODE_ENV=development npm run build 1>&2 && npm run serve:stdio", @@ -28,6 +28,7 @@ "@modelcontextprotocol/sdk": "^1.24.0", "cors": "^2.8.5", "express": "^5.1.0", + "pdf-lib": "^1.17.1", "pdfjs-dist": "^5.0.0", "zod": "^4.1.13" }, diff --git a/examples/pdf-server/screenshot.png b/examples/pdf-server/screenshot.png index bdb8f17600c0d211fd32bb60de5aceeb8f394f95..fd87f8f50e49d4c2dfe82d04e25b8f0fc322b517 100644 GIT binary patch literal 87852 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 rjN|@5s7upyUO=88#|SuhP~OsDF`B&t5ycoK0pm zN*vQ-KQNpyMVd`U_T*)^k2Gq=)IB*cb=_;v2{qIrALhWs85ZNDSyQW~IM+semw+;n z8tBGlRP}`cn74~kY=}8iltbqnC z-L)KAfv1b?i`UPyStbFWC#+-_DS-w9vQw3CbK3(6f-BV{U2+nme_2I^=tyJ3Y?(-N z3f>fm0(F@J2^FzPYLpUgUZ67k`66+Qiu>)%uD% z(0_YU+3C=+mM_qy1TnXnEZf9dW`b zj#-Buh9E~s74E2DH#n-$c%o*eqCjL!sgwx;G*<;fa^X8ok{I^vz(e4yKLFBP`EDDUZeF#&oB08 zlS|*x2!X0Zm#&b>#pNS4-`DAGW_A$<@uJyo<84+96ojz(^t*PBH4BfU(h#T0g~#^4 zkOSfJ%GB4tr6eZl?rf^&2|6+qri{I1N1wm`s@>n@g)@)?!6)|knDjkcb8zK81cZ~} zCmbkSsWgm0DrjKv8EO1|T3Sc|5=Qt*99H+s?y8F&@0YZ7W}6fkv`a=o$?3{uCqdbo z#Xm8`{rnoKL{H};=et(1I&14R99Fshe9_LEiaD7X!I6_0uYV`}bt{b^xXX`~OS{Bx zGqTv?U1eNP6=xdSW&oA2Mt7r~YZ~E88iiyUn^k^oFo-%yZA;8t!#m`lkvs@vGXwZD zx>oMBq1HUXg66))2Qn3`^f#0ox@g?<9CuUeoTN3vi%TwQGr{IfQVYlyfm@Ow_Xag2 zybZRsfB^#r@wTuX)!#%?3@HwKA~_2Q&OHjDiai7lg~3DL{unA7Pj?fy$2RLjRWz0Oe>!TX9QV27e$nYn zZV!8d-rv8FavSTsEv1o_#x9J4OJ&RH>2-fp#6->Q#TlgI%QQO*d@J{ zrBM~Z_E?V z=XpxI=VTNMQRtl;^QQmJ`@^_jDh@F+l2*vuWb&jo(v{V{-0wgJ2H~c3T{fd$GnWnm zq*P;7q8Xx%VOFd0wG_uTql+%R+y)d_jhrW8F934WW<;ev8<&VBI56fEXS|0BqN%&i zU#1vIBRckXwTH0Zo#rIs-NNs(sxkr~VyV1sd)o5@Ub4uNzIvNMZhIsFCEc@~Fq2)a zV>d%8inGDdJr~@Q;e2tT2v_{Il40`=$tKxLhH8*!XB zBi*tlq#6S6I_C>Qczx!a=f|4Gf$&{VQyxyt2lrA7m&@y9{;uEUj=~YhG$qjD3I9pZ zXOY(vVpX;msELL(*cDwF(x-W{5EWRXmh@X#N&8YOtuSNFs-#w$8Hm*Vj&{z3vSLBQH4KSn|w#vGQXplmJ#$H#_yGY8D{| zcQc%<1(M14KD*`mkK$BxJ|v?43)JR31@P8Z){%WDKnMD zsPD&GUo`nibcIgyAKnZA)3Z99Ronh zx2GZAla?)j^pr-?pW*xL-T+W~n!g?VQH>r=X6x_2kmp>PnQ_YSxwr6r0vHF!Tdx6% z(<@GoOY;WDzeC#`FxxfGHLn`pog|}WnD^228_%ybrcnp@S5w{q-RXErmib!*A+t+> zLYY^_CV)U)LJZN5-~}B4-pc*MTi0cWV}McMh)1j7j6&x8qZy!N#m?yq&ffrN%JK}` zAUY(&v%DGl{J?7&@f3UQ2qHoL#D?@H8hNgn5dC7U@P0gBML89bQk5`Z>hnK3UK$iKGxc&qmO^EPtW z4Ci_POrgB_a1#NnNm&&HyvfWLs}2qE2B3q{MM7{k6P+5zXNpx?Uz|4#6g#}-@WYuJ zB6UjpqsV_1*DiR|6QknP1_Z|n%&*6EEN!pC9Y9D|U?8P9u4k7m4d6Gh7HwrwSCn`> zA4-%m9?f??U}=LsNhwg}2jt!7`WdbX&~|JZR(67-Qg}v}U{s`rd;rMmS_^2e6(aS0 zJX=+lO9FKkk_0hM@v5Rin8(r3ztC%?^Ly3{M!z`+Saj>&7zW;tXZ@` z$pFCEd2axG45FU?3`+d?b+diz5@%B>SHhiQd;Y6g`rp*gw_u{!vw7g3m_eo^A<7pZaBl7N2np>2&o zjJ4tpVV8@Mu_C4Jw=ae98KDBM$J!^mm26$Z&B~%3dz9aZ_67H=?wqO1LsOoy(((ZNV2<5ft7y1QsY#a(Mig_FQ(W2L>9I&9X z)NKd2Y_a|pxqBa<|e_A#p7GcDI*wu{yNMkQK;_9wLfef*Y`eK31P-kba^4bkZIW=B$dM|0jeM$;E5MZDXFl-yI+*+b(Em_THgK- zMkL;@t2x*MfDpZFUY#hm;E?NE2w}!vcHZGC(j;B;*72pumg@%xMBtcNrR1ANB(c7r z?@95quth=>e~doOpL*k2M4e=6rY72{H2vNz2p&y-^x6vZgZN!qIRWx!9wOlHM+7fD z8rKpUm3*qyoI8leOSK{;t0{ULrKztGfY=N!_;Uj|A$<6r=Q;%ZN)Nb__nfbcil+3I z{16kiE9 z;ahGl_oknquS3+D3y@9E0*hWLMhb1u<4TflJS3K0MrXYR$PsOovEh))Pa+-;8Nw7O zoq6LCX6xpn_631Knlwm^q=XxN*#%Q?B!`@;IPVMY6iN{0F4CVB@0l16VVGY#Ej0F+ z>x&f)e%W6qS@aaXyNJr4kUIrE%FQ0v^EZs7%Vq%eZI(v$Fx*Re6zrcmD?_i5jDt|8 zRFb?YNcZ^FV>&(HsjvQiY3;dwU$IfJPTJZ6uy$+13HokSGXHwKkIC(m;YUs2&LCl* z=HMh76?)UBxDz3%S%8c}z(0=s<22or9JwnrdqPn9H)x&$U&r!}J*@9ZJxbp~yj>NS zFEz!`Qq0g+GX#_rR{J`=caxZ;7%7NclkR(at*O3Mo((VZ>`b-l1)Kp9cOh}}tE>Ml z$jVtJ_)U~=L**iF2JkbCn^+}s z7e3HMQX0)hsu{R7l-;YKOUyVh1;C-A5Z7pdsz1?2ngk9$ZlKZkkW=YJ=!3*sJKr<~ z-sDuy9y%IEem6FzLg2FgfkXAdVStM_)wByAUhA${)xJlrh|oR2ib!WDF5f<$tbn)< zjY>V@59udsnV0kUIoee_UX$(sjPBq;WWc94wo}fsh=I~KVHcc6NY?$5#UicAu5_m} z&sipbMuJPiGP<iV7bS!MmC$)k@T#KG{t^s0^f{ zG-~cNE#d$X3{K%$fB8n2w9~S6Q2f`>u7#Eo?ERy@6b-Qj&q0{Me-!(#wk4;Wmh?jP zJf_3ziiE&2&QPemOYW02h4|HwniPCT>YlhSSam5DW$u|a~y zXqGS|fU4jwI&3B|26Dj^$fzx!r;dcDK^xoHphN0rhKAOI9Rv^fout`+>`@_|V~=pc z3c^EEVUKWNIvcxkVP5A$Bj*dav*}^Wv}e?kTEL`K{lWl7Vr$C)z|}ynN>x%StKe4x zDfaFH!@CC2^PGE;QI%N@LHqLuN@%(h%GRmW}crlV* z+ZFTD)Y{V^o1n8cA6J@u$H!5yhpiSiJni%RF3JBjIyU@D36*RhI)>S^IW-euG5X0u z@FaH7h3S)o(|4LAF1ElQ`DeHG3aAp1HB@XH9T?AMjx9Qp(s7Z(64^a6Dy-Bp59t`f zjYWe$C+}qYs(agTN9Vai>hx1M2en(_sa<*i4fJ$@d`Wpu&x6VUY7jgNMY#j0N9jX( z@_R5Id^z=s&0f=~E=`g>K&x`&t^DaDHDn8Le`l_^l+p2mC{pJA;Bh}m!hyHyUw9_;Lo$zqaANyM>Hb?(F%bSp+)=(|QmMYUhBfc+ z34tvy@pw|Az%AM3DC1=e! z!)Lx)v$H{D{k?MfMhuR&E#tEP?TAZJ*egOV(|Z$ci5iZR-Y0h~`7kbnlpDIFeCw|m zK_+LRRGRF&=p#0)M(C=vXzA2oe^n3g07utW$(&_qLrh zvixvYyI(rV3`T6{Yr;rtvq5l+;<+~;tA|bZ0(I(N^&5UioYtSRvvxaUN#HcXN-e9$ zd)v=l<&T^@NmMQ$6~;W5nK?mI9hto+$Q;2G$ZMk@*xCtHW?HVDS0V& z?6LU%aI$%(88y^abhEC4w+fCzigh;}=?6TXG;xhRj>kQUT2PW_Y4*2JQ8^7Ltbt5? z4Z0MkZ1!P}2=aTcdPg*aZ6a#BfQ|bRVWTjR*5;4F^+>60vQQ^9LE|q|5mP*}=?-LA zfv@3$@9@UCh*-aU@UhSN7~QXzAi%K59k|C>iY`a=vV`NVa4KOfR6SvOi>m|y?ku{d zQy_^g#A!owDg?xuSOE-uXPUuOlG(fn`Us~3WYdk@f`9|Q{eN=-Ok!Gl z9KbfLiLaK#Ly1ik(UpgoULy3Lk&Wz$-Ts@24nC8>s8jo8&B9Htg644N9rwc&6{{Ie zf?(jI`tBw-=R0$h&5y@W9b6Ypza(|Jj3Yv1O%NP}1dXQ8D4#ttN|~ZBTptcuR66eE zma%@S6u2se!htVNq3O@PxbjU8+wLc+s8-7Q;y9G^#h~G~mRrN7PTr%L#lD z6w@IQ-U#EYlEP3rgX{ufoA{TPaqKMTwzEw3?16BFc+B#zKM|a#61+=V6m8jhkyI*A zL#qN#h>n zsxPC?NRm?*d|>0=e9Ao!e{H+H%4U*C?o z4Sf~x{$k=$SbkdVuEWi81+P2rOFst@S#qqLkTg*@X6lNvzjWXF8^8h2P9a@RbaWw0 z%~~r|DK*DMgze?15b(8X!peFh45aRD(P%^@A1Bht<`P8vd+hL!>3+;t`{t2To3qmR z%7c!05T{?y^i_T46>_87o&Tfm@Hnw7&If9LT^L^UhW#N}1zAc~>n*0FFqg80ReMNt zpgs9i412D9kSJ?sEzQ|ykW(hYyv+Qg0x2Lcq1cQRN#-YMt`Xo%0Tl;1C|WykA>nzx zV}5}ojVFhQLqgqVU8y`2j6=BTXKG`~hl+a_Xr_PAl6&+R>p32$Q*cO401*-pB^6b6 z34^W^hei>!sNB^L1miHY#nN^K5o~hNw9Zcuf%10jZ{CuIf@a{US zGUc-jNEYMhIWEni=&|=yx&Nad%O|ms$RxR-i*=&l?@IcOX_C`#Zz}UI%~`t!=)XED zveLB2-hr%_7HQjPe}pwA7=5e=cG}`Ar$v|)>xQQFKj9k6G}Y6-r&h$sjFfYVnN4Hy zAWgS95T)7ScSjMptgvUgp^#fnl@oRw6lCwh)5D zTyup)T4J!c-ftqI_+_0c%t$nXcO=UHX7mtJ`iWKp4RVp|#U6`zz~k(xiqC@UC&6wL zw&xyC;Zd=W^^35_>8k_<$uHF4G9hL(LKb=u0P&RCvC|8dzh5^76p^oS6w~Yu2y4Ei zGM){vxih1^4-E3B=|10rLrT~T@QQ#4kXXc-I0)wblu@E9?i23-7zWe zFK?m^!a66IyAUL|Iv!~?8)Aw$qy{^oIrT7pA}u#dua?aaUpy7u5NT9_?bUz8#WZ#k zvhET^Oh16D2oBK%yPAW8j^_VZ*phKO8rK~Jw@uF@yJKz899NN_zjLrUSik1+*6Oy7 zUyiXPD&$CCtk?Ta)kjxcH}l)9Q3l6bduN+&b|-Rq7}IROMIoxsDtLMEqXQYU+5Etj zI3(CXIOW{pz0ZEWP3vjiYVpc=mDy}FxdHvOZgJBdPRPP$EdlR%Scu2zB>P!{pXnLnR^Q#G^E%c3k%|$}*=l4luFSf+^oUAabs;0d( zta@^Ba-iAm@fI9WW1Lv2pBL(kaR~YL@c&=e`-q8p0Yqxsu{7>*4iS$QhYF_k-!~JIS!(5>Aq&4uM*L2!VGuD`0td zGIs?K6C6eB`P}`r9Zli*r)>emwvMA*qEc9bkM_PRw`W@`fD`#LkS|&R3Tj+)-PAAH zUO@PP{5<3AElernIw?+w$?XGR61Scenst@~XQJ5rGwq7Ffa<2I84wA0B>~l3M)`f9 zK+9HO1tgr^f_7B_GUp@ZD=LXddzi2!IvP+^4@O`f0tF7*B!bq{J&&7?BbeKYNX%ks z6|ZkZ`Tj@Lv9#3!G;s=gJ#Q3U7l#E{bBFNV@8&+QGN_djIX(i($ZtSq-*BT<0Q%_U zTVWK<{|A;i9&Gdg22TsE0;e?;@Ql#2v14% zK;l}_n{R0aC?|YWLB-2`-MT?HQ70!_-KZyLo!QfzOtADGd_SnQqgull*#6_Bj*ZK zzj>h1vNR$UEdovo`G4w%xg|E7C79GU>J5iwsJ;N8@Bz$$fqFd`iDvI?Q7Jf-QiNfZ zEPS7VaqGz$`%1Q_^12z{|ESY<=yh#)NSN@Cio%n{IWAwxQLf(+W`|H1xi~K3>d4=OJVVQ?l1y#_n~jWipXSkn}2Dhm2X3N>y}l~ zbj}OU@3<}HI;*OFcd!GfoF15pr77!C$u~Ui_X;WZwo*=C@V!FlqwC-BGciPLbnw-=6)`_?~ z>H+}FB#n6Cx^MgRR z1R+(W+_!8svNpUuvH7`jor6R;W83|qc!nphDYq~IieSKGpAIt=bu6_hsh!lk_<=g1WMAa86qKN-*zQCjQ)RG+xL`!QqN1m60n)`3M+eS!))&3F;7lG4 z>(D4m0r;(@x9w6G>!Fq7e{Tp$q|qEHD0Be z78DP~ReUX1xrpy?A^TTp8r^EFl-|nU;^w_TmnY@-nPnV9%jl2ag>2$g!;|_4-Dhr# zgq62oz7O8=*Rb?=1mmefC@19XEph~H4{t7@G(ti}W4n|MIb97zF!$H3HV%tsTW98g zH16qyZUAQe_nIKw*Ots&#?Qfk*vN*<4QVoa4U_Uu(t-O-`~3w0=cOXH6D01(#=*W>?O)buB@Hm8grf< zW)aNCc>VBdKxv=vx1(Z-KT~br2Bdiz`t56H>Tw9xndN_Q`KDm(0frN|3My2-4u_$y z=Ay`W|71ox)jvz8`F!Mo$rf<<*6-MHw+6m`CW9!-<8@X+CgwuuUeO#Yy5SnWrl<8{ zpFGdL!^08C2nanZNB!8Y@{n_vU@DcO_;nGyW)o|%8XzEm_`~TXo`^)*k43iebQYsv z?8KLXNSMb_r<9R1S$FC1a7&SAf+9dp?V*|=i7{0YGyZ0)(Z+EU{=5eTGI2TVS-6RS zBR+-M$wpU+Bk4sngBa)sbtgxo#sA`Fw;I&WK6u{jB8l4#7?NNh8ZZ{3mgIlE(3j#v zEe@S8c48KAU^C`S_q{#7R7&}-G*J1*cC0QPEtWzU-$c@%zK1#BYta?UE)8|k6TEy| zC`}z_!5S!C95p5cc8tGfhx%S0AI;S>GN5xoUsUj&^&kKWH+>O95h>J{KrJ}Y4>*SJ zeu%yk`SCq8E?xvt_H$)p1X@nfcl^(2{#hY8LX+?^*@#FVnN;7o;^N>4+fG03oGlfm zyWA5wjWqpfOKV+9EG@0uA(feK0>F5j>|7JpZ}XT}a?EJSFn#jF$)lY(ToB z4q-(HB%Zis^5W4EB!eK+ukxzRsG>jnC|{`O3m z{8G4(`JtNGbI`2)oT1&(WBkTze7d=1xH-+|XwK*8Gq>O=f}p)i^-YlA^Om51cdxov zZ)-d!5nlvsc$e{f?t!XZhxlt-{Ht4sSsw&0MFlS_yB~w}ZiA+qTbG*C+x}{`{ax+b zsS$jrQ9QZQJ^5z$7ZZ7$5;hk%f#Z)O<9w|T&Fv2hEItrdAIOw}&t0PL-Cls;ZGfU4 z^h(e7ISt{dbo{<_n%1j}HcenZS785g%(d;}&|c@k=j6tx@Z`SygvYzj%&Tv&36jC< zJ#|1e2lTU5Y!57Z88>}7H0eKDlH zeS@TJ<8pDX?fMdq{1gsCwnytdMVsz(4DmU>%-6fmhn%e4_HkwawUC~-FGtrNN3mVX zhc@EcudUjzACn=uX}Rr3a{V&9h|3wMzl(+y;D)5OK+7I`0IOa)VlW2I<5HF zqnI|W?U?rfc5T_ZENQB zJ*}B`MtoR3d0K_E``)fo)_;RYF?*6>-U~*!3}lZrzSrYS?GI+q!_0I6*vqnKpMc>zD2%=@istcNYVcla zjlTo7e5yjAeBF)U6Hut~d=JRBKTTk#3#=mutY5S*;yp+y#z7To>ic;?HmEXeF({%eCCv@jhrkfKe z?wINGSKa6D>Ts)z+^@&y8|d>|;o8&68b3eQ<0cUEd;Dt`{E2J-*<)8$k5=AVK4sp9 zWxCxL*xeU+GOGAq9!U3P-mCcTmm*Xc^OcJOTup~0OepM^P<;Chx`60ANq0@J@IJCq z%shRWX}{{wC*+U=R3j@0(#Z% zb6?_nRUu$rk>0!Z;OTp!9h_bic7_ez5agS?Q+ys2$do~i-F?xGRf7*KO1?;jX zcTiv)p-1k1rXP%hZ;k7z z+4tsTjP>Ec7kZMpbm+U4r86}DQ~pGcJoZ1k{TRe+tSQs?!0xH+;u!aN%l9!F0$nK? zk6H750=jr;9glvWMYed-T;_vPPOE2fn{jb>50pK0@`P<{j>S}`z;-kZd1!-eEq>k3 zPlUc_gqea{9ec8*JHB_!(7($}H_pxrlO#N%kmqUNdqrl3hE3+jpmzJWPBu^!=sJ0t zpwpDI-D$@aX`K*kuVDHt-6)h2-o~{AkhdYr*G!DA({_nVt8+p5S8$)cziJ zdQ3y_^`Hlrs(M$dX71B?)ukraXO0!u-mqWzs@8sr-fo|e-?UxB&n-F^(uqzK(iE@{ z@`G1y0}h=vK8B1z>125>yqPLxB$OKp@^gy9f5$mPrsq+d7c%rR^LhH>Y=Qi-lRWJ} z8E|8QKp!vPo}9gfNLv~vCAB{-wR?NOw#kca!)0Pw6W)Tqh+fBwz|Jbjtyd@zJ7~Brp>Ftz zrgn?xi6Rqrbnyc&8PKP8!C^^a@@oTfm-~NbaD&%yLmI7J`#55`Tg8n>#YG?_&AXx$ zR-07NdjiFKqNzpj2J*bTKv!lw{m}3Rui4cRp)YmAo=>VkC}BV1apukydc5X+`UG^+ z_uhIWia2>Pdi4bD#tLDpPkJ}D-m&u1BA@CMc9}3+0NvgfW0RlZk~`c_l0QveT)jq{ zHSoym@MFl$9UkKtGBzK~OZlB%{abxAV}s8TT+Q!Bk^r*uoJLBiJY;V;rFUb zYSmPo;$55~H?Q7=;+CZu6xIevQ&B7ZG||o36wR8}fF_0pj$_aLV%1NlSrl}C*j&5k zcaOxBt^}XZ#X~ZDs&g<)%P%5F#MqPDfIHoJr^0lex+F&MTBHHS`vA*+MEvC3oO$1! z@yFx~GaB8D;(r$}_aI`bbJ#gt$b6r}>@nytH)QZTf#TXLSc$FaF;DT>=sW*K$=EO& zdu-aI347fGZ`&5{+vVXfdu;erlW*@!j$o&*^Ke1pHV<Rjp*vVN{H_pLTTzb+r25cI zg1iem_4IZ?RH>`&vq@aGQL%SZ%uiDnA2QPpyCTC*%4$mp1k zY_D)gVj$Z%)G2I_)anyna6vwX^ptcvkC-hFgehUFRU5sld#U!hFsAiwvUW`1IGOyufk_wt(xF1hFrn;@s3j?(`#l6)jt_V}UI ztgJ2{)O2WwP4Xwy{Ng6|Ss_rrTyDG>-HHI4SC)kOmQby)?$mxw8N&GmTN)P^I> z%l4Jl(}x@2+-mne=IlR`Y$wJxab#T_X|iD3GNNqm^Bx)puZ(rC84u21KJf6FQR?;Q zA5Z%n0V~ad+31klDsl9eueTi0t2ry|WG5GlDjoW!og~I{BkdVkiSk^AW1|tGcHoRL zE^NmrJ-gvwIpb6G7QA2+ykI4R>vui|@{N$OxykNG?k$Og;%J4tNT2<79~6cK`Xw`# z?bc@*(eE2fo2G!X;#OPPr{(Z?FsQt>-MiFMaIopEk}g$qnd9^tQ$%^d5Dlc2 z^-Af<+Xr#cM=aAL**);HVDpa8m{MxJvD26F=*7tRa&a|P+M7yFT|a>`>sdxepVz<* z&z=aJPV|%19TQoR>ag*A*$q?#T=}^$cxA`!tAP)h3{$|k=Rbe^?+kz!Mq_Z>p#a_d zTaL0s$om{+aRNbwd1};GP1I*Rdk7qETW_>^Z6*7qzW)@8d&n#BOlri|9H43}(Z1eA zCYSu`Uy11YGW1mx6OmLh{Mf6yhsGj|Oq0lN;CIFJXx_cU_;4fMd0k}D$`zTHu3fG6 zJo(>TfQUtCvq+DX*&?@0x1=e*$fdcK9dSdhQIFedm&IeFy}IT=ZezrMy(T76%D7nY z-7ig#*}9pK24!NbsMTSh$9@E@e{k>FvX@`&1f?(0OVxc&n6Q&xntCHvG^^c2(3>_$ zIYQzom9Nh$Lr`FA6aSfMrgi6ss18S%z6Fg0qWE8Yer-81Aer6S?B0V>O_6< z1$Bo&+s|Z+-x(!SMuy&6$In`v{`Rq@aH`^w%QUGX6A9)sTbT|Zh~Eg$s8E)&o!sR= z0B$fsg>yVIzJ1?ioAvRJl((&=DHE(mlT{$++QQxrA;>N zxJL-$m&3abU&$w`+7<3-am%f_CYSB5OhJh-B*O5NKT(mRH2$!SMyuAC_K z&DIiQO}Fl&d&(EamDrR$jWm|sx8xfU=f*4SRy^lFX|V?r=wPckTM(3-tKEMK^syBe zZhUjVh*qEL9L>=5#d)X=OywM~zfPJzY_B`T_nTiT!-Wx@2UB-$T($@cZ)VGV#>WC9ph>PLc9GHR$x^7>fHE2O(J_35hO zP)q+C>Y>JC5V06C4+ed@vh82cL*tb|g>xx*Qik@U!r?qqlxnXGHjj>G@2{3}J&b4E zd+z2o1z5L$Nu&DLtx~!N_$%^k5_TWb-3T5bHon02(c|0IPPBf?RqctbVDV>EJW)q} z(P7XaSf*TMi`%kAY`QLIr+FJh^`E|&V;l8+CQh9|DmQL+OmZPQ?#`-_Bv!Y$Rl{-; zr=MGTGvlDOCp}li1B74Y76!U<#%x*NFT;G4bfz*x)m52x@Wgl-9jdxft9YkN+_3|7 zVz>ejdvUfCw>!5PP7cOPM{p~LCS~TQq*v-sEn=^;?7j(CIVL4u>WiDqFPR8`rhngH zewp#@Ki%mBW=HK}W1x01_q$p@xI?Z$Mz206NkxHF^xs13oBuT}re0v?mwok1WAdyi{*WB1nA5R*NYDl+I0f3;iw8ASqm)!%7qQu;Gv5fCXe`y` z{8-MJ^h^MDyZ>|kc9jaz8g-@!?p?!X9q`@E&3WV?1oHomsgzFUAC1Vd+*Ra=Nxja1 zM9GOKb;fm8M0de7>$LX8%{4!{nW1-s8r9=>@ULU(??Sm+nazU0CgZNy@r!bEr27Jt zzB~)!S14UIB_Du`H+5W#`>y!rn(khN#Dx&8J z;Do<)g_Naq;Q~TT?v!fWFe*r`bxmI~-ban646HzzKHbY6c$0h1VuJcH`k__Trdx z2Zht=L#J)@yY)q<|nL@6^^Q;J+at4pC-7Ng<5oz=#0@W2A zdbArlqJuR_=i>d6pum-Om(oj%2qvdf_&$SApDFJ`(-H@1Dr6|R^VvE{#RmgemAv|! zhN8t(%tBr={Hjz4Gnrzk#m~siuPuKm8cHgN=NO?WFF^T+IQ)3=?bP^Z8eA=(`4Zi$ zUl;F{+OEsYujSak*-Ow6iT-&wy5|~ED4dNvAHWJs5%xduvKx@Y^VH{a+y7W zb-B(`G(V;Ui!E$#J8y*GNDs-#cvjCL?t{HJ-26i?2;@&7NoEQ*uA@NDW2(^?PgLvY zXLnp&UaHA~*H-E-+dugdd?PO`NzOyC8eV;*meOQparL|V5I;oqEkjfJ?n`c0R^^0P zG8;{n6K9}vZeji`zT~s{3QlIg)?I$z`k$U%_;=Uxu(Om(k>&eu$;bBP70j;yr&JdZ zIE+{|$|cz}Mp^QQvsHuCAx$|8Msi)B@kN{VT}ca6t@EdW{c=Dx!~(@y-PBQYp?p!r zAjD+W#;ohbf-331xV`pin!BAZ)^OncwV2adQft5v()9DIcpD6a{bN84%!0l|9s z8(URqLU#)@+HZpY>5KVQ4z~MrAMnQB0(@tqOCHDd!L|Ej-$QiS+pe>8rS5y+rg)Df|pnCCh#F0v#1L#eXi*R#}JZ~|XV z_GMh+^tY(6F?)^KEkPYXDJ4Z(@3K==+STKdc}~{v_$eFLbJR-rf;ENTdpqlDa6i7P zKH%tSr*@?uXEFH;PZ=7xYK&Jne>({YFD<$ns|qcq~f!BaZMx?A(X7bSb0bwbd^Jck1q!t!~Iyw-i+80-nqB>9j}F zWjZyk&O@0j6fbABFIpv~OMEJJhStR+yO$RXt|9&m9;N)t{Sle!pe7>habm77lGP0@ zq#oimg`@XhUCXqdbSEuza$?ZA#Mb6Km?od^+UC9mey~R`@o`W1T1DXF8}{k&XZhh| z{!tyuZw$2=`?=kHZ>0&c{H|v7(Pbq~{>D$=a)#@s@f;}?tUkWsF3XMSX!wk;o1=f| zt2dR;@9nMOvTp(4AIL*ySLUqRY~1A3Vv3sCR#aw9HN8*>HPr<_v(-*H^w8a{ElYD85eEd#QY5nqVJ(be^C`;=iJC~ z;6C0CP~{qIy4M2X8mh3ATNa=oS(jtuRFR%jc{nlfm3Sx`Z=YGvR@_tF;*94?o5&%r z2$k5i^-%_I@z?b(8E>b`gdR`S+(7L71BlhrWbZ)A)L=G)0$K&GhdQpja5KHMd;&FR+H$t z0jsFhy2ih*P#LGD|GE-cvHaoAeBTrmEV8sc%@P`kSy-G-0}b~tt!Vk%@9=tXuR66! zjHAyWCO^>YX$z!=@83Gk;87P&P^Z-!{=r(6hN_1GMA`S%Jxyg?>r2}++s8%i;y$LR zaT(-U1Kpe%UXe4xl#Y)W*Y~sZdvRL*F)B*f2)_w%7cJI4AiY12R5)qKc~#1~oa?=m zBRL`h*p{-rc&d^resWmJ@M5s!RdZ@;utA?SaFJ=_Y}vphJc4txHWU_J>oBBi>SXX} zmLcA)4Nv1XL4W;Jzmg zAOeCgT0pvcG)N0bY#^PJQ0Z1uK;W6b`}N$f`ybe@bFOop^NsiCbHoz|Eg(tJPD=k4 zg$Tko!H&wE-E+W1*Gwtq#!V@d=0gG11+dI9;?QvbZYRu!_ZL@_I1Dnb8BVM(OB+Fj zZ5rDql3M5ioM5j8;m|D0zbgxCD<(bfx(rsThsL4mO7x@akaJpCB;g`!ghtNe5~TRv zF+OV$tqxHcURs0L4wb4W=w;AUh_0>eFUF_BlURG$x_;Her_duWnU7!d8cHy5_@r{% z_R(n`qCQR{Y2;sYxs&?p3h0QlHV$+hhW-K`SM#{1St5VY8F?8VDBT>als*>{hA=CQmL|B?_IeK4AzW(05i zGz3xp-xs>WaMbwzWvKBT5~ECS##AaGR!w$ZiPLzu#cLh{-@Sv0kMpD2=cQ^WgZw9^ z%PgnSshT~N^vQoKnu>iDf4S&MtF+2dq@D8(1ejRqY+;$b1duH}&+;0XQ zCN%#b_sCOQ->a1H$eAy)Of_T}bUFPv%0WNKWH#YMXj0MRXF+b(jpiHg+2{OVqZWg| z%sgr)$;vl?!={peFRbJA9Ip8(LXX7W)axe)c&9>5^ACbJ7ONJG(#^qIEr7;@(V9Vt z=t4a6+e1L@Y|W8w7k8hn64h{WJ<>myYNP$4*ll=lNmvW0289?sWDbw$+GNVX2D+g~ z{v?<^dGV-g_ z!|7C}hdvDJW~0XTTyuOX{US@?9xas!(4X(3#AinS64g{5=%92IrZZXR?H`NywU`m$ zHMw?1PduyjOONh_Manmo_ez>QW!uxmytL!9`M9j*-D0|H$X0;;+RNO5FG?`-1en zUQ!A7bI`@#y@uQM{wu-7P0RR?6VrqxcQbF}<4+i>Aii^{;K0O<5ol#EU z?O1kTsOvlU`!6!Hi12Zg0$^S1rpNmZM}BDQqk? zQ7JaxHGOOPHxb!b^N`MUw&cJOuK5!Hd{ZqOOYGdD_?dzeOSTlW{IojVxa$7RnhFK~ zb@u*;S}$SH8q$HSHO$ZvPBU=w$3&L4i_IWs>GWofHRJ=|iuw9)7ehX;@#E-jgz`GA z{bFDTlc^2h70n0gMdjhmO@MAsLdxYq(mEkQNy^{emX0K;E!^M-FktLN**V^kr;e51|a7-|1USL}LhVpLWQD zqE}hFaQY4un|#a0Q=_C0KtF8VYxgyq#Fez7-}+SfL*bRrmJlrmV%sGtu7jtUZtCzAAHE(#R29jOW^BaLvJy6T(hvNSxC707 z0UAE;gqPSGd8HQ(n?k~ynx5aYb5>jF74wNIzJ}Gd7bPuF+O*8h4X^<{mp zUP&EDlI>=^J8=$rk6U0qx=dTXJ{-vYum(GKV)yD|V#DySIxC)Gorrzak|GDKmfvyf z>KZ&0Cb5`Ysy{~w)XBQ(KaZ_C^6BNq{KYtexBxr%Cxa${hXJ+cVDCO`Zk0di3*Y$1 zzUA!n2oMXN;y)#O@@b}z&wDh)O+e*gl!Z9Wu9leM@5x!oMPMFd_dA~~8X(8k7a?+q zPrxUpv?BO2PMezBnihyD4!u7>`n^p68Q_V7gtDzO@Z|00O6dl$THjt&J|Kp_Jp2h^ zxnbbzvNX4WK%}=R(Fu5bZRC)lAAj-qi|aF(g}fBF4mo}?Z{ik8*o1HySl<@{zY(D6 zBC6Q~nhWo*2HjdTyuD=f$qK8z1ad?nxj;I@b{VAb#3K5Q?-wN!3?WK5NW1f&LKj1S z>}ehi58PSa*FX=!n#20pC@K{L2${q9g=H`VQFVldgTFxF=P3AeV|lOHpFci{(Ydpj zXTFn=OYrDY;FHCJhN$BkU=W{OI}$H#842O>a?8K!OsJ!;PQ!Fig7V%q*RUT*nV}=! z-GV*@P&`m_V_$JY2(h7hXSws_U+WPg0gm@GLn;665o^xk{-2|jb>6btPttC``QFb6 z%X8pw*?$KZ*92beT)%T7PM?13M=9Sit-E~ToeP_il7##{1lH-jWI)#D-_U0XtqRGl z1$`z(t#W6kIJUf0OshD48^ZXK2}i>Kj{PWJsK(plsw1PL)7W7+J>#sk! zW&y(IE+Uv_BS^nysZawF)|V4SQO#pNRuoo_Q8(oz%KDO{{a!c=Nl;+}Sgl`rc8Ot( zxq13QmL~mvo4Ivj6{z~?`_c@fLqPDs`@TJRUb>}9G-yIsV&vmh#RAl+`zWDnygAt~ z@1&`6Z-eG%Si!Q|H&d{O51Z!m3)6MIn1j9clf(EM;O6dV)Ogr%qt9j!ta=jK92u-^ zl$(5_U~D|LG2Z@f6F7{!{aa2$Ep7QQ(Bo#2cCfP3q(m9(Bqc7pp;2LB2Y;)O1#?b= zHmIrWUzwEb|F;FNL{K>;^3|l985L75KZvP*Ue8G7O*hKxUfO{l&6$Uu8||ZthkZ*w zY%~ye#g>ry_9XFsY-07Ww0vD4Y8C1WmZuIQ%2-=4@rdl^rOMrS74xdhyauZ5gn{!- ztJylVO1g(W^gCdebOXUWZ>g7jbLD&sLppo?J?}e+eMszQ5L;OQT0m-GU3!ZiiB5v% z1xd-_=jctXDZH!qaEbsLPbUsQ&Tr-YEPna*Y$==icd18G3^~G@3?OV%= z)r55@L)bq?)(TC(8jAzhfu_MER?DJqNuF9A`4>n&^nd@CdjBsME8U;6kRtNBpVa)s zObUbKCpG}rjLd*p{EJBC$aH4^7&DjZrem~Ia_<1a&WK50e!zWE#h}9ED^Rr8&V-l^e)%Ex z??vMARb)w6hmsZvCP~*{H>Oq=m#1RyehN%t^IJ7EON~D>ViW!gKk9|LmpY7Ec2foB znP=Jy4ykv}r(qGldLR3TF4%tj$t^l>E^_9G$$K*@CyR?;yHqQzM2R$}Toa(Y_3#S) z7MwBiNwuW#6-VZ-svINvS6a-;cT&8?Uy4skjo+!B6Y7}+I{&%+E<-G$_41x>kYh;k zPnYl^)87v(f)Dr^G??6pn45kb%J-Ged_E<-S*`YuLeWTa99`wD$ONdqew^YzFmYs5 zT4<4)_QkCV>!zEfeepTY3m!$^8-N9$?2N~&HP$C?*Ef96U*5dAcX_@%s-KR}92T3~ z`kWg~m3gCKbb6XlcJcxlW7&7fZT+-V4PbsmmBPjT;%VE>?AB60le#4-p5+JgOL?Ur2?oV?3+!_yoaJkLSF^)-!YR-3oEXsBj^ zY?xIzh0cDWFwtIiDc7 zDTufLsy7uPbJ<6X5+ZXsi51`VDv;)7EwDR{%w1aC?AjAQq3XYYK^HffN&n&xg@#&*rsZf@?o`d)5c zG_i=n*$ts*7j8VAGPK&K6l_Dk&AMryZ#+VJD+a4+8#PT{ZNnPpt#8&wVEj`~0hRTW z?a3rqTJKg=+D;u2IpL{PD&4Mq(AxyUuWnnnp_2=Th(;J#y3N@jUrCT*@TvOamPmD-)bHa+{ofh+SqmqHZ_Eb1rKuX$BLlR(k{73)D(;!s8Dot z;_n}OIH<}aZJ3*VTLORpFM(QVuA~gh3QHv*wF;T-qr27vhj(F&dhbxmVQs99S%uH%gBGCm!;XfF zYfI;Cmr(BauoxM#8!;-&f~LXoZrmC@s7-J#B(k}TGZTm|eeWf$?z$fGIU*9nr;B9P zCC;^T4xgQkPiKk8nY6BRE99H|R`>SVyIpRYjN~5S^Rv=ItH1nLND{iHH4&n%#n`}= zlB|U>%~{PuVyL2vy!knu96TA z;7nF92a2uk3)PLEl~dx3AcHnsK2!aF7C>7IhSCh_dS@tv!Ae;TmZZa}kO0Urn-hy{ zdh}MeN`^d7Bvy!OGxO38twlxE`RWk8)6jKERgfKa& zJhNyL3-ztFgC`Xg&Ryw1iT|A$*y0TMn}ESDB?-w2usgMDb3Zq`+?B`gkk`AfssR%&jqiz+7}qp>$=VylCO zGaWl31mQB|k$t-149qms+3fKAZVEpU&o%rtTz227^7<$O0G>!{oY&?(>xS{n1?Tc~ z)I3jjt-1FHLz9c3%hU6Xr{E|6J?pH_)0p--KatMl#ply_I3Hj^+gmcH1a}tx$qc-L zN5^({k!}CJVzl??b!JP3rfZkD;i3;Nu=!LR{cL4*m=hKI6qqM66a70km3_ec`{V); zLEE`Kd+3HO$RQW}Y{N?hH8SyYFaTvMH@9Q%v=4dGvTUn#JF1$ED%aGiZ@13gEVYo` zpPiI8Z{}1XerD%c0k;Zh6udZ+i<(8(nuKsO8G`g%SkGN+GTic#=Yy{>O>3ND!&E!OVe|0pe8^(ozUenczh)G_7uqgT(}W-*KbtKD#t-Si5? zNd8{TG4>h&dGgbFO91B;2^2fHVDq1P<~YVDD~T+hS7yAyL!~s|ycWa#KfMh-x)+Gc z@{4arRcmuFM(5&2Z@1)E0{?Um2`2KAP>GmjiG6($ebv(mtvd2JjNF99W^2YR7E2+B zC83zveZ&6n^+Xv!9&t zRiw;)6#C4wc)=7SbT~pZ$?6&Wf$7nAh{B5@$@S}r%()%Y$*`&O`6lBq@|6Z8=Rwy& zx4{);^iKxHV^It*0YsfuVB){H-~OY@$7)jPcZ8TYRKZ=@4Ed5%7>VYq z19lFSWO$m}EhX7gYQDuk(_}5a2M9^Z2gk`g&sI9TJ3u4PlcxmlQ|=csx!x}rJ~LHI z!yQZTJuMGPsf7?!hhYf6vq&%dx@l5WU#zPn5dL@M^#_L0*{*5ZOOUNv_t(qx!6WVWNJ&q~6Oz8C}3 zHN4}pZzT4w#Cm?FuJ~GJwE9%g6dQiU+n5i4XiQ8e^?<6!)ryhr!x69!>%3LS0(e8l zPobq5q${JMsw^|Oq}Yy_`*c8%{U^~GUD%LN)?zANM_D7N$U|R{{C&7t?7L?VA)e6~ z9RnVQ)V{tsw({VtUwa7Awz{bc_bY%$`jEU&!u;HoS1O=+s)wD9)f?US8NBdBSsL*{z-^Aed>X=fy&bHHRw9t z^L9Eh9|ahF6xZP@o1=J|A`#2$w50vY3I>;GmuQeq{wZ_m7IGoHBNXQ3R#5%p%6&ne ziI3+^F2)hwSjs`#idFsM)u@RqHpJyBXZ`Q?lVHz%c3GS(xhk@>V;a~b;;H!}@{En7 z={a1_J)OVjZDXCL4ytiJ92}0C#N$=?2K1>`3EsD9xI5tjjmuu#@}pay=J1-P@+kj- zpNaRTkNho75FPs?Yk+AHhg+=>e$8+>d4d`S4AZ^nUsvl3|xI8~er%Hbd)RwA_TZ_x>FCp5gT9?xa(Y zN)3r?o1D-%1gy~3ZhRFW{kXsnhRPoe_UlQdRMg(pr@k=Xdp5~~ZqR*>*j8Pz-yx;- zq~Oq`n}={P!hC%Q!$QIb>SIh!|S%+} zM?UDTcgt>IA~s}{2S*UCS;UUr%ZmG5^L7j-?fOCirUg(O5$3=fRMfTGtsXS!#hV$k z2UeesJdQ3aXNVQ1G$(F8A%85X8juCCz;miVjAYfJCP=fsz?zKEt@{QLTO^*_&#i0? zrOJIi;CTx3C<~i|ajfYr<)Bw={tKcep9G+Rf@kL7=X!X(mdr5n0%Vj>aRX54dLtc6 zyO5Lc{&qmS+B2+fIH>+^9!HLV?$5#T4u=SdB*XKhX2NOk(hyj#x^scv@w`hy6Ur5WNAZgC7kc*$_fs zX@y_t`c@uM62kSlBe^)wkH5e>u5ZV69ITs$jhccAfjl`31)BX z;qG)`dQyE=f z`eNdic_Q8;(J}w^`(_8I1h|l4aq@B0{pr)3*(I(E01Kz35R9fFGJsB7JiRuG|OD3sXnsKs-m6=s_@Ce453dc#>0}y8SJ1HhcJt=O51h|G z6hd%$l~gTyCJvHq7xaV(LNsWMd}Z_&r!RlT)wwG!&ShL~t3E4Oj$93RvK3r{P2cmq z`(`Y6uwfPgaey2Ha-y2QbrCex^cum<`IM0+DLg*Rmln%|h%IE@^C@#xM#{GPhmkf-w z%v;UF&ZaM$E#!Q>yd|;E*bQtRe5FV{t9a@cmwD>*8I;hr$~k>H=m-i)4+3J%L0mc= zR3wAIK-09H!6mWfuK~wPtPNSOD8aLfwiozK|1={1tA$=EjO#pkvIfN$J3Uq#wEX6j zxlfz&0$1*(bmXn>XID$_wA~@%NPP@Wqmx-F^~FVsPtuuMzIS1R(>;$sBkvFe7qu&m z1%)J$Jm#caGnnbQ?y5CpxtpI}dTX+>Z<6VRcsBtO`}?-)}DomebCY z_Y^ZC)x#4;`Z@dBT4T){h$regy>qS z@f94V2Rr?6cxB^L>cQd;<~br6B#TXd^b|H2Af~-EkkSoS-`dP}8pY-_8)#^LZlq^? zdTccLJnf|NB~afg*)p#t6#IEVmPQ7<%Z0#l$)&r7)81E}0>58+==hb%t2Bwlv`knB zuY(%)(nV>c?!F%93mYl7E4k@(yjin?&^16TZQiy07-{QAEHd`dItw^2`c;tXbU{`JG^9n2RM6o?D#YuG%5&iIIB z$FQXlTW2_~TdBYcG4)rhe%w!3A9`rIxa`_4?%Fwow#@4O;hgxd8&N*b<{+8^u&Yr` zL*VB?jvtIozB zU4%6S+3X%PuIk1jzKd*9Ya>(P3Ngd6n1>R?!`UT~0=F4_k_nJqnpVlKAJr8Ih(T}T zchPyberGLXG}{p^VT8)Y&Vw2+8^yW^WO+602rUy_ewJdgyXj0Vdf1EUjV@%mtlf8S zHwSXiPLqX5>Nfocg!2HfiRP*8)cfm<24A8c)_qNK4eraQz&N(wn}3!x)JU`=Yk_GT zJNbSW<7|9q>9p&~`tOi6^ptB4csM@f&$Sba3; z0D25Co6&q}cT%8wNfJ%b<2S1LB1J z`Gaq)B_%wb4yI%IDZk?e2{;5l#7Mj(NT6CM?m6AR5a`lm-Q`ahzSmeks2B`aN zP#ZQ<@E>;015iqUT!9r_fBFUyQgZ4%oDlO4w@TDY$97aVa~LlQzkD{LVuNv+0qyyq zfJfVjAY)LM~R$BS~E-5&#)+guTmB1k^>TE~%v(g4zMQ0hv%;hS?SFhye+qD&w4jwIz_4?6AN_*ymbtmBbs(_*U{9WqVaGgB zl=}I;@I5eM!?26aZZXhtvruc%?fp=)WoO7P9ery~Q9ZmW%$IOA$v(_W1%8zO^gu8; zStP1*9WMeT0A+xmbwHEF(9X8@%;_aBPA`{@BC@e&j{GbH9`EV>xG?OJiWo(!VJU1F!y0$mvZDvucLA)QbBFm&=|n4d9-( zu{@T$qZM5}Qfcxzk5g^S8Z*~55^hP>>ji7lfQObu{5U1th>g02B6*`QuR0D+L{Qf* z{o>=8xQRx&q^yjX^A9Ht!d>i%O=}=X4-Uk1x z{(q&SfA%mHxESHvtrjF`jOKs6VXhuc7GeeB*8V2!S2#2DT;e6e;14-J*(krKn2v?> zove0aMd~j$uu2mcydz1&KjLyI+!!>sR%SXieUuteV~n!s5R|4$XA?i5KM5K!Oiu|+ zxow7_&l~3snACI9-#qFFQ*JM%j6ME~mEsDP=A>@DT0P~7Z>paE zNjdv(p5+O*yXP}!xVBz^#=tR9zaEO)n+ znbstj@LXRKu}{ul)IwBHH4?w#G^}}_7n(qDecp@KG#rKPFc2!MRN`E`4AaBhm5-IF z8njISeF)j4R6xCN{MB*F%Wv)FwZ%~<{2{feSiZ)gPNy%E8p3yxw05()w>TRA>b!5C zfHkQjhQVWRnEhI{Kq!CP6%ZpZO|oC(|55!Wd6h0$JrbmxiPROOwb@M#S0FjCsJif9 z?J2D=ZwWj#F55~r*Rv{(OWvxM=0%R)Cf_zE_+$|nd`O|9GRH2lqNt}0C5~>C_nrE0 zk}^I`zC@BLZv=?y0+cCKz?9Y#R2#42{%4X_uQ-zI=mG*e+g!0WdqJHEwQ8S~?%InF z&FAOkdSSxGcOTMtoP^j=z;ZQ@(?$DpVh3*9p;;i{;IA{~Ffz zzMjol^B0)inK9?NqocjndVNu}|328(9pPE_G;-G!Ndn+=A)UuoGqe0CNrLrm1UPt#B z2N9nx*TS+|d~dFMS+~Fc4rG0iBlqih35I<#+h2|EUw#S+Hu8ZC)QYcOz0?1meil;6 zFCnk;i_lhFTu_%txbuGD`NjFGp2NR9<}msuiMgSO*$ygxYmbu;3C80BHBCHiy__RR zdx~eY4QCurd~0t~+k{qlS3j{8j0*eB{)|=VQk4C)B?Jz=!B%l5JQ^t0_qUydKv$)U zEAlQUp#{U^ET4uPlZ{Tj^LK&yG)e&u}_8kzfZ>Ae$7~iQutZx~9i)Iqc zrx#Y$V~sfznCK|VXIl+fKZCQr81+J5n$NxFMfMt6(sKxNWEl1xp#U-7agMPrujEC_ zy?DtVt*`$SQlPY^pQ5HOqVKxj8NI-rX9A0>n@dNLrw`(l)`~k0f7BdkYcAeG%is_} zTSDzz_iyH}U;CWlWY=odUoU*71e85S2ll?A3nhk58> zF29}n3i*MSozKk%T)oSOJD;pDn#;*n4_cs=o3z1Bm?O#kUlBp z2CbP*>eAN;uMLzn!Ka-%KN!EWRGMz=q22yIcPnGVYIg?-kA=kY|@(+sGQBhgo{sRqEk>KzD?%LB4PMh<>sh;lKx?C$Kv|0zRZ^X1X=kTDlAKc z8ifvfhGKffj{F;uzwSqKht$}UxW{D9)9YP9c*6>$3uL(YQ!-UFu%?9AHvDr^CU$3h z>1-~e#rd7I{K09wu(sOLn|i`NM2U+>F8Uj7q0J_NPp!qr7?8N zt-B(1?b&}RN@CNcnCh9sUf2h(fw{TEm1>zQ>v}U!1(s&gy57KWxen@eySyw!cCZaC zYq}QY3vF3GKS5_BuQYA4B<>h00&521z0;AWpFVSGWRjZlm^ESe$PXMT0Xc>qDgMTb zJoyz2tl60EKI$z`Ve16B$kMZz%;)?HIy!q`n3hYa?02Ul8u_I=comc2#R(KtUcaG?OF3t)`O=;J z8lTc1Xs5=|KFQsbXx3Lqcasi93(|vX8Xf6j*Pa6~@y9>mJ-_O67Db-aog2N;!#xzx zi2-nodX)bF_nR;n-Y+LDJdD}rxcI^W`(m;jVL9AC7m-RIEfttP&E zuG}vFM`Cc#@5t$M>oQyiAf+x7j1{x71kZ9cntzD&ud29WK?=jb&Pgo1N1; z+ZRfW%2wY$Qn~2>jh;V(X4|tUuAA(7WmfgN333jDHB!7uOzX}|m^sRaykfLp;dKrdQw-LFc<5^r42fO+C072hr ztqZl9;;{g$;|nEOVP&Kk>@A&W3<(yOQ#S|B?X3;2Y zNRu*c_^s3V93xH!F|jIm|3BLZN$i+RvI}|z1}h`dXZfp1YV}rKWQ*VGvLb*Anb?E1 z*2w0Xqp5{XzxYA_B+C@UnCX{4CtywCQE8~*qJ(BwEd%xB=P}Sm!e&10`;U(pm;Vq0 zf`bzYL&kJB9M0MGN}Hr*G@rn_j1A)$Z_{WRGeE&8%!v)<_h5P$! zX#Z!pW>RVL7J0k*=%(A^Vra>nbnpGM4&{y;#e&d@QlECf7G>)^3?LU(0)f3#;Aqc) z1$61sJE~&sehSq~DhV1{LN%u%bS;hQZ>DI??5FXdqhUx6K?k>zdqOL87)?YNiN|2Z zC)rcG)IWhwfHSfwk~YZZ0H`DNV|)uP)xz(>#Yru8jCCv)%I$#tM9r7-se281NG;E9o>fwF zm>uksYaH+wT9CKiPWJ$e!T|!Ks>g*&02GqH_+ztKmxV9`vi-%uQ(6vz`G@Ew7SKAP8!bI4Cf36zd0Fjo!!~07R+C~+^Ivd%lam= z68s#E$bajhu`ZSB-E(Rrv2di^O0-$>ayxd&tuA)9T!i=EVh$U5eXY^RR^-c}r?@V*SuLIU|$>JzfdLb#!tL(3m)F z5O+H4F1P4chh1|>%i%8n3FhG@`KC=p#)bxt`s>5t%LGEqENqp)ETDF#+LMyeUqa6N zmw^GAH(N4x8G)J;|~NT^ma8sIO`ZN8)_OPP-gwZhG=Dwv}54}K!!6>3MI(~b2vntBaVf5 z%{&^;SSwx~?=I|cbvCJQqu+dVt}*G5X{xbP7~Tj6rVZrhGS%DIg)HxCF(G+c8H#@A zz|xmRwEEVW2z#jWj>Undymhq;zao^2Bml>Ul^zQOkRMX@|ZvXxR2 zO(K+!bl?kRdKorGEIv@Ca5F|b^G)hu|K?=5uv1CNjZ=COp5gb*(SP~pq(G7#(`5J0 z_bV6k+KkPI&sMu;rkT+DuiYF1rl2cZf!f(}74Wk`Rm*B&uiam^%PxiG6v)({xU}l{ z^qg4IIN7-pS=!oKJyMW^|IlJaZf8-xfO`WdNBy2ZD%F*nwCJnht?lmPEC` z@o}6&%)>&oM-D$$A6sEq)=LB}X1-?3&fM=V&!_6i4=Ii^H}L1}YAkLWdlT?}_~c`o zktIAmZGQ?TUH#(jli2*xKhV~g>-5c@^b(O7=(1gl5GOFYL~bM=CVRAYCcn`?i_NLz z$99XhO_dpH2sv~iiRusQ*Q)G&0u>5E{U6JOYb-e}$FF7Iis`#ZYAeqf#9Eh228^uR zyw{toY@H>=)Zk0Ctq^s&a*cYG_dDA`fi{0r{@qv5A*sRz3Q)|J<55xvlzc1}q zPgYa?fCYus;+o0T&AwT~-+&eEdUX=ozGdGu;xlddUD!fH1{|GZEqi~{b)%h*2}Yw+ z-T4cd!O`hsSfYDeAr;^81$2MbAAlMY)1~^$^DjS#Uo|*?ax-+M#}z5BgX%K9klD^EaxrJm(t%DpH%IhL#XoKFZ27z1iv&A z%QeO8??qTnyI}DijEhlv@w$H2+HfSK9pjO_+n}WH80uf575;oYb}+fCXm9;L zgRU8dkBP3=p{%R6+IGq8M$ev6$`V2Yvoi3U#Ejs9g0V9f^&-k1;PFEt1>{7EW!GT3 z#_k#2^jMXdrlCRJk$*6CeYVDNi3pNlc2a#I^VkxsSqh~7tR=8QL0!Th>$0PrG&)k; zq3;Ck?8!jq{Hvbdq@Mmyj^H9crmRL^WU}S!$>Feu?^8Ee+FjF>k%>pma;cTrE?mru zs#jNNQ+eN7Jkynd;**r0f@&46=}+$sUIHBjGyfh^k7|4ahejnN9fgl(Zt)jLM?4e2;Ru=^_9=4u9F;} zH}Q!$7IUNvtD9cTADVtV;IeLNLkyc z0@|>?3PBUzQqd~>{m|aM#ZGC_&#vBWxLjnmk)H82GQhQa3Ks0l=#LT{ZkS0vnzrp| z*WX)J_ZZgci21=$um+3QV*IedaN+Hk-=3Tn?vvlT@|opr(ZaSCoH#={8KU)X(X$>% z(@A+;(mT1e9y2(6!{%X3EMPSsPTFY6x#$TM$LIq`TaCEZ(#sjsi4b6HaH04AbbUl% z=#lj_E1hw`H_+wiSDn`7A^&}G;!rW8NEyRBg(s%m)XiyM#~Nt8wz$99j;vEN6>41x zUsB`Qd;I=5Nk47=h;DX8Aslrq;js(sv~&WWsAoF)lzv6+wx9CZ@`$bF*WUJo`r>Tl zu$oF#uOcUkC*ESxw=-x zDCYN1_?%r$6L{5}t6$>CxPtjx@em5VItW@#%a%}`JGfy>RvmY}RPvEGS6;rBDNwfq0^WIuzE3Xx&F zG4Jiex^~5Qij`!cP%6NrL>Kirx)fya?ytra4C|B%>kL=ItcUH|M=rhma~ze_>jB%Q zc#E|VVzv~k2uxEva`If(?}|bxOhl0;G8A9mIli<>EKE^U#up_M-?-k{hAJoUO? z$={Kxg&9}vmr9u0FMiUk(7o*KR#Ijjo7lBFref1aE{7%L0#0q7 zpie=+$MJI|yKOpqZJyWnoC#c!ey*NeJU=v7_${tJDT=Gqi zB?l|t+Z<+MiuiTk(YJ32j^Kpc$969O0T-Z&gd$&Y30O&6{SIpkL@AF7Segvw=Jdr0 zwaoSPmP4sIylR>syy?df&r!Wt;{O>g+G>PyFnv>xbvXD(^O# z(inTDt^E`{9riN<_hdTNPukC=Njuc6W_VUcXlc!TmDP2FtrMW)s+FSujE#5r{McIHavs{Qn$AEOrIX<7>tC-wG#I!+6vo0(``w)Vvql0mF@@(+X z{O=ELV2t%Z499{U{sW`R1mc}x=L4s#xY6R7S(mPZmrGPteqQKHn*^HwA8mix)@IYa z|HH+#K=GiZNO5f`E~UlYU5dNA7A+Kach};D;IzTr-HRt!kYN9CUfp2*c~}ch=TSL5yvl$k^ya$b3iP8cDUsdL;U+6$BmoTV!P%*`o^FF zD8VqhR8X`$ysqx?(u|Vi)#;MHG&XBMwL@q@XFB@!`jhTk)O@71so)&;5Hf}`qU867 z*&&c(oNVd~)b`$69c(^CR6(+aSKJcp^~}d)5rE8YF@F!D=(=4W=v8aQACrHMI7v@m z^ZFOa758c(-+d%@KwNss6z=KptVYt$kZbR&;#{)-rYpf%vv%=kX)%t|O?Ll@0{-bT zwQOgUh*_hhmc;Mg=A&c2SfC?LV1Rz6o)ld5V7oeMj^&6W*l+^7tcItG5eb@(;HKQ+0qL_~reCQN*A2$6!BNB?;0H_5KX_D9o1Ay{Ic=Cbq4|Kj0#qcyZefo7^k zvl&KHF~O-IHr^+@R6M4bo?!fi)ah)6Ze$m$Ww|?1$6n9>Z-OZkDjkk1JrJ&Xi7RQA z56FHN52t5AIQkgXZCMYHvOId%H822Dgqxe@@ zZA)n}xNs^R4d7o^aCz$?%&*%DuXKH5oZaR;RLVVXXLygo;*T4xWNtH6AIUS*03@BhBTEV2BTrC8cvl25_LW@Sf=Utj~@iExF-qh zCFDE<%Gm`a<3pyv%5lzAfC;MGBBkL8p7(;Uuuv4|q1aNf{YZlD&^FB+kCfaZu8t#% z%`fxwJGGdgTpBavx!x`0;GZX(lt#LCoP)bNKNbt6^murKTYPk~$-K4A7AX(ljXc4$ z8dAVvx0*p?^Q8i(vnK{4D5J!NK^65Cx}Va0n? zT&>w&uHxHqC)=!xA>O*LYNc%@IU;I?#6DHNIjJXbINIMPe)W*8_-5K7THlTR8u6~8 zx*Yqc+TW=GE~+d5ZNm1naoy|;Tu{%30eqEfQXfZ+MksSK3pRXu&pj}4<)W<#VbS+1Wq&VpCWwavx4met@DRio)R+kf*V zZuxWBR02Tyz)Xl=c6hAYCOc8vEeDj zcr2upM9Y{bd$s8=@oFk6-xy1p5Sbw;KS2*5PsQ-%AEr$L=GI+NH*}_+2Y?xR01;RX z9yAoEzfoZGGTJi~3<$QEWnrZ6Cg}CnLg#&R&W8R^rQ_eRN^lo?1A*G+okd{>HBn_} zxjjHX4t~3ou97x8RPmDDU|IrWs(2N?*1|*ZjBJRNz{eQqxt3l8iZ$71uQNlxVHF}K z3B0?d5hr_h<@4pV*}jbQy~iZn_R|;Q1u^tze-$iEN=21L&32xy%?e6qQB4ZP?17S?Va;QQ8ihK*Q}G{)~YHoV`akwM|T_ouk*v;%4OiYBOwC9$~ygm4GIPcwpqhi z1N@<{KbTuvY4P}NEUjA~USvM~WBkgfc{Ha`?%Zkl(BC}K(t7#t07bAt+4_H63XltZ++CTa3~}b$=u(E$FZ+O_T1@M7e=4 zDtzLD$R4p3^4)06BOWE$X$?Gbcs+#=urLp)R6qMI?DOlCOHe0X&za9co8pk9C$@`6 z_wfwU_s#YVVZg-B4z<&YKjg44O0)aE?eLSS7|Hd?S9`h1{kQx_u2!%9XH+m`;zl8x zK=D_nK!%t^fQp&T+bNo_UqU=7RG&!Cfq?dVRti#ad2G(^yt5=>QgB2wXjk!bQ?>v> zbUhb8g*CSawjzU=qZCTN#Wr)ExQQ5Gg7mwtqn9l|*`q7lP67;ZK2+Q4H^LvQ);_ z49|&T(M#1F86EB#fa;Dk%+}mT9^Ipxey-o^`&YFQ7%1r~r^U_us6<1j_$*fz1Jc2a zBLF~k=*R;1(mgeBj}Sxq6O$N?bf5j5MLyAn>A#?!3eyb&ijUF>Mnm_wK$zp+RBsk9lZp`PDz7&@3$MBgU zn>uNVj%(;-TL@Ph@P5;&muHGGZ(qcNg~2OVB4aj}r<{XsFgMLPouc|)tvfOqV{!%V zb=z|rzT>9BQO3?nRbA?uOcK&%?&Mlr=D7UZ#?~`E|8&iSJ5(Cmg@d-l(fe!4fduO0 zxA3Am`}&61H)%h{Z}pt_Pid zp5{9)^#Uhi#~a0QVs`3n74Q8Gq4~kpcr=Vg&-|q#6Jy=KkWR-2mb*l7=49?F9vgu% ztXg~1STH<>8i81f8UiBM80ImGgz1Igr6p+} z#uC2{T&S4Rno>piIeB#od%*6SWumiPbm?{I@bK`OiptAe{A5=UP$g-v0m<#Ju5uyx zs2E3aAii$=@ZwkD=n zdIT#mDNf-2pl@BA2Wh$)DH$*Uym+FULga!5k`rvwG7>WS5DO}VfZ>ykqIB(D#E#V% zPC!YLC!o8>c@r*VHEnW9XUX|!;T_(VIH3}8Xf@3vAjlEhC$#R8en5H{`edQ9xPSNJ zIi|j{FkmublK7^~62ZiBapa@sRo^$Kz2AIh7sal_L-nV*@U6OHkbyYx!Q3 znit-UwfQ@-Q2AEK(HM`hWKbgs)W}-pT4lY#h1gZMTAch*T{k);(hf0wG4_|dHm2jp zBk%7;TvFk~_3(}z?D&b*ksmHj42c-S=gSrI9>}#^&I*m25bwtrGwY!$tS^H&tn?B_-XQAPo_yXwS&K$S(@3#x9(HlzFjY@qNb=0+wUH>^@mcj!oYP@*p=$4^h2=zx|T*;!#93cO#~Gu?V4yov6=KY*jW1d4ZPle~|vYcnmgc2Q&4om*7>|N4;|~I)WW^R*pH6)j;ijb*czxQL90`&2NJoT zz)M(yb4?}hTqj404~ZTpsa;*p;Q4%qo^$!K<-&Nb%z!Lo7R)N(bclBVLBO<_L6y_J zhM+^u4cU@@Arp|{V}4Q}q`7M5a;_!RIDo^sBlWbsGe8~lw<22W+<-EYVeo~|uFEh_ zsourP4A-7}Wyc)!MmS($T8e6FDa8-0*LvE1(j+9<$|%pQle6DCX!Q|CYH9?2c@z1% z0IcyzcRkaA=g;60$S!Ut{|O`~SShmNiYO>vuwMU*y1-4ihB@H})7xYD!m>^uA=lG4f1FA62^lN$3*qZ!8g!|A$=si( zLkGHEsr00@kmuw&>(QiNfym7Ysy{Wwl?pXbq$7p=lf4oL9!zewQty1V^mcP9bN;Es z7u`JK%){krcvRc_HQ;xzY`+}U>`{1+H~1hu5*MR~LibE)Wp;eUk$>PigdKov_n?e# z_r$&w)h`v|6KF8m+$2Ubw-mYy77P3c!v6A`!SM#&CJTAr4#o38Vw#SMp}5Pe`tqL4 zTgbZH|2MJJex20@GUM7`;<@C4!IgJ5DZxBm2yoqnvGgwM(5IvpgucxZYh#o*+oysR zG~T#H6cRL0O-q;4lMlN*%VBiyE7SV5ol&Q?im`)W$w@-eI7!Zu(7ol!|f^K)M`SY#tNWui;+85EQBv#El8JhTan~v_xX-Tt^ zf~JzII6wLccmxeHiVC-Lu$&k$u%yjoORLpz4%15GBF!@cd=Ucm=6du%3 z9|S+#&}pCz{&^l!!IFq~3x4X(K|&?1AUz^t+!l%bJI-N^)pfH(4{&cl8f7hf=WmHt z@jx|p1U%v_G0>;oX=1txENFBSG=i~AW1&5}G` zwuYrXzY$jVUfGi6n8G>jiX%x9Re)zzg0fj9-zDom{rk`t^;w3gFj8uYkLx+BJiC~d zgCM)HC_W{;Ce_q^%$RG~gDsg~W`WCWnA4lzFxJ&wA%9ibmn&-VTi<-INjhn^bXW_s z)}zZm}61MyYdpQxNK}e%bOa~tozgK{Z!CDQCtTHdH{vMGV zK>D|$LG&wH`i0qgCM!oii&MPEQy!_<3tp%mFgnG|7h@&C{yEQtj^!8mVAlIxAgIDK zqK&?Yh^aGMQ05MHAf4rWile3nO_;*oKUD#gDS)yGHjT9eN^q}c`lNEr!wh~rl}pr` zraP=EwH&p2C9se!3rKZT`Fut;9QZHhK6X>R)>+iq(se8X3J`vdwt8Pz@vPYj?7OsK z`ntIXrySogxy$crG*!zHtaf}#rv-Wi?MMSh#B?A1%|8ZewUpym)Y++QIzGPMs5^GS z1&|8vse8MoQ#5o58iMWACIsN`4Y6}l{rq1ZOz@^|49IOvUszPscW#9K3pJGyuJ7`G ziu3H4)%t+ej*>rrpn>N94i=Dy#}ZT^OAAs^6s!9d+MYaL4lG)QT<}w6 zP7I|rNC7xF@tfYd``HMtOQ19z2Y~rUQ=)@yevxhpC8-7kqAq);d;fD+2Q@3CP*xnP z!<5a*Ig8<0#o%|R6N_9Y%MR>(&N5lP!q73m9q?t|;tV>l?0}qa+Gq1nWZ{!`^NQbZ zGl;)UL==xJH0OteOV0J;-n>Y;XkA02QzKp?k4)NNioxN}g}DcVr9v=g6`QOe;?FNY zI|0j8{>QWF(rhrND_vEWtSiuh#@9-Q}DnavkuLUS}q|CL-Dllloq)o{OuML6mr}rFwga(W;Md^N|hj$N6!bU1w=D_&&=U|irmy7WNK0}%qu&SR9YsXm~1UKQH zt`LqG!Vvt2d{J*)TvpNFnJwe_t;)v_%-0kPw^5P>xd}?8QUoQ%8KzClZt=I9f`u+u zGO^Z7U|BdfcPf;nceN9-d=e}fB2F!9CW!B?I*!QAuKz)Xi8Z7=hD-$3-pOG}<0S4( z97fs4Uu4dmzzG;1PNf*LyfKXU^f%}v>#|am2V$Z4rT=i#-zT~*b zYbWI<>YZ}m#&##$yKKGs$e*&+7C8aH1_2G#wtkFNE*GCTw&S%ed5iNK6NITW%X%PN zq4nRbYn4yAW)0CwgJ9q5CM;&aPktf>{c38-M!&ViMS34wnIP}1ageBrGy1Ps|0*Wk~Q z9DRhIzGXQv=s&peIEv6X!(3|C4ZF`-Gjlhtnh>ZqtBaf`5F*g!#)|Ir)pCJwPkKC7 z3p$uCu28@_qN2rzU!UI`J!`C7ORvTa5B{F>SVQ}`^pRVn(35C)4e9gXCO(E(U4*{Y zcY3%pJ)rK$s95Nr&4b zc{SWsj448+NGzniZ#^XEb-#)yZ`A~|-@fz_qbVlRrVop$lyCIl%(#JfO*A;lQU&Ch zfyE!t?CYx?+pps0QSb3<8v(VB6|Nl}?v*w)Wu!E}a}I61(FrRW){Bn5$R*Nk&@*?_ z5|ZQY8qvp-ArlTv-!Ws=9Owf$7-S|u_bcYD{?H58welV5Tk{;f+3f>pw z(2yT4cpY!^^*dPJWsOL-Rc8G}Z`kL^yW0UOuEcQtqiC$0H*D5yc2upX$CGTw-(m5iT6eRvp zx2H)~ZgYIZDQ8Fam-4>qt44FCm<@iVD}kQ}R8G930C62(SPQe;qONbSyHO`UmL<8i zm@DX{ZNeYi6|J?eays$*41H}Jds}LJ>N}647n|Iau-CRcwFuS`n8*u0UWHqE9GCIe zlV#5(5cvGsWK9q9rZd(JEhQ-e#1UyP1^#1XhYRE=(jok7yz5gHbEe$P6qGvUdO1IBNmb zS^s5nzu4U*iB!_Gft?^UUY1{brUqI2YOCV;93A1Sb022{IM6-r>HHUJD?ORLXwiE=qS^CsdF0WjoXpyQmwzIme2)+!0!K!9Ct;e{ z-#fYLgjaMj^xA@N*W|Wp#4qG!T?{_hSk!deF104JSM4>;gV*|s8a2&iWInNMKM}*| z$U97zn$wB0>S_K;1+{0UfSk3N$q-&|9A7_HAehj z3jsMN!v9b`uhWD6XD@*I|EI5UYD69lgtM%(^0s<2+%`qwa9qc7Fnpj@A#!gxpH~9! z9WQx=_>yphb^sH<3)jA7j*99bFQiX zky>8+z=V$TevT)&7ER=)ZQ@kqVGB2JbpQ_9?ar>6INNE=dpvo^wotTTdfS60@(Xwm z27WTQhde()_7nG^sXSe^hpUz%ml2(7g-G0gI9`421+ngUL~H*r38yJ%Ac5YC zoJX#`-0Z;Mz~_5Nj&a$Z57ZYO;=6J0Vf66VsDoen;RToshX2&DCx^o+=^GoDyYJ56 zpz&5;Z}_K`Rv#Av9~XqXeBnXpypM!4k>`BRVIy59BOcFia%U5el}|&2a>DN)k0%`O zz2R{saQeInhXc#l&kVeT&vykLn&S$U0>C|{y^OxEF}J4y!)&)|9nm}i ze->3XKIG3>X^!jMZOGqrLi{0Mmac77v!%KwQ$DiG|Kkqj;ki7N`piFa;zFBkB zR)TIYK{vOYP0urQYFKF9h|vrej~&(J|c!R$|mXF>m%OdFUAq ziw>;!9h9JIfUI;;r|DLQuBzg}^CMqI;1t{V{g$8|q3`L~xG_?956$Eblf;KRc~+|z-` zTP=!h_lIa1g7pLfa$EsOrBY-JCU^4~829X>8=0D)(gMcyKSz6ucMV@cg1&O(-i=y< z2blRdmI$ivhzQ!3Eugp@UcFe?Zkw)iT;iE^ey6rZz~?~CbQ0t~I(6)Szs7vHSN=F5 zB;gZ;FJbj&^up0Cj*G(A^>LjM@3a=Di~TIDEgZP8F~Pb#pMp_0xPqI+F>;@-${^1H z$9fw+3f7mxWzsVIuflKpNV=S;IRPKuqaVzs)s$C%W&{k(-mj5yN?=)@?HN7o`AU&W zP2a=0@sI2NoOnOZ&>_fls6+!4Ze-6V6Hj&3N(ML~na>yCn0DQOt0{T!&>b;&6m7WqWoP zugpiWv-*EQLEn+qMfUk8mY!o$U!d~KmqE4DYXSi{Dz6YOcxt1G*bH!?;;~Z^qOc-S zSaAIv8#+2G#Rl&487?H?E-lboNi9vuz@*eDcJk58f;>TKIP+DJj4=;DuICRqZ#0LJ@AAyG&$_$lFWNs`wk#qgE690b zo)2bn#KP_=-ai)HPpo*RCN^NxQhNrSBD~8h`WF%fJl9>t5Vy(V$v@?F_zPBEt2&rvmP>tis0X9g-6(nL3j^PtDfV={on_MjiEFFiL@V|b>sve{n}0O}nO}dt zt5ij<9bui9PvgpDQo-NQ_!?7GfxxpODu<91l7AMhm|s9=i;%=E;}#WSG1$4mhA^Xz z!rin9r&Et@oKPxL4C(fK*cmDA(~Ogm32a%k-tFi*%<4MS-Q*#!L74H3{u%OTKmtMS zm3WnHH8K*&tQ1?5pFuu)%B+0GLH?-@A;}~pgLD18vE~3Iv&(?!c2yhDF_%x2s3Yo6 zz&- zu<_BSSY;=8#)28269vl@W5bSi8w)nruU)hF{n5Et*w|r;OX$PUXyd$mYQW{EKvxc> z9#0^V**AQG9FST-aIWWC9Vd=y53Nt4eV+uvjQhtks%@xl&mSZL%7=;$J*@QRF?!J^ zLQbF}o$+=4!k(73*TX)NR%@B@Sltyb%IGax1NRnK;JT2c(<)Hu^ag&Y@e5xvA?_2i z6Xx{kd%>qQ=2f8oAdEyJVC3WQ-3q-p((3kk7DaM9rGDC?2Cr01B%%M9cEt|0A-eq) zA#7K-n@q1KksW@FjM(@s-1ukwxif?4eWNHauT2%%|85;Ss%ZCsj~^suJ-Yrd;nl=u zj6N^on#WdJ5?~)m{~HOZG#>khgqfJv8(q@)db9iT8(UsSR?u*Q^++Qz3*Y#fhpInl z*1Cy#8mAv`^L%-9<5BavKq3E)K7XSS7P2^eqN}|9wuu*GcUSk%p@8PWF-kMN_U(}qI}kniJFXqx^NqR9X%!kgFlYwl8~;0;X9b@{vYe$#Q&klkYYge`u8 z465&6%kKgc=nCNnz!b~5N6dxAWx5S{7buBd6N+351JEly(#;Ds!pr``ivq8GS#J^T^&MPpZT`&n9nx3kpfu@C zo{0ipE{**15Ms>yc4n{AG`PxFA%7d_K<5w{)P|}!%1W=-;M^xN5k-SRS*s@j#<26G zkOdmah94e8(g|w>L{jNFN67Z(l*m(v%oayT_`M3J_2R+_XO6cknYz6onC)sEyufq3 zd?eP%4GS-Eo*R`sWvJiB%jxVcDK4z$#EmIAGSN(bge{XS&2~K))fpvDaKTXIW1S9j z>FkT+C~o+|O$Ay|KrOtnlQZt!?{283_e>wDx1n5a>uh)7Z1(I^Z5kVbuWc7rJM$s7 z0ei|>&_*A}D~q2-o$J3#kQmIW3LSyiRAo2jE|61%r^svC=$#pCKn?EK zFnFN8SW9g6?|w^1$G&D~ak%@x`w|;~b3%{nbGs{5m+x5sAoYBc=0PWli9%vrB}Y~K zFYmVv)LGEij=P=7j7c>s;W(-*S4&&}nMX(YMj!$Kn@G$ib9==E^< z>~Oc}1G3Sej3E4$X&*!3c;m#;K?y&^artkdUod1$5(u6`!^i8`CbjS-;SXr06Z))s z&)cxeHBrqJ(4)8Gs~q%x-APxdK0MQTh}!SvJ~;e3?C4M;S4gfStt}o$S9z(K!p%D* zhrbSv!FMa$4q@pKor4%CQFfOgTHq{XiVtR9P?S>bHhJ2GwoHggMpBeEVKV4Znjab_azpn#V@!wAZKLkPK^5A=;O$iePDUu8?D)9xmq4t_m%r8^QOG@#r>907Fg0!!1!C3BllR5+7qv# zK+`Vy!@MJ<8f-GvPOaBv?7hZv^uP^h>2CJ9?gr%qt^440*K}vQ%Y*juefo3xbuyRx zJ?;LPxx)T}+k-5se3khA46^XypYc8!^D;jRpX{8BDAy5bGb_88sD&MPyfP1Sa${0x8L5fs%D6ulwhaa=9|DWXwAmIp`&$<8|`)Cx!IDb?wc zB)N)fVfr82e5Kz?znqT_^OgG8k23>!P^wI;qo~>qBDB01=&9Mfq_<)wzB^o@B`Y(x zCwqyn0Qd%6nxvTg9W-hctnd6OY&oeAhNgb1>$-Fjm2t`8353npqRBn#e2hPHu+kYyCo-eAuoRUNaud=<*Su;0O^H-saPxlVZcn-!bh;FK~ zHN~geZQgw@!%cTc9XJjFkSwuIVQR43MF?w${gZz6=vJ$0g4gk-EQQ{X-q-^uJgeBc zr+7@0r9HiMd7Gksm5^~P=yN#m7+gfl>NV_Lbw$wbGjI7iou6BrDwawk>vQ+3 z68zXn{Xk|2s4|}MS1pMVDWKdK>`xHj-i{N9JN92XBC=Dv`mUd2I-$aJ;J?w_8~7*p zD7`Y8qI2sLvOZQ0eU8!0ISV-_*V0{$Kviq!a6Ugv@A!=>94nfTpO*NoZNZK{!Yc=D z_^yTY=W*g%hA(0;JtIpu#q39dy=NETa|2X#iU%_$5jb!~*iYsJxA+Aw~ z42D|>0bKf)Wzm;}xdo_+JgnY3q-@==OFYGe=FDU)W>4iWd>dRG$g+ z_zuhlZDs(S$fFLe5zB`@U0;qf72GIm$8T8!N(`$w7BK0uKmIb>aJ|ZSJ3H+!hd_YL zE>702fFZ`9JYHYgBX&ybXLun4B45_e>O+P}An8mdjJFDuVkVJ2VH-6{|LE}9;PBhR zii5=+-5jMK?T*q-)#hHekMB%m#u^<4WiZog=wK|+I0d7j0&YbRO9)$Dry`c>kc$Vk z*wxRzUCMd?J|W0rzL+hxTOj)tgoaMC8Yu7MxSTURq z+~OOnKjfcT#FkAiLya-K4#iq*&!)xg%f%1y@)TdEd*JdFs>>ebzt3Pr|IEDWW>CLp z%22UMzT znhUZfvh~yS4p!OE5^>p3?IB#W>Cr#B2arEVom9jzN#mJi1$gExfZ!2b3X*9y@O97e68s`X zPwZv%i01!8xCGhgmiRUrryirB9&R6(8>jomNGUa~!^dT%9j(YM^(oH>AhDtF2rvx2#;t?|x(j%&f$eOXc1C-K9*DW7E3 zeuA7%?bcT2lik(~leCMR8RJ_vgPHppA?@wRb8iP)r_9-s+GG5qPJZIX4^Ohk1?Sl* zQaX3l=K*65X}|uaF4%pOiMSWuFR9bYt~||E?Jb)If^JGgV2`#Uhj=Zp5s6#7mlqx% zZ>jF1wS7l~+ru#GXzwOo^*atd4Vv*X;#Cn`GvZ8hJ#TFy3Lis19b+PMxLxpA@22L! z|0Td3QiF6R+Hw$YsypY8*8k{g5KdsZIz26ZH(jBZOR;L%o<$nthq%3&GjNc+YMrB= z{(Ia@^0*iv+!B0>Qq3Xv=IFA=IaKZEyX?Z_h~@52I8Pi)^D%v$)-#^G>$P`HY(&3m zBi2{B5!5WwwWx9sze|4$J{cx|Jp|}{ND%`gw9UF>AXAl62N#z#mdZO?2OdgGHpogi z`U_8wVear4+QlpyNVc2c$b%CjH(4wcDNCK9?i9*?mRaSAsk ze2dNS&bQ-b%VM6W8BLzl$uk|wbWy0WnAXCHF~UQP$Ul+ly++iS_Y!k}O3P8lb^A+(bHAl5uJze= zjQn60%Ahkc9$mT}<7!mnLL)+VV({jiC4BOnF}*f&T`kfT(CS`*cp`WCdt zp`A4!9cSv-+4U3;j$g?5NVj)fSz7-|4huB;iu+FA z(j#&!^zcD%JQQJ{A%={SaJHWC@FZ4TIwh4@!I?W`Scl(wi;#9d>FO^)Fz{=SuyLtP zw3~l;`J-5Pao5^_c&RR0Ldt(nE=bEFl(rp5Z^bkF%RHBXv;6`F zH`oUWmNHxHxR8-8_^mhYcWVocvfIkLJku^(9};!`N;<;!r-|n~(R*5MM0Fc8^0Io3 zKoi!7Eb1=W_LaRz)Byzw+o^HOJLHndrcp<0z(d#TB7f{CgF3m>n+?w(MTf|DP zr*@~8KtPV#<;g{%R!hKm8P(J**eLaO+|z`t7muArE9~Egu`jN%Kd13R?;mbOIOg5K ziM=Xhjals<`!SRqHj|suwh?hM%chaTHVN%qcXjcw8R^Ywteyp{7LhDKd%g?&wj_%V zKV9~8!Xrwpj2@3{U7}bi^6RSJwEs;&kg}Lg;AxXHHJbiA zxbPTkVf2P`moVSsT1kw^*lsAqo=LIwqTh=zHK41779r7LQsSATdCfg8cG|i(IV6IZV89nm26nxb z8*j}Wn9g+M!RtpEdk5R@3&_pws$bXO6p{ z^2J3!gWP2~=d|XAv|T)(Dn~E4d16x@>v7hJO;2_A&dh<9EcVg+4XjW^bLu$iBxET66o&ZARPHf(Z`BAc(Syc_o z3V$B?a-sYKaP!wjdgE(b0a0A&o-a{BZ z>AJ?54mvSmc@-?atj3ZgG#7KV8Zk1T!&+4LRnI<c;~qi1}w+6k{O)V$K)>rN>3#(HqbY zEq@^|dsUmhVceP_=rF205BjjN za8gW-2Q5Az=O8XXJ0oDGS709Cd0_569_L?YT!}dmdLG(_l1*JbCMNZhec!Hq-)qn} zyCvQs>k4J>542K{1aR$ict}@b7%05E zXl@rBxUq;AC#4Ev=qE0G^afzE=6QBS95Gqv7-X6<*#Id$bA_kqjq&dqije+BvS%K% zhVAmvFPHjZNgq(fCl_N#Ad?z-&j6ksNW0Y>!CiY@UHkWX%fDrHC&8oyk4>jh*Tc9U zT#yfxVs;3#aQM*trD|`*aZ{IT+b!wGx$dzc2R1FOY7>NK@d{4UyGDmUclroKC(Wmz z@kMbbd}d7tE2M|<*H;P7XeXTJpQ1)_{;+X=LDlh*P!v(5b?eFe^G?UvX>t8*ALU%pMdT!mu ziZ{o!q&~5+>i6gO2)JH70ofj2O;Se4J4YehrMFEm4~nZ&HWzM$njMpVFRMhe4q|>= zm(B(RSBz#D5?b;wDWz}%%>pXLZYmO_Lfg6goiwa&j)~dNp=9S~nTIJa3n3RaKDNGI z;OtE0e%x-9b;NEd?s%+iqz9q|un!4L1mI3hx*J>D4RE8ho*~)Wa!8Fob|wxp0iyIO zf6dz3tmwJbN%ZXgS*V4in8Xf!8&W*3uUk}raA@St+tnXQ4WwT8?&o|m;C<|Z=K?j- z5AEGn1pW!8dQI*9Rv$ZBbZ)25jMIQ|)t^b5u!uDG9XH;l3gjLrgPf#mZ+O}5dpd~3 z&n(hx9XEb!IL|x3w=SrSLM1^WAYo~-3yfv$!pogmwqJzX59%SP)gSWxpL)V61<68q z$5l9N;)G0gL}mI3z@yb4Kh;zgN$9 z=-;WQ?@Al$`%L^}5;;^tOM@MaPmJ(1Sb6xp}B@I3mc`>2d9 zsa{vZ!=j@LRXDL&g6X-~q{OaE<+A~dHTZ=clfJWDrY0qhX~uoBs(PX(O{)H*`@R3U z*(af%@2D{5DW{%PsxqM(s&n{L<=;{?uW)xc&)1t_oaFNZV1Pnr;Nf!ipQQOvmX6^f)yC#^+4S~h`bG%FP;}x1& zl?@f;e*ANw$~9yI@BsMOMRYE0myEmUrs7K}ZX|mJEQCZ6jgD5Bqm);3AwKfDQgP0i z?XEa_FFl9Vf5F>j@ckOR=G)23{xJ62=VS9^2X85T9vv^G?aeTXJkwsZH0&4P=Lb8c zIe7i=k4Vz3IG~tQaOI$+HCoxG^HRHFFwvGLDK&$sM%Sk0!yyF|*L`gM!oh)m5Hmx? zFV&P8%S1-fccvZzvcsJp9EZz~P{L|C#K+}zGyt)iTeyL@h8Qs_M_t&$)(;0MmE#EW z5VIzLWu@O{#_`q6ef1U7QI9p8C`>;No~xZRdz&?0{I#-8e%ME$)2JO@Px+M@FBumH zE<3AG4jBmG`FxSeUfU3PjB+%2d>}1iD!(jGgoh)E32ZdNaDP>FeOqWbYv*GjC$bQ&_!Q&2`Q2 zDfU%Rg;E|cwaXJ&coWMT-+AtlWsC(SA00dImq$@d#fBl z`5|5I0X28Ux8i!uwjK>v2Kz%ac~|3}U9O@Y2zhaCN`|UNcPiH7TtI=+k9nc75~qek zLDs3_cNfGr9lez3NTeho9hoF8GN6Q|8}Jh|OTTvZ5Q4 z@a&L5?EE^;oK8g0D5ok;48CrKN|UbUYsSh9ZhEo2r7p1pJ2LZ+f(j^aFx9%N&?*R& z?Sam8ofDH%^)b|^Eg(C0One-okSKC+ePzq^#Ls9~h3>qflT(yztbsR%u3bz`o7qJZ zR}z}zE;d!a)qH#3#T{Ct#kD|jE5*G)aZ5sRTHK1eLn$rp?pgwYA_>Kz zl%Nd`#i2ma;I2=&uJb$hIWORTZssq-X78CblQlDYzU#Ak-VtQD#t684N)nRCGzvGs zOmo<=v3?7a7uA%nApTVU)krTlZZVR|EoW4>bBOaLoVHk{*7?9d$~`6Ii?r&dbEL-@hBJU`luj#gvb&eB$k_{;nxJ0C|%Po-EAEH!IPgk)azb>Ll!@QSjUbe)3I>=#52wd^D$tfM!KbOug4HO1nO^v!B!qsnDTS` za|kBMoIPf7)+Zhue6=RgSU{ml1hqvU^fKn#FJdtVxs0*w!V*z_rqY6AQaYHpJp*Cb z@=)9h7|^6st~8Dfqqr3oL`k5~*fY|oPRh^09ciidy4aGEpr!mxKR)QejE)enc8^Lf(y16l2#!-MVVHPR~E1iq~!4f47~{tYvVdqV_P%XSl8>mdKg= z`75$&KlwS`2kZ=$jE^RQ$<&q@z_?+1rQ5WgYOmge4e0{o6qe|A>c_knz3)%2(`N_q z>yJyN%T*~-^e%j-&aZ*g$MaT1!09wwNq7giqr#YU!Fc$J6?sGPXMS;uWJDAqnMeG5W>`kX zOu~B1D!^8~yuqIp<1g?dMeM->fRO;UJ_gJAPGrk|yMKqc z#$Lab^Lf>Obf3Q{`L#^E=EM)aQC3+_rJYLG%;CXkbVo!sO5OI{97HADkyH*Yvcm*|GwyCV!2fQ zd)Rk3;MaZtN>AB7?J!J#6sj+1{&(ewbP9GV8PnL2yG?nz{*$7Pdxz^=(ze#2r19Bf zNj#2F8+5@f%~H=V?Z=Pk=o6+(!lFik@g++-Oo3)`PF;T0nQM`H`wL-^Is^Gd%HX^@ zYgqjANXJl>`9f0LXL7^TKX&vs+g?=lZ)VUrcX6D#s4pSj8$FAFwv$|zMmHP_cetM~ zc<(3wI6_DIWAp|rrxIjXr<}(AWh5B1f6kYJQ1AEjoJz^ec)2I6U_mLkBYC3F-&rMY zpl{7Xs$$uWmr>nA7UyWk=KUGulCNGrl(eHhN>v4@f5ZADf0E+069H|ISBSTUfqXEi z&vsfFviyFi;zdIWaa?{iPKOmJ%UBy=0TF8Pg9O>9CbYg3sUP;^p{yb7Dh)AM-yLGk zI^?a)Zva~DXElo(CTXl!?xb(Vv5eGg3`ohAGDyPBJhldxJSw&=Imb4`cZc96&jNAj z_L8Od4LE%rTBeXvuj66%P4c1X2s`(RrD})N=|XRn`}yQ;&RH*~U(HwnUl7H<75ExN z>b<+=bFQ52lv-dBJF~J6dxuRsBTxPNHWCM!OiXBupb%Cgq7ic6?}&KVNGyAW@wmP} z@Ixegv@*1Zk7rAOX7q1TuJdTVaEG1~5+&$bvKjniV7n_=(Okbq5XM<7EX{Bns?TYz zDv(~i$F2Ku=P@cFPZ(|2U)0Ogpu^~Mjyc`DV|mN^T$K7I=5u(`AN9i$UA;$6WZLLu zDgF)5*YC&;IY|6O<#0~90<9y$B3|X%9iuyHqO|(LP#*kZ&gc`*UbM87(lM<k{;>}kr@_hRa+I<=B~fT!E8+>=kg6;3HYhLIkgc8-&gT>VRa;PQkkGZPqavl+sjWb$1<7i4dRb#CNQ{`fx+!2@G!yiAQIoBA3K2 zM3+jvI3)Sop*%CxKgF1D23A}G*0sfqHCZMV$Y04ir)wypQgUFGYc|SK;*9Hiv@r;| zPJhp5*%LRw(1t7UqU)Eli0{O(^_tJ$NxzN{+60-lsw?Xz@!OF4cbH6bIu$nVb7xPbnM0Zz&wyc2*1c(7#L?Aq0Wx8J@%mTlt#&)8GK67+1`C!qFN`j6y0vc|6Ck5LKOpyl9i=2 z!YK1{)6Pi1giF>`p^Zm{cGjoPq#`LHF<3;lPkcB7Vf+DQ44>VqpzGp71IL)^H-7@i z_{F5_Z;g}f=>=m-#&QdytF?JW;v@M8qT>iQSqOZLB;@-dl#1}x-AU-uT@Hqy@n{Oq_YG~v5a?9HuBV=*f2}781^fxv4 zryZcJLvHp-Ur~muo(k(6&#=sg!96SQJS`K64D4kZt7lM#qh1L&>_Hv!$r^FI zavPdT-=)0Y3I*cZ4D(hMICSowjjY#|RepN~qvuceP)lf_7RL4{odtQkLeoP_iBfQ@ z3?#6>utraX{HEs@VhbPz+?o<(^qxcpG%szvazPDYGyhLp64KCtpOzBM7LkS5u?2%) zk7uApDF2S1K}ek}Ml_(Tg4<=2@vOY-iyP<1tZhER6zwXwvDW7lrqWz=^xBExdSRf| zkS&%Hz9QAHKe)=~lWDRR(XZ!>>`KY4yGa9I$ZxI^V$w~|%D*eXmneUkX&#m~`*gi% z-nyL-UiCyHhVSc%-its>g6ObH1oPV~0qGN$po)=q))j&=wFS{DJ9;Axf*O~C9b!NI zoEF)NRU?NFc|8rOOi(GoSTQQq<)jq*cHV+>oM=h~KllHdTRej~SjguipU=IV)nEU4 zYVry?l=Y}5^!J&N>y}3{j@S&``YRiu+&&H$)uJ6O|=ZI<-0n5D(b4}m~&W}*9X zL9)xl+RRgGDbSwY42{9URQ5(lq^(G&qKc&WFJ^GGH?W z?_-c2RdhG`x7g5ySwl%{8CvJv@8RIm16@ zod~E_&4FCVbD^`Sc1OiO3X17QV7*h<495$Jp3%!{!1R_y5zR#}d@}>~e#7Y0rhngq z#s{U^hi-7?FP9I#rYHkTEIb2r7(108&tQVb>sq!^K}eF0PbP5MgrSnD^174gQ=CR6 z^1T8%P(iqWA&0S6^fO~oWz7_pLfOb!v&uhA1qMX9_-Nyt&ar&uC5O%sw|WmJ&XKCv zQqV`0vrQ(0tkJ0=5;c^*-hm=wTe#hb6H@6pfkc7*1Z+N<>5Xs6GSl7)@> z{YMLcNg>z!e4xJ9qIUuYSQjgkQJV~JCJHz^Zf<>^TrF{WEq!+k&~K?jI|fBAn?JRm z`&o5ZwXrD4E(YaH@E?+{@9{QpNvkEq)+Yi5g7!d3dFMnQX#YFJr!k;2B`Zj*jg6N)4Vs@6D^@&6r~STlMW&@PT_w85b3QjdJJ*qkNd0l%r-HyiEt! z*eyKrE{}%IR`+Ftk8pxi&_)S@pk}py(83wh^7rYqXf6twp7b*bVpaPbe_brjOX|MK z6d22^OYE?^w!EbW2IOL;viG{oM6H`)ZdR-bOUvn+Y9o&xKOYvQ*#ZWL43uqqCyvgZ zZj4ghsgP=GysV@M$~(WbZ1g8{cxlof!ZA3|)JN%ou;T%GCu-|)xjim=xz`#6hg!?l z4Ot4xFXq1h=GMNRX~>jL2lt7N7~A|6grUx_6N}od+T`t9xx4WVJOqYjdHw87G+t_7 z07@$ke69Q7WXeu|qtgx`jRsHd%EDB^7*xs9hb8p9XTHBg75zEqEom#xlI)+i8ICe# z(kFGm4y2TyamL?#^uj}9<0KsPJSl_?`i^9p+VupkeFx+!NmT3>=L61EeyIBBu0Niz zSE-(KPPIuN9uwtauzUjAV5gzsfk&T1uQc|UXarH&e8)Urq`udE_jUG7BQ)wj@%kdp ztKp*Myw*}}MF$e3*Gprfn##PIdZKG421L55#7(jVIICY+1lYzieD#{~l;WZZmAAG9 zRj5hZR77dPUt>eBbRqN;fp0Dv){+C1t?MAizK{r$^(9a25wp|kvA36;Ey7)RNHK)l zLjaC%DZgCO$C0EXUMNA{%Ina{T6KMelTN3QPp}ciG%@1tXiv&YPZ(3twI{1otDPgw4fYJr7ll zYIUGWr)WDH{p0QQtOHVaVi21hFuE&YnwDc=u#N0EPU|&s02q{Q(!V_!>6BgOqO3EJ^F9NyR+PkbWjJs}IRS*maR5O0F&D^dT}T2eCY%^DbO z_~QwSbdza}Uak3jRdJ($xK%AShuL3Tdz*~DwLE^%H3eGFVv!0*AoBTAsVdpbnow88 z07ElERQ}IAOABkVrbR$4%X795@IL)f1}6?~mxu1Nn<`)O7)T_!(QT``F50$9fBNk9 zj@5tnC9>MDGX+b@797M+7^UI*OY#Ma)p7_H8NB<2m>qr&STY3>C?@?RBe2xk(Ox;L z$Gm+QWbW%{i98>*GFkX~3Feb!R+z1QtVRELeR$F>w zYJ^fb7fgL6w6o)ct#(7FZe9Lak&Hh&%IUC8>Q1lnRjf=@6-r9QPQ zmN^_vgJ9WL_~TIu*VcpR7&ys4$Z1Ix)LT}((Rrw_@1~w9|KrH%(j#UU68}V9idT>O)8M&W z#8DX_g-1V*jlwBJSNjdpwThO8Rh5ETh%tDl@m!%x?>to(e)$!gXqZu9UuUH@<@g;( zeWbls_pxRZ_7MH^oQ1WV7v$8dU-f|D$z9=#*57`bNxm#rD~%V$MjM9a;0A>cZ>fUs zQ85KQxRmMABlQnvXV2F4b9c@s zRry{ya4IPeWCZSMw5T-M^LZ-Xpo3B7itA^hWD>W)W{=Xuse6pCQ1e$B@32Hr^OIcW zJd)XE4#6wKv$ciEYjo~PTXLAgHMhO(xbk`WJ9Y@^$1@FA%EvZa`osgXPD)Dh1s1*L zoTl^MB}L$g(EY%<(!10wZ_Y=K*tB&F3iMEMYP3|+^9$s5Ixam%S9(XS{LV;z{qa)y zSD`Y4Iz7^9GUj3?O5&eOv|3Wrt>3t@BA!>O%-i7T6_M@cf%OYN_bgwcc4d&5gaMjG+q_V`^P% z6(y15o|~_hU_-ewBjKyLr&M{%8d%}al~M4&(!l9IDzi|(AI@LQF7(N&9nY6-!1=h% zCR3dW5T%0S=WhHn{Z%vGv&-aSM8x>UrgN z;$EfO`!s7?;au2-+jbMEds7p8HBaB#x6Uph}jr$98T>|yj=)W)U(C)l|wt?QtFN>dx@hTvYeEz2XV+rCb?kgO@3_BZZ`)lFoI#WlX5=JB!s%oD zDUnRI9c|(^c-0Hw&kLeb2d1jth@h5z=Myd~@e%jkmGeSZNa%R|X=%}yj>b3%$yCYb zRLjiEk6NE&Q$5*kc>N2~* z;C2&C-lPsA$6dgZ`_pVmtY>z?(`t=*R}wd%J zE;emd;TkTyrS&es!u3$s+_pa3difLxRtoUbTZ+2toBU_L%j9D>ga!Gmtl^B?oYO;s zIIg2QBwvgcf&bBtlBO=?O4K?JZNMuhqVAr){Cstw=9YN^)3!%%y3VhE<;Vye- zM*9}>XVp)Jym3tBgCNp)^}Zq5{>4`DATzSu4MAGcvtc#2q6OJ5cDAs5vw38a=e{M; zk6A&TJgE*J%P$8=bB{V;#|PJu`gfjmRPE;I5Rq(iDt;=PxTL(Ty-T~W9D*kgNSfR? z)9YUXY>Q{fazASpsnFP}qJX;juW6|g95p}|sQ7?Y0R8~jTxAis)Ql+5@~;rYm<3zZ zyj^t$ldiwef;W@}FTha(aw*Rxz4a!`4u^KOgWzDzp?s?Joe@>dR2+C2B&PVxIcE)K zDdMndHdZ5EJ)Cw2CI-+{e)Y53t&8<<-4Zl8@;8B@mUQBAjK7Scpj6EhRuxMqA#HG- zmOK-skk}S7fmDT9&7zu0rbiWsM;xmwFnjO-W>kX7|3o$_iy@aB4~d;g?xva zUxWXEQP`ft7QRkfRA2$;mMzE*yI!PXpB5z!85X-44i$@AHcSxI;vJhmtRBk*v&3nL zK4o&sdAHocLLQds(9B)(%VCzFUuk)p}e}9j!x}XBXM~0C5JytcP;Hr*-BaU908z=cK_tl!K z>C^86>@IzaPp~*{90#8;ZjjJT^>PIW>S(;fLVO!950nYBMYnFW=w;h1v%q#Zifi}G z6<|^;rRgP(QTX;sx`i12mc2dlBKnp1;8R+ILI#Hu51Jhd@Y%<*3;MGmK2hpWzJ(x? zOKO)Y=2sxkMM_!=0RtAA2-Xq!8Rls#<=icB$)5GO!T!RBH2APrbCBo#LBg1sM@Sxk zhM?ILFY2UUCn-dI$0zN^G#!cZghPN!M#{N@j0|0koU%uPbHbSaN*{kG&n@v z27}J|Wo_v3y2RL&HUsn{JUmt9-hLcJd!Fz_kiBnnwAe{CDH) zQPtVG@`H#t`&S}FMWcmvIz$8cjz_q>#VvmH^$4zA!Mh%kls){%;_#Q zs&IQBEfaYhj)>H(xx-BFE5=b56#fv$k45~0Bo3Q_v3||s7AsfFL-#=F^3Zp>gH@^; zi?E36;(d~}BBSWv5Q#ij53%`te~Cag`Y3?qZkTSPg+-YN8}y-Dc(&B9;6kC%gzEUB z^ML&@o||7(^MF3X;_|t-40?_1PWTyXj_m4GavkZr=Lt1(1evxq(&fcA7v?cnuV#7( z&G1viW!K_+?s%p;Zg& z9fjV3N-1Gf;0yCB={eJ|l9?y(s4)ty1{DgT6O}KqhOWxcH&q>lo5=Zrt#5i5qqc&V zzmb*%m|}fUN(t{ROs}1W9of_08s1(lpkDL60D%(K(1e76di^Y`W92&wgJMeWVu{+| zH)HAT9vyx*n`&r!+143^gWR=aO;7oMxyU)a$@exWh+cKuH(ESO(?A>F6`oWRt;JM7 zk~f2Y@ETIdMqZoB&@zZ!=CgF3HwR8$j%@V|PXLfcbsj%64nNZ4FW(W%+{AGohF8U% zKJ$?7DRfmwH+wMso@P{Ai66nN1~Y`1QP^4!mzly!JTS+KxQE@`OTxMlbnDw%_k16v zF++UZJBWeogeOLUU`%=@%))IRv;OVd0d6L^J<;ZJPJQ=h#$YfS*n2Og> zFds_nCJ-df`~5pFS~4-@}CfmRCJne6?9_Jl~63MI6j4dkeW~u7H0{ZY@$W z=;b|$!KQ3mq4}1w20)<@I5)QldnU>BuB>l&#l1d zozNn9Pd-(T^y408GEwJyZ6%-eJ^4kemX4K0UI{DhURl*&2a7Akz;f{IN&{tM=FaD)eg#&yO3s|%lP}Kd#lP|A)#1~?oj4$kP^9xoEbg=)) zJBqOY$IKBgv)9^--WO2vppIr7xeXbf3Lv5?Gzy+Y8Z6~y+f2(#+$7!4{0zR|zYkpE zm5OOUWNo+MyGieV*O(1G^uFB=2$(3Q_k_s!m1s-@9~{~WRzB&R0d;);>+^gQ*u#?D zA@wuQ8|}A0YERDUK|x{@UZxBl_-$%V>sbm;uGYQa#gldi#y`gP&_te8v$)YFucca5 zRVZ^G2hja!pj^0QVI&>WtMK~=PX5LQ;5Clsy8nirYRajqdZdRngi{^bXu9$#=xUcT zpJc`raxmUo`$@q~km*&TpvvO{um;^~4Fgw^bjOvYQ z6<_62)WNyn)kifNeuoJB`V>IyfiL9qs`_K>@+>tebe&39A5m_hp+oW+LJuyvscn#1m)HK4PB45>}$54?a z*yvETv#xHA=4r>s%8wKw0Q za7g1!1q7z9tz2f=n5|gV1dUbJ(SjkZ0MEbLR$xD;n&slJKXg-bWH!)fS~ zaSW36Yo3m;Hv^#C++M%0zlv)kKU9EqPR!LemgZ;V%WHNwBF62Ooa(iNHz5<&0f@k7*0fMFo11SR;frS+U#fqwlH;G6!#G(W>ej+wd)8+0s7@N%KbpvD zWECC9JYg?jQr%`hX@LB8HtJb0Yf@tmIK6oLKMXhLTq7dUj78c@W- z6PCZqiZ|A_WLl`szvp+iR-`O!4!W&+_4kD?lBFF6Vlz5Qb`Wf@LleUJ5SmEFtk|Hw zk-@L`sOa-M^FAhVCd(vW9Pp8#L}jWr4AAptMmB-R z7R#+_Os(d}=ylgMfM=V3)wI&~;}V`ahsjfAJuc+hH?g0h!@7rSkArogZ_Ogibg|g`*(n?jWC*k%C zlhbf^?#q5*swG_G*$_K;e?`V*R>VYzN&;BtHOeY+r6G1@y?D90L|ie z3Do#exKWv8MiXKkWJHt=w2V!~`f`|81AXvm?=-1{IPWH+glVlG>@t~gOqh%?5c|h2 zgU9*zH$AF46#v^a3TR{`Q|M*;u~1O7L6Sp_q32Txbp|!mcTKZ%7Z_{bDGBKRD>+#> zbuq~mblT2^Ol_?8?)X81+Ly%F>=xLzfYi2c&!X(%I;S_88u9XKjhW)L$UuNu3psyx zy#g?y+OktU0zc~AwW6!zr=MtsuMA*5TowSmi$rRr3zR)9*vkkWaim$w1 z4&wP^SvQFl$w}SxtfQ*nCKe6|s7Up4)bJ(#_|$22!GJT*qqz{oBZzU{lFw9m^f!Rh zDd)|)>t?*Po2UatUKqgNm9G8wr%IHk0*{I+V%j1=6n4GQO`07@Sp{$(+5YYF+7U@Rj63m9{JO-X!M z5}vnW%}aRA1iqCCDxTovbG%{)-kZtc?Os2I0CCe*-+&)U`H}#vEmiCxo<4kcp7Grj zRk;lawnvqq@}3MRv=k)Ye_sx0-2zHXja0f+ohneZ=nFboz*Btp*=&DRln|hYAg>VC{DqgM_kgmW0xfO24;I*;dvC6d^e9glQ zI*-74-AOC8h#b}+&lU;5PniX-+{CNKHhX`CN$_QAeg9`-rzFG{AtmD%SytN5CV7DW!BK3wC!)d1Dc-0j}PTCnNv(y=@S zbe-y!OZ`mywEO)FAZTkciLQjtKNPIa6=_AM<9erQJ{5Q3xOGjur8=Aj+phd zdd~$29n-;$bi&f-(wPj)VNI&rHKYnfL~N1iw(vKI>U)eTHsL%}*&QW29|F|Y{un~j z*A`|))9c(u6PkR1sZy!-_%TXKjRbum?iME~!>&XcL^{&Ffg!n;#T)YObk}4L8Z>tD z0@#0R{=@pK{DQ&(>LtwKYe$f4U&>kGPYP9WJGForb%t--E_(PD^Q0k1f3gaXi&{bW#=hfi((I28(?44C z859r=V;OJ!A#rukz2kb-au6rS3`CS*gU<0)UTiLl#yhSXT5XZzE(_+gwc8NI;rF|p z5o^l`ro}t;6Vz4Hp&G?S$KN(D?0khCI+~53BUpJ$2Sg)oOJA&HJq1vZ@{29qFuWBI zi?p-S&#f2A<7iAz@&i?v;&MOQ2=t6=Uh{kjZOHGSP#ejg%#;P`$KTadng&kS7uoTh zWYJ#q+gv^7hbHOXI5cJJ15~!M3>#61xTs<2 zZWVWxEY_&0-~IzKPD*v#^=D3vs+_R7AIA62VxA2_F-v6Y%{t#w{t_Vf1?y?v{msVy zToA%NubzYupBGmU5n@TC2R40~B*izwMt6 zI|+jdRe_Fjr_tYUMC|0+Kp`LIEz?3~dd=iC2j~oWxb$qf+S8OLV23g*cv`;)-x{%L zvC$%qo8c{|0V1e@r_W|?*fZSF1wzRZ^4wnYmdkH!1cM*=I z_V)(Eep5lvD-?S2Xcqj{xgTu47V(YGe`fHk>lY=P-w)@9+aD>s3AuXrRC6iGRV5 zpQRP>hwNODgL4=YIo)x0dhLJU_~1X)JB`t8s@6=+$NY#fU2(AoK*RD7WGtM@BwQam47}Al-(2ld> znQi#^d0FzDb4OrD(%J~5)zRAzl$PX|mujFhBiLXvAa{Muq2)VpcWKCjv>7Co0=?hc z*u=Vifc>>hx1T}%{pioWMItdi-Jh0&s)w(IMCYI&jj-3CZ|G^Vg$b>$MN24BrK_zL zW0gh4S1SxBv!dyz_6yZ;y}6utpPwve$QB$YH7jBXK1`ky+-i8lQxD1Onc=&zLmYHg z(@ac*+{OF5^QD@cO724)iFW0d$*-y3CL10(AFbjnTxA}8`q%MJL*jCoFRy z^kED7%M>@=r?Gk@}gS4F1%h54Wl^@DScg z!*e`8HuSj2x9j5g;jfh6l3RRp^IYp0WwH^Cr6Y=?mpUmVSzriNDP=>BRm5bQZfThz zwh-B_sM$h;ir@dxGecFTF{qRQZAgH8gqS8P5teN*O|i-kHM6U++ha`+JFR!P zJ=BiKE3+<~H>GSgAS{=@GxsR^&G9G2C{sdR$FYY>pC?zGxI5@yJ>egjBv)?S9`ZP zEHO}@Slqyp%f&|?7A$I5L#XNqbKQP_b$dy(02SAxvjDR}fau~Lj#gj{B5Zw{MnGq) zEvi3v!YfXMP*^+fLcsca=cA~UUMTeD zz1LWq_oDB{9$Egy&%L@8z5J_*y$2q0&F%e`R6p%CU-o5zX0k{jy|83~A zbsaEu7)lagKD@(fRH)@cesQh9a5Vxp8LvOdyzBEIYKjXqBX3CcA~|g<&9&F+T|2lt z?+6~w-z$&1Ea>Bq{Crb%fAiwfQ>rDV9ckTNiksmabe!!ibD|*Aa1E}x0xzIAmitJV ze^AT|`T;%qyB$V9dZo{5`7U-vf>uSmP^4M2rt2QFo1TSkhP#7>+x_7CUoUTNP&nni z2YRaaun%0wE1l>8)ZBVq#CKJ+uynhyguK6ppiq?y4AcU2pZEaVG}{YW*AH4R@fVBwhf5rE zbAV#~?d`Ph?NlFb`7Lw5{NZ4BJ-bj$fBJPn>*lA{?x`PvXj`<0o9)FzHGqLfx6e?h z*nN5w!g>FJV(Q_I>H?ed@4ZqVYS?`U9%!1)=`wVe4=82_C-)nfi*T9m*Pom(J}sa+ zeQ7~i=4y1|dhxvd_Vgd3;dLUzWujusnOLrSemhpq1EltC?u{hUPHS%bbOS|teg;oR z1*6bix5rKniv%Bw?4ND}6842qqo;U!D?IORjPG{r?)-s_>#)>z3UOWt?DY=l?Yf@f zrf=QSaBgOk2^#)*Ummnw?j>_9BvXG~y?<4`z=9(8`p=)EaD@roGQP&)YESu>E)m{) z!5t5$?zazkR_JiY?Oew#J=*aD<<<*DyS{JD7ZVV~C!P14Ht{bNi6#l!+X&j5T_O~& zH$1<8us$@1YAZeXGJQYw%ZdYwlaR5HWnlN1_x(luy$=b-v}SJCj*VRpo3;yQs8?*w zu&7CIzsqY|5rQ}jF!CC)ZOH#x!8$iJ2pJg^SA(s7QOj^$yP%hMl;UtQaftsE6|Ia> zed`=^kwp;!8;uI;n&zH8-&C~lSvxnooisBkZW^e=wr^G8H(3?NHAm5lmzwUg>mSJ7 zZ6q&qyk?QDO3ARgqOYq}&Dd1RIkvXDH)yxi4rUbve29|=HuaeWBTL}O;AWmc`}M;9 zVh#Pg1^O4QYGvn1iq(46LlY0GF{Medt2-1ZIZ*j@tFq&&(i_F*14UO~95rls)GhZnO#xW(=2^a6I_lMYmrB+eJ9n z(Pv$R$=r0yv?}SRIzt&4TQ(;jaNK+B^T26|JCyk@=*fJiCu^m*RJ3M~zwg6o^O>wU3iw_<;!~g1^1-5gPevoRQ@W>`7&*R;dYc^L7^Hr z-KQ>L`-D+`l{EMtH2C#JD8ogl)NrLm=~DH%6gxL#(6~t8_+8M+G8R2`zO1L&5-Kp*R{H!vszI{pkc!ywgZRvdd80m>|RGBtjC)ZIyK1uhRpP`qHPAM7w4*}Z0q4$eU0NMow3M}5f zRONT=O=uian6bBEe1eu!z}U&u6!{}-J$y$@{D2Cp(Xj8g*g*4GRQRf;7*l9eC^t0U zwLqb>>ck&m(HCwf&26pT9sP)$E=$D5x%q&aWhQv_0UM@#4!p5u@$<0 zkqHwl=RUCNF$xWy{k5iI#OBOqA2jm85oFcA@%0dBzV=Z=^Tx@_SsojmmFCc5s4X@G zk$lS(Xo#QTWrt~7>BzX`i1!B=>0pK;GwHC=+Z*9$_+&|UUZjD-)X>~3+b=Y5 z0?gQjWO*-GaL1mt7w#xFGIZ3-E4MiG_uf08naPTT8ig%8=svey4O}RlrRGON&b-HN zz&kpLL{JYevyo(kK6(u3t`mG2UV=;5&h?yqw*|BG1!$p~Otc{}q+jJUq#`)KJO6ej zADL@o{qeSi(rQmR+`QMkD(4@VI)k|=TO}q}0^^)X`|4Z!&X+>fXya`Hf_Utp?wBZ{ zZKMq?JR^ka3X2yJ^Um$S2!oBq6hC7&PN=G@8O3=N?P8PsV;(b&sdDXrCY0~GXg!}h zO+hP1q8+B3cj#d%^AHzV<0Ch+?*?i9D=jz3*|XQB+esKK%BJ~L>h{u&jVPzUt3I|j z)IJ;WTM4R5!QH3X*^spI@$?D(7CYMbtFq3x4_)<*PZE6d#HzQ(XVV-RDXrxH+}%~h z&eyrsqi=lE2oFLe^jOYt3MQ9EiBqwYRKlyDEd*`0 z;mM!8K&wBSd56W}16;1H{iC1s<4WicezUx_@9SkhxrE_<%ZSD0cc5Ih>1u_V;o)q4 zA0X3pZeopEE^o~}UC_O@Zlld~ZK@gD4@Mg%G+N3@$+w*IrT;5^)BltiXD#Rp z-bJjErrP6o6FDCRE{0BP{15zVae+= z9)Z{qb?fTRSV-S!2=j*hPV+&UzFfw_8DBT_)R1+p`I7FimD(;^f?#N{d!~ij2KrT) z73_q>TB@m1w`-P8A1n*BIFt7GSMb&!5zd{cnmYF*FG6b#E zN|rhT`#yqm79>&RP5h(@D5BXsWcivw{zg(RUS%N3r1yi+CHnB2L#`H#M6T~7OQWY5 zy^_{id~FLwd>6f@ebA#%n$4e#F?o`u8ob-So>>s&R!{H8PI@(bpo`E(W@Aztt-jhebIHFs7WoNpGF-7exDW$;kmM&RS@9`WY#Py!`Ang62nho zP6ADBot@@3A1Afv`%hc?ZYLHgY_?9>$QUN>w^Xlhb_=+Cr6slDdNW}XMmzb0kdw&z zUWIpzPrTBRS$WB6HaO>SDAhIxrTH~T-pBne^7g3R!U`l@qdd;Zxz2X9{foR@xNu>b^pK| zX4(52{#yy>-?E2N45;$QnS1VKfYP#p`D^&#|5Q?~4@2PSVJEt9e)+ps8s>k0y%gMymxW3W zwAuM@p-WG|dB66slWf^{pEmI}ut&glSsxGF5R&{?%fAC86E@r*QvU2U?^L(!A3tn+ z&lBSVEJ2y+vizuYLjSSz7=*W{Pb=ss`98Swge447KSaZq^FLb4;ls!l6`LQQe9vbd zgv!aY_%!yXaH+-;G|5qp2e@0;TPs3CYmA4dhWslF62Lc2VwA?*CVF8*xc~zO3bO z)hxIP2pb+7Mp@=3DwR(&w7@QUN=&1N2y@uC-FFpBQl>lnzlIaFFgh|&m1H%NDf!i{vJAR&_8bc3`C(jfvOEg&V*4FXDc2-1xpUDEkY z_CEXho-@94#&_N^-uJ)PG4{}L?>p9Str^$6<~3K4sX&FV@FKGdJqR{) zb}rLoew3rRJ}dzLOA3*pE|>9RWo4xvQBq#cFCkH1R8&-Zf{KFjERdIv;+goX)Q|z32V+y>wo6(=rQzTy_Nv>8=#jmfwR%VGmeO@XWMmlp8|H>(- zo|MhA2vfOtZ|)7@)vVw8n!KdB!4%Q~(wWhJ+86>er?OVtqZqBNtmNh8oy25L_=NuZC#b;QE^3ufZ9l3U!m0~ zw@Xir3vPFHao0#+iMNuITK|_XUv6Vz)p;D`kCpN9@f{r+-MGZWiO=LVV*QB{KH|Nmai*Q`x4&+WWTqYU`kY6t z6Z@-(AN`7uIREC8BJ6B2+wexVfR~py5J9t%-Qg9=hO z-NC^aq@)SnXUDiS8Kh&b?ccu}9&Ajerlw9jf=9u^!a~C$dqy-iI=XITzqj(JHqflz z`)tbR!V4Bmv+g28)D4dl7#P@{AV4YR9(~UWiPSDJQ_|MfHZ?U>RO}inv$S`TMj!&4 z=U|(D{7`3PWL%3@h-IIwa?JYtxud@ymwIFJs)GH&fjktk5l8T#_%&r(0Fp0=LeSI?uJv9YlzMwPjNCU`a)zln(nZfqx&d$vl z+1Q*9s7TD>`uqFuuMT4m8>;4LS~PPpF=g{%@s#0q#|n53UhcwT$@5-$1%(s|pDFjW zd$FBfo}T5_ke#ka(NBvby?xbTmADnAfKqRVIGxF+Uvl<6ZNo zPoI_$(KzEMh4Kpo3i~1Fj0q%p;al?csv1~ZnwkWKgdS;Xe$lIXSG!*AyhdwOYFtgw}F9@MOD3Z}PBDn&t1<^{buWBn~$d6B8q8Ws-#) zQ90b*+`Nt!V#jnp3-w1!DA6dlV@mUK-su6)m|qqaf*aQLS(>Nn9NDj*MuZy57J4E%Yu=DQ>rJh0SdJf`c1)8y+6syQrv>z10Ia(6jw<+tb*z zB0+~$zkmRaC&hmHbF;HWmc#6)uF}%YU=bf^hrkpb9E6k#iTUg;s%YVMA0NA0T3VW+ zL(m&7H1x$vdjiWaAIOAwGuu2~VOwBO|Md5GQhYdX+1Go6lKqKrxKvmM-bbbi`?(oN z3L%GIbIl=LbBzJma{3uCjjlOvqHUbD6T{2`_W%rT}VChfmJdc`!@Vkt(wMW2DA=5uDcp6sU_pAKm=ccCq{{8y{wEi#I+0QyLyq!XSYg~Pe&{*=_AV1jEV~^b& zDY_;hIS2{I`^?=_5g$C}R~zoBP+?n}tbl-kSyZjZ!Q!u9Gg;&SXVlf-jiFK8zS#AI zcqeLk6p?*fl9!E*jYF^U<%P1W?6Z6=qy9vm=i!p6s?0H9SooyRq zH=N_#lzYjfDogy>G}oqf+Gt>XeWyaw%#Y}6*q1XdY@ISW|XDL48AIAHBt!Bz-PB# z1|lYYILh3{5qzu?TcNe31>!X2-5JYhrCzJ@EF^@Y4}xlE>lM>FKd34cAm52RErwLs z*Qe@<@kQ>^)V6P5h5#Qhl~V!l9}95Qm*LyqzNoBB%x(t7C%)fIT4Sjsj$DB^VPSb7 zYl5Z0+1dH9NJ1$(HujeLD`p}D{&EcXnJMIV@fW*GxZb-21_PQon(giF7;j$J2C3(K zb=^$P%$0E6oHE_;FNuTHenOLzO23xP(%b9SA>b_1O8P)Or*z?F907*3i%U8G&|*bb z7^#3?-HpL^M2U49-zS0B3`+5S2C=()d!`uR9`@8HCKaPzWpj~c60?Q2*KbblPsSoO z+Uhz6QZ*Xy&aiU7Wq)8HC`C2=7NHSw!d*$%1a3PxJEvo9oi`R>OOGd)`?S01C6fCk z(#3t;LWMoh%%kR;-4#G{L6|b}{`ddmg;!nc#BCEcNXDRbg@0bMy>2)|`hY6l%HaX; zxO9Z@_4O0Jj^N;6mkV`OFE1}?=^LJ5c!($^cz;c|tZ!B=0)I7Ak%7l=Gr7}*``VE= zhu#1$&gF;4Z}=-HDTRIf^<^wwlldrR4t4BMBw+^9hA?X+ zrc{Y&pxK{nP3AX}YLH(u7y+q6v~W6nOw%W?_WahR1cuUS-Z@Itd0)PL{ zR{G!n@_+kq|Mw&R%~}1Q+Oe1U4DmN^n8+DYt1~Bz$|ne;@(Jf?#^yPVYsESbl|0YR z%#0JJr?0NyXbU0_e0^2wW?>IUJQvqe{rN435am`6T3VL+sK2u@#bkRNXk8T(BR@;I z@a^b4D*urgPW>%(V}xtBo$+AgL&f9+8IXX_0IKMA0?j-l*E(WG_{h7ZBw|h|~v9xq* zwea!gnw2{)H34ovZ+b^ZUxoq`H{RLw#kl6qsgQ$fmI865Gv~s>uD7GZ5|*etBDT%M zQ*3sK(M86p2Zt!&>b2zyT*=mm^ot`(cSLJA-&v~WJJPv+dis9<;7~+Q4--oWyNXiA zjjPm}I>Bk_2IfjRp3MwvHVPSSy%FNyotzLAHj#DD${PYShYJQK`$iFYzghiRv{W~z zvg^)c8qlx@ogP}txe19qqVYq;I#uAUIx|G@FruwbO`5oP*OzG7Cmk-~TGPY? zpNmMOl;e@6c_2F1?yIjpaS^qvy~pdXApf>P;9ci(M})uMKOR zN}TN>=XGX23wU!QI3nx!@3+*uG=I<}3#{5g+3($~{eva!MPfbvuoLl^u-YRwc~-C( zFrk6D-)Qjo`b(7EUrc z>#M1iCI$7_)eQH&d>Hz%VyrHyoG$qy6zOo{>$c-Zv9rHk%5l7(u@~OD*~FZWU-Up; zVOiK{o5lE-OT;8Mt}J@aHY+~1MQzSds;F^L;Qfnj%C<(|jrIgv8b(F}GDY2;o}~H- z`L#gpK{nPnHM@$HA8A6S802T{?7I<9?YZ1n^D-YL2wW_fDJYDopry)n-}Tb5cBc`n4p zbU!n*Z9tr2peFg<|JN}nOeYiTLhZ&E(zQu8^OLNN2W%I;h<%VeW2HKI4_ z;>;jAE{K`MSwL-7D8z6SmqBz+D?TcVRDdU+1^xez;0DK9yO&y-t3( zx6Zp7-5Czj-Yd6Cy%;H+jd^8P(`plkPUkoH;(ZWW*_7t0>N)Xw#Kp%9GU{rHLv+_= z^<&w$_AEuT8{W?73T6Zr*S@R@qyEJ3{8w72LToTBW^yrNc_|s)e!v*H@OJ-?9j)cB7B3^Bos;7^NZOG##43wT%((mmp ztrjc?dHq87dM_2oP$8k$?|EW9c2(4y@v(hUAdXk!NEWu2ljqqni^$yH2k(b8ax9vE zwW?HxwGd(WkhlIYO^!E~!xoR5!6A?wH$>Qvo(H4s%Fs{S>-J|(=b|JMb<3MSbC;z< zgKnOAw7nE7GDbVg4Ot$I62Ci9_)2`^8&T-~diurh%cmO}+Ff8iPqtgduhC$M7jfw; zA-O*ep$f}Sfsy2IwCNS?~@ zqozcY*?q>!!lJKc^9SEe*pG+S2UuhuZAFX6O%PGzluBvsf1e?-qvP&EtkTaBoJr#f z#p~~M`c38@F7K3Hl1}KL+71uX@?m$+cQqSPW3Q zxn25y{+H15A7z$KRC9JY1zEOx?ArHJk}ydSo3+)|Igvcie;aBN zc%{B2ck8OtWIpcu*8C>Fu@0YY5aI4hxWQBB*ZMYIK7}ouMEc;U^HwMDI!y;`p`x!A5D0+o|#w_x(^O8V2@oaXyBb zzs;gI`LBS$&TjD)VyW%ar-T?;RUHzx*C+e^2|gEMUT)M(+3k6);kCuIG{GZRGQG69 z)7v^VD4*#o^OmK4^831!t6uByutn8CC8czZv_nx&9nb4ZU>4SiRz)$MnAhh=DuYA6 zH^LPjqIyZ{YYjUEAegO%XH3s$X4|8*HVB4?2l9&4#?gmg>NK3bTLz1_8!EHR&JMJa z&q%WknfyBHl$D&tv-S=Rd&xMr<>B#EqqIo(;Z> z<`=E9E^W_DpPnTm=!+Ok5`Kev8|lth!-w;qzAG+KQG$!dga62{YO4Q-zf{2a-c+@> z+g8?t`1PRg)is?#nNPWiXPcNMHO8`)TGRL|luAaOc12E8d~Dnw9v?aSw$Xe}a2qG0 zh&7+@cKb6}Z!~!CC|k&vSbHuloHkzc=$TVnPNPzAWA`;p4XOGsE~kR}QH)WTQQGuu zd2!MF78UBu2JQD7yR92jlw_R&<^DC0A`L6V5y8*Y>fo>`uKa z?_QLgak|nJN!jAhXbu?-O`P}rLMH@8A~sH3?DO$g3+CjW_!)njJS(uGT5I{~610kI z!^roBrkpzB7Wl`In|pP9&z8*VG5-0d-4#vcF*>%Nm0B}g+&}NVVZe5Q5Ymp8E~QLv zqfSPH{Z{dzK!$q%G7%BmT&GFn*NrhNc~bta#|Tss8ynJOE8%#&A2`+yB@J7@uaj_p zGI#y+dtkHFj%Ufvkzw0I##&<3?OkcRZX;horl-*DiEJv?blv@XMy?k4E6-wcFj2k+ zGn(R_{FJhpx2S2_L+_VUN^Ki?+j>J)=ik?v@y1tbz;-8uNU4gP&$QUE*Wx^y-|9nN;B8(D$8lswX8Jv9%zg#|mfJqc zR1bM$*)!H#x<585U3}jpS2{D9dOFNti#hx?erJKxF8y_3sLg0r;ADu zI1^-~B2|jB8tkzsyJtOUBW?0gEn(cBF(G`+j~9_JaUJbc=oNbZFS9;1kw-7Srst$s zNNZ?Jk>tC%?JOXJF&en5O;c!GviMW6T;g;zIHv}qiv!{3|32WfDAClmJ4!aP&maN# zOW;*ncL*N6uS}EM)yqRVWc{^a(*3^}VsPU%0ul%U+OCzF-b$K8@!h1d>@aDhdu-01 zfk|q{LUS!_Y=S?&co``#D^=Park{LWS?_XDvx|yz2jQ9C7GTepW*6{^^p2mYQ>VD} znzFSd`5JfGm2Y*DdG}0lY5#pq*|kUqkw(g!7T0VibN^mYVnX;WN)?>Hwxi2(?0#QHwF-u|sT3PNQlSQc=$G1!d)DoTs zCj4BS5aPRM%}Z}5FPCb-CGOx?N3nbK8@Zu(>>wWbARvJ!Xj;VLq+R(hU&(iiBMkfx z3;Z+lihVSzvXMG1#QupHgE>aI0AB`caER2!*>q{w>>x4X-;I$|R4@G&@qcWqjaYAc zMH4X{jbyFB&&+vdW|}NUU;f3FvHPLsBG{@@*Q$L|y3*76vu>&MP$%

GputV^XD?iIv%4g57aV({jnz`McAUaeKS&NHUDr?Cio-*$gfM)1wmfmuTjw707?;%xb;7#@;^MnJ z5f!!-t`fq`sH~SXgg@H92#B*(rH4$`cvs6TFqo20f`Kfcihr5h$3Pp+fAf_N-;KdI zo?QFwQwRy0@`#3tbTlqCOD3H*YZ$DEN%kRa)>vDAON?!F(6^ecPLu!nWXyZt6VCjN8ecx+cZ`bkim_h3C8Tdm6X zDheC?sNc6=pJx|8&6-WmwBJE|YN1x=L`LzpjVJWH+4wDETla!%lIv7c$VZ**&FdaB zBeS9Cpm)RsD99^;3?KQ{^!O}?-wBylrnN`01j>e`%kjFsLv3GJx;T>%#zYv?9&a_) z(?v+!!y@eNkQeU6>QU)Y%8E|7#dXQG9KTF54M>Pu?4#zsT=>V5=LT|N&}T7lvn-V( z@q1DlsLT_NbG$&LQ(Pt&Jin>p}@ z%6~^A{coWr?u!I13WB9wYneerT}2rsP5u6l7666w*)EOKB^~B;2j|ib@1qea0ZsDq zN;*-hZ_RJ`)PF&f{hwiycv(F?J%MK)uegTKpeU=LFreidK`F7nwS{xh{^k}@vbfi0 zq6EJ;Z)W+S2hyW&f{%;)-RarI`59giXalJI-o1Obzcxxs7y`_4sDjfXv}U{5lf^t* zqNl5!ZxK~jRq^rjuME9-{FuXU_ z#f8?k{)}H*?eXKsvOaY5^s^kLw<*Q-BKXyqV{Ge=7^Kze0iU}@KHFRQS&40CX12C7 z-x>iw{k6JU2iaPg#Kp(gT!RyYfM$Q!=MW-}a1y@H<>lq{>jt&%cLb8-_?{0!17x}Gy{)`puyGcsiYUa&pS6a$8Ff)mmpwEb4DH2zU3zX&6fft@$*CD za(TQED`-&w%Ppg(S@5)$Ld?A>8oCIa?Ce;}zR)P*q1@6bHo2+69@URI# z8_ZgB(qp@$&VW&AO735>hdDCo3yf_TRSU zPx?je=bD1=us}aYQBe^=6KTVb%N!4_LQ1b)+>LfhpVL(JoJ^$zhN$)z{>!touU12v zjdC=P8?hy3q&G}8SmP7;t)b!h7@9Kof{(|i&p|OF9hj*@X%2b}4go&C^?|I2H*elR z8;#7I1f440|Fy5L6f|>cYDAJry}i8=Z+tFJrkkj#)wp3P(1xgmzC37N(z2oFHotQd zpFx#iufXSQ6`FI)%gdE#9tRsa)+Qr`hF1N0)lT=M)#T*l(5WpgS2reWco<7gyLSQ? zp=ow6SYB54KDwCKu@mSIgvSwYk#n6Pl{wJApcHmuqN4gZYFKwL<)IB!-rc)*yMq}d z+oq=}wN}9b+}(wBdHIfHt*eTPxTMvlrl!!Ti?nb5Z3EXaF)`;`!lck^Uu>so6+9)7 z_BucM{Tji;${L!M4O)h|N1Jsg8`Br(t{LhJ#%UPjF zXgbf)GE9UgB#=t0K@*ZbzkQlD0x2vkJXb@1JOly}=oJ8PLQeA9boO7IHKfe4i z+p*G{loxoD{xacXe!kB!9I-4{P6%~rgXEbbznX=2qD-!`5 zZZ`-tX8E_>E=4x?g55W35A2kZq@sl8OM2#FAO`GE`mKB}k2Y7Upjg3WVph$9hlU`0Ms)%{ z_&!i{oU#hnn1J}=g?j`EAG3hK!S3?FrQ!jC+y@bU$KO58u5W8xH+#IP{E_=nD&nb3 z9YaHeS`=JH*J&-l!9Ox}3=H7gwoS9%HQ_iqsJ{qH;laLjt1-9Sc6usZ275w<-0DZY zk5Bn2ZivNAZ0y!`R^9U3U^p6dcwDH4`8?1mjvIF{G5NLfGdHLKL$cjwcQD@Q zQ0B1pc6WQh*@GWLw{S$@_287nwJ|)LZWpumck~3(-Elm>!3isyhKCOz%(U`+f^Oc) z!6qXGPa+t(_%W4yaY>1iqM}_pxN%ZKLI{p9^gX@#my%qkB4z2cahZaT=R!Cjg9JVV zrHK3P(gU^V$jE+B2H{GAJPgzxVO3Q};Gy-WI|`z&%FN%-{%VgpybY1iX0qDr;_Sfj z=^O~KmY0trd`^ugtDUPyn?^_P#-7eoUdYPIQW5^tIe{pc;&U#PzdxjFYduG+bPfZ|Q90`W19WSV?2#W1^z| zY|To2Vl1QqRni3Lf4mGzhaEor{P`1_p@*t!?6IqTg7#+*q9Q66KsX5`bbdB`%SPv0a)FHVVqOm;E7q-+-n@OAAPCXSiD2OAIU)>x>i%kKoh%Q>+w6s^Oo%wbpQdUz~(3EdIUD>jd8V=XY;aE~t*^ z@PZb5Q&N(W&gPnLfy^x#{nzv@Y%A9`lj7>?>hd5;U&8LTwl)A&qF%?*HOx#*foV)} ziY?KfGBVh7N-wDZ;SaFLE7wp%Da1%P0Gw85Ws=RfRxF_#RWYT(kEz4c0N?lm)2Gdjs@FOQW!sZ5;sN+8o6|) zj)~2qGwHH6@`?z$=Ab#z*V6-CS79nB z=(3cP+|Q1k{oaCzRh#vEK0@Nf3MZ(+)Cl%K&*;~eqmc#q72tJ=$AOKmu5N~U`;^+V zXCJj$l@%03AeKzkdhl>_?{7{QXflr`oI+wYDiWllYZ@Hn1%h%}(c0P?ur)llySqDS zN-Ah(j6qRk`*r)FgToF)EKtonVvfnmdM+v106$hZKPuHij&<{99GCG!J-rFwKSA`+ zbzU`9<@npOptjuY&mt@cG>QyEcmLpF`oDQ|0~HmdV?oVxAd}?aDA?NC0>EiBYD(zq z>kEn)5EXrO`}0ZNyyioQB}3I2fhyC88o{wTuS%kzp}9GzJG*QO|H609t3$KWR*&{ejRIuu-$(J_ z0Da=xeflrou_#)U0C8k7tw6c~<*+r5gg;BXdJZoqXJ11@n$N}gVTD&q=v{Vp_JxIo z;R1u!4Mk;T(7gFJ_6ZX785fywc*A@l`kqLcmc7X z9hG=#lc?LyuT7r|5ot9jg)-~wC1~SA-GWeIr|)1i*PrhdK=K1$*45GJFyW@9r3G_& zswgW9i61npU_~IiMK${C5OQ*IpeTa0;-_1LR8HVu?~3CAI1&*OLK|v#u%W;I&rzVz z#v@b$XKDRL)Jn~|NrKbV)j`0eSNQx$I!Y{WWcI<@8+6SElC>EjNY*ZByc>Rpp#2@C#Gdbh#xbtu!IN+l$Mk<3cpdnA`|?k5zq~X1bbZO_*>ae z6-3|n@4pNPK$BLRot<4Hr}ldoMp9-sD+x;4;IvB@;+QKG_@0Y_fdP`=VBZ2hW&IoW zTQd(9udn!Gi_0o1@`6H%herxs30x3%uj#FQHvk5(6-;tr0%{X0tI&v4PVfjgc@Q=F zqG4|UUm2!$Zhs%&XwkbTrG)oxuhC>Ldk@F z3=O?seY_vZ;Lq6r=wmc}z{KP{Z%myxC>f_w2E8a92{nWEXGuv(reFYkW+a+S1XlfD z?dMzI2LsKU{m_btXjE@n7W)1M2uBs~Lmk@*0V?c*0-_G+C2=J|>sk-51me;T3>Z{wYwn&IUK{}bZetn?eeCn}Y)(WbxyF6w9j$b(LGoZ4> zA5P%6PJlT>kO{^i5pnqv7KX|7%S_sFAXAAs27@{}E^ahSB?Xj^4POzyP-Q_i__W3a zN-h;pV_mxB+T%BpMbExpHRBQ&pSq8TvSu+u9*%77EOZh`gJ2oQCa<7?5fMcyI~K@r z@!0wsxGgFcS=+hK1OcAK%D#DKc{qeY!5wc0&mUKwCRi6$)I4QNd}Da^AD+li=YQ85`qMP;AW2 zNvaKkKZ2A|{BXt>M9z9fW@arK0VACd<3MtVBMDd+y^=7Tf?QKf zs#l8ahY0FlFx}kLw7Wj;3Pm_1BaAmR_wEHf+5Ph;oyh`recgyj39@bL2h+Kxpw0S= zbD&d3ZNwZGZ;K-uhApaI`4tRtfx-QXVbR*L`uQ1vr+`+z-qA+QCJ-1E7foBYFfc~c zel0Hx0p^6_?n7K06nhcKBiI(N<6U4DdLht*^7u85kqV2;3qfJw;sZQ#@@}lZ+}P0j z*N-1R&R6TtJ4Z*WzJC3>8l0(ou4HerIsOjPz= zLsPTK+adGOvg{>&*SGO+k}+tlnVFi>drwSvbXb6ut0ar!j!DYPcYs`bFdt|e2Pdbm zJMRD{oV#>%bU@mS5JqP!C5`C6KAJZfHuQNLh8buGLuhGez|8(0Y;fOO0gF(R33>Z2 z-0D3RM?8$JH2P!S!o+OuZMB}L+lG=DzhAZd#T{WIMMeF$D{s?W%<5`Djv3$ z$E@oa;evzEA5QBB559v^A0+=j+09H$;A_!t+z@l$%`Pt|^blZSVWFXU{Q|wctqon} z9JV<{(Ee&YDs7~!a*Fub+9;2TO7G0fGf$R6P+h|x0Rb(VNcfJ5Gh6-6^-SOX(o$06 z(w!X#NEIWPq?pu$>@JqRhs#s7BHoP-$GgkGUR1u#dGh4RGK9?4)exz`$*be?R;%>j z0sj6BbaYgH4ULVU|7Cyrb!mQnfdBpSoZ0g2v?_?&GBPr!t~NIL2?^s+$C8kc(9qC$ zdU@eW0t*!!8cIhv@Z$&Q#-V-$a5b+FVtNR^KqunTJ}h)KG%+!;w5)+)5=TeJHOW(o z=X!dH_4OA3L^h`DFFHBuX9B-Ryo*an7#SRrNzA~oi1uo*!L5O{0-Q8DItuKNjfn{zyWwzX zNC>I8=OJ*kmG4b-gNmjghmS@y%}Fu)^#LgtcvkLj`t5SPQBhF=x9>KH>e^UahYdW0 znUI<3ZxCQ1;KgYp(AQx*0Y@GNnUd{7>~EEefMJJG`*y|ij~_q6xQriLJOu>>H8nL5 zXynSgKgTW?IKX1P)R*x^2(LLFVVTb8j8GdK~R6Kz`Hi zYHK4Fb1yxlhlwLKH8uEN2r%Gcg%uU8MC@EJuyh&H0AXuue~_hX5a5N;58#JaU%$Re zL=+3`A56gACKoO(EaYTmwSw6L5L@F0A;6sR8I=J|(X9x&417m|#v2mhPz%`1R_^=I z$#5m!mk#RX2fV$?1BMWxF+iFdaG zO(c+!H=PYjD|CPJlQgMxvN`5y$jCAhC_NadN3arttCbt~q=w%h##Fq5`@>nfq^M|n zu{+@~m=xuq@8K)+pAN!Rmr~oMSa!O2csu~v>yx*9uXSC0{2Gai$hy-Fti!D0JTWOL z>FN3?WKF{I#OP=`!jPkB)-@(4@)FMNnS}*YW8-vlYoZD~iDv=jgqIT*FoT2^um}$h zrJEjmz1trK@0H+M!rv^-5$AJc$1n&LB})ffJB$Lfs2CTmwzjrrWo5xQ$9%y7g!x(P zxFMT~%Gr$#$k@fmewtHx6*x#ICnvCBZ|#EA)LEeU6n|(KMP`S_iF*lqI04boC4*5l zLxdJ*^+oZ7IYyo)a-!a+zPef%q8F0zkLHUGZpQ)g$Vaq>46 zIXUwKx{86osDoE zBf`XkWXrqPcy9?%z#s=>r0l~`V*AZ0v5hfUG!z{Yf`TJGJ?wyc-^K*KLIzW^1&YGiz+G@34=Orht`XUi2+t+BMi~X z(Oq)M$xvU1S(JJqR~RRRk`a0w8)JTce(-E_Jm{{ju3tWf5V9Tb4ygR@ii=82 zR2*cS=uJWeOA>|({%?W=SRNi8p4KqZ=a2<|{|=bu7I#@AmSp1RANu(-Mw^b=@r)b~ zZ*FGhrOLH9%cr4oFnH13-MzhOp{$JM>Ixgi9e3MjE&AwJ&U>6|j5-WonkLm0x?cOV zSH9=EUt%|ZSq(w?m-{&H2VMLji!s>Y$ zxf)0k7#*2W)P%^tPRy3gxBjd$EiN+B(8A(!Fbb*}wkO4(N=r-Y>dtcu>KY85&l@gJqt^2Vj@|Q_GvSb z0ZgP&GccgqZY(U6LEOB<@)&R_z;7&4ennP7sD|pnxKmRNVPptG_>)?9@HoCASxvM2 z1?;=rml4v>kIK&*T3q0zu(R=QB6GkS8&Y8H?d(7WNFw2V3TQgKpqX=B>+xeq^ZlKj zmQbca+&8NW&!Gn<`Z+fA5aTBu%VP*Ro{HK`2yTQs@!ygR%(g8wqn`UdKJEeU7qFS& zN$zrrom-pdq566 zH#NOOMy9A(4QSVEyP4?lj=JZssqp^SI^9^pede3Ve+psFwV^?hZ2ItBc^$JW(l5NU zM8{u9_0cWun*%ZHeRnSV5YHgw;syQs_UhVU+UI}03zae(&g--Ot;Y>crXo(#{Rs3s zL`2}Or$Nup9&hxalbdIiDtdZ;MbH>dGti*0INOWBv=&Ta^kM#QWRCxu@W{JHW)7+7 z|DF1{|GZ^#QlBBJ%$4J%@{PbuaiAsvF!xzTz1(=u!Ner^V(XcvrY4jVBSp1uU908# z)ujIbjG~D|!g<4K8et?QB}qe)WLNoz?CdKpYieo&;Gq10^TB$+O4+CXL~zo+tj`Ok zW__%!jWjhaGi*diA|Qac zPA4v2mmZQihGZ19n|Ucq_c=Se&y52h2S5j)8N3d+49(0IfxZ9&M-v#Ad|D^7JFca2 z{c+Ox)Pp6@VW|o(azITI|{7ByQ~TEdJ!5IFWgTtM)M`|#n{!op=n z1#1Q(3I>o`{Y4<+0Rcj4`!zB#(euw@H$1jc1klT=mt@$hdveOkizH+RbaZqkK;PNh z+XLf~BI@Q~W5YhahMo$E;@h|T&^9iD;bOfn?K=TjM#= zg*4B>uK))MHzI`d-K#D|KCQHSm6i=G9#Ai+)Vrh4Q;tqfKxq*3@8sW4x_DU2+;j)P z_e<(D3OdG5w6y`7!UP9|Zr=+N;Y3k{bMPN=&On_ZXy_gRJ^)e?=y&j*c-1jVk(_nx)(4k=lhy#(KA*hwG zNO-e9etb6b?G=y>RwXPk9Z(Lwk=%x!xFwW#qO@W#5o~NsyD|f_!-YUtLeO24q@<(_ zPJ=^(IXUR&7a`$A7}bX2oz@S1y88o{Z_p#9AyQ$dr2ybDfpkvz@B#P^8(PK0u4iQ} zE=rP;SEbcpG9FT3Pj9bGQe+QpJZyR>atWer$! zAvuUA&D_GGqyA^~Jq?&*q`Z6g9_UKQ1n;X2%20Ym$Hcr5#sY#{R8)_ZP=nwOF>zbs zM7s$$K7JGg_hcclf}EV2=;)AeJ~AI;5onY@f8l_zXFAV1v&dkjt zB4v5OvewqD8fGfr{AY^L%G$b{U!;zDnLWa@MVkYbr>Qv`4$#NPhczAw zxn~HNIE@7Jt;CwG0rs@S_)*>-%x~^P0~Bx>h!Ei31V>WCxnF|0eC3vZk;QZF^*sG@ zh=JBtM(F+FfRc7mDM|PaHLuH>HsB>-=isQ&Q=zEau`L7KHQN|4KmHob7952X7z4O0 zKn?8yOutUml3s{GlL9FE5@|=E1P?2*Ll&VXkO?Qd7b9OrpyZhxo}~mK3cM^11K7m% zp}cVz@ZFkwdF5K+3A(Q(o>KYf9SmtGnc>?2#hw5g31*hwgC#Jwy?_NIg)}~8ssVI; z)3O5t(fx2{YamVX6n$=YztlbaO|nC80s-ef@x1I|7dnp8HG0_hv}`Wp7FoJ?)7~d} zVBZc^p3sRp)NW~Rev_6B2nmXifAMIolaonl*}$2=PSoxV>2`^|1#){4!vD0_K@t>o zvDHTvP|2^1S8PJx8ES91Bmt;Z(3}AApoV4$r6P2|A2SiC=L|MA`K5umQ&|;3asdAV zNx?XDf1u)RYeNDa_d3~kc5+(#nHvja69XwK8d^epJZMg4oB!tcD1@ERQ{;JS#9<7) z(6A9s4A3e(vkz!5^1mOfjr#Up-~Qg7!ja6&NT zBSG=?SK07W59p+`v9gYYaoQJ0|0MBvczATAMo{*=mtxRu`I}7qn5vf6K`W)tmV|xr ze`e3}KOrlalUq5W~k3+;2xN`+a z7x+ITu_R^o_~UC0t%E}M*x0kna zLDNhCj$yKS07MVht&`uqgJtoT<-)-=8QCKc2skczd5j+dAbI&YZ26ik>&q7ac09e^ z`e0rspOl|G8HKXR*;20plTyMPCZN}rmxG7^>$|Ow@j*BO9t&)QRwjI@&rIv%9>Wbu zXnw-g7~35RY3b>@jhp1;&^rWD&#=)S{GG-R=q7%f31T85#_Tsl98W_@_~h52mi({S zx8S5Ca&BV4;;&NN9$t1UzJB`Trz^u8vocf(v*XM$kdR-O$BVeK*EPN*g8AI-KfX}A zH1=k!_TiIP_ZK05%DuYF`3&V;Nx#z0(9VuiMJXr$%0Mc#|C}5g;<=1bOPFFiK|HmM z-w7L_q@vQg&}0N`hMk?As%jskaEP_`o+hTIm#n(&q6_#V(0edkcI*U78ojnbuzAS2 zJ9~T0n{h?DFrp603kYfe7O+L2jsO_T4ma39F#x=zErx#p%%+d(e|^#4+KP4;rPh7V z=;?<)2L~K1ES=rmF|u^<*~7rfzc|6mju({Y&}s$*bSUkx|1IwO;=%$~%XiX^v9eV# zvaXH}kYY?gp8+UTJUqPor?nj$*Tyx#V$YyppvSvuKahy4lqNpjv*ut#peRuJs$ZyY z{!2M~INNSmpzmp2Spb(YZ9FJ(+uu`lfsmm=BqD*NDSlM9e~tS&CP0No8Nji)TP z< z_$DVOZEHUj7QRJN^YZROcN)4V7YnflTPJ}478sQi(Xp`$a&r@e92p3e{$ch^&^M#( zrFld}p+WF9GZV@cF8Dr3&;X~QUb@tRNHWpUA(&(Eu02OxU0drSMzbX*An?PtGchxp zBZON4pm2-B!bxu6ShqiE4`fhF8Fha4jH)J)_{IR{#)dH3aXbN{wB$b#ntuRiwCn&o zu-4Z5V%e2!#fs=-Pxyn7Ot8cgB~oA(p$vq8IC~J!p^>LET) zclJoxDNr$chBxLz^$B-KSeuy<;^9e_&dko@!o45K$vuQhP!1=C^MD8BXp+Pu!!HZK z2j_5k2zY!H5?E?&9i6#cvnF^Li1wGJeSUtjNh)B|w9ZIR9|mu)WdFWLP>;mhi_^zn zXkz+cW9K?7)HnQTMmUxw{=tI>DV{qwb$Lf4Ij;5dDuSHI)YjH#W$<1Qf*a_L!^1r`s*XDQY=R*yAL|<${uD>=v zHwRpO_n?!jYeZ1c_Rfy`;TClb8TGHfRH)a1#{@hIddy2<9pEImeG7DzMR1!JVF(Z- zXFy^=JO?q}_sv`79MCp}v^fdz0h~F2V`i?j>|bQ33H0J&OSU6gp-*SGPir&-Wa^7T ztN9sBXn0%}28;ROIXU+tPb0SgWln(JGvtpeCtPj?a2>j2zrOnEr;PHcDTmU~)8BCQ z&Gr|@b&n$eV#?2v3lPfRRIGsVXFM{pF74z%PvD@)IQ?#^K5zXP!Fw0fUAEJ8-QFQj z@BwSEFf%i=u|Xt)dr~Z-rksg?Ik-tmzUH^Js1Uu;0;Gt}$klJyioyG7#(|mp|B#>! zL}g=dKm>Rx=8~kOxUPf!f#5i!B*@Izcpm7!BS+S&dGeqIWAy0AO1~B*S?|PunXr(L zg!7Ql8OrfmzJbDXmD67ME0TepKB(Dfk?n>NZVB*`G4dIvzHq-0XlF`FOHCy7@?z_p z1<`Au>j6&>Xri?IE--F6)0BDd1(=X)dAMw#s(=p&3*;{>zBa?SqL_$98&5n(s?ucy z4Q221_v9F$^@JGNY&+BZFILo}4j2SGAcgGhpFl?tF4B2TX%YmbUufv=!2x6WLU~JG z@4Bvo1Go2uI{slZ_bI2)Kqb^ivUCv63i9)Ny1Vb}zA>~0h0PH3KZ#lF*B=`gq(H?4 zeelx>rW$cWsWLOVmP@VWg!qA!FWk~}$y<4!3Tni0UTO~E<_c)ETUao^m!t^zZ2fi> zakW8at%#A1Zf27fn6BiAxs}`aY!l>px)tma5(YGpoXZ|J3ySjMV`E!IJ;NP4a1sPo z?eimuOYHQioaT7#^!gft8pHF;69to0FXey;nmB%Il0W`m^w?A2@)9URAQfwawv?QF zvfk$cl#`d#5k&I;e?oL*+(DOiW&Y4um^P{%Xloi;+E@;Qa7t4~P+>yo7>7In02eMI z>a`K&;ILi(kzrIc0>Qku7yCff01B)E{ThDg=bfJ(9mc3O*g$B9-*2W&d@D!~v=bWS$=G?vN2frc)EqpD9Fic|HY10w0NK?mfE?N+Dr;VV1P?-PG2(5-e~v?eg?QY0`9?C$t~Cta2~zf zzcjuER=-=76u(mh9l~$vaN7qi(Ok`Z#Hjq6Kq<7WjE^=R#9D$!9sdt=?;Vfj`~MHy zD`ju8N0P{Rf-MOGpztF59*N%!-r&-{Mx-yipV z|8w_ve8%Jb?&7@8^Eh9}>-Ag*8Y+-v|G-EU-jbG2P|zup>Xp6MAwD7r^UriRri9Af zM_SGb^Df-%O?)TnvWPBZ1E);K`=(2tL1AD1f~t8e$A}voYA@L!@2?gZ`pl2Tf#R>K z!@Q4We7FL34ekz%QkC`W?-s78-6m;<049>0Hj5X#E`(sL<*T4e&=!HeHy2|?A0w}z z5Io%+2z&&h?`hu_alPXe3IHZCW3JdFAFs}8z!X#7(xSFrIMClO%o~PV)bF;Uq%Bd9 zbx1YrLkTo8Ce=^iRQ~zPvDXiavb*AX&@xn0WHBvP;W>c4g*L6E<3KY(v z%X9j^{3eQbkBT&e5e>U1AY{Vq560zr?RhKp4F6y=h6^)*`xcq{XG^#qEAR z&HJyvPs*=p``=+U|2OK+ejJN z>KQB97)1p=-8^1+l7f4EiSv)yfn6V;0oVh*rctgZ=nG4BDCjbnF)))PZU#0TR~o+7 z*+I}Fl}dcR;*M;Q9W{E^SCN?}ARqw7CdK~_|E^=~dTcYadTh*z_)7M}NNwUs>w&}% z>gq@++3rL(0h_YA*nL1rQBkf!4dok1Nv(}E=0s30fQ1|MbEV7)gd2^G$f8O~P5tyg zkUx=sB7XrXP!)__w1&GWlbLu2Iig*T&z0dKdOia!%Y*y(_n4b|l$MhO;28QacLmt7 z&5-M{4IzB1Ie=X7#e0kz*j@04T^~GkgMKjXKU!s;-6x{ZMxlEHTzQiD$Kv&em=<`3 z#qN1LI5RspXLaZhlC+Ng53Eh^FV;5KrR#92q+}=PCRbP2c;*ir>m-tX1DEU?h$N+r z1c}_Uc>h*EzhY)1V}fDvgkG+iQr*Asul3!Lj+@zEoWAi~>1*x9LWHQ899QU%>aTj> zQqdbIF??p&bL@g88w+!omSVGBr54%nnVE4Z+2)wIt!3Ae=_ocnmDxzR{xR*^mg0fT zYj-oRDSo`#R#J4}d+SFXmEy){ud>)9em)C+sP_GK-=Sx(G({{y=>9w_q2=fp{o>wf z#x9aD3Dx|97wcolucTR1V4s@D7KE?sSp+s!hY*b00;b4`ZPm%um2!Zkt|J=yTP)m_ zVM9TBy@GS+a94xv+1M${2)Qot#Whe0K+fN@&6I7hxg|9`p4g)0RbylfB(1&0IN&ybr>W%ckkanxfOD- zHEio>OaS&+pEjW$N2i-YG6KO|alO7iIXxYzjI;kx&u(v9nR^=c{62fqQG{|MUE0=Ck z{TA{W?#a>7V9>bVxYv$>`5p9+DFFCU6ixY5IhBk0iQ*RMej3Sqi`enUK1P`U^(4bK ztzwCu`-vF+fMwnG+%9#I@9{E!+7ZHO^}%|0n~U_6qk}^yGZ*A9P8T&l-pa z>{c!=bC8(~_aGne@@1Jd!+>ecW$)l%1sU44p7eCanH>n4{Prz0(fQklrw33x&s6HkSOvsRXT2vEJRs ze~b+dn#mRv7Z!f~@`bqmx^MAsDl|7+-VIMj9y1xwB`V0=0tsW|yjJ_|#2b;5Wh!8EI)*fdjK7`XUv>817@jZ#}idG?%8Oj-86@dM%k_<(G0hX)!M(8yn|tn3;aW8d7X zC@=5KO@fZ$on!3E%gY0%n^bRp8~gXIpDNfA$Ts!Fd_Tq51w>VA)ZvErBj9{xze7Vp zE+4wXdnh9-OVZ(R``g#AZ5tEpH^}|#_fO6on1`Ye^D#3xJl!CQ4zz{iqE5X>>y(w$eCi3Lv$^7 zB0W-sp_l8DgG>a>zxX2CRZQC}KYw!8s*s}}5zyNR(L3m2^`$qj+@V#NVi9-yfp{4aSma?eLLMpb zE@YmDyS5@L7fj16D#z1nhtpbHe?s#Cu@rMKD1_cBFZRkXZs(FKL6#hP5T6A-yX#u74@#8R*TD+QiRm6)Yzf{Ax7@!Uft0gkEDWhEpIU(Xj_aRri5P1VozYK_tj$|bn{bmT zK?tcTybv1a=}98`%e_$M@cq$bC@_vf-sRws{&M7LHFqH16M1{ovxn`!e|>~@HPIP+ zyylPBPy{0v%hBD#118x~3}F(v$8m2#(YtWFqp!tg47h#4Sw^%DqWTI$c_Nl z#14J&(ObC0P_a9EFoVG9SXfBEn^T?LCKi|HPin)YD=+UDa;bCKEFIz^l55Alj zyhSRJ>HpJP{8 zt!uz?8N0&6!y){`mbLLb9AA5?tp*Cv7LSg1p*Lx97`*M7p3GNNwZYMo?hS9IBzhZc zCwweFv3G;06#Nw8`_8*cE{=zL3uAiL55bMEy+^6AZ~HuN6IjnoNr7xJ51{LI$Hc7= z*1)#{x#oBj;HA7gDo5;5n2|76eSj`}diue)D`jO`&~ifb zi&+gAaPIvV*ue0ax+_l4gPv!m{6Q z)?gT9tXHwjEsEE2+fmrw9vvOM`ySZ`TPv#(xV-^|pbN7*bSQJ2n5#t<*Q)KKQgk{$ zzgO*G^ZMkZ(Dab-Z5u)`CJl6^9UVd%8dH6JukamE(=a6H&4X{95nV$ARc&=qr#xok zvzxvLushk?KS9TZ>HrYf*VT1&d|Vkc8Zayj^iYQ9I&-%;_~C^{yG07U*t&I(L@r)9 z^oy|g6#nvts2MQ7{SRo2Kwy#9XhK4~KjvZFJId2b+1c4(%y5enogWMgzy`R~+0Dw> zg=y4KBnM#fRojL*1-AtQ^i>e2fyhP?B;Cs9QoUPreM{BL2|@?;{3ch)zpn(DnM&?- z=B8odyummfkw?DMHV?!DS7=?CSJ9a>jZIBxg4HxM=7Xt2aW`X<;}j^nCA@8OaV^*+ z&~O7#gQi!HM~ELr1ss%dufM<3wR^p6ch#qlZdG}6OZ}M@AaR6!ur_a_ETt{7${O&No1YMa2H=P zl}ycjs+ckqpmB@(tbftcS&3FJ=)}Md%aO`GVnOI!@ytKMANUR16~p=)gh2nAO%j}- zz6B9sMTJOPO#}=^9UUDINd+qt3QcbU09^3Kbb)sn8Wm`1>7I{Yb!2MFK6~~c-0wCv zc>tY%aBUXk=i}QmeH8a9GcC=P8?MMe45o|OIeg(6bLZIn=1;J`5#jGD00^YNLHkzn zwD&Vb;aA-uM7BidrN*(xk9F^NoHZ=$JE?CxBg1st3(peBBYWxA`jbB2$@JKx2y73l zu#zQ|Qi|N+4nd#pT@>$%?gwBlUXGQ6Cvi6pIXVhHw{U4yE3RRQ4rKlMaF7PGB^l}k z_+h)7K0LPx8pnS$#>S$Be}RgEnc?lnkGq|TR8Y}iU@G4NRt)TI3xHp+h5-TfCe`*W zu(@1pym@oqMH|4#7~qj%FaanD(&~ta)e^N}5@1kpA5<~;!edbLLI8`rYjojw%}aJg zhTF2bH=HQPxY;KvYAv3g4d<@}zOtlQazei&OkdLC!Y#3D*KuHaI|>)E zt)PkPdPT}`_s3c!PnJ?u(DJEBRKh5l@yBTcJZkF66APMvKKOEwVly-{@(IBQPwzx> zZA-#aI5&YuFf7A$?hTRj1pEw}%BDUlI_~J``^@#8I$@KLvT`Ue+3io#_Omy7Wr{+^ zOCD{grQMl?f`H+$=;f<~80CTGI1FLcR`lkP78Z1(!omoY*=J)jq?fVlpY8nBW25|e z(aKa-Gg5(1dK0DLqy^hu(Qh;mQCs9;rP|AN*P35ku<@F5Np+H3*j>{X_0ATSM=9{R zh56ErN$jd7CCXPGY%1)|FD^cU;{{Rzou5gcr#$H%G{o)5ZXWn0YUtjRfc){$57~wH z%8M*5j}~|!t}r(%!eFQc69#Dvnw*RPi~`ouMebNfhEPU>aV)WRCQ74Zl*Z}vtAG!@ zf{y5uHlO!mbyri1xGVGN`P3BOW;X~5cNAU*IEBjVeWNIAD8IDS-^FEQco-lbD;HOv zu_@I&X3~y`TB?hA0~PbGm2(IBn*@B$iAd60#cWQcEZsWupv=Z>dQ&mG)Prj;To18c zXO8dUTC#JhlhErGmOEYjyC5}{sq219uE#~Tp+_}aI(CY_c7O&NK#CwYcXCF?@ueAZ zdG4pxR9@*q)SFCFx>iFMYm6Bsn*E}pZh+{XQ6vy$igS~S_19m$dd0`hEys8rCt`#j zTgDbe5wGl7gbjOWMl~hHsbuB~Yn7F!X=zQy?UJDhuNgvacrnO5oVdLKy-b1* zEFgoM(?3|nDH>!`&>p0IHPuioA%AA(*7EWrx*`eZd;tkRWic_Ty`*zAAnSwy?>dG^ zyrF2v$#o8#IDrxMGxksV-}jA8;}@9OWrzp9ZR<3=Ol&&kuR(WCMDWke>}CGfHLh{~ z;~Eoove^E)NJPz8h*aJ*J)DSxK$5C!YAS*%2*Hh%*+UxdftEdP(@k! z*{!2Tp#Kn*XE~)itrOqm!zti6+TC=mwY50-e_W>UTayXe&{1~x$xrgzQ|!oQtErFHr3tS@N&$UgKQfH}d(CnsukO_`AB?S2Ciuqw&Rk}wIDbCL`3xq@@87<) zc{)n<3ZT_Y77Ui6TDqi20wn)80I>8)WdI`=oM zOEWjO{ceGJlw2ECu~%w=xW?}%rwGf=cU7YL1UJ^`UKFObdsS9T$hDYf6G|c!?$EcT zH@A&HHPE|NR`zCNtz6rCIqk20O8uVwic^YvLKQHCNfCScW(@ zZV96ZN+fD#ZM+zGcTL}U)zoZV#PRKr6P9TdeVms`p18B#foogj8CMh6mxi^HtaKT6 zR31SUF}|=&pWRjF#lTFPpf5GqO_HlXOh_)w^mvu8sJ`OmrBtfEO-clv-KU&}$?0Ag zIh$M{dy~s7!|qwcYxRL@fidCuWA6#DD!xHI<2;9&zli7%Ia4{WZrFmpgqn8j+RrZ!x9k5IW8p zm*6A8f2%_Hg_+i%#l))yVWmxl?NTzO{r!#$djwJw?viyXir=#;^YYeF7Ecs@J|t+s z``W_WNZUPRqx!UBppvFp5Vy~WBUU{SX7ahRdOGpqjPq6(0aJ*tZ|tz)%lzlp%~8Vd z{_mSStn)fGF;9bBP1m`!FL6xOZM~vCO5!}TDCsV{{O2t;l`S~wf7dvAV~CVem5{Up>`j3ANS$h#_o-SDxd1qjkFA&^3Mq zOm0!J-cjB+)VFM*-`$-YH0w)3Nq2wW9g+vP?zo9l+@24P}GPB?qd7B?D3bkJr3|3$`9?|SHK^6=+k|2 zd_Rg3ea%5ZZ5cM9T;U&FgBI+zmSos);`;`#fIfThV8*x!1HPucur||+%Ap3ks+C%* zh9HYsgSA_7NvF)GSPkahRq%g$kwHh!^?4@5c0#`F1A4dRmOkSO5-wh?vieE4ezT<| z3rB*^%LU#~@)oO&M%W>UhC2mzxSk$bn;qRHZk6HxuI%;#cngA`DIs32ZyUCsPl24& zs?ij0Q>d9#Mp^$mU-N5gkGQ+n0M!SA8Y4wC+$#3EJc?c2g?m~0!%Ycd zM$rb3AnyYeEi1RAlA0UomQo|01#G);E}iVZ&wDoW8ydJ40dak-L3bFGfYgDNOh5Ie^T@bIiUxwLV9U zHJ@6GJX*QA>E51iqcgqT1@3)H>*cis>!!RldwcsCrn&Si;Za>jp|p^y#%+e%;|um4 z8=aaej^LTSawKrL=3?%bA+Eb30$XlV38#yL$(SimD_|t3b94C?sT(sLkChq8A?{(O z=&7aui)#T=+LB}R0iOH#6s^0%@t3V^ZNnEQ$iEHD-5I_s6Duqo#7dErG3Rb`K>34loS;F0s=|OVVK!g$nQjX`uLOpqLbiC zV!UC$F{`|6H;usM{*Pw52A-a;A#_mWQM=~Xk(r)1FgvBqIn;(9x=gbXKU6X3DYex8 zfBjfWO4ythW@pLcKRkPO2s7l+&=6F^C|eM=0|FvzuZN;rwxH|bI0S(^3VkqxTu4vu z1eyd*;*vg~EWS&OZd3m;01sW3c9dM@SxHc#JQJ{7M_ACjAYXy(gj8hxY^?jjj z!)kXpCV-lq~e2G^lw?%1Ru3C1480^F0kNTD!CknqA>2U+I@u_wVW{cLQk(XAhG z6t4lDK{5jwDIjkkyB=X zVW=bpdhMPw80vwF9|Nl#Bi+cJN z85y|FFD4!l7ZW>ERP^o37ho?iE?;bDV0k%L8y*n>*<#bpn)UhiFgJ~($hK`8O=syB4r~%U=`YeCDy68n4yO_*M$}YlVTWm7V(Iw!KIl%irUh#u z#{y6frXqQWiN+LxSH);FgVzG*hDU)+js^NBTp|i`k6|IlW{Jd^fq@K#(&hv>*8$pZ z>}|SnBXCfhzn8$$aQ#TinfrF{ zAWRD-1qHOU9sC%|zZy={t$!OG8j=GIvin+cefFtS6gC?{#)e2UevoeUnmfWW>TIg3 zOSzNra=$&Mi6zxLz*bC68N1|wH3;n^XAn(?#W+B-7?=w7vk%f;ax1KOU1n&`X|=sr zl2=U@&@L}u2C4=qmsS?yVA_Bt`e?u>@$SMJ-7#31u+BJ1&G|hztMMHp0H7qOz2SG_ z=H}MoT&hX&ppn3Nl8^yyFJIB2idtm zVKA4@v?}S;4*^xOs8ikZ1@@Fz(=rCM%R3YaDSC5n-%7)|aP1ll2*C9L7J&KB2gP^w zYH4;h8Euo#bTf;x7o=|&(w92H2qs3C00~D7gJpDg20EU~n!>!iFQ6>u)g9ug2MrQi zj{$#!%tDUw{A<-Eaih>Kr@#DXMK1)$oD9zM; zQX=e(jk-VUx0m#RD7?Vgd5 z9gu}WGPJaT<`dQXw1Clt`;t*S$3TT8I&;c8aP#us^DCmz@PqEb^v}wA`f1`(CLe!e ze4fb*V7kthg9k*}H(a@MN8m;3bv=NcYAR_`^k-x0lm~E!A+<(c!1V11wzkM0u)<~W ztL=b50|n4P{qaSTBH{{8pPsFiI(-iq)YQZTz5~40fO#+2 zTmr2_O-nmp2l>6F9`miZ)9NzjQxLOAQ;fgDRRfvJ%Z)=f{f&y^h)-a*L*Z$A7|Hja)D3(T84 z@kL)QE`k+Zgx;7K-qsS|)x1R{G<2Jqs_IOzTJ6~-LUTOE#i16ek|xB~?O@o3kkuCq zhnY%`&UMod4)87uUhE~q-q%Mz@#PSMGxTHw*6chyE!YimOuRxuzTjaXTOrTnaCo?C zal|A_kkyep{AIUdOUekr$tXhCP!nX&(X3FwDt2M7EA}H^?Gv{$G6ujX!oOr{nl8J( zt|f1#Rs5297TbsSN65Gww|x9&Y(3O zZs^-Hp%{2}_pEv76KSDu-@m8niKt%McV*w6>JecLwUVroF0LK?TSU8TeEBK&t2Nnv zX5fjFd?M}OEq+RRW<>72=LRsUp}#gfw{W!!s$>xGD>9nSWPYeCecVVO+kBSEScZy* z2I1VG*J zH7`s{tcm3C6WN?s%{MA-QL>bLF}06a3aWgC)d{k5gwxa~UK`+13OaqYF@ze6FEFqb zqoo5a!~2b_x8|%@x^CP=ZRKWV4T4L0_UNz%LA8f0(=r^JY3c6h!SPcI)-!xI7cGU< zZKC20geZjBjFR2Tou&5hN~>0+L}{|6CKg>#-gGI-xLKX*t6pQz3VUdRXR#uYJW5|@ z_Ed23Qkq`Sgcn!#?=g$q9ZE_^Esk2X`HHW}D=8&t-fcN7HC19Mx_{MV&whXmY+Oxg z85uo$_%D6|>L#3$q%wev8*Cuh?v1-@=sjd8u8zYK_UzfYKQ~Y1f>otfh*4tp5S^Zo z8^!8}=sfX_9Q?z2nx*vmx&#|O+P!UJ4gztbnuy-E%8$XD6d zvnfO-aC$PhvdWlSRXXK}aYuL^wC+%_*x&Fzef8=`lw0)Rh-tfm&4!gBEs7!Pq_h%) zUXmLf8q|12ia<&FzmJ-=v_s69may=-&_Z!c??#}-i#^1DtjzNuSS$X0(Qg2MJp*x* z!yo#DdSSQHSk;)`**yOP^wB{RxjMleQaS2P>0RfBzYN z2tdTuA3rj`NyBK}LCC!PPc6Vw;c>l0uQ*USLlrzV15i4Y2vUq^FAGvi7E^4Ry^0>0_zwyc~%tRHqB2oHtZySPvA_EF+@nTVYtomkAs zIg%~E!z#%HlwC*Xox3kPI><`m>No(m%`7-g>rSsQTdB`gBvz6q=WMqMJ*M;^G2pFY zH)K3Xrg!w6T6dKkA9j=Fy?*#UXQDGASnUrSsC^`TA<>@yg)Sly(me>ZGtik} zg9tywy2(_}6Fk!522W@j_+-VGEph{#h`5RZr?1Z{lz5``G; z<^d>x;oE^@Ja&9GnQNvVFjT{&jF;EpUqrV9;b-7;g%u2{aVwKJee5?`hnL zn1XiWNCL&)fq`wBn(LtOp*w>N00UA2?Gcc$xTJlTZHLFlL9?CsFs&AK3`rMY%pk)& zc>X z7i$^>$rJGs6!z>pqY)nUcxs9yAH%ND)YL?h*CFI5 z$_od=AO3siooG89AW>OUA686}O8%mw0!v)1%IOtWJ>__7!xaO!E$ZqxAe}E%P>FCm zKA@Ob9e0U>07v%x(?$ z<1``0=;l;M^~)_{l7-eSWO?(?p1tEWDzPGzD5bkpB6n91FU|cILBzuK^>wUc4lN^T_z2Z>v#H!P9~ zYDUqS+o5~f)Zc*f=h4x|)rs-1UJrRQf-2Ca81&=MiVYWIe#!bcrN-FS{k#ew#a_0W zWFNZonM<*EPa*pD_Vt_f^;&yl3z+?^n{BeEJk=fF2Y$dp?Qn2GA)UmqnH>v5sb>+W zVFT|yL>{3c2}kjF3?Xe^&_%%GgI{c*uixqHh>&Bs8bAX8vOq$|#>QfzNhYGfPx8A9 zAQUTaZuIaDo>njDi92XFqU(j5#dj2?e;czTDFz=S0I?9i22O>&`}V<5ntFVHQbGds zK(S{@c6=OEzhp+$i9_v)L}aKhr)_W3GI!aaLKqC8Kc9EiYX>7qk&n^A;mYOaX6_l2}sgWO`^OOz9dbE?%WgpSg4MTkXvtB)zsP=c`t8Ehb&Ai9R!w1W;20V%A9Ig z3cDm70E2xoW7{q~O$sHTHqrlF)8Dean-KeQPV|O%5q*1q9g>rfl3*u9c_Gn~S8c1^ zpDj0}vdU@;|GglHs}Mwo^brgLn==A~gRP}cBX#&89^NzmR?b>yAh<7yeD-hd^xAzd`& zOFr-zn2z-I5y&`brXMH}R{Otc-3 z1cQ#NsJ7bT$gB2C_#53rD;#58w8sHL=$|tunJ}KKi6-o~JQju&C9HK6JUk*G!_zh> z8|OAE=8W#W=^vhtEDnJ3FRbL~(m;jmZ4bGbuQj{3YGM4cgcr9FZBXyDk&d@4#w4Ragg+!d{bYb{9dazImp;)>+W!6h*YC^x_Fj7#uKyS5 z2T-51W%f%&)j;FHraN~IA`ok;=^?0k)Sr24v9xV(l&s!h=Oa}p_359OSxu@xAt+?= zsvibqgPrXoV78H90dF)1M}p?7IK|C}mV6p+|Ivh|pNN3(tc%HCQ2fqyd=aFwhx6{2 z;q0>h0LlyUe#Aon@qzmW_gQBietcQq&L#^wibEMGK(OC#m8)?U_y6r3t2-2*q zB-dBwXVs}GNlC@KU$}dDAv70SqdLd-P3=8hwaph;G-9E~U)sQ!%?tDo?^C)U&0Vv3 z=58vDhI_*IoYL{7=<%hNbswuySH)MK&92Co7;!J!s=HB|T%v4CZz7JaIl+JJ{P|aL z)Ei<@Cmf@HeDNwHn~x_BGxt+?))glvrSLH_FsLI^&%@&t8WnUlRC(=WM%%g&qK3z@ zdv`SAUGOll^+NyI!FC#m3Qma#9W7DzwLft}vr7(-iIkq?AXX%CKqkxi3{KDx*v7)g zm!{x7p~k+?8Duq04!@??bp#8>X~si(ga{tF9Ydo!kfI$&S?sKZ;gwXNiX=LEdJdx% z(Oc1@fHg2O`~-ZKsYP~bSz(+)Oj7BocZpj&j%DMe9O z5l767EcdW^DGZ!0r#VeFKgvFz9*7?Y7;DS5IrR)Cl~Xi6OgK7 zV5}GSWju=$>l$c5!j- z-PLwjOPSVX5v|_n#Y*phzjf@Gx|O_0QH>VwN7gvtw z6-(B?kDBQA3KAPD)FR2l_-;rrAot&mFAZsb5&&xOJ#*iufRa|&NMj;K9n`-qUZQ?f zI%+4z2BBNC)X%&`GDnO3+fu#+voq))I<%Sh!Lwt|9Lk|VD^&w%U@#bML)HLxK4c=H z2PU6nnOR(%9vWI|YX1d3j&bnK83Zs%5ZJ^6P|3=kHe;*_zCdG`5G`w4;HBQbZr z5~Y0>Yx*U9X?|bOihvrm?c0+h0WQpBCuS$XfkF(An*vK;N?1_|!{KlWY?AbiJ#g(H zwU32hEtIjiwotDV8W@NGWwNA{nk{7_kB5hc$HuCHZwrB@Ga{y#Ynj+SG2Z&0E8033 z8JGuKg2ba}8_{h)d-e>!1tmyBO${Mxpe9)#AK??vk*U9kZygnd)Sn876*ZEel??!^ZacVf1=1_GriGUth7+LU{mx6EuR@Og8Tf*K$k$)v{yPu3x0Hs}S0>5VVSj z;quuy#dD>lj;5v$pgzS}ITJ1say|e6$;ru~O;73jP=S+xHxsQWRPqY#S~k3s@>%K?15HO<_@!qtNI zHDo$D2xXM4wk$>KqT5I9q!6hAyK$QGZ~)K^O%62!6%b^f#ZSf*9Y8$Dv130bER=f5 zR$7&P%lFmJT3m2```jxID+=vBQ{PlMxv%27a&Q&)KFBW(*5terbSxqCoSwdHBaMx= zut4CCzk_iDDhH*AJ1CWj-wF!f{+K~rY%Q|XSU&f}{lm$&v_oY8RUZmHNYj0u-uenf zIYh({R!+(t2vmH1jv;|!6V2xP`i??JkLq2Bq!>KHx8K&5dpWzKS%m)xt65GNLGQtF zOAXB@kVL3SIX7It9*m)M$tc7A3Lx9w(qnwC9#kFu`}lV}wPrI%a5Nf)gue7sOAEGd z?J8{2*^g!goVXjw&dZB|aecUMYiO*OpYKqBI&I~Ih)bQB)R{JELa>FwJYH|C;i2D~ z7#Yb@_&n-`DMVfyH$)^+g;|`Dlk7MrCNbB&NFlD)IUI_m3Yx_C=I5=TiAw#ptBwE(MrVU0(JTpF34yQ-3kCM8;t4 z*njGq=_SMJd14oLjmXJfwDI=v2t)E1rWmu$vu=5F`k9P#&Ow7B$u}=_WGk7CNJoC3 zoE4h$c^>U^&G?S0d>EZZ9Z7hmCRI5+J-r5ucPR`rBwQE=@jp+W2Ga0}2*G1%_Dr}_ zfL-DNeZ6E#ifRMnBfC3+v59*ZF=`nG`k3-`Eo|3nC0#>(T(%Kg>YxU`eAy-en4U4 z)JR3Kxu!#=#50Y7(T+{%3Pb!!Hjkfj#Vhty^82SAK$6zx#oDN>_W)UtOmZG%ICD@H z+h(Vet^=>;|GIL`1j2VQBL5g0334mj46$wQ_NJ3TrT}sgCrB5_!^>N7VUk_9M5Vtk zQN$?x?ndV$Q3v|Xs5^CLUFBIHYuw^W$#ilpAy|bvFy4_wpWHa8(p>*$3tfj+!BQS)>T6BgdoDiOsX9 zLqn|jBr#r%{F|6Oi)4QJkFN9eZ_eqRIeAP+HRkFWNDzH|;4IsxseJ}Z=7JXvzQXQQ z`S*giXbJZihtmxXUg^G z)NbtAeJ@7IEKxr4drCmSoKIMo%7oasNOH>)cLUPQgGDaN3^Z*KVaD)SMjaC3_DPPp z+xMTB>akH|kVjKrwty|fT;zfFE@A$T{a==rRvx#nV?b01oYNB&ECmw^ciKz@U!E%x zB>qdQI#v=H8=f1*ZWR}wG|haox9Rkv4fEJ8O-|7hPjR#u!mLokprYXX;;Af}P3V6l zSBL3JE%+s{3&{I6D3}bhddhB=crFw7XPI=-0&!n{ugS8>tR&-i7Qtm(+?iTm_dl4f zk|9_W^qK40>2WatBlfAKWMn*Ta7{`)Nn4%lsZSggCZ^P7Z@BUF*M3QbtA3+Z%m!#U z>(Z{!!(vD2*qcFjXdml2vu>sMr_uU5M9IMSCthH)v$T{KX^FHm4&Q#np)0A*Bk|v+ zT=;Zm?w`;?Ji$oraOelm8I*kxs$|vMv<@67ww1|DO+^&UQZ~|Ts%>R@nSv9xF73RB zEfsclgr(u|f?>9&aP^3obx?zT`;EiNFfc!F4f6+=R`vl3aysiP@B*N9n~}7^dlz1! zp`gHaq7`lFMf^aeXq>PJh6f%OoVzd&v)+prFwg2Q2`!gUQBlPwB^eqR5cgn{@BX$6 z$I;+^QxvjnVt&*`Qam5JePQon)X+Gs8DqpzGrGK88cVZ6>gqo*lBCO?R37+!=bctH z(-15~>^6;OHRiJW-O%olw5zA2scwHB)EFAZ!@^*Sr8?Zd5Ca2l2tX}ypcR=?hLoyV zF#y2Mg8Yi=J7{6C1i|~KvvwD;!;t4ekATxI=;A?Ss^cg~fDYIcFnD)F)o(lbjf{<1!VPRCanSblKN1M=)L6-q5)w#5 zChMuba^*d~K3=W>`)$1Y?Cf}c@tVL@;kWQjtVURj_x2uctSqt24+F#33e2VG1 zr_t;?K(CI2F5$~U(b!m9SGS3YDQP=7T)w!`7=0>jq_sn+w;`*kBs+WN{rjhrlk{xE z^WBI;G~g;9)*79L4+ZK8G=!zU*F2^h>gr@e4&E1^5@P%jr?y`lpuorH*5TLT4P^GtZl56l}q*S{nb?BQM{ zd)9e#Oy7tA9z@JsYATWviAn!A5(u+zOpJ^;@-h;Q$tiJC%3%4ir4*qf2|jav%)xlw z(20`m;CS8T4|=e@z1{u_P);0zc;(V1gotnMl7pp=WO~%W^8;p!fUIuac9I}Jl1Fg> zV;;N)B(({!&&8U_r%!(+?Or3_oS>knI9Bh4*pzwm?LcNQF|oeUkA>;G`6xgm$AbrV z!T$gRP{f}MbrJy8?ubv_aP5QOM&ks=N$V#j5EOj=L381DS*2o>WvcH8xf|`j(y76&_DP{arhE#%%I;cSq_oT?VD2 z6rzvH2FQ^Gwe;{MW0&a}x$?HQLs#}eLILYVpfcghA%lxHM5L+B3l5Wo_ZiNhZ$`+2 z*6(+aAccKAB!VYHe?A_k{%~<{utZRTy=lkMU9f_9;wUmjuMvcX4mI%3^y6tt5Q^CG za}OP=a~_Q^0TN1Vx&>(W^>dCfMYJdg1wbSZyyQQgWuN5{>G-SU5L%rr-HEJ*8MOc# zM!iLnBnbb(sB0ONe8rG*LbL1&my{1YsB3|)E=Qvrmvr8~d1DMg2_s|UwQH=+)GK|ygZ5D`o#mqC*!hDMk(+j2&dV2bR7!wy4k+ujhy?E+~bJ}BO)|(_O z%SBhagYh#Wi&-+vMRK&h&anOb@gtzPnXlVnsQ1T@cUNJZ89oCVqia?R!iAwrG38X> zmJ`4dO%SXv+UTTdmtNyZj6h_?%={`OUEmsGpT{$Hb@%kJ?4L2MN7MzyuLX)mBMR&y zD_jR4duR#!xcSwcKpZf(B66zvXv%G2Yrvx?Kfli8SJSbun7Q*F+g)r?#4M3om68Hx zs`LE?Y(Vu^zJ12ISlMp3z2b-!TBGp~>M7&RGjU%_2y7fD@v?8$un5QB`+MJ(vR;vm zy`*B8f>#fFo1cAK4gH>Z!sw$%du0m{!ww4c&?9CEO>R5gShm?JI!+o$xTF9Q0Y-tM z=2o~(lAj6z;s#_Z523TXfB)ToDlf3S&H&lQQ7_Or?3L!we1K?pID@25djsuuX@J{u z1qr~i@beiN*&+~BPmgNtN!cGs2aa}CQ)H1Qn=~~siTf_J)GeaPRqxW13QgUYcI5Ia{x%MRiOCO`osr#`*~=#QaI#RC0`Ya7 zFnAyU3*#=xk@C$LR;#Su08@r<(L#P=a&oqzQrseF;s6sV`wr*e{RA-=LhXA;%NeoO zf5j{v&sYlk3T`$v873@X#>HdUj1xLg9N{gC3S)@J0z9PHjFgnvmq zU{7xYl4w_PtPpAn36;k(Uurcbb+w;+D86nttFN}347b!v1{{bM1wQr_#~bz;(N;9r zv}auns8HE;UrnYj%5Q{<7qErsg>fDMfnRXO7Zvg1DChfAR=2ZTz4$Sj9_01Ap&rCWaN-ZZvL{)jw_kX^ z5(@tNY;YJ=shGL*UBi(y|E0)$^{6r+V1DLI;)0IZvxQ{Is3EcW2l_X6ci)0H9dMWa z!!^ndBD!JP!wIZ~hCQJ`Cl z-(A^z*u}0rXwmQ)sjt(5#J=;j&dzv950TWv7Nw_2A?_>&0p_`*t@rrZJlgdRkcRAB|BF|ZI1r2 zSbspysG!S12y)%z_?@)b_DMA;N-JZyU2^_HcQt%7-9GWnk%ym8{!V~ zvA#LfQdv0<2y-(BM^7PV_`3|Fu*Ijdq8qcKF*1sAA4D$R1uu}{EPt=t4cf*f|Eu8O zaNYF2|EKFVvOR-@V+$sLcfciM{q_+5Tr;yH#W0oO&e*70LXIC=SH* z&hM#o(bY`fJj?Nrvhz~6E0kxVm!g#$PH*RC%gBx`3MD! zn5WddnVX|{?!>PV$|&G&@^@{NR5_Dme}uT@nLkg)==2eW91(B^+E5u`Xl69P-* zPc+JaiUM``=0=21z7{V@!}5lzz!mWj@a$ltPFQlYvMshO-WX&N7vz zA3wiF_)?j~zn3^h38KDPbn;Qi%t(hFVxXJnA-fK2Y&4!Db^Gy!yDU=53*5ZQaq;^@ z|16$=E|?)PKB`~rlIPuj8{EN^)rkll8|g43&79K9h0O$r8QJYEz979qxu3uK9q@qqQZ`eYy5%C4}ta% zh>^FE1{kI4VfQCw!ToXvPn&}*-q?lvzId$Ic4Bj`?5jn-!mPj3PsEa7KaTqPXg{pt z(LY8@XAGl+0=p>XD>E>ohV#<=l5c$9RXKjsD4t6{KV>J=TN=TYX}+2%-ESUME{{oA z4w5nc#v&kEeXkTdux?l3gFejH$`Fqm{*;0aJ~RUw76#F<=51ACJE>EV_r<# z-~{>mab$9UqZB*#H{?C$M&h{mrsd=7YihD_P#FB`<@4`w&C;X8V?)~L4mr7OlWIsX z!oa8uVKPCQ0JO5Is?9L`K(BzoWM#OgSz$4N84_c5Ha5yE!OEqSaKstNY}*ED$A#kZ zY2sbfRUU3`p_7<9jU2SaShd}e2#HKLQj1u5egp0-^0~?i8qU%(TT(7912PF}*{Pr~ z`t<1?SoI%2=GrXRE&1*1SM95M(e+JN%gSP|8);osg*ruEo<%>y!?;UqzAL$?^Rw|n z;e@~yhT`{GH*aM0nZ?KWlYdI`7pygu4gEvnBJCi2hcb@9K@tN-Jq$ZbpFcxfPI+yH zBxV^b*-~&Hk-OkLNhdG>A?eg#31ezMI`EDF_p>xX(ME?>FX^xR5jmMaW z?75<6P(ng5_#g{PXwy}6Cq#~)G52Un_d)E6WE^M}K1BUXd`QMVgVqLz8E_z{gp)H! zT{r&ZK8$w|TRDTy#B#PYi_y>Q<6~pHj$}@J+{pg3UQogiElIPDo?yVtx$j3#pnk{MuFb$h7pGyuBGda^k=y zp8fBm5*CAGYnM{>Xr zf)vJkdV47XH_~mp;5D~wU}#9W`U<{ToP8!%^b%mq()U61pIYbR|77!6eaY%1kzAYP zt)NCnHMEi8JuN;KaKv2bEX2^f~7t@CMYq;kMRW| z1agJHFLZOPfRg;Vr;0ev)y~Ey-hAwm7wcA1#7w3P9PLPLVOD~E)mS32fsgi{WR8bR zSfjMhK(T})9`pfQ+nIkp>spqKgQULoI_3}@%q6{L3qY6ExwP$w;zgI*8Zi5R(e|d{ zRQ7M%uwh}5IT8H=bWVkJ|_xR4N0p_DNci3XwK z-B;cBf4lGZeLg+g_I|py>*|WN&hs}M$A0WXBM>lT65c|2qHqniPxHX@vGl>^K=F?D zHY66U2!sXoB}jXU;Df%4H0|#+wmf?B+#MWR5WC!E|N`XmysM_N+#15 zZ{^Y9`huw#99;0B`-*K&fxd9n#zkiP_IGH=0G3grMlA72HY5^#MOh-8{xbsu;1LyD z^$jfhstby4FBgNs5QH~c{QxJX1Q7V-?6|ZSW}?|!9QE;3&Yjc#-SA$gb_247fSx`` zNqGf2gT>3>R8?bTCDsywo0gZf*FMfWs z28#t;id*|N#}C|ob^Ih!7_!_#ML*!BXs9X=0wqYB=kfguB`3{A75*E8t#S80bM~y~ z7sci^_q|z!9(t@O!pF)D6+dq*PFnk`RSNN7KwbFx?$nguz%}Xjw{J`T)?O2HxU|Ba z4qlCQ`|iDhW80$4W4>6pW+3RMX50M!IFTv4D^%Yl_<991WVoWna=)n8J2doVbdtKjS#_yuS@)^!!z5FJS4bNJ>(0eD?OP^)^6NiEJvYNJvZ2830Hcc=Za(flC0-B&5A?s{&BzssDy6 zw--iBn7eoXdInBbbaXVzf4$zFE$Fc^if6b?UrefjPx3OlLud&sED*u{eSY2p)F1gZ z8ueRPzp5)M!{kr_Sn~F@Q9?Vy5@pZ{gSmHwN7Q!ze!A;$20I-b{FlD4M|BYl9hQij zj~*?mz4lv5?e1<-N>Hiq)^{ZKt(|yQ zD2<>GVwCo&!4}2VWiaV*8o;d) z=G3X_Zbt-9;y~pS5Mb_zLdqYwP{S=2!o&B5gcZ-UsCact#6sB&6abu7az;U@e!Hs7OoE0?`FeWe#-Th#?T|-9YgLoMIFbpRL zHjfgCL@Th$anr$a@jaYg!ATzG349bY8AD|2ssY3<^s^LjEb3MibH6o@*N#JQNFH0S zuQOntta1{a6JE;aPoI{7kYb5kQVw}1v*{D;?;P%+fG?r(yVm_^>U%O69JmyyN*0)d zD{R`-$h3B4ZlIxT=RtNMO7oTuObvsfSgEyPzJ(y>YfsFxeiC1(z6j#16oejsgb4SWo!c_jU;hRkU727QUIDi>FN zS5&AY0EKKdgK+5HmBpkcfj-W!Z9W-Uh3#mAEpNhGCn!kWf)V#Vbz({q4rQSn)t??c z8M_d{Z?@Rv#>5d?AjA)N35pOH@!(o8&r2I7;$!+VdL4OyGH z`yYC&9o5*Ap~|cfu!j=3E8K8=5(GfZ763iqKBXMuXZZK!nRg6%jAlkF>ZxwL$=dBR z>JK+B0X4;1y85Fr(a|8y{^e^KyktH{?RI84ZU}1=f_gDErE)c~yZih4?v#{to!&h1 z+}725?c{cSRr80!l-vL81i+4g29$$?a? zOZ~tvnKD&C#tXPGI%mEU!*k(vMwKOiwStI2cZ?uRZUtb=VRPbZQi61u0wvw|$&@Py#07W4?oTHw1 z);nbtAlN9C*cV!5>V9e(;U(7omJn~Isp##3?HUoo)m0%qoaDPR?!eL1l>neX}n7c@O*;(Ihgol}1+HJSFP!kcr4*@jJ< zaCw=$wLbUs`SVDFQU)=MnhUcN_0jFtt^6n%X=iI3)^irJ_PeWlGn$~^OL?`jav{-( zP?Lws48(6ox493|FFg*)WYB1?t`3~-EhxBOG@>hd=E=RjvNOf2Q5UY4pRs+?lb!F} z^XJ5)&wJibD3%t^e)SaEb?f}}Eoh@c%D8v#;}S^8b>Zbo$W7asL!i(S7-+e867|wu zL}KnH{kq?mt+V=W^8Kc}Gy*49b*k>pZg<-|ndN=Re_?x9i^R+$CHFT|*Snf*+`Cp( zr1M06E4gyZP>F9Sl^T~={HBf`Iz%nuyuG}@Eu*8O%Nam@k7ku>nb!IX@m!(VqHSjy zK1QNp!~DSSlO0A@sMU>)FX5!Zq!iT}PK!Bt*GQlNm6aUK%%}}TgoNUtxc>12mjLYM zTxA#>m-caALlc^i;Pat4T~tt0v-971a|ND((P3c z*x+;5??7zl92mT=X?nee+BbgKyEoorX$Jugs5CA_ICcWc#y*@scy&hWQd*HQ4s#U^ z4J*!YXg(xykpp{LD}XxV5zJy?)d;^!RE3}c=prr>Fk~2q4j^&6nqYqb8qhuy9iN~a zz;Xt9j~Vdr*jV7_H|1dX#l)}}Wq3&q+jJ!1dEgbn6cj~5OMCl0#BRYm8Pg^Vt7e9M zH5$nYE&fZSv?8Qj&p?4 zHDG=XU0mIMR-p~e8Gfz9S(U8!4ev*{1n5_#odbN5!(+-TW8NmKbfCJSd29tw6j`s7 z7ccz5`7($k6*|9gcugh3cCD2bJu9yscA%9Z5M9$~X<+W~hBju(8z}>d`8uEDWC37E z9jq$uZ=xs5uCFlpVKCJ(~pojx?wT1l&s6xmLSj*dZ#zQp&Upm;@ivh=7T~pK2rpCu9Zyc8P9e48fW{c_%iCFym%rNjTNWqa3Ufc|b z4cA*?K|zR0agO2%m&?`pmySAgt%N!y!EIsWv)rOQd!Aul10K_ko^i?8bD3>spEL^Km%mywa5m-S%C|xu}lWJke^0J1E^!r@3SbrM!!i|mw>k*C?Jrn zeflea3GFlA3-oh|Y-~@?|Ee&P{)K5;0Q5)*nuO@Ar>QCIos&LF+8;|Hqh+#6HJPLAC0PpW7KAI==5YZzE}H)ujnvJY^(R5l1op`WVc1r; zN8hPu|ZneFiksdc{Zy}kY&3; z{@J@`307=1%ce)+K>54yQ)gJxgocnLGsm`<3$Mj2NMb07qlC9c>!z5w*!B8nCM)qU zMi{+4c)HzLtz}=2P*j*C;7}eGhAeLJ3!VuD#%BhHJ-7J;Dn~ZvaC&5J@;zPD!f%p6 z(Bt&g>ycAb)I}b;=b_ve?%Lb8j~Map@h~-ozx(5g_(xxkue~qmt^DJKn*J+-UJbJ` z0wlkQA|rJAwUdVjr26K@w;o-Y4}1LR%FtLi$7#zO>X(}|_9YxBzC%mUBPMV4fNb1g zg{1rd`)+pDN8^Ixh7C6X0>g|E4!=4&A{R_9g8c*H`vo)AS)$q|JPkmyB9x1u_Cu!y z(%kTP<5hK4)%r3AsL64Sp24C4(+Xw_>1L@&-kSy4DRe8K zlPJPhgq{8V-MbL&FTWjHX^|X`pQ&%e?k}lb-lVF^v!`7J;kjlRfK;GomCEvUbaJ}6 zzi>FA5TzYRTvy*AlOXDRV}Hoz!}pC?qFOp4fS!1XCtvyu>-85wPj23%+f8%O?`}0Q zgm!QjN$mZ@d_-FhcORu*ekTbP#!VYfm39R|yE)p+kUwQ4(^Ak zv7NF9#>@tH&w#up#0kj@E62;_R^1hF$0<_gUiHxbN<|nrPtduE_eOsPDdTptR)L{by;KoCFkb(~p!7_eYc zW3E!c{d@Pu~(%& zCh9rry8C#3?qFr*80Xw}5q|NL^L z&}3v5I>WCYlMCEzEoK|_I4LgX832sz&;NJ@fEwr^xM8bvQM#byQCSQSI-M~|X#arT zO*rxsHuS7N8NHZvnfqI^(^1bs~wAiwn&w&}(-$x1SK2VQdZln!Jb8Qi3YJCf2QH`k)n&1a?L_ z60C4uh-wB91mmtyOgB)Wy3O13Q^+d z_n@7kX8HvMp|uLnZ#&9$B^#><&g_KM*zalkRS4P_=H`HJ$MVXP)KE*DMv5KUdOc1&S1`ObCbtc*-on%Yg9gXT z-69#xq#T0>v-xe3=$o)~sYX^wc#!E2fxH2n0d`+XX((jJ`S@$A?|W8Lu8D@0%Yul) z!*&I5oqnaC=63c`w@yDVvXT`;1?-bI@vxNoK^2H{FI4t zFpaJz)2unBoGwNLZ1?%&M@Pm$T1W3xWM?ucU-S2?s`AerZhR^UW;h34(+8A)&SiU6 zbBpfX`!%%s$6ib8F^ba0bw(hK1fVwo`ILj59quSsj^d!k)DeDBI=|-(ZtYKpQN9

B;h6yR6f1!L;cEeO!R6w9D+;`_Ya(hwe%00sy)iM>L z4~J{L2qU~(uO{_K`}bsl#!=&Qp&4ZsruBHaL}R2g*MLz5FUh8+yqcOpXgIM%Yx*cQ;ER?cI46= zgRPp;6pGbnF3mmY%0`pYdai_+8-xV=8)5Y*m$G;nAVsy7YDp4co!0eSVHENkHWspDEeHexSdo_o6Hmfrtr<#grH-8DtqG zOPMbY&Vi{(#!eY&*~1x*{`oP2t#r=6dH(!d3U_ucb9zJ7#Wcc)YK>sEbDe z9`^w7B=99C^dEtJ-2rmiENc|padjrD-jFs>)07{9Cpf^Ijfg6#*G|fd$ z9#teJ4phaiGegKB>Zvrt0q`F|H(*HC;gP~@4$BDa#;V7UbtGJ=j0pI$7wKa1iG}>0D+78|B zx;t`kD($RSTGcvgT5wo`w|ly$E0s4LTl)v zXn!W2?)SF4u`n-e@-*@wyVimkB|jZxx|5$?@+sO8eFd;?aWs9y{8n)N`j)q;^KSTT zcs8UiTM3VE%MYhRBEPb^ZjeST7R|hdT9QT2n`V>>uVT+H`#$?IHy2V@Mdo`H5o^y8 zHa_kGc(B+v6F zA|e=%fIxQUZgS17x-0xO3_JJ2TVHo+e64?Btq*;q+xvv~e?A?qb9y1D9GN$|GQ}cv zowjN2;OfV4^Pa%tKNc1m7sURkS%NK?%GfW&s1^F%1;2fn^GaW7s}s-Udv|GbMEIhX zz$2idZP+nbTWClya5q7^!M%Ia;DqD|)F!2*r~%K$X|pg&O?4^J@E;}c=+3+;pT;IM z)3BtdO^jor*?7@pZgl~)ZIoO5oSbtr11iKP=rGNsfm(|Yc(&54gAg`r-t6p-9W>u8 zIK#mT#&qlHhp#9pfd;?kzYnwX7ML|sC}x@Jmt$!xH?e!*Hp9UWw>zeSxrVR)33_XM zLcYW_>-)dJM@Nzy>%~vV=cQ#%djD}xM$XYFiT?95T0uGj)(wQBQB?iGdZ^!XctProZ3~ zYo0qy;={JY&nJncrKP=m^$K65VOCdKsBU6?;8!%gImhMETUYS*y?O*;@B;mg<7gfP zQ!5>Hnuqnf-0Ra@k<#Xa&;dx`FyVw51f{iA<=VJk~41 zT8t&A*iq7x&w0_9o-WeEFkF2v>#v+Az!s5BC9T(^bw24f`|i?T{ikNwi7(t$v9p2D zmtFv}?bxf_ml!J(!d5S=NpE$wI~afnbZ4bD%IVLBsw{d6kW{_`>Qmmh(F3zRXufCMcp~&0?nC8u4yHKJg*hl969iRcR(d+L=s=^( z%2aq(|LYmn!Dn6MIQn5U=1`i{UR+&45F22Apl=ug_#(F&*XqTUZ#OWVh!+frL9_lm z`1W}?-gUI%Du7cFjL<*`gayS6s_{Pr=018lx{2r6D3Y{s0l*v4OWZOeB_+Z%1;nC} zsVQO!ZuVtFkD-QFUeb7q?}##Ef8jw4Ke`=oG4$6Uns{-cvkE|FW+pTnG?F@{2X5^* zKErerMjZGwU8|_Wd3P%6=v=_Pf~K__vf)(C#zL)&E82m&Ae=5eFZw(^O)n1N5Z)E; ze+(n`ExG`i0Cb71as|-0qcFK1A8&qfG#(;`q|bWJAje>k2wwVavvh2nO7tdxNN}RP z9Tevjxx(iO)tvrKs%C&XzP!V%6bY(+NtZmfLfo@*~?pD8X2*!q889 z{tPYdZ+MA(8XL>Ayl2hlt*3>rfa0z?cCPN>IDL#=)VA{wNuoUjPX!_zOzs;s#8>=wa{5~I zNDk+88|Ok7?gK^+n54La8W;UhfGybY>-qgpKm*tW&W;hsAOje>9(Ok<CyRb)rE+ zD~VZRycEx0^paK2AZGE za@$g)fu8**Zh2?~~zfvt26$h??6 z!F~;z^ljr!@`DzcJ0{Be1H5T5s7EeE7(h6%X2`NaX2Efrz2qC&W3I%9rlR;hM&GGD zYB&JzN?4tsY^k_N%C^$@#*j4e;jo_yj={}fbKp5OH}5L8Y|_-UA}(yx))v~M@TNM@ z4UA#X#?SW4v(xpq3pB0w+f-^V7lK*C;L}m!aDU95p@e|Bha-{nSFY+@@b7sjp9=P! z6S?2Do7hSKo8!1mZj`+m1R3FNA>N#OPezU>I7(PkG?qrgn~KF|NWlVos`h3e%IG)P zz5~o6I5nU`tt>5d_w{w7KG)$LX;fS1zpf_m-@qx~*d{W!UgToQ!Ajgqc`zeHNlN0z0|w`i+B^UJ2^;L9BjqeB zs@l*zK6s#<5GLrrM|H^nhyA!(px%C+!A9Y7W*56y`95C1ATI(-BbN7Vk!87nWW$Xq&%S>@u_qYftVQ5Ru22v%F&Rsn zYiyCx(h^kWtcsp75&CF!O8ZhcKrVV`4&jZFsg?_+>{n0Ce-kI1wlK1Y^Mz z^OuN~2yxzg{er=>hTcd)_Gn$L7B{0hh!|3Ddy_HL8#WLkcjhE^a(Zt*xNw&?leIq* zMTE~?70D=8!L|*NA5?zMYma+1DMViz2{+BaJQT&o{M?-E=FMSiwTJz#VE@I|T`xiV zL=EJsN;!1TlH9jNa?wCdi@gByFLOR3?8Q{@kfnj3w{X~OSUGb6sg&^WBX>&K?st9z zSa4=|IAm`HTtd+l91F0bpCLiE1<2z_aU{2|@K?v{X`M<>G!`8a^RiSHIOrVE(1ZtiX^a%PFo+6KIt##}N|V7ZhD2*f z+`~y6AaRGM<$4;^rwt9crKOzX!(z6GPPa2%Uxr_B*)YtvyrM$6uHUL7LoHU&T8LK2 zX8yb2e)j9?gMK@H4=CvvECbLWt9r+N0Hb8FRnJSso#OW8gmLk{plzIHj9&CYh0;r( ztpc8wCTe&nFLj*P=Fogwx@Pp4MrhImtZU%&07Aug#HXGHsEHC9(@@+Jegy6nW^J6G z)c#Xc7mB^GUTw7S{nQowoE6cC^GG^YUC(w(h*N7FiYGT*y0}_!0U}-8#T$+|wV<(} z1Di|;kwV*}uB3D+K0Z?7l7sbwByoPhsb&vfcX!aVww~I-W<;-9L>olQE|b{if>CZr zovV9t*U6XCoHtgRtmEHNXzMWOMT``N+o02x$_jPV)YM?NlI&*lg=eSu-Qkkg%=o6O zi$k0HN&pff%%nX%JVKo-9%i4Su(Kbj^f`L`_@?^@AY)V3+9IQ<$njd9m-K|4nR$Th zyc;H%2$B8`un-fM2UkWkh;N>+cVeru=~v|40hcKsmjNY5G}6uFb$fNoj}+TbpZ-U) z;Qa6NvB}cc+NJoYf3egGkG>{&euHXvg+At7ukRn7#^@ti@7y-d%ukr#&j}KFj$Mjk zEtx`(5Y3;~Fdn-WkUvcY+hZ}iNQrUpp@8pT8zcDp{1NukUmFTUALZEOTu&Y2xZ~VK z&}?;mDi-H^HL}x1)u!;E$qJ9krQmzX6Bwp|q_nx_MQUB`ffLeP28@nLh91fp@02Q< zJxanVxBW%;S^lGk*-kird6*nA_@PvJAc4~ys4^S{qu zUs9;y1$FZyEcY-c9fdbCr+Uox?v0W^ifdygnmd>a^m-niaY&Bd9)nF27M2fQHoFRJ zi9&?!sB#W0*O-`qlP5nMi7EGE8`e%h36D|N!E;_OP#OY&221)HCUS9(P6OmEICrfg zz(+@*f?}h%45}F_n6IceCRbsA!WlBdlL0IJtGx3Ytw0kGnEDOk|( zozfU;$#GOWvET7ZQksK$0!Vj{BK8z6bbM)eAw%yO5 zLSsKZQ5{@O&IfXuGtBg5m-9Pp$NQby(kA;GcN%BlD8aZESLKs)O93EwdPRot`90eW zdwvrW7Oe*Q_#L5)INHLGMxh5opdue(1bF5eHnwK@<|7&w`08Q85i>6qI#`2dpT!BN zlq#9YY4NsnbjU$rUl<)5s}(rGdgmuFSKv}%oo#cr%)vAoYumq%#+n_3QNP(w02^{g zAMvQ)ZI>rDXWQ`kV-OgrvP-xpqcd(oC9e5!l!aEwHAOZ_V7+ktET*W-er-pQX%4cD@gfnu)v_t4~?Yn*_&@3$`9 zK6h2jc>e3TjXgH!2{c~UL356)y}_W~*4a1^LI!A8p&F6W`5JxlTKk7L9nLo;rOdA8 ze;gY-aPT1El}-_bq$La!S!qC=&uE4ZY*%#{aort(WZ3PpvcyUr&yk(-wp9sQ90XAt z!q6os??W&DT}&X{Xu~Gw01V}(KYncc2wXnw6~h@&$Tda(E+kS?B;ddY`E5QUe^(LS zmj*Sh1G65h+H=(=w@41kg2VDYav}^nu#7N0vL6KTGPCftdUpr^{NJ_2!$VlN6C_pi zy_85aC2>#G-L2TN5B5u>s+Rxw`&@u9a{u>pv7OqJrQzu22Dh$;PR`T{D|(+nz8I(b z<_sZ0Z)+?c@#E^a~q(L z!kGNkt8$p6?U{2&8Z{VLxZ-m|AuqrB>_MJB=-1V$PV%;4m?w3mtH?-7j>Da6vqp1= z#)+wJ91{KHT^;iE;DHWKY$W%5kBJ`I69YX)>j=6f)b_4d!X}PQUjUsFV zrrO*6#-(Jq<9{c-2=mC+WzbR(of{G`(x?p7khlE#R zz*9ih0nk-?IUd8S(ZhAihd?sZ76^pD4uD_$VX1FywlSOjccqYCt$-`vujO^NS`;ew zOcdq1eVk%{W3+x+lwh10m1~+gZXrNCFQ(q*>_jR)UCqk+|LvEF>V4t3OIEHuP?Cv={XI@##>1RZbnPgqtK? z`BH)IHac04%-MzIc7fuSWrAK*r-YEX^yzW>T(;+p7Kc@9XodOivVA|QT?JPf_*dq6 zUwe2T(@>CZabu!r#l#oEwnzN@<{3HWzi@JP!{P&S?Xzdk3LCFo zxTv9_QGdtOo#X8Zc)`MiU*EuBU>BKojw@vVslan^K#PthzP^R27b+VFb8yaoou4OH zRDc9Lh2Gy^agSJJ8z5_hp(@DB!^`z7CxL^9g|&V zw0ug=w#4){QcNOpl2BKOty4@d)gW6)!Z*@mqGA0hN8kDwTlu0kBds+TVx-ntcW(%8rdT_(oCR2Cn= zy*)4yee3h@skU`?M#xwg2*NTPgK|{(kX-6<*8W*|OWng)tRA>14$@@)dzxT1VXgv| z(>Zu>&OI@{C^~O65}$OLtO{V^{PKy*hRGmXM%3>Jlpa9_X+oqor0OxJ;mdQl#Ey+) z6oL~{V5C&`u^04$l5Pz7Mhoi`gd~cnSv^T>uV=n`_0VhXezNoiD& z7QZ|iDiToRH&wNf(0a69fFCxiX37h~m3`Ztn>`$zq&g8R6apYs0z_xj&igPHVKtb= z$QtGX2>u3s1Hep-h}kK%;s+7iuLs9m6n$w`{w21MuQaaU2yC4x0o0&p6JFsRB< zn*~(=Mm_J;t{KXIdz*~RB-U-P2Y}ON#PjTB0ks}2_OL{%+`yWx_0nXTPac8~F@$7i zVIduG8YX)DIZu&@&@xeP>FFQY<)^)EEggMldbnUnr@?wxXcpbFUg7y?W@5y-my>`I zFAy&8=MSbr*^>WKZyXQEHqqBHgYslB@IOXF3?jiQRl#T}@6> zq6&E{;Z~4!DEL-sY(W0sHOI#;yfvc#^iCX_K)ra9c}$y_et{;#<39cxyjy&d?hn zpdXi&g^AW75O^4RhR?5#mxD@jThk-F|G&8a=9$=0wV-=IS=EUBk7AM~f;8X`Ub}tB$8(?${PD&e&GQHEaWmpd@@_)r8W?ii$b%PS%h&oLPqVh;&FMkuhM zM2mqQwCuVLiJ-l|Dh~|UDy0gR=ebCI-z-BQ`9T!u#qC3*4jYn>>ePs0z$JL4sBje( z6sXaui0j510d?_Kr#0{P(h-#Yqt-ByocHXO(loRxtYGdk%(@)yVg}DtCOlm2YY!u` ztHsp0!J=7y0QVGbpO4WT2jqP=R?@(rT0hT1-xtoj#lFiUe42q0kT?IDB~Pr`Aj%C^%YLTsvI*1^s4O=B10TZq2OR zN^MYB>Ho5e#;&REUR1pbk_bQnV9pI~PxBVN)RtG{^ET0`-u^-fdES_6B+<0 zsj9*!D1fKj^Kt*TO(#ax880V}%LcB*D;V4-%^PQ6C=zb71R~CGFx497itYLdG)gd- z$85HV{y>zBcmH{N(QO+LTW|YEs=n#eZlA8wJjsfn6ZATd4ov^xLM%{MWG`=y*N1}voR?tK_wfkE5u^5FB^N@~nC%UMW501Lvz z-O8IrTcI1b4-!bWZ!4{>ec#@`CSNZ*E`NtK+cj0F5CeKn$N;7GZESi(COr2N!xEI1 zZW$V?Lty*zag~shj;Uagdi36I`w*}w2j00eIFbn7#>~p$OWKEyyKv>e@5LnZOFx;) zBIxO%M)ID7(*PwXW())wnsUxTkq)pWFmdng=wQ_evxm#<%TNODe`t1bC=G9LQjqQ+ z0${lq%?0DKcO#aG`HEKTZpG>rR>C4Y{@>@0dg*2!2_`6wa$>}zY%ywQrdE-z*3{J5 zxz_uefGx0GKo3CDOIt-qA%{X1F!IN8e}6V2{#eA9ZJL^xFJeUA&_HWz%Dcl$#MUME z@zST_V2jc;`0+q;31ZOIt32Cx3;c?e8haZ3j!$u~&wZ2oB<6>EL6bNKpq?dS6edcL zCInOuc6NHhlnbEw96vh<0q_l5demSDYwVPw8d7-Q@ zVmGG*I~T9iZ1X|qOluYG!I^xvG?_OODpg1a8g_mM%@0&!;1e*oqo)WTzkk+xP^)w z(k4CO2dpir_ihn5+a92t0xbCDfGXuY(o9f#!_yiFrXD9ik+%>OKo^pB$ZrbjlDE(T zz}@us&`oo(WOWUVXa-!qDjspzW?gAY^mg}NeZpiy!NZAK4EB4~gXWT-PeH7Qgakcx zZF|!+rUIh5IN!{NnsLkShDOi~?pu*b<&ORimZ;MLFHs>9vm!I;Cah(AUDmfd{TBEL zj+oD3K7gYFm=}s8GhrhK`!4^U@yMiaeK3|ngO6E=l~!epY*2*-(H7?D{w?WQiFt)Hoz07rH7F8nVXMTeZJKg-m;nZDwAEoQ26cZwyWrLKt zaC^+-_9ST`>*wVz|NG%uV@xVXC}8MuyGpJDBA7(W_gK;H`k?Kr3Kr>|J@6_`g#rgP zFhmq*AD#{5Rni}vU&4cm|22ig2^aV9M8##aTbiahR4SVbyBMk zkwPwd1QT*QyX*LQr%zWy+R77*(>&q!3wIRP={pi&ff%vZU_0(ys*4oDCL;75LG$SC zO-@U5_wo|rf`MHJ>0B+zF0z@5n`_{nTn{msnjsSczoJG=7Qd9%1O(`s& zA}|nIv#{lhl@K+^!4gU>c+3G`zwmp$^?3OknDt{l7PaGphJ5B}6&(k)0%ui&Uf7O3 zd*ZKL*^5bw5JShy&~UV+ni?8VEdNIF;AZonI?Znd?kY&$bGinv3vm;s`y`te^cwveUV9=iWmz2!tZW7X=X-3(Md?4I32|-Q2eM*G>^9jQE$nh=|cf8h0r$ zs!j0Q2^ngv+pSz;7nSA6dQ;EyB9F}5X_E}pt8;QaNDlg))NKAmOSpL zKCUOs`V*d3zw-F+zc9yKKNviHllT82bCOVK>f)KztW+N2p1%hXpSIwBb|Wt1x+L<65dX^mb4vI zXE;y#BUIYz=qUO@DsA=0U9ejrg=b?!s$ggfXim7SqdHYP8ZkBp;YLf)Q!rSQMn=))kmIx<$k(-JN{caDcrvK~UJ3 zd5f79mx`fKpnH*X8fMA((=$MEP@k4f5T*n6?g zo9*@`@s1kD%YXmf!$w#W8VT3-HfB@J` zzrZU2sU*z|T}Y`gd@j%U`RyyVglG+;?|P2|Rfo@=tBHz=+Fz&&DMFhI4Da8JF_OeW zc;!YgbH)^X8-;~b-vP@PH}4&$|Dlzl1gW;mRQHCv>hbc72oaM5%fEh&Ofy^Yi-F9b?rf;?>K{;&97D-OBFS&^xv(XLt`jp1npuM~41F3bM=%2d3DirlSHq=;B8|xu zOe)JBuy~2^K4t9{7WMZFftnQq3#77ugm`1Ak>SAZ4##3;XRv*Uk7psOmy?tGo~|DJ zY=j>lVC+TWRhp)78Sejnz@SIq+1XfHG7fNd^F~4Mk-#Y|EdM&BI+yeMa2>R61sV8R^ZFF8}WbWo9*7TM?c^p6Gyh}YA^_QA8Y7=J6H_-kbxtx2L;L|QY48K< z(76T*RQ7QN%D!=YPi{C0hh;NT>t5su$2M@JOw(@ft&7>&1T2VmmYqk7`Q zo~!w&Ikrb^l-Sk3c-y=g)#P(yDDg$4u$|P zaW>>MHsA<)@gi}09Vcfgetf!_x^oL_kdT9cK@(6Mas&t*|G1Z6bXnH~lW*J@!YmNC zC3zetMrK;t;;&x@1dP-0kk_&7g42>`1q7Xbq7<0TA_Qm*PtdQPx8kw~4?%qM=5~nI zEx8I`q086~#oPM1G9Fa^uDg4GmP1)bZo$ zI;c$@Ao3a;qgNPn@Oksl*rvl#Y0DQZc#Nt!x*EF!-;|Os{H3RI#fop;mc;FlHmohR zj}q5lN!zWVt84#u3%-x{U=?_8T)GzKHbMkF=z7BM?j$P=P6MfQ`qn=Ry9M3@&zdc3 zawO#`$wF6F5-%#Mwk=(10%!Nxz?D{u{jSJ7gtZ3%y!w+AiKogPbC$D4Ir6)GzYHiQ zvo9FCD1(&@H%n_<+nGpW6a1nIn4~jZeP@A$=@#) zQt4o@E$Qquzo8fe@~|BS==_`23g&IJ;{Sh%wK!G4IOQpr z`6J^u0aC=-X6UgB6!aauqVzT3w&Owfsz;BcB_(ld!k{g_Ki=n{eJj7xSd`Mb-F7%r zuI`qwAC7z`aC&KQ=W4!Y($`Cl2hYcqnvCP_Dc!|ep%G_N{JfuVd_$(>{cd=0#a_C^ zWv9D^w029yGJOk&@1}UYjTRqdn=SWhI#)~XUKOXn@`werf%0;gE1(eiM_agcq_{OhvXJ*JjcqJPKvVn=)kA9YRgG_clH_&>lX!QpTNBO| zF5}qLB4&9Z%uU&=xNm!UdSCzUw*6#rx59CkZc7Koyqw~ImYha;W6^YiT-H5}nB~1& z$pa48HA?#{z=KscnDfHOrEz3j6nE)-h>0|z?ZcMPBx$ceSh{g;46dpH>DR+!<9*sG zEc(790OTH68Fk%dbT7#>jD96DoD>FRwqP#}_TFxbe_x8>O3eg|2qoeWSc_s)vXPGJ zH2vIdESxne_78YXPi>5c!K-CAs6tFlR2~&LqQ;i8BMTZy{m0r0oa`M410>3at-;bw z$^9qyPJocm9dVwz<*voBX_`uPzQ)&T@w}I%RN!aYvs-!uS}ik;!~XfpT`?M7>S;3U zauwdt;dw<44{S&ci=dLGZ%T^n^FA4t^y0devC8JnYxZ!4Imf}=1v+bgwh+TSuK&{) zqYtW06C*--3mg^))6ADIqSdOAE`PY=UxAL}&@)V8@^@V47NSAi7UNiD9{Be=W~t%> z9*u#MdHK4Br6rS?bU<|&SEYYRg=07OV>y9CGi&0+Rz9^p^PMw`bfSHiyaZS4xr}cX zwy#*T<2rF{8SQMs`AKaOkUGdb1(H+c|I$zOxST{iU(I1J#*w6 zX*0~avW=TG9+0-fc0cs#Pv?8l z@esN&{2O&;UZwlHGOKM@K*)#qqv6FKiL0py!>+R+lK!qzhS2@@UR4d#9gDF(>}_6>Rahq&kZO|Ad2Z5>&5)LtRQ2D>H5}MsBs1S(AvH0qSg-d1q0JT6 zM~*xYAi2fn3k6X#m^h{Wd&O$5aH_hh(L}yJ8n@l#R+85F6EB_B=EJspN)*a%XG|HI z(%i94-M7w|{^h;EE6W8h)h;JkTv_0k>QuT%%U^ak(y@ts@%(vm#-bko52JX>F@ttr z_mJ-{4?krXJ}ppWdNa7^Kl-}&5Awl7q|yW5TXGWSE$5^qJ3$RV12ta(;&&wpr7w#0 zSQNg0eGd`Hk!B{{-qjV=X%EFG$jCYv&OUVUMXQ2n0xT{tQ-P0}U`YLl#(uB4`IEm6 z#|{Wym|g_<1(J5QhW`e@EZW*soC4vYB3uA~l{Ay6O)~U140>t07j%B`U4nKDW{v=+E1p=UYm|Qs01eff1_woeCyUz@GgWSqy5kM`B3hN z{CvsR{vh*o(>yF9Z%i#ZpFY(9MXL7wgGb@%Ev(%TGd)4Jjwo@Qli!e+;`zy z<`77qkVA zPB+BYZu?`L?A@>JH(ZY=LDj5a#sNZk(8-gp`uZ?)F@7VF+=eKS$YLdBWhBUZ^{c}H zIz1!fll`*+V4Ii&WMz4|x!t+)8*0Yi>QYi4KvBn-8yC7Z>?N)ne%i+;D!N*B<4*_h z6iBcZXK2~C*z7$?m=99EZVZyBdAc&(6^Bu30(d5i5rJ_4e!n)8l9))_bxr*$er|C8 z4{T^t+SzXZJJz$vJF6^o&z(9zbpUJ-jGKa6yQzz0>j!`@L^=@ zqYNadWCMBFgf;tO%nL;A#`d!nZe1e6pZaAwK|4dkduxB&XqY^08H1h?tkcP90EVWs z))17I_*c(oP-V$3F8L<6mj8UYC@Lt}p5lyQhfypZ&d|lxKUtcAa}u4_J%bO9t&!Yq zd9KX|RFjRVrWpXnpoF)2esfnWwB{81E_{9HjzDRKwBQZmsI)wsLc4|gB7xV9UFpIY z^n5#X=||w(Sb+nAx$Zn*dJHi>1e}I!pZ%nq2McKnz(JfrlXJ$_^aTaZ(6q3MxX_SRw7uZ&!K|RRRT`3N&_-&2V+6 zZeeH;F}49(hq4e|XmbE?CS6p8nD-)A>h-HvN@c!a?_>0X@jZrJdYpb6-Ee$?V**V# zj;*?tWl#8!Gw7eP6+8n!cI;Gaz{cW+20aLD0CrZ}Qu*NM2OQd~7qK8(;b(@+5WcBO zN*0-qP*vSn`F;o6)6X^aNUDL^5+Fif$r z(RyFONwI0rknF^kzH)0DPMoc7?OfDj$*CyW6{$%0;yE+nn@BB18)P*!7WwKHn}LGh zMo-MnmXG5;kuQu#&wfMIT0ry=;j;CvZuEDn%YAi?b_I}F?c|r5GSV8Acfk*XkO)5v z%H9!q{GaB#I88HfilfXPebb#7L{Q4r^=P3`O8X9Ssj9Ej1I1_+>=1ZVFrDrDXrx6- zqg>p6CniU!fOy=?>-XEC6=`B4@*aV&{QJ{is)ZZeSvQfe!Kn6C|7ajE%mC7o82?Zr zx-CO>H{BtE#V$_0IHhDQkNvwi4-vR1{3_MS5T{f44gLo~;{R6>`~Q_(9_(`5s!&#- z3%!Yf21o!vFmQFnW}>+stAr~oh!3#a1m6Ag>(`#*#@=3N0B|Fi@f*Mf_`*`VJyf}X zIzBvG2YmrlbzzbKFF?Z|snlI++l$lNuuqHV1&sa3kqn*BRF}M8Z-?MGcn;hya1k1# zU)Z0-J48pBmzM{vTT>?!`@2&o_W_zdbVy3%F<`14bDBTP)4>nV!yShGfSdkQP|y(@ z8=yE)JJ@j&wA!8B{KR_12pO{o|u(AEQvAT2vl?w~W59UX(IYhj9^w@2KM!|Y_>CToG zLp@HE(kNvZ^nzD@S3~{M2aT+Zs_NAz2=${3KuEGPih3vF+;i;s_~pwD*g?X5?Uv;| z20fGoS-IRGtUS2z=gheeTkDoOr_Qu8Sc+nx2mn-?sE?fiZ{3Y?7}+WT5m-kU0l>QL z_Ry9rI>cSWz_5ZGHXJzXsqzv197znx+VWPV^$iUuPY!bu@B-ioquqvQqCg}W<_%Q( z-Vh_=VgZ@D>=Ulg9RL2`qkMI!@Nn}YwyXU5Q3&C2eMtIx*qp}`yK(MoTYY^<70wi@ z?}Xa|JezkY`)re}p^f|6_YFV>)Kt0`ey5pcfZ7A_3Yad+Kh!K|;iF>k1OCz8yh-y#_q$vzlJf&7}72$azR?-vIggqd*T1kwsz0%u2<;;7vgYlOWA zVT=GIVbH87ahfQb@(iul=FRs28HO2KJ;h1kqHGPLCKyS|6Y0ui)YN`Z(?>!>!8&@A zbUXi)Eg`KQQ$vu^0LNpDg9I0V`iRRUd5}SGsGpde#Kdx%C{Y%Aj16=TTuEDYRh3k9 zlWCj7*4))RiBAs<6|3w$hU>t;3VdK_^1XL2fOH3GOaO4!LPb9|7ADo?1>Ugh83ZUk zra{F8*f+^pW>3bjjvIF?4lUF}Xp77iT^xLT?Dp*wTXBKRG4=Xuxqz)SG%Ur&JM|7; zXJ_2GYZp{?+ggm2-Tz;Ae@^_a$V^|amv~RWB><0uW2$kMa&IqZI2`T%%{Kv!v!}xx zIbFl&krdw4if;y<1vbw3!~qwVao``B85tz|hV}TzXte^d5ykXK`xj((;Q9auW>}&L zTLK*W9m9Xc>$_m#j_@UfBf)^+6xUB~f+NV1=nSbYp`M;ios{*68VJ#%E1gqa---JM zal)8i>7&TUhX5Ttzip-vi?yWW)TvW@jg4QVs!BZ>+fYwHsg1-eqRzw)WlZzU+ELSr zmtt&QT2b+u%h1&TfrMW!{M3TM31|_BkGoC$Sq|PDtFYic?W&xNZ=02rULbD?NE39D z4P5&+rNBRzT0!7%p!%ckvls686l9k)d8-l^PCq^eu&5GVQkwbKFA)HXRQX|M33Wm|`L%pglAf?sh{J z6uY(o3A^(ovEb9En_F9++Ou-GYTc$jI%Xw}EmImWpoE1VC#->UoQ;252p zn83sj&N}F@$yC{h+W%AC`A1WIhjCo8gY{#IQc72?G?aeH)@o6+>?&-vFgKR!6v<5; zraGmVepo*&WXu84R)-_Cn=|(oQfjyfOG@nZJzJgqvA=fC{uswU_k6$i ze%*V&pU?BWpZD{6P?k4R;e`IuU>e6|K$p!+q!FyF=36`-jMnlJF~N-t#HZ|v-U2V6 zkZLB5msC1hsSukF&DABCm@Z?;lmnDe0FG1iVj1eWN^IQ99&d#_+}=*8Wi~Tl)f2hF z^oSKjuqGoU$A7A-8mc=eak2BL#38NeBa2NMiU?v33vcg5?@C{s6RC@n2z|{CuEmDL zSQrdbkFSFqG(}1$o|EIOl4gu?DMSso&Cs8`V zB10GH-e>$4B6Xqo?9x-UG7W7T1}6$KsFDeha?t9DqwRjMBd5bhiCaE+P5bszV_)YQ zlic|X*ihyeMxLYKOb~hY1|VT*aYvN6d7B#TGos$#Me<2k6}}ZZW>`JY&}GG6R zA}x@QVcm_Lw*?VDj4X|ns+w%0m|h$R)bnR?|6?bh5;L1RZFqP`cQ>D25VtrqEN%#5 z+M6oXiNEJ*)F}Hi@9&p;a?8<1%5}iYCFt6r9=xI0tng5^qiq7aUWqJ&>L+cjQ<{h| zxCOg9J73;P?L+@9Yo!ex>yUzq50+D8q(9?2L*34fj=mOUUkhi%-rY28r7rUqs0-3I zIhzfQf&?2feZMoOq9*PwCZHulBjQ{?=-o~ljGob3k3W2`Y{@WtN6DkwT|=3+dxr&p zPm=m(HiUxn07XMW=*y{CHi=yudI#B4yJr$B$aAsj;vyjL?7!^IM|^*_sJFEch5vYX z?A(#tt9Imx9kJ1`OWi>}abaaiB+@%g4h+@GyS!`iR*IIrmO5Ycz?z|I_Drj};l!5y zN*ktBgglOgk(QT7+I!P}QS5>nRaJeD-FKSt)|i_MpbmUN`|5l4IJW`gB|8<6EtMO? zne?>Vb$IT4aE_wz=L58C3wN$vV=~3t3Y~##{QQQAL`t%CvJ_kCDnoke@MD8LH@a)G zXjTAI+?t!4&-b_eo`tpygzAe87M5nb6XcdSvjoObj6-{2E-)@aRo1g88^|?WVfx8# zRV{S$TSwn|mB3@KS63H)@LAcq|$ z@`L~p#soje85MP-creB4`r+p=ommvBYryhT{ywaVJ-`SZet4VWte}bKl?_rv6o{$e~J5rk-K3uN|#ZV}Z zPfpHm^FY)IV+nglDi~s9u#^VK;C+{CE>S&HFMZEMjqo8IvK14>enlu|YI!`Q9L;r< zMhP;mItMX${6-i+@e2CP&E@el(`c+=XG&-uZjcHM!8tfxwJPGr1`j;(VJ$Qc1lvrS zv|F)!#fo`NIiM=E9%8Yf8VpdQRHNJ}l43^Fdf-g>PR2@IC}I5wwjmo*Ecf*tDnq=J zO9))5zs?3oCxs)Bs9<{a$MO*<7#e}b(cwY(R3Ks3R14HTc_?NMtqQQz1BKtd{1WPi>Zw6zIx;Vi!s%um-oFl>aJ)@D?nqZ9d&!=ay3EXmnLar&Vd#r+YFw zb>D$416#({>XxjX95k=zgJy%>Mjj@s_3~B2U93pm4IUhgxS)!1v2t`dH9~A<_=|T$ zlu?v-pv`Yra{a4%GWlH>u { server.close(); }); }); + +describe("isWritablePath", () => { + let savedFiles: Set; + let savedDirs: Set; + let savedCli: Set; + let savedAllowUploadsRoot: boolean; + + beforeEach(() => { + savedFiles = new Set(allowedLocalFiles); + savedDirs = new Set(allowedLocalDirs); + savedCli = new Set(cliLocalFiles); + allowedLocalFiles.clear(); + allowedLocalDirs.clear(); + cliLocalFiles.clear(); + savedAllowUploadsRoot = writeFlags.allowUploadsRoot; + writeFlags.allowUploadsRoot = false; + }); + + afterEach(() => { + allowedLocalFiles.clear(); + allowedLocalDirs.clear(); + cliLocalFiles.clear(); + for (const x of savedFiles) allowedLocalFiles.add(x); + for (const x of savedDirs) allowedLocalDirs.add(x); + for (const x of savedCli) cliLocalFiles.add(x); + writeFlags.allowUploadsRoot = savedAllowUploadsRoot; + }); + + it("nothing is writable when no roots and no CLI files", () => { + expect(isWritablePath("/any/path/file.pdf")).toBe(false); + }); + + it("CLI file is writable", () => { + allowedLocalFiles.add("/tmp/explicit.pdf"); + cliLocalFiles.add("/tmp/explicit.pdf"); + expect(isWritablePath("/tmp/explicit.pdf")).toBe(true); + }); + + it("MCP file root is NOT writable", () => { + allowedLocalFiles.add("/tmp/uploaded.pdf"); // from refreshRoots, no CLI + expect(isWritablePath("/tmp/uploaded.pdf")).toBe(false); + }); + + it("file under a directory root at any depth is writable", () => { + allowedLocalDirs.add("/home/user/docs"); + expect(isWritablePath("/home/user/docs/file.pdf")).toBe(true); + expect(isWritablePath("/home/user/docs/sub/deep/file.pdf")).toBe(true); + }); + + it("the directory root itself is NOT writable", () => { + allowedLocalDirs.add("/home/user/docs"); + expect(isWritablePath("/home/user/docs")).toBe(false); + }); + + it("MCP file root stays read-only even when under a directory root", () => { + // Client sent BOTH the directory and a file inside it as roots. + // The explicit file-root is the stronger signal: treat as upload. + allowedLocalDirs.add("/home/user/docs"); + allowedLocalFiles.add("/home/user/docs/uploaded.pdf"); + expect(isWritablePath("/home/user/docs/uploaded.pdf")).toBe(false); + // Siblings not sent as file roots remain writable + expect(isWritablePath("/home/user/docs/other.pdf")).toBe(true); + }); + + it("CLI file wins even if also in allowedLocalFiles", () => { + // CLI file added to both sets (main.ts does this) + allowedLocalFiles.add("/tmp/cli.pdf"); + cliLocalFiles.add("/tmp/cli.pdf"); + expect(isWritablePath("/tmp/cli.pdf")).toBe(true); + }); + + it("file outside any directory root is not writable", () => { + allowedLocalDirs.add("/home/user/docs"); + expect(isWritablePath("/home/user/other/file.pdf")).toBe(false); + expect(isWritablePath("/home/user/docsevil/file.pdf")).toBe(false); + }); + + it("dir root named 'uploads' is read-only by default", () => { + // Claude Desktop mounts the conversation's attachment drop folder as a + // directory root literally named 'uploads'. The attached PDF lives + // directly under it. + allowedLocalDirs.add("/var/folders/xy/T/claude/uploads"); + expect(isWritablePath("/var/folders/xy/T/claude/uploads/Form.pdf")).toBe( + false, + ); + // Deep nesting under the uploads root — still the same root, still no. + expect( + isWritablePath("/var/folders/xy/T/claude/uploads/sub/deep.pdf"), + ).toBe(false); + }); + + it("uploads-root guard matches basename, not substring", () => { + allowedLocalDirs.add("/home/user/my-uploads"); // contains 'uploads' but ≠ + allowedLocalDirs.add("/home/user/uploads-archive"); + expect(isWritablePath("/home/user/my-uploads/f.pdf")).toBe(true); + expect(isWritablePath("/home/user/uploads-archive/f.pdf")).toBe(true); + }); + + it("--writeable-uploads-root opts back in", () => { + allowedLocalDirs.add("/var/folders/xy/T/claude/uploads"); + writeFlags.allowUploadsRoot = true; + expect(isWritablePath("/var/folders/xy/T/claude/uploads/Form.pdf")).toBe( + true, + ); + }); + + it("CLI file under an uploads root is still writable", () => { + // Explicit CLI intent beats the uploads-basename heuristic. + allowedLocalDirs.add("/tmp/uploads"); + allowedLocalFiles.add("/tmp/uploads/explicit.pdf"); + cliLocalFiles.add("/tmp/uploads/explicit.pdf"); + expect(isWritablePath("/tmp/uploads/explicit.pdf")).toBe(true); + }); +}); + +describe("file watching", () => { + let tmpDir: string; + let tmpFile: string; + const uuid = "test-watch-uuid"; + + // Long-poll timeout is 30s — tests that poll must complete sooner. + const pollWithTimeout = async ( + client: Client, + timeoutMs = 5000, + ): Promise<{ type: string; mtimeMs?: number }[]> => { + const result = await Promise.race([ + client.callTool({ + name: "poll_pdf_commands", + arguments: { viewUUID: uuid }, + }), + new Promise((_, reject) => + setTimeout(() => reject(new Error("poll timeout")), timeoutMs), + ), + ]); + return ( + ((result as { structuredContent?: { commands?: unknown[] } }) + .structuredContent?.commands as { type: string; mtimeMs?: number }[]) ?? + [] + ); + }; + + beforeEach(() => { + tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "pdf-watch-")); + tmpFile = path.join(tmpDir, "test.pdf"); + fs.writeFileSync(tmpFile, Buffer.from("%PDF-1.4\n%test\n")); + allowedLocalFiles.add(tmpFile); + cliLocalFiles.add(tmpFile); // save_pdf test needs write scope + }); + + afterEach(() => { + stopFileWatch(uuid); + allowedLocalFiles.delete(tmpFile); + cliLocalFiles.delete(tmpFile); + fs.rmSync(tmpDir, { recursive: true, force: true }); + }); + + it("enqueues file_changed after external write", async () => { + const server = createServer({ enableInteract: true }); + const client = new Client({ name: "t", version: "1" }); + const [ct, st] = InMemoryTransport.createLinkedPair(); + await Promise.all([server.connect(st), client.connect(ct)]); + + startFileWatch(uuid, tmpFile); + await new Promise((r) => setTimeout(r, 50)); // let watcher settle + + fs.writeFileSync(tmpFile, Buffer.from("%PDF-1.4\n%changed\n")); + + const cmds = await pollWithTimeout(client); + expect(cmds).toHaveLength(1); + expect(cmds[0].type).toBe("file_changed"); + expect(cmds[0].mtimeMs).toBeGreaterThan(0); + + await client.close(); + await server.close(); + }); + + it("debounces rapid writes into one command", async () => { + const server = createServer({ enableInteract: true }); + const client = new Client({ name: "t", version: "1" }); + const [ct, st] = InMemoryTransport.createLinkedPair(); + await Promise.all([server.connect(st), client.connect(ct)]); + + startFileWatch(uuid, tmpFile); + await new Promise((r) => setTimeout(r, 50)); + + fs.writeFileSync(tmpFile, Buffer.from("%PDF-1.4\n%a\n")); + fs.writeFileSync(tmpFile, Buffer.from("%PDF-1.4\n%b\n")); + fs.writeFileSync(tmpFile, Buffer.from("%PDF-1.4\n%c\n")); + + const cmds = await pollWithTimeout(client); + expect(cmds).toHaveLength(1); + + await client.close(); + await server.close(); + }); + + it("stopFileWatch prevents further commands", async () => { + const server = createServer({ enableInteract: true }); + const client = new Client({ name: "t", version: "1" }); + const [ct, st] = InMemoryTransport.createLinkedPair(); + await Promise.all([server.connect(st), client.connect(ct)]); + + startFileWatch(uuid, tmpFile); + await new Promise((r) => setTimeout(r, 50)); + stopFileWatch(uuid); + + fs.writeFileSync(tmpFile, Buffer.from("%PDF-1.4\n%x\n")); + + // Debounce window + margin — no event should fire + await new Promise((r) => setTimeout(r, 300)); + + // Poll should block (long-poll) → timeout here means no command was queued + await expect(pollWithTimeout(client, 500)).rejects.toThrow("poll timeout"); + + await client.close(); + await server.close(); + }); + + it("save_pdf returns mtimeMs in structuredContent", async () => { + const server = createServer({ enableInteract: true }); + const client = new Client({ name: "t", version: "1" }); + const [ct, st] = InMemoryTransport.createLinkedPair(); + await Promise.all([server.connect(st), client.connect(ct)]); + + const before = fs.statSync(tmpFile).mtimeMs; + // Ensure mtime will differ on coarse-granularity filesystems + await new Promise((r) => setTimeout(r, 10)); + + const r = await client.callTool({ + name: "save_pdf", + arguments: { + url: tmpFile, + data: Buffer.from("%PDF-1.4\nnew").toString("base64"), + }, + }); + expect(r.isError).toBeFalsy(); + const sc = r.structuredContent as { filePath: string; mtimeMs: number }; + expect(sc.filePath).toBe(tmpFile); + expect(sc.mtimeMs).toBeGreaterThanOrEqual(before); + + await client.close(); + await server.close(); + }); + + it("save_pdf refuses file roots from MCP client (not CLI)", async () => { + // Simulate: file is readable (in allowedLocalFiles via refreshRoots) + // but NOT in cliLocalFiles — it came from the client, not a CLI arg. + cliLocalFiles.delete(tmpFile); + + const server = createServer({ enableInteract: true }); + const client = new Client({ name: "t", version: "1" }); + const [ct, st] = InMemoryTransport.createLinkedPair(); + await Promise.all([server.connect(st), client.connect(ct)]); + + const original = fs.readFileSync(tmpFile); + const r = await client.callTool({ + name: "save_pdf", + arguments: { + url: tmpFile, + data: Buffer.from("%PDF-1.4\nshould-not-write").toString("base64"), + }, + }); + expect(r.isError).toBe(true); + const text = (r.content as { text: string }[])[0].text; + expect(text).toContain("read-only"); + // Verify the file was NOT modified + expect(fs.readFileSync(tmpFile)).toEqual(original); + + await client.close(); + await server.close(); + }); + + it("save_pdf allows files under a directory root", async () => { + // File is under a mounted directory root — but NOT itself a file root + // (a file root, even under a mounted dir, is read-only per isWritablePath). + cliLocalFiles.delete(tmpFile); + allowedLocalFiles.delete(tmpFile); + allowedLocalDirs.add(tmpDir); + + const server = createServer({ enableInteract: true }); + const client = new Client({ name: "t", version: "1" }); + const [ct, st] = InMemoryTransport.createLinkedPair(); + await Promise.all([server.connect(st), client.connect(ct)]); + + const r = await client.callTool({ + name: "save_pdf", + arguments: { + url: tmpFile, + data: Buffer.from("%PDF-1.4\nvia-dir-root").toString("base64"), + }, + }); + expect(r.isError).toBeFalsy(); + expect(fs.readFileSync(tmpFile, "utf8")).toBe("%PDF-1.4\nvia-dir-root"); + + allowedLocalDirs.delete(tmpDir); + await client.close(); + await server.close(); + }); + + // fs.watch on a file that gets replaced via rename: on macOS (kqueue) + // the watcher reliably fires a "rename" event which our re-attach logic + // handles. On Linux (inotify), a watcher on the old inode often gets no + // event at all — inotify watches inodes, and the rename just atomically + // swaps the directory entry to a NEW inode. Directory-level watching + // would fix this but isn't what we do. Skip on non-darwin. + it.skipIf(process.platform !== "darwin")( + "detects atomic rename (macOS kqueue only)", + async () => { + const server = createServer({ enableInteract: true }); + const client = new Client({ name: "t", version: "1" }); + const [ct, st] = InMemoryTransport.createLinkedPair(); + await Promise.all([server.connect(st), client.connect(ct)]); + + startFileWatch(uuid, tmpFile); + await new Promise((r) => setTimeout(r, 50)); + + // Simulate vim/vscode: write to temp, rename over original + const tmpWrite = tmpFile + ".swp"; + fs.writeFileSync(tmpWrite, Buffer.from("%PDF-1.4\n%atomic\n")); + fs.renameSync(tmpWrite, tmpFile); + + const cmds = await pollWithTimeout(client); + expect(cmds).toHaveLength(1); + expect(cmds[0].type).toBe("file_changed"); + + await client.close(); + await server.close(); + }, + ); +}); + +describe("interact tool", () => { + // Helper: connected server+client pair with interact enabled. + // Command queues are MODULE-LEVEL (shared across server instances), so each + // test uses a distinct viewUUID to avoid cross-test interference. + async function connect() { + const server = createServer({ enableInteract: true }); + const client = new Client({ name: "t", version: "1" }); + const [ct, st] = InMemoryTransport.createLinkedPair(); + await Promise.all([server.connect(st), client.connect(ct)]); + return { server, client }; + } + + // Helper: poll with an outer deadline so a failing test doesn't hang for the + // full 30s long-poll. Safe ONLY when a command is already enqueued — poll + // then returns after the 200ms batch window. + async function poll(client: Client, uuid: string, timeoutMs = 2000) { + const result = await Promise.race([ + client.callTool({ + name: "poll_pdf_commands", + arguments: { viewUUID: uuid }, + }), + new Promise((_, reject) => + setTimeout(() => reject(new Error("poll timeout")), timeoutMs), + ), + ]); + return ((result as { structuredContent?: { commands?: unknown[] } }) + .structuredContent?.commands ?? []) as Array>; + } + + function firstText(r: Awaited>): string { + return (r.content as Array<{ type: string; text: string }>)[0].text; + } + + it("enqueue → poll roundtrip delivers the command", async () => { + const { server, client } = await connect(); + const uuid = "test-interact-roundtrip"; + + const r = await client.callTool({ + name: "interact", + arguments: { viewUUID: uuid, action: "navigate", page: 5 }, + }); + expect(r.isError).toBeFalsy(); + expect(firstText(r)).toContain("Queued"); + expect(firstText(r)).toContain("page 5"); + + // Core mechanism: the viewer polls for what the model enqueued. + const cmds = await poll(client, uuid); + expect(cmds).toHaveLength(1); + expect(cmds[0].type).toBe("navigate"); + expect(cmds[0].page).toBe(5); + + await client.close(); + await server.close(); + }); + + it("navigate without `page` returns isError with a helpful message", async () => { + const { server, client } = await connect(); + + const r = await client.callTool({ + name: "interact", + arguments: { viewUUID: "test-err-nav", action: "navigate" }, + }); + expect(r.isError).toBe(true); + expect(firstText(r)).toContain("navigate"); + expect(firstText(r)).toContain("page"); + + await client.close(); + await server.close(); + }); + + it("fill_form without `fields` returns isError with a helpful message", async () => { + const { server, client } = await connect(); + + const r = await client.callTool({ + name: "interact", + arguments: { viewUUID: "test-err-fill", action: "fill_form" }, + }); + expect(r.isError).toBe(true); + expect(firstText(r)).toContain("fill_form"); + expect(firstText(r)).toContain("fields"); + + await client.close(); + await server.close(); + }); + + it("add_annotations without `annotations` returns isError with a helpful message", async () => { + const { server, client } = await connect(); + + const r = await client.callTool({ + name: "interact", + arguments: { viewUUID: "test-err-ann", action: "add_annotations" }, + }); + expect(r.isError).toBe(true); + expect(firstText(r)).toContain("add_annotations"); + expect(firstText(r)).toContain("annotations"); + + await client.close(); + await server.close(); + }); + + it("isolates command queues across distinct viewUUIDs", async () => { + const { server, client } = await connect(); + const uuidA = "test-isolate-A"; + const uuidB = "test-isolate-B"; + + await client.callTool({ + name: "interact", + arguments: { viewUUID: uuidA, action: "navigate", page: 3 }, + }); + await client.callTool({ + name: "interact", + arguments: { viewUUID: uuidB, action: "search", query: "quantum" }, + }); + + const cmdsA = await poll(client, uuidA); + expect(cmdsA).toHaveLength(1); + expect(cmdsA[0].type).toBe("navigate"); + expect(cmdsA[0].page).toBe(3); + + const cmdsB = await poll(client, uuidB); + expect(cmdsB).toHaveLength(1); + expect(cmdsB[0].type).toBe("search"); + expect(cmdsB[0].query).toBe("quantum"); + + await client.close(); + await server.close(); + }); + + // SKIPPED: the unknown-UUID path enters the long-poll branch and blocks for + // the full LONG_POLL_TIMEOUT_MS (30s, module-local const, not configurable). + // The handler does dequeue [] at the end, so the return value IS + // {commands: []} — but there's no fast path to reach it without waiting. + // See the `stopFileWatch prevents further commands` test above for indirect + // coverage of the same blocking behaviour. + it.skip("poll with unknown viewUUID returns {commands: []} after long-poll", () => {}); + + it("fill_form passes all fields through when viewFieldNames is not registered", async () => { + const { server, client } = await connect(); + // Fresh UUID never seen by display_pdf → viewFieldNames.get(uuid) is + // undefined → the known-fields guard (`knownFields && !knownFields.has()`) + // is falsy for every field → everything is enqueued. + const uuid = "test-fillform-passthrough"; + + const r = await client.callTool({ + name: "interact", + arguments: { + viewUUID: uuid, + action: "fill_form", + fields: [ + { name: "anything", value: "goes" }, + { name: "unchecked", value: true }, + ], + }, + }); + expect(r.isError).toBeFalsy(); + expect(firstText(r)).toContain("Filled 2 field(s)"); + // No rejection complaint — the registry has no entry for this UUID + expect(firstText(r)).not.toContain("Unknown"); + + const cmds = await poll(client, uuid); + expect(cmds).toHaveLength(1); + expect(cmds[0].type).toBe("fill_form"); + const fields = cmds[0].fields as Array<{ name: string; value: unknown }>; + expect(fields).toHaveLength(2); + expect(fields.map((f) => f.name).sort()).toEqual(["anything", "unchecked"]); + + // Note: the "registered → reject unknown" branch needs viewFieldNames + // populated, which only happens inside display_pdf (requires a real PDF). + // That map isn't exported, so the rejection path is covered by e2e only. + + await client.close(); + await server.close(); + }); + + // SECURITY: resolveImageAnnotation must not read arbitrary local files. + // The model controls imageUrl; without validation it's an exfil primitive + // (readFile → base64 → iframe → get_screenshot reads it back). + describe("add_annotations image: imageUrl validation", () => { + let savedDirs: Set; + beforeEach(() => { + savedDirs = new Set(allowedLocalDirs); + allowedLocalDirs.clear(); + }); + afterEach(() => { + allowedLocalDirs.clear(); + for (const d of savedDirs) allowedLocalDirs.add(d); + }); + + it("rejects local path outside allowed roots", async () => { + const { server, client } = await connect(); + // Whitelist a harmless temp dir; target a path clearly outside it. + allowedLocalDirs.add(os.tmpdir()); + const target = path.join(os.homedir(), ".ssh", "id_rsa"); + const r = await client.callTool({ + name: "interact", + arguments: { + viewUUID: "sec-local", + action: "add_annotations", + annotations: [{ type: "image", id: "i1", page: 1, imageUrl: target }], + }, + }); + expect(r.isError).toBe(true); + expect(firstText(r)).toContain("imageUrl rejected"); + await client.close(); + await server.close(); + }); + + it("rejects http:// URL (SSRF)", async () => { + const { server, client } = await connect(); + const r = await client.callTool({ + name: "interact", + arguments: { + viewUUID: "sec-http", + action: "add_annotations", + annotations: [ + { + type: "image", + id: "i1", + page: 1, + imageUrl: "http://169.254.169.254/latest/meta-data/", + }, + ], + }, + }); + expect(r.isError).toBe(true); + expect(firstText(r)).toContain("imageUrl rejected"); + await client.close(); + await server.close(); + }); + + it("accepts path under an allowed dir (reaches readFile)", async () => { + const { server, client } = await connect(); + const dir = fs.mkdtempSync(path.join(os.tmpdir(), "pdf-imgurl-")); + allowedLocalDirs.add(dir); + // Minimal valid PNG (1x1 transparent): 8-byte sig + IHDR + IDAT + IEND. + const png = Buffer.from( + "89504E470D0A1A0A0000000D49484452000000010000000108060000001F15C4890000000A49444154789C6360000000000200015E9AFE400000000049454E44AE426082", + "hex", + ); + const imgPath = path.join(dir, "sig.png"); + fs.writeFileSync(imgPath, png); + try { + const r = await client.callTool({ + name: "interact", + arguments: { + viewUUID: "sec-ok", + action: "add_annotations", + annotations: [ + { type: "image", id: "i1", page: 1, imageUrl: imgPath }, + ], + }, + }); + // No security rejection; readFile succeeds; command enqueued. + expect(r.isError).toBeFalsy(); + const cmds = await poll(client, "sec-ok"); + expect(cmds).toHaveLength(1); + expect(cmds[0].type).toBe("add_annotations"); + const anns = cmds[0].annotations as Array>; + // validateUrl passed → readFile ran → imageData populated. + expect(typeof anns[0].imageData).toBe("string"); + expect((anns[0].imageData as string).length).toBeGreaterThan(0); + } finally { + fs.rmSync(dir, { recursive: true, force: true }); + } + await client.close(); + await server.close(); + }); + }); +}); diff --git a/examples/pdf-server/server.ts b/examples/pdf-server/server.ts index 0f835b7..5bc2502 100644 --- a/examples/pdf-server/server.ts +++ b/examples/pdf-server/server.ts @@ -25,6 +25,42 @@ import { type CallToolResult, type ReadResourceResult, } from "@modelcontextprotocol/sdk/types.js"; +// Use the legacy build to avoid DOMMatrix dependency in Node.js +import { + getDocument, + VerbosityLevel, + version as PDFJS_VERSION, +} from "pdfjs-dist/legacy/build/pdf.mjs"; + +/** + * PDF Standard-14 fonts from CDN. Used by both server and viewer so we + * declare a single well-known origin in CSP connectDomains. + * + * pdf.js in Node defaults to NodeStandardFontDataFactory (fs.readFile) which + * can't fetch URLs, so we pass {@link FetchStandardFontDataFactory} alongside. + * The browser viewer uses the DOM factory by default and just needs the URL. + */ +export const STANDARD_FONT_DATA_URL = `https://unpkg.com/pdfjs-dist@${PDFJS_VERSION}/standard_fonts/`; +const STANDARD_FONT_ORIGIN = "https://unpkg.com"; + +/** pdf.js font factory that uses fetch() instead of fs.readFile. */ +class FetchStandardFontDataFactory { + baseUrl: string | null; + constructor({ baseUrl = null }: { baseUrl?: string | null }) { + this.baseUrl = baseUrl; + } + async fetch({ filename }: { filename: string }): Promise { + if (!this.baseUrl) throw new Error("standardFontDataUrl not provided"); + const url = `${this.baseUrl}${filename}`; + const res = await globalThis.fetch(url); + if (!res.ok) throw new Error(`Failed to fetch ${url}: ${res.status}`); + return new Uint8Array(await res.arrayBuffer()); + } +} +import type { + PrimitiveSchemaDefinition, + ElicitResult, +} from "@modelcontextprotocol/sdk/types.js"; import { z } from "zod"; // ============================================================================= @@ -44,17 +80,326 @@ export const CACHE_MAX_LIFETIME_MS = 60_000; // 60 seconds /** Max size for cached PDFs (defensive limit to prevent memory exhaustion) */ export const CACHE_MAX_PDF_SIZE_BYTES = 50 * 1024 * 1024; // 50MB -/** Allowed local file paths (populated from CLI args) */ +/** Allowed local file paths (CLI args + file roots — read access). */ export const allowedLocalFiles = new Set(); -/** Allowed local directories (populated from MCP roots) */ +/** Allowed local directories (CLI args + directory roots — read access). */ export const allowedLocalDirs = new Set(); +/** + * Subset of allowedLocalFiles that came from CLI args (not MCP roots). + * Only these individual files are writable. File roots from the client + * are uploaded copies in ad-hoc hidden folders — treat as read-only. + * Directory roots are mounted folders; files UNDER them are writable. + */ +export const cliLocalFiles = new Set(); + +/** + * Write-permission flags. Object wrapper (not a bare `let`) so main.ts can + * mutate via the exported binding without re-import gymnastics — same + * pattern as the Sets above. + */ +export const writeFlags = { + /** + * Claude Desktop mounts its per-conversation drop folder as a directory + * root whose basename is literally `uploads`. Files in there are one-shot + * copies the client doesn't expect us to overwrite. Default: read-only. + * `--writeable-uploads-root` flips this for local testing. + */ + allowUploadsRoot: false, +}; + +/** + * Saving is allowed iff: + * (a) the file was passed as a CLI arg — the user explicitly named it + * when starting the server, so overwriting is clearly intentional; OR + * (b) the file is STRICTLY UNDER a directory root at any depth + * (isAncestorDir excludes rel === "", so the root itself never + * counts), AND the client did not ALSO send it as a file root. + * A file root is the client's way of saying "here's an upload" — + * treat that signal as authoritative even when the path happens + * to fall inside a mounted directory. + * + * EXCEPTION to (b): a dir root whose basename is `uploads` is treated + * as read-only unless `writeFlags.allowUploadsRoot` is set. This is how + * Claude Desktop surfaces attached files — writing back to them + * surprises the user (the attachment doesn't update). + * + * With no directory roots and no CLI files, nothing is writable. + */ +export function isWritablePath(resolved: string): boolean { + if (cliLocalFiles.has(resolved)) return true; + // MCP file root → always read-only, regardless of ancestry + if (allowedLocalFiles.has(resolved)) return false; + return [...allowedLocalDirs].some((dir) => { + if (!isAncestorDir(dir, resolved)) return false; + if (!writeFlags.allowUploadsRoot && path.basename(dir) === "uploads") { + return false; + } + return true; + }); +} + // Works both from source (server.ts) and compiled (dist/server.js) const DIST_DIR = import.meta.filename.endsWith(".ts") ? path.join(import.meta.dirname, "dist") : import.meta.dirname; +// ============================================================================= +// Command Queue (shared across stateless server instances) +// ============================================================================= + +/** Commands expire after this many ms if never polled */ +const COMMAND_TTL_MS = 60_000; // 60 seconds + +/** Periodic sweep interval to drop stale queues */ +const SWEEP_INTERVAL_MS = 30_000; // 30 seconds + +/** Fixed batch window: when commands are present, wait this long before returning to let more accumulate */ +const POLL_BATCH_WAIT_MS = 200; +const LONG_POLL_TIMEOUT_MS = 30_000; // Max time to hold a long-poll request open + +// ============================================================================= +// Interact Tool Input Schemas (runtime validators) +// ============================================================================= +// +// Annotation structure docs live in src/pdf-annotations.ts (the TS +// interfaces) and in the interact tool description. The inputSchema +// for `annotations` accepts z.record(z.any()) to keep the model-facing +// API forgiving; adding strict validation here would be a behavior change. + +const FormField = z.object({ + name: z.string(), + value: z.union([z.string(), z.boolean()]), +}); + +const PageInterval = z.object({ + start: z.number().min(1).optional(), + end: z.number().min(1).optional(), +}); + +// ============================================================================= +// Command Queue — wire protocol shared with the viewer +// ============================================================================= + +// PdfCommand is the single source of truth for what flows through the +// poll queue. Defined once in src/commands.ts; both sides import it. +// (`import type` → no pdf-lib bundled into the server.) +import type { PdfCommand } from "./src/commands.js"; +export type { PdfCommand }; + +// ============================================================================= +// Pending get_pages Requests (request-response bridge via client) +// ============================================================================= + +// Keep well under the MCP SDK's DEFAULT_REQUEST_TIMEOUT_MSEC (60s) so we +// reject first and return a real error instead of the client cancelling us. +const GET_PAGES_TIMEOUT_MS = 45_000; + +interface PageDataEntry { + page: number; + text?: string; + image?: string; // base64 PNG +} + +const pendingPageRequests = new Map< + string, + (data: PageDataEntry[] | Error) => void +>(); + +/** + * Wait for the viewer to render and submit page data. + * Rejects on timeout or when the interact request is aborted upstream. + */ +function waitForPageData( + requestId: string, + signal?: AbortSignal, +): Promise { + return new Promise((resolve, reject) => { + const settle = (v: PageDataEntry[] | Error) => { + clearTimeout(timer); + signal?.removeEventListener("abort", onAbort); + pendingPageRequests.delete(requestId); + v instanceof Error ? reject(v) : resolve(v); + }; + const onAbort = () => settle(new Error("interact request cancelled")); + const timer = setTimeout( + () => settle(new Error("Timeout waiting for page data from viewer")), + GET_PAGES_TIMEOUT_MS, + ); + signal?.addEventListener("abort", onAbort); + pendingPageRequests.set(requestId, settle); + }); +} + +interface QueueEntry { + commands: PdfCommand[]; + /** Timestamp of the most recent enqueue or dequeue */ + lastActivity: number; +} + +const commandQueues = new Map(); + +/** Waiters for long-poll: resolve callback wakes up a blocked poll_pdf_commands */ +const pollWaiters = new Map void>(); + +/** Valid form field names per viewer UUID (populated during display_pdf) */ +const viewFieldNames = new Map>(); + +/** Detailed form field info per viewer UUID (populated during display_pdf) */ +const viewFieldInfo = new Map(); + +/** + * Active fs.watch per view. Only created for local files when interact is + * enabled (stdio). Watcher is re-established on `rename` events to survive + * atomic writes (vim/vscode write-to-tmp-then-rename changes the inode). + */ +interface ViewFileWatch { + filePath: string; + watcher: fs.FSWatcher; + lastMtimeMs: number; + debounce: ReturnType | null; +} +const viewFileWatches = new Map(); + +/** + * Per-view heartbeat. THIS is what the sweep iterates — not commandQueues. + * + * Why not commandQueues: display_pdf populates viewFieldNames/viewFieldInfo/ + * viewFileWatches but never touches commandQueues (only enqueueCommand does, + * and it's triply gated). And dequeueCommands deletes the entry on every poll, + * so even when it exists the sweep's TTL window is ~200ms wide. Net effect: + * the sweep found nothing and the aux maps leaked every display_pdf call. + * viewFileWatches entries hold an fs.StatWatcher (FD + timer) — slow FD + * exhaustion on HTTP --enable-interact. + */ +const viewLastActivity = new Map(); + +/** Register or refresh the heartbeat for a view. */ +function touchView(uuid: string): void { + viewLastActivity.set(uuid, Date.now()); +} + +function pruneStaleQueues(): void { + const now = Date.now(); + for (const [uuid, lastActivity] of viewLastActivity) { + if (now - lastActivity > COMMAND_TTL_MS) { + viewLastActivity.delete(uuid); + commandQueues.delete(uuid); + viewFieldNames.delete(uuid); + viewFieldInfo.delete(uuid); + stopFileWatch(uuid); + } + } +} + +// Periodic sweep so abandoned views don't leak +setInterval(pruneStaleQueues, SWEEP_INTERVAL_MS).unref(); + +function enqueueCommand(viewUUID: string, command: PdfCommand): void { + let entry = commandQueues.get(viewUUID); + if (!entry) { + entry = { commands: [], lastActivity: Date.now() }; + commandQueues.set(viewUUID, entry); + } + entry.commands.push(command); + entry.lastActivity = Date.now(); + touchView(viewUUID); + + // Wake up any long-polling request waiting for this viewUUID + const waiter = pollWaiters.get(viewUUID); + if (waiter) { + pollWaiters.delete(viewUUID); + waiter(); + } +} + +function dequeueCommands(viewUUID: string): PdfCommand[] { + // Poll is activity — keep the view alive even when the queue is empty + // (the common case: viewer polls every ~30s with nothing to receive). + touchView(viewUUID); + const entry = commandQueues.get(viewUUID); + if (!entry) return []; + const commands = entry.commands; + commandQueues.delete(viewUUID); + return commands; +} + +// ============================================================================= +// File Watching (local files, stdio only) +// ============================================================================= + +const FILE_WATCH_DEBOUNCE_MS = 150; + +export function startFileWatch(viewUUID: string, filePath: string): void { + const resolved = path.resolve(filePath); + let stat: fs.Stats; + try { + stat = fs.statSync(resolved); + } catch { + return; // vanished between validation and here + } + + // Replace any existing watcher for this view + stopFileWatch(viewUUID); + + const entry: ViewFileWatch = { + filePath: resolved, + watcher: null as unknown as fs.FSWatcher, + lastMtimeMs: stat.mtimeMs, + debounce: null, + }; + + const onEvent = (eventType: string): void => { + if (entry.debounce) clearTimeout(entry.debounce); + entry.debounce = setTimeout(() => { + entry.debounce = null; + let s: fs.Stats; + try { + s = fs.statSync(resolved); + } catch { + return; // gone mid-atomic-write; next rename will re-attach + } + if (s.mtimeMs === entry.lastMtimeMs) return; // spurious / already sent + entry.lastMtimeMs = s.mtimeMs; + enqueueCommand(viewUUID, { type: "file_changed", mtimeMs: s.mtimeMs }); + }, FILE_WATCH_DEBOUNCE_MS); + + // Atomic saves replace the inode — old watcher stops firing. Re-attach. + if (eventType === "rename") { + try { + entry.watcher.close(); + } catch { + /* already closed */ + } + try { + entry.watcher = fs.watch(resolved, onEvent); + } catch { + // File removed, not replaced. Leave closed; pruneStaleQueues cleans up. + } + } + }; + + try { + entry.watcher = fs.watch(resolved, onEvent); + } catch { + return; // fs.watch unsupported (e.g. some network filesystems) + } + viewFileWatches.set(viewUUID, entry); +} + +export function stopFileWatch(viewUUID: string): void { + const entry = viewFileWatches.get(viewUUID); + if (!entry) return; + if (entry.debounce) clearTimeout(entry.debounce); + try { + entry.watcher.close(); + } catch { + /* ignore */ + } + viewFileWatches.delete(viewUUID); +} + // ============================================================================= // URL Validation & Normalization // ============================================================================= @@ -439,11 +784,233 @@ async function refreshRoots(server: Server): Promise { } } +// ============================================================================= +// PDF Form Field Extraction +// ============================================================================= + +/** + * Extract form fields from a PDF and build an elicitation schema. + * Returns null if the PDF has no form fields. + */ +/** Shape of field objects returned by pdfjs-dist's getFieldObjects(). */ +interface PdfJsFieldObject { + type: string; + name: string; + editable: boolean; + exportValues?: string; + items?: Array<{ exportValue: string; displayValue: string }>; +} + +/** Detailed info about a form field, including its location on the page. */ +interface FormFieldInfo { + name: string; + type: string; + page: number; + label?: string; + /** Bounding box in model coordinates (top-left origin) */ + x: number; + y: number; + width: number; + height: number; +} + +/** + * Extract detailed form field info (name, type, page, bounding box, label) + * from a PDF. Bounding boxes are converted to model coordinates (top-left origin). + */ +async function extractFormFieldInfo( + url: string, + readRange: ( + url: string, + offset: number, + byteCount: number, + ) => Promise<{ data: Uint8Array; totalBytes: number }>, +): Promise { + const { totalBytes } = await readRange(url, 0, 1); + const { data } = await readRange(url, 0, totalBytes); + + const loadingTask = getDocument({ + data, + standardFontDataUrl: STANDARD_FONT_DATA_URL, + StandardFontDataFactory: FetchStandardFontDataFactory, + // We only introspect form fields (never render) — silence residual + // warnings like "Unimplemented border style: inset". + verbosity: VerbosityLevel.ERRORS, + }); + const pdfDoc = await loadingTask.promise; + + const fields: FormFieldInfo[] = []; + try { + for (let i = 1; i <= pdfDoc.numPages; i++) { + const page = await pdfDoc.getPage(i); + const pageHeight = page.getViewport({ scale: 1.0 }).height; + const annotations = await page.getAnnotations(); + for (const ann of annotations) { + // Only include form widgets (annotationType 20) + if (ann.annotationType !== 20) continue; + if (!ann.rect) continue; + + const fieldName = ann.fieldName || ""; + const fieldType = ann.fieldType || "unknown"; + + // PDF rect is [x1, y1, x2, y2] in bottom-left origin + const x1 = Math.min(ann.rect[0], ann.rect[2]); + const y1 = Math.min(ann.rect[1], ann.rect[3]); + const x2 = Math.max(ann.rect[0], ann.rect[2]); + const y2 = Math.max(ann.rect[1], ann.rect[3]); + const width = x2 - x1; + const height = y2 - y1; + + // Convert to model coords (top-left origin): modelY = pageHeight - pdfY - height + const modelY = pageHeight - y2; + + fields.push({ + name: fieldName, + type: fieldType, + page: i, + x: Math.round(x1), + y: Math.round(modelY), + width: Math.round(width), + height: Math.round(height), + ...(ann.alternativeText ? { label: ann.alternativeText } : undefined), + }); + } + } + } finally { + pdfDoc.destroy(); + } + + return fields; +} + +async function extractFormSchema( + url: string, + readRange: ( + url: string, + offset: number, + byteCount: number, + ) => Promise<{ data: Uint8Array; totalBytes: number }>, +): Promise<{ + type: "object"; + properties: Record; + required?: string[]; +} | null> { + // Read full PDF bytes + const { totalBytes } = await readRange(url, 0, 1); + const { data } = await readRange(url, 0, totalBytes); + + const loadingTask = getDocument({ + data, + standardFontDataUrl: STANDARD_FONT_DATA_URL, + StandardFontDataFactory: FetchStandardFontDataFactory, + // We only introspect form fields (never render) — silence residual + // warnings like "Unimplemented border style: inset". + verbosity: VerbosityLevel.ERRORS, + }); + const pdfDoc = await loadingTask.promise; + + let fieldObjects: Record | null; + try { + fieldObjects = (await pdfDoc.getFieldObjects()) as Record< + string, + PdfJsFieldObject[] + > | null; + } catch { + pdfDoc.destroy(); + return null; + } + if (!fieldObjects || Object.keys(fieldObjects).length === 0) { + pdfDoc.destroy(); + return null; + } + + const properties: Record = {}; + for (const [name, fields] of Object.entries(fieldObjects)) { + const field = fields[0]; // first widget determines the type + if (!field.editable) continue; + + switch (field.type) { + case "text": + properties[name] = { type: "string", title: name }; + break; + case "checkbox": + properties[name] = { type: "boolean", title: name }; + break; + case "radiobutton": { + const options = fields + .map((f) => f.exportValues) + .filter((v): v is string => !!v && v !== "Off"); + properties[name] = + options.length > 0 + ? { type: "string", title: name, enum: options } + : { type: "string", title: name }; + break; + } + case "combobox": + case "listbox": { + const items = field.items?.map((i) => i.exportValue).filter(Boolean); + properties[name] = + items && items.length > 0 + ? { type: "string", title: name, enum: items } + : { type: "string", title: name }; + break; + } + // Skip "button" (push buttons) and unknown types + } + } + + // Collect alternativeText labels from per-page annotations + // (getFieldObjects doesn't include them) + const fieldLabels = new Map(); + try { + for (let i = 1; i <= pdfDoc.numPages; i++) { + const page = await pdfDoc.getPage(i); + const annotations = await page.getAnnotations(); + for (const ann of annotations) { + if (ann.fieldName && ann.alternativeText) { + fieldLabels.set(ann.fieldName, ann.alternativeText); + } + } + } + } catch { + // ignore + } + + // Use labels as titles where available + for (const [name, prop] of Object.entries(properties)) { + const label = fieldLabels.get(name); + if (label) { + prop.title = label; + } + } + + // If any editable field has a mechanical name (no human-readable label), + // elicitation would be confusing — return null to skip it. + const hasMechanicalNames = Object.keys(properties).some((name) => { + if (fieldLabels.has(name)) return false; + return /[[\]().]/.test(name) || /^[A-Z0-9_]+$/.test(name); + }); + + pdfDoc.destroy(); + if (Object.keys(properties).length === 0) return null; + if (hasMechanicalNames) return null; + + return { type: "object", properties }; +} + // ============================================================================= // MCP Server Factory // ============================================================================= export interface CreateServerOptions { + /** + * Enable the `interact` tool and related command-queue infrastructure + * (in-memory command queue, `poll_pdf_commands`, `submit_page_data`). + * Only suitable for single-instance deployments (e.g. stdio transport). + * Defaults to false — server exposes only `list_pdfs` and `display_pdf` (read-only). + */ + enableInteract?: boolean; + /** * Whether to honour MCP roots sent by the client. * @@ -463,10 +1030,18 @@ export interface CreateServerOptions { * @default false */ useClientRoots?: boolean; + + /** + * Emit debug metadata to the viewer (currently: allowed roots shown + * in a floating bubble). Toggled by the `--debug` CLI flag. + */ + debug?: boolean; } export function createServer(options: CreateServerOptions = {}): McpServer { - const { useClientRoots = false } = options; + const { enableInteract = false, useClientRoots = false } = options; + const debug = options.debug ?? false; + const disableInteract = !enableInteract; const server = new McpServer({ name: "PDF Server", version: "2.0.0" }); if (useClientRoots) { @@ -480,11 +1055,6 @@ export function createServer(options: CreateServerOptions = {}): McpServer { await refreshRoots(server.server); }, ); - } else { - console.error( - "[pdf-server] Client roots are ignored (default for remote transports). " + - "Pass --use-client-roots to allow the client to expose local directories.", - ); } // Create session-local cache (isolated per server instance) @@ -496,23 +1066,61 @@ export function createServer(options: CreateServerOptions = {}): McpServer { "List available PDFs that can be displayed", {}, async (): Promise => { - const pdfs: Array<{ url: string; type: "local" | "remote" }> = []; + const seen = new Set(); + const localFiles: string[] = []; + const addLocal = (filePath: string) => { + const url = pathToFileUrl(filePath); + if (seen.has(url)) return; + seen.add(url); + localFiles.push(url); + }; - // Add local files - for (const filePath of allowedLocalFiles) { - pdfs.push({ url: pathToFileUrl(filePath), type: "local" }); - } + // Explicitly registered files (CLI args + file roots) + for (const filePath of allowedLocalFiles) addLocal(filePath); + + // Walk directory roots for *.pdf files + const WALK_MAX_DEPTH = 8; + const WALK_MAX_FILES = 500; + let truncated = false; + const walk = async (dir: string, depth: number): Promise => { + if (depth > WALK_MAX_DEPTH || localFiles.length >= WALK_MAX_FILES) { + truncated ||= localFiles.length >= WALK_MAX_FILES; + return; + } + let entries; + try { + entries = await fs.promises.readdir(dir, { withFileTypes: true }); + } catch { + return; // unreadable — skip silently + } + for (const e of entries) { + if (localFiles.length >= WALK_MAX_FILES) { + truncated = true; + return; + } + // Skip dotfiles/dirs and common noise + if (e.name.startsWith(".") || e.name === "node_modules") continue; + const full = path.join(dir, e.name); + if (e.isDirectory()) { + await walk(full, depth + 1); + } else if (e.isFile() && /\.pdf$/i.test(e.name)) { + addLocal(full); + } + } + }; + for (const dir of allowedLocalDirs) await walk(dir, 0); // Build text const parts: string[] = []; - if (pdfs.length > 0) { - parts.push( - `Available PDFs:\n${pdfs.map((p) => `- ${p.url} (${p.type})`).join("\n")}`, - ); + if (localFiles.length > 0) { + const header = truncated + ? `Available PDFs (showing first ${WALK_MAX_FILES}):` + : `Available PDFs:`; + parts.push(`${header}\n${localFiles.map((u) => `- ${u}`).join("\n")}`); } if (allowedLocalDirs.size > 0) { parts.push( - `Allowed local directories (from client roots):\n${[...allowedLocalDirs].map((d) => `- ${d}`).join("\n")}\nAny PDF file under these directories can be displayed.`, + `Allowed local directories:\n${[...allowedLocalDirs].map((d) => `- ${d}`).join("\n")}\nAny PDF file under these directories can be displayed.`, ); } parts.push( @@ -522,8 +1130,9 @@ export function createServer(options: CreateServerOptions = {}): McpServer { return { content: [{ type: "text", text: parts.join("\n\n") }], structuredContent: { - localFiles: pdfs.filter((p) => p.type === "local").map((p) => p.url), + localFiles, allowedDirectories: [...allowedLocalDirs], + truncated, }, }; }, @@ -613,27 +1222,76 @@ export function createServer(options: CreateServerOptions = {}): McpServer { "display_pdf", { title: "Display PDF", - description: `Display an interactive PDF viewer. + description: disableInteract + ? `Show and render a PDF in a read-only viewer. -Accepts: -- Local files explicitly added to the server (use list_pdfs to see available files) -- Local files under directories provided by the client as MCP roots -- Any remote PDF accessible via HTTPS`, +Use this tool when the user wants to view or read a PDF. The renderer displays the document for viewing. + +Accepts local files (use list_pdfs), client MCP root directories, or any HTTPS URL.` + : `Open a PDF in an interactive viewer. Call this ONCE per PDF. + +**All follow-up actions go through the \`interact\` tool** with the returned viewUUID — annotating, signing, stamping, filling forms, navigating, searching, extracting text/screenshots. Calling display_pdf again creates a SEPARATE viewer with a different viewUUID — interact calls using the new UUID will not reach the viewer the user already sees. + +Returns a viewUUID in structuredContent. Pass it to \`interact\`: +- add_annotations, update_annotations, remove_annotations, highlight_text +- fill_form (fill PDF form fields) +- navigate, search, find, search_navigate, zoom +- get_text, get_screenshot (extract content) + +Accepts local files (use list_pdfs), client MCP root directories, or any HTTPS URL. +Set \`elicit_form_inputs\` to true to prompt the user to fill form fields before display.`, inputSchema: { url: z .string() .default(DEFAULT_PDF) .describe("PDF URL or local file path"), page: z.number().min(1).default(1).describe("Initial page"), + ...(disableInteract + ? {} + : { + elicit_form_inputs: z + .boolean() + .default(false) + .describe( + "If true and the PDF has form fields, prompt the user to fill them before displaying", + ), + }), }, outputSchema: z.object({ + viewUUID: z + .string() + .describe( + "UUID for this viewer instance" + + (disableInteract ? "" : " — pass to interact tool"), + ), url: z.string(), initialPage: z.number(), totalBytes: z.number(), + formFieldValues: z + .record(z.string(), z.union([z.string(), z.boolean()])) + .optional() + .describe("Form field values filled by the user via elicitation"), + formFields: z + .array( + z.object({ + name: z.string(), + type: z.string(), + page: z.number(), + label: z.string().optional(), + x: z.number(), + y: z.number(), + width: z.number(), + height: z.number(), + }), + ) + .optional() + .describe( + "Form fields with bounding boxes in model coordinates (top-left origin)", + ), }), _meta: { ui: { resourceUri: RESOURCE_URI } }, }, - async ({ url, page }): Promise => { + async ({ url, page, elicit_form_inputs }): Promise => { const normalized = isArxivUrl(url) ? normalizeArxivUrl(url) : url; const validation = validateUrl(normalized); @@ -646,21 +1304,1096 @@ Accepts: // Probe file size so the client can set up range transport without an extra fetch const { totalBytes } = await readPdfRange(normalized, 0, 1); + const uuid = randomUUID(); + // Start the heartbeat now so the sweep can clean up viewFieldNames/ + // viewFieldInfo/viewFileWatches even if no interact calls ever happen. + if (!disableInteract) touchView(uuid); + + // Check writability (governs save button; see isWritablePath doc). + // Also requires OS-level W_OK so we don't lie on read-only mounts. + let writable = false; + let debugResolved: string | undefined; // only used when --debug + if (isFileUrl(normalized) || isLocalPath(normalized)) { + const localPath = isFileUrl(normalized) + ? fileUrlToPath(normalized) + : decodeURIComponent(normalized); + const resolved = path.resolve(localPath); + debugResolved = resolved; + if (isWritablePath(resolved)) { + try { + await fs.promises.access(resolved, fs.constants.W_OK); + writable = true; + } catch { + // Not writable — leave false + } + } + // Watch for external changes (stdio only — needs the poll channel) + if (!disableInteract) { + startFileWatch(uuid, localPath); + } + } + + // Extract form field schema (used for elicitation and field name validation) + let formSchema: Awaited> = null; + try { + formSchema = await extractFormSchema(normalized, readPdfRange); + } catch { + // Non-fatal — PDF may not have form fields + } + if (formSchema) { + viewFieldNames.set(uuid, new Set(Object.keys(formSchema.properties))); + } + + // Extract detailed form field info (page, bounding box, label) + let fieldInfo: FormFieldInfo[] = []; + try { + fieldInfo = await extractFormFieldInfo(normalized, readPdfRange); + if (fieldInfo.length > 0) { + viewFieldInfo.set(uuid, fieldInfo); + // Also populate viewFieldNames from field info if not already set + if (!viewFieldNames.has(uuid)) { + viewFieldNames.set( + uuid, + new Set(fieldInfo.map((f) => f.name).filter(Boolean)), + ); + } + } + } catch { + // Non-fatal + } + + // Elicit form field values if requested and client supports it + let formFieldValues: Record | undefined; + let elicitResult: ElicitResult | undefined; + if (elicit_form_inputs && formSchema) { + const clientCaps = server.server.getClientCapabilities(); + if (clientCaps?.elicitation?.form) { + try { + elicitResult = await server.server.elicitInput({ + message: `Please fill in the PDF form fields for "${normalized.split("/").pop() || normalized}":`, + requestedSchema: formSchema, + }); + if (elicitResult.action === "accept" && elicitResult.content) { + formFieldValues = {}; + for (const [k, v] of Object.entries(elicitResult.content)) { + if (typeof v === "string" || typeof v === "boolean") { + formFieldValues[k] = v; + } + } + // Queue fill_form command so the viewer picks it up + enqueueCommand(uuid, { + type: "fill_form", + fields: Object.entries(formFieldValues).map( + ([name, value]) => ({ name, value }), + ), + }); + } + } catch (err) { + // Elicitation failed — continue without form values + console.error("[pdf-server] Form elicitation failed:", err); + } + } + } + + const contentParts: Array<{ type: "text"; text: string }> = [ + { + type: "text", + text: disableInteract + ? `Displaying PDF: ${normalized}` + : `PDF opened. viewUUID: ${uuid} + +→ To annotate, sign, stamp, fill forms, navigate, or extract: call \`interact\` with this viewUUID. +→ DO NOT call display_pdf again — that spawns a separate viewer with a different viewUUID; your interact calls would target the new empty one, not the one the user is looking at. + +URL: ${normalized}`, + }, + ]; + + if (formFieldValues && Object.keys(formFieldValues).length > 0) { + const fieldSummary = Object.entries(formFieldValues) + .map( + ([name, value]) => + ` ${name}: ${typeof value === "boolean" ? (value ? "checked" : "unchecked") : value}`, + ) + .join("\n"); + contentParts.push({ + type: "text", + text: `\nUser-provided form field values:\n${fieldSummary}`, + }); + } else if ( + elicit_form_inputs && + elicitResult && + elicitResult.action !== "accept" + ) { + contentParts.push({ + type: "text", + text: `\nForm elicitation was ${elicitResult.action}d by the user.`, + }); + } + + // Include detailed form field info so the model can locate and fill fields + if (fieldInfo.length > 0) { + // Group by page + const byPage = new Map(); + for (const f of fieldInfo) { + let list = byPage.get(f.page); + if (!list) { + list = []; + byPage.set(f.page, list); + } + list.push(f); + } + const lines: string[] = [ + `\nForm fields (${fieldInfo.length})${disableInteract ? "" : " — use fill_form with {name, value}"}:`, + ]; + for (const [pg, fields] of [...byPage.entries()].sort( + (a, b) => a[0] - b[0], + )) { + lines.push(` Page ${pg}:`); + for (const f of fields) { + const label = f.label ? ` "${f.label}"` : ""; + const nameStr = f.name || "(unnamed)"; + lines.push( + ` ${nameStr}${label} [${f.type}] at (${f.x},${f.y}) ${f.width}×${f.height}`, + ); + } + } + contentParts.push({ type: "text", text: lines.join("\n") }); + } else { + // Fallback to simple field name listing if detailed info unavailable + const fieldNames = viewFieldNames.get(uuid); + if (fieldNames && fieldNames.size > 0) { + contentParts.push({ + type: "text", + text: `\nForm fields${disableInteract ? "" : " available for fill_form"}: ${[...fieldNames].join(", ")}`, + }); + } + } return { - content: [{ type: "text", text: `Displaying PDF: ${normalized}` }], + content: contentParts, structuredContent: { + viewUUID: uuid, url: normalized, initialPage: page, totalBytes, + ...(formFieldValues ? { formFieldValues } : {}), + ...(fieldInfo.length > 0 ? { formFields: fieldInfo } : {}), }, _meta: { - viewUUID: randomUUID(), + viewUUID: uuid, + interactEnabled: !disableInteract, + writable, + // Debug: viewer renders this in a floating bubble (--debug flag). + ...(debug + ? { + _debug: { + resolved: debugResolved, + writable, + isWritablePath: debugResolved + ? isWritablePath(debugResolved) + : undefined, + cliLocalFiles: [...cliLocalFiles], + allowedLocalFiles: [...allowedLocalFiles], + allowedLocalDirs: [...allowedLocalDirs], + }, + } + : {}), }, }; }, ); + if (!disableInteract) { + // Schema for a single interact command (used in commands array) + const InteractCommandSchema = z.object({ + action: z + .enum([ + "navigate", + "search", + "find", + "search_navigate", + "zoom", + "add_annotations", + "update_annotations", + "remove_annotations", + "highlight_text", + "fill_form", + "get_text", + "get_screenshot", + ]) + .describe("Action to perform"), + page: z + .number() + .min(1) + .optional() + .describe( + "Page number (for navigate, highlight_text, get_screenshot, get_text)", + ), + query: z + .string() + .optional() + .describe("Search text (for search / find / highlight_text)"), + matchIndex: z + .number() + .min(0) + .optional() + .describe("Match index (for search_navigate)"), + scale: z + .number() + .min(0.5) + .max(3.0) + .optional() + .describe("Zoom scale, 1.0 = 100% (for zoom)"), + annotations: z + .array(z.record(z.string(), z.any())) + .optional() + .describe( + "Annotation objects (see types in description). Each needs: id, type, page. For update_annotations only id+type are required.", + ), + ids: z + .array(z.string()) + .optional() + .describe("Annotation IDs (for remove_annotations)"), + color: z + .string() + .optional() + .describe("Color override (for highlight_text)"), + content: z + .string() + .optional() + .describe("Tooltip/note content (for highlight_text)"), + fields: z + .array(FormField) + .optional() + .describe( + "Form fields to fill (for fill_form): { name, value } where value is string or boolean", + ), + intervals: z + .array(PageInterval) + .optional() + .describe( + "Page ranges for get_text. Each has optional start/end. [{start:1,end:5}], [{}] = all pages. Max 20 pages.", + ), + }); + + type InteractCommand = z.infer; + type ContentPart = + | { type: "text"; text: string } + | { type: "image"; data: string; mimeType: string }; + + /** + * Resolve an image annotation: fetch imageUrl → imageData if needed, + * auto-detect dimensions, and set defaults for x/y. + * + * SECURITY: imageUrl is model-controlled. It must pass the same + * validateUrl() gate as display_pdf/save_pdf — otherwise the model + * can request `{imageUrl:"/Users/x/.ssh/id_rsa"}`, we'd readFile it, + * base64 the bytes, ship them to the iframe, and get_screenshot (or + * any future echo path) reads them back. Throws on rejection so the + * tool result carries the error; silent skip hides the attack attempt. + */ + async function resolveImageAnnotation( + ann: Record, + ): Promise { + // Fetch image data from URL if no imageData provided + if (!ann.imageData && ann.imageUrl) { + const url = String(ann.imageUrl); + // Same gate as every other local/remote read in this server. + // Local: must be in allowedLocalFiles or under allowedLocalDirs. + // Remote: must be https://. + const check = validateUrl(url); + if (!check.valid) { + throw new Error( + `imageUrl rejected by validateUrl: ${check.error ?? url}`, + ); + } + let imgBytes: Uint8Array; + if (url.startsWith("https://")) { + const resp = await fetch(url); + if (!resp.ok) throw new Error(`HTTP ${resp.status} for ${url}`); + imgBytes = new Uint8Array(await resp.arrayBuffer()); + } else { + // validateUrl already confirmed this path is under an allowed root. + const filePath = isFileUrl(url) + ? fileUrlToPath(url) + : decodeURIComponent(url); + imgBytes = await fs.promises.readFile(path.resolve(filePath)); + } + ann.imageData = Buffer.from(imgBytes).toString("base64"); + } + + // Auto-detect mimeType from magic bytes if not set + if (ann.imageData && !ann.mimeType) { + const bytes = Buffer.from(ann.imageData, "base64"); + if ( + bytes[0] === 0x89 && + bytes[1] === 0x50 && + bytes[2] === 0x4e && + bytes[3] === 0x47 + ) { + ann.mimeType = "image/png"; + } else { + ann.mimeType = "image/jpeg"; + } + } + + // Auto-detect dimensions from image if not specified + if (ann.imageData && (ann.width == null || ann.height == null)) { + const dims = detectImageDimensions( + Buffer.from(ann.imageData, "base64"), + ); + if (dims) { + const maxWidth = 200; // default max width in PDF points + const aspectRatio = dims.height / dims.width; + ann.width = ann.width ?? Math.min(dims.width, maxWidth); + ann.height = ann.height ?? ann.width * aspectRatio; + } else { + ann.width = ann.width ?? 200; + ann.height = ann.height ?? 200; + } + } + + // Default position if not specified + ann.x = ann.x ?? 72; + ann.y = ann.y ?? 72; + } + + /** + * Detect image dimensions from PNG or JPEG bytes. + */ + function detectImageDimensions( + bytes: Buffer, + ): { width: number; height: number } | null { + // PNG: width at offset 16 (4 bytes BE), height at offset 20 (4 bytes BE) + if ( + bytes[0] === 0x89 && + bytes[1] === 0x50 && + bytes[2] === 0x4e && + bytes[3] === 0x47 + ) { + if (bytes.length >= 24) { + const width = bytes.readUInt32BE(16); + const height = bytes.readUInt32BE(20); + return { width, height }; + } + } + // JPEG: scan for SOF0/SOF2 markers (0xFF 0xC0 / 0xFF 0xC2) + if (bytes[0] === 0xff && bytes[1] === 0xd8) { + let offset = 2; + while (offset < bytes.length - 8) { + if (bytes[offset] !== 0xff) break; + const marker = bytes[offset + 1]; + if (marker === 0xc0 || marker === 0xc2) { + const height = bytes.readUInt16BE(offset + 5); + const width = bytes.readUInt16BE(offset + 7); + return { width, height }; + } + const segLen = bytes.readUInt16BE(offset + 2); + offset += 2 + segLen; + } + } + return null; + } + + /** Process a single interact command. Returns content parts and an isError flag. */ + async function processInteractCommand( + uuid: string, + cmd: InteractCommand, + signal?: AbortSignal, + ): Promise<{ content: ContentPart[]; isError?: boolean }> { + const { + action, + page, + query, + matchIndex, + scale, + annotations, + ids, + color, + content, + fields, + intervals, + } = cmd; + + let description: string; + switch (action) { + case "navigate": + if (page == null) + return { + content: [{ type: "text", text: "navigate requires `page`" }], + isError: true, + }; + enqueueCommand(uuid, { type: "navigate", page }); + description = `navigate to page ${page}`; + break; + case "search": + if (!query) + return { + content: [{ type: "text", text: "search requires `query`" }], + isError: true, + }; + enqueueCommand(uuid, { type: "search", query }); + description = `search for "${query}"`; + break; + case "find": + if (!query) + return { + content: [{ type: "text", text: "find requires `query`" }], + isError: true, + }; + enqueueCommand(uuid, { type: "find", query }); + description = `find "${query}" (silent)`; + break; + case "search_navigate": + if (matchIndex == null) + return { + content: [ + { + type: "text", + text: "search_navigate requires `matchIndex`", + }, + ], + isError: true, + }; + enqueueCommand(uuid, { type: "search_navigate", matchIndex }); + description = `go to match #${matchIndex}`; + break; + case "zoom": + if (scale == null) + return { + content: [{ type: "text", text: "zoom requires `scale`" }], + isError: true, + }; + enqueueCommand(uuid, { type: "zoom", scale }); + description = `zoom to ${Math.round(scale * 100)}%`; + break; + case "add_annotations": + if (!annotations || annotations.length === 0) + return { + content: [ + { + type: "text", + text: "add_annotations requires `annotations` array", + }, + ], + isError: true, + }; + // Resolve image annotations: fetch imageUrl → imageData, auto-detect dimensions. + // Rejection (path not allowed, not https, fetch failed) surfaces as + // a tool error so the model sees it — don't silently skip. + try { + for (const ann of annotations) { + if ((ann as any).type === "image") { + await resolveImageAnnotation(ann as any); + } + } + } catch (err) { + return { + content: [ + { + type: "text", + text: `add_annotations: ${err instanceof Error ? err.message : String(err)}`, + }, + ], + isError: true, + }; + } + enqueueCommand(uuid, { + type: "add_annotations", + // resolveImageAnnotation populates optional x/y/width/height; + // input is validated as Record[] so this cast is + // the wire-protocol promise, not a compiler guarantee. + annotations: annotations as Extract< + PdfCommand, + { type: "add_annotations" } + >["annotations"], + }); + description = `add ${annotations.length} annotation(s)`; + break; + case "update_annotations": + if (!annotations || annotations.length === 0) + return { + content: [ + { + type: "text", + text: "update_annotations requires `annotations` array", + }, + ], + isError: true, + }; + enqueueCommand(uuid, { + type: "update_annotations", + annotations: annotations as Extract< + PdfCommand, + { type: "update_annotations" } + >["annotations"], + }); + description = `update ${annotations.length} annotation(s)`; + break; + case "remove_annotations": + if (!ids || ids.length === 0) + return { + content: [ + { + type: "text", + text: "remove_annotations requires `ids` array", + }, + ], + isError: true, + }; + enqueueCommand(uuid, { type: "remove_annotations", ids }); + description = `remove ${ids.length} annotation(s)`; + break; + case "highlight_text": { + if (!query) + return { + content: [ + { type: "text", text: "highlight_text requires `query`" }, + ], + isError: true, + }; + const id = `ht_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`; + enqueueCommand(uuid, { + type: "highlight_text", + id, + query, + page, + color, + content, + }); + description = `highlight text "${query}"${page ? ` on page ${page}` : ""}`; + break; + } + case "fill_form": { + if (!fields || fields.length === 0) + return { + content: [ + { type: "text", text: "fill_form requires `fields` array" }, + ], + isError: true, + }; + const knownFields = viewFieldNames.get(uuid); + const validFields: typeof fields = []; + const unknownNames: string[] = []; + for (const f of fields) { + if (knownFields && !knownFields.has(f.name)) { + unknownNames.push(f.name); + } else { + validFields.push(f); + } + } + if (validFields.length > 0) { + enqueueCommand(uuid, { type: "fill_form", fields: validFields }); + } + const parts: string[] = []; + if (validFields.length > 0) { + parts.push( + `Filled ${validFields.length} field(s): ${validFields.map((f) => f.name).join(", ")}`, + ); + } + if (unknownNames.length > 0) { + parts.push(`Unknown field(s) skipped: ${unknownNames.join(", ")}`); + // Only list valid names when the model got something wrong — + // display_pdf already returned the full field info on open. + if (knownFields && knownFields.size > 0) { + parts.push(`Valid field names: ${[...knownFields].join(", ")}`); + } + } + description = parts.join(". "); + if (unknownNames.length > 0 && validFields.length === 0) { + return { + content: [{ type: "text", text: description }], + isError: true, + }; + } + break; + } + case "get_text": { + const resolvedIntervals = + intervals ?? (page ? [{ start: page, end: page }] : [{}]); + + const requestId = randomUUID(); + + enqueueCommand(uuid, { + type: "get_pages", + requestId, + intervals: resolvedIntervals, + getText: true, + getScreenshots: false, + }); + + let pageData: PageDataEntry[]; + try { + pageData = await waitForPageData(requestId, signal); + } catch (err) { + return { + content: [ + { + type: "text", + text: `Error: ${err instanceof Error ? err.message : String(err)}`, + }, + ], + isError: true, + }; + } + + const textParts: ContentPart[] = []; + for (const entry of pageData) { + if (entry.text != null) { + textParts.push({ + type: "text", + text: `--- Page ${entry.page} ---\n${entry.text}`, + }); + } + } + if (textParts.length === 0) { + textParts.push({ type: "text", text: "No text content returned" }); + } + return { content: textParts }; + } + case "get_screenshot": { + if (page == null) + return { + content: [ + { type: "text", text: "get_screenshot requires `page`" }, + ], + isError: true, + }; + + const requestId = randomUUID(); + + enqueueCommand(uuid, { + type: "get_pages", + requestId, + intervals: [{ start: page, end: page }], + getText: false, + getScreenshots: true, + }); + + let pageData: PageDataEntry[]; + try { + pageData = await waitForPageData(requestId, signal); + } catch (err) { + return { + content: [ + { + type: "text", + text: `Error: ${err instanceof Error ? err.message : String(err)}`, + }, + ], + isError: true, + }; + } + + const entry = pageData[0]; + if (entry?.image) { + return { + content: [ + { + type: "image", + data: entry.image, + mimeType: "image/jpeg", + }, + ], + }; + } + return { + content: [{ type: "text", text: "No screenshot returned" }], + isError: true, + }; + } + default: + return { + content: [{ type: "text", text: `Unknown action: ${action}` }], + isError: true, + }; + } + return { + content: [{ type: "text", text: `Queued: ${description}` }], + }; + } + + // Tool: interact - Interact with an existing PDF viewer + server.registerTool( + "interact", + { + title: "Interact with PDF", + description: `Interact with a PDF viewer: annotate, navigate, search, extract text/screenshots, fill forms. +IMPORTANT: viewUUID must be the exact UUID returned by display_pdf (e.g. "a1b2c3d4-..."). Do NOT use arbitrary strings. + +**BATCHING**: Send multiple commands in one call via \`commands\` array. Commands run sequentially. TIP: End with \`get_screenshot\` to verify your changes. + +**ANNOTATION** — add_annotations with array of annotation objects. Each needs: id (unique string), type, page (1-indexed). + +**COORDINATE SYSTEM**: PDF points (1pt = 1/72in), origin at page TOP-LEFT corner. X increases rightward, Y increases downward. +- US Letter = 612×792pt. Margins: top≈y=50, bottom≈y=742, left≈x=72, right≈x=540, center≈(306, 396). +- Rectangle/circle/stamp x,y is the TOP-LEFT corner. To place a 200×30 box at the TOP of the page: x=72, y=50, width=200, height=30. +- For highlights/underlines, each rect's y is the TOP of the highlighted region. + +Annotation types: +• highlight: rects:[{x,y,width,height}], color?, content? • underline: rects:[{x,y,w,h}], color? +• strikethrough: rects:[{x,y,w,h}], color? • note: x, y, content, color? +• rectangle: x, y, width, height, color?, fillColor?, rotation? • circle: x, y, width, height, color?, fillColor? +• line: x1, y1, x2, y2, color? • freetext: x, y, content, fontSize?, color? +• stamp: x, y, label (any text, e.g. APPROVED, DRAFT, CONFIDENTIAL), color?, rotation? +• image: imageUrl (required), x?, y?, width?, height?, mimeType?, rotation?, aspect? — places an image (signature, logo, etc.) on the page. Pass a local file path or HTTPS URL (NO data: URIs, NO base64). Width/height auto-detected if omitted. Users can also drag & drop images directly onto the viewer. + +TIP: For text annotations, prefer highlight_text (auto-finds text) over manual rects. + +Example — add a signature image and a stamp, then screenshot to verify: +\`\`\`json +{"viewUUID":"…","commands":[ + {"action":"add_annotations","annotations":[ + {"id":"sig1","type":"image","page":1,"x":72,"y":700,"imageUrl":"/path/to/signature.png"}, + {"id":"s1","type":"stamp","page":1,"x":300,"y":400,"label":"APPROVED"} + ]}, + {"action":"get_screenshot","page":1} +]} +\`\`\` + +• highlight_text: auto-find and highlight text (query, page?, color?, content?) +• update_annotations: partial update (id+type required) • remove_annotations: remove by ids + +**NAVIGATION**: navigate (page), search (query), find (query, silent), search_navigate (matchIndex), zoom (scale 0.5–3.0) + +**TEXT/SCREENSHOTS**: +• get_text: extract text from pages. Optional \`page\` for single page, or \`intervals\` for ranges [{start?,end?}]. Max 20 pages. +• get_screenshot: capture a single page as PNG image. Requires \`page\`. + +**FORMS** — fill_form: fill fields with \`fields\` array of {name, value}.`, + inputSchema: { + viewUUID: z + .string() + .describe( + "The viewUUID of the PDF viewer (from display_pdf result)", + ), + // Single-command mode (backwards-compatible) + action: z + .enum([ + "navigate", + "search", + "find", + "search_navigate", + "zoom", + "add_annotations", + "update_annotations", + "remove_annotations", + "highlight_text", + "fill_form", + "get_text", + "get_screenshot", + ]) + .optional() + .describe( + "Action to perform (for single command). Use `commands` array for batching.", + ), + page: z + .number() + .min(1) + .optional() + .describe( + "Page number (for navigate, highlight_text, get_screenshot, get_text)", + ), + query: z + .string() + .optional() + .describe("Search text (for search / find / highlight_text)"), + matchIndex: z + .number() + .min(0) + .optional() + .describe("Match index (for search_navigate)"), + scale: z + .number() + .min(0.5) + .max(3.0) + .optional() + .describe("Zoom scale, 1.0 = 100% (for zoom)"), + annotations: z + .array(z.record(z.string(), z.any())) + .optional() + .describe( + "Annotation objects (see types in description). Each needs: id, type, page. For update_annotations only id+type are required.", + ), + ids: z + .array(z.string()) + .optional() + .describe("Annotation IDs (for remove_annotations)"), + color: z + .string() + .optional() + .describe("Color override (for highlight_text)"), + content: z + .string() + .optional() + .describe("Tooltip/note content (for highlight_text)"), + fields: z + .array(FormField) + .optional() + .describe( + "Form fields to fill (for fill_form): { name, value } where value is string or boolean", + ), + intervals: z + .array(PageInterval) + .optional() + .describe( + "Page ranges for get_text. Each has optional start/end. [{start:1,end:5}], [{}] = all pages. Max 20 pages.", + ), + // Batch mode + commands: z + .array(InteractCommandSchema) + .optional() + .describe( + "Array of commands to execute sequentially. More efficient than separate calls. Tip: end with get_pages+getScreenshots to verify changes.", + ), + }, + }, + async ( + { + viewUUID: uuid, + action, + page, + query, + matchIndex, + scale, + annotations, + ids, + color, + content, + fields, + intervals, + commands, + }, + extra, + ): Promise => { + // Build the list of commands to process + const commandList: InteractCommand[] = commands + ? commands + : action + ? [ + { + action, + page, + query, + matchIndex, + scale, + annotations, + ids, + color, + content, + fields, + intervals, + }, + ] + : []; + + if (commandList.length === 0) { + return { + content: [ + { + type: "text", + text: "No action or commands specified. Provide either `action` (single command) or `commands` (batch).", + }, + ], + isError: true, + }; + } + + // Process commands sequentially, collecting all content parts + const allContent: ContentPart[] = []; + let hasError = false; + + for (let i = 0; i < commandList.length; i++) { + const result = await processInteractCommand( + uuid, + commandList[i], + extra.signal, + ); + if (result.isError) { + hasError = true; + } + allContent.push(...result.content); + if (hasError) break; // Stop on first error + } + + return { + content: allContent, + ...(hasError ? { isError: true } : {}), + }; + }, + ); + + // Tool: submit_page_data (app-only) - Client submits rendered page data + registerAppTool( + server, + "submit_page_data", + { + title: "Submit Page Data", + description: + "Submit rendered page data for a get_pages request (used by viewer)", + inputSchema: { + requestId: z + .string() + .describe("The request ID from the get_pages command"), + pages: z + .array( + z.object({ + page: z.number(), + text: z.string().optional(), + image: z.string().optional().describe("Base64 PNG image data"), + }), + ) + .describe("Page data entries"), + }, + _meta: { ui: { visibility: ["app"] } }, + }, + async ({ requestId, pages }): Promise => { + const settle = pendingPageRequests.get(requestId); + if (settle) { + settle(pages); + return { + content: [ + { type: "text", text: `Submitted ${pages.length} page(s)` }, + ], + }; + } + return { + content: [ + { type: "text", text: `No pending request for ${requestId}` }, + ], + isError: true, + }; + }, + ); + + // Tool: poll_pdf_commands (app-only) - Poll for pending commands + registerAppTool( + server, + "poll_pdf_commands", + { + title: "Poll PDF Commands", + description: "Poll for pending commands for a PDF viewer", + inputSchema: { + viewUUID: z.string().describe("The viewUUID of the PDF viewer"), + }, + _meta: { ui: { visibility: ["app"] } }, + }, + async ({ viewUUID: uuid }): Promise => { + // If commands are already queued, wait briefly to let more accumulate + if (commandQueues.has(uuid)) { + await new Promise((r) => setTimeout(r, POLL_BATCH_WAIT_MS)); + } else { + // Long-poll: wait for commands to arrive or timeout + await new Promise((resolve) => { + const timer = setTimeout(() => { + pollWaiters.delete(uuid); + resolve(); + }, LONG_POLL_TIMEOUT_MS); + // Cancel any existing waiter for this uuid + const prev = pollWaiters.get(uuid); + if (prev) prev(); + pollWaiters.set(uuid, () => { + clearTimeout(timer); + resolve(); + }); + }); + // After waking, wait briefly for batching + if (commandQueues.has(uuid)) { + await new Promise((r) => setTimeout(r, POLL_BATCH_WAIT_MS)); + } + } + const commands = dequeueCommands(uuid); + return { + content: [{ type: "text", text: `${commands.length} command(s)` }], + structuredContent: { commands }, + }; + }, + ); + } // end if (!disableInteract) + + // Tool: save_pdf (app-only) - Save annotated PDF back to local file + registerAppTool( + server, + "save_pdf", + { + title: "Save PDF", + description: "Save annotated PDF bytes back to a local file", + inputSchema: { + url: z.string().describe("Original PDF URL or local file path"), + data: z.string().describe("Base64-encoded PDF bytes"), + }, + outputSchema: z.object({ + filePath: z.string(), + mtimeMs: z.number(), + }), + _meta: { ui: { visibility: ["app"] } }, + }, + async ({ url, data }): Promise => { + const validation = validateUrl(url); + if (!validation.valid) { + return { + content: [{ type: "text", text: validation.error! }], + isError: true, + }; + } + const filePath = isFileUrl(url) + ? fileUrlToPath(url) + : isLocalPath(url) + ? decodeURIComponent(url) + : null; + if (!filePath) { + return { + content: [ + { type: "text", text: "Save is only supported for local files" }, + ], + isError: true, + }; + } + const resolved = path.resolve(filePath); + // Enforce the same write scope the display_pdf writable flag uses. + // The viewer hides the save button for non-writable files, but we + // must not trust the client: a direct save_pdf call should also refuse. + if (!isWritablePath(resolved)) { + return { + content: [ + { + type: "text", + text: + "Save refused: file is not under a mounted directory root " + + "and was not passed as a CLI argument. MCP file roots are " + + "read-only (typically uploaded copies the client doesn't " + + "expect to change).", + }, + ], + isError: true, + }; + } + try { + const bytes = Buffer.from(data, "base64"); + await fs.promises.writeFile(resolved, bytes); + const { mtimeMs } = await fs.promises.stat(resolved); + // Don't suppress file_changed here — the saving viewer will recognise + // its own mtime, while other viewers on the same file correctly get + // notified that their content is stale. + return { + content: [{ type: "text", text: `Saved to ${filePath}` }], + structuredContent: { filePath: resolved, mtimeMs }, + }; + } catch (err) { + return { + content: [ + { + type: "text", + text: `Failed to save: ${err instanceof Error ? err.message : String(err)}`, + }, + ], + isError: true, + }; + } + }, + ); + // Resource: UI HTML registerAppResource( server, @@ -674,7 +2407,24 @@ Accepts: ); return { contents: [ - { uri: RESOURCE_URI, mimeType: RESOURCE_MIME_TYPE, text: html }, + { + uri: RESOURCE_URI, + mimeType: RESOURCE_MIME_TYPE, + text: html, + _meta: { + ui: { + permissions: { clipboardWrite: {} }, + csp: { + // pdf.js loads the Standard-14 fonts TWO ways: + // - fetch()s the .ttf bytes → connect-src + // - creates FontFace('name', 'url(...)') → font-src + // resourceDomains maps to font-src; we need both. + connectDomains: [STANDARD_FONT_ORIGIN], + resourceDomains: [STANDARD_FONT_ORIGIN], + }, + }, + }, + }, ], }; }, diff --git a/examples/pdf-server/src/annotation-panel.ts b/examples/pdf-server/src/annotation-panel.ts new file mode 100644 index 0000000..6b41095 --- /dev/null +++ b/examples/pdf-server/src/annotation-panel.ts @@ -0,0 +1,1087 @@ +/** + * Annotation Panel — floating/docked sidebar showing all annotations and + * form fields, grouped by page in accordion sections. Handles panel + * positioning, resize, drag-to-reposition, per-item cards, and the + * reset/clear-all actions. + * + * All coupling to mcp-app.ts flows through {@link PanelDeps} supplied to + * {@link initAnnotationPanel}. Shared Maps/Sets come from viewer-state.ts. + */ + +import type * as pdfjsLib from "pdfjs-dist"; +import type { McpUiHostContext } from "@modelcontextprotocol/ext-apps"; +import type { PdfAnnotationDef } from "./pdf-annotations.js"; +import { + type TrackedAnnotation, + annotationMap, + formFieldValues, + pdfBaselineFormValues, + selectedAnnotationIds, + fieldNameToIds, + fieldNameToPage, + fieldNameToLabel, + fieldNameToOrder, + undoStack, + redoStack, + searchBarEl, + formLayerEl, +} from "./viewer-state.js"; + +const log = { + error: console.error.bind(console, "[PDF-VIEWER]"), +}; + +// ============================================================================= +// Panel DOM Elements +// ============================================================================= + +/** Floating panel container. Exported — mcp-app.ts reads .classList. */ +export const annotationsPanelEl = document.getElementById("annotation-panel")!; +/** Scrollable list of accordion sections. Exported — selectAnnotation queries it. */ +export const annotationsPanelListEl = document.getElementById( + "annotation-panel-list", +)!; +const annotationsPanelCountEl = document.getElementById( + "annotation-panel-count", +)!; +const annotationsPanelCloseBtn = document.getElementById( + "annotation-panel-close", +) as HTMLButtonElement; +const annotationsPanelResetBtn = document.getElementById( + "annotation-panel-reset", +) as HTMLButtonElement; +const annotationsPanelClearAllBtn = document.getElementById( + "annotation-panel-clear-all", +) as HTMLButtonElement; +const annotationsBtn = document.getElementById( + "annotations-btn", +) as HTMLButtonElement; +const annotationsBadgeEl = document.getElementById( + "annotations-badge", +) as HTMLElement; + +// ============================================================================= +// Panel State (exported — mcp-app.ts reads .open, writes .openAccordionSection) +// ============================================================================= + +/** Which corner the floating panel is anchored to. */ +type PanelCorner = "top-right" | "top-left" | "bottom-right" | "bottom-left"; + +export const panelState = { + /** Whether the panel is currently visible. Read by search open/close + debug. */ + open: false, + /** Which accordion section is open (e.g. "page-3"). Written by selectAnnotation. */ + openAccordionSection: null as string | null, +}; + +/** null = user hasn't manually toggled; true/false = manual preference */ +let annotationPanelUserPref: boolean | null = null; +/** Whether the user has ever interacted with accordion sections (prevents auto-open after explicit collapse). */ +let accordionUserInteracted = false; +let floatingPanelCorner: PanelCorner = "top-right"; + +// ============================================================================= +// Dependencies injected by mcp-app.ts +// ============================================================================= + +/** + * Callbacks and live-state getters supplied by mcp-app.ts. Scalars like + * `currentPage` and `pdfDocument` are reassigned throughout mcp-app.ts; + * a getter here avoids wrapping every one of their ~100 use sites. + */ +export interface PanelDeps { + // Live scalar state (read-only from panel's side) + state: () => { + currentPage: number; + isDirty: boolean; + pdfDocument: pdfjsLib.PDFDocumentProxy | null; + pdfBaselineAnnotations: PdfAnnotationDef[]; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + cachedFieldObjects: Record | null; + searchOpen: boolean; + }; + // Callbacks into mcp-app.ts + renderPage: () => void; + goToPage: (page: number) => void; + selectAnnotation: (id: string | null) => void; + persistAnnotations: () => void; + removeAnnotation: (id: string) => void; + requestFitToContent: () => void; + updatePageContext: () => void; + setFocusedField: (name: string | null) => void; + // App bridge + sendMessage: (msg: { + role: "user"; + content: Array<{ type: "text"; text: string }>; + }) => Promise; + getHostContext: () => McpUiHostContext | undefined; +} + +let deps!: PanelDeps; + +// ============================================================================= +// Floating panel positioning +// ============================================================================= + +/** Get inset margins for the floating panel (safe area + padding). */ +function getFloatingPanelInsets(): { + top: number; + right: number; + bottom: number; + left: number; +} { + const insets = { top: 4, right: 4, bottom: 4, left: 4 }; + const ctx = deps.getHostContext(); + if (ctx?.safeAreaInsets) { + insets.top += ctx.safeAreaInsets.top; + insets.right += ctx.safeAreaInsets.right; + insets.bottom += ctx.safeAreaInsets.bottom; + insets.left += ctx.safeAreaInsets.left; + } + return insets; +} + +/** Position the floating panel based on its anchored corner. */ +export function applyFloatingPanelPosition(): void { + const el = annotationsPanelEl; + // Reset all position props + el.style.top = ""; + el.style.bottom = ""; + el.style.left = ""; + el.style.right = ""; + + const insets = getFloatingPanelInsets(); + + // When search bar is visible and panel is anchored top-right, offset below it + const searchBarExtra = + deps.state().searchOpen && floatingPanelCorner === "top-right" + ? searchBarEl.offsetHeight + 2 + : 0; + + const isRight = floatingPanelCorner.includes("right"); + const isBottom = floatingPanelCorner.includes("bottom"); + + if (isBottom) { + el.style.bottom = `${insets.bottom}px`; + } else { + el.style.top = `${insets.top + searchBarExtra}px`; + } + if (isRight) { + el.style.right = `${insets.right}px`; + } else { + el.style.left = `${insets.left}px`; + } + + // Update resize handle position based on anchorage + updateResizeHandlePosition(); +} + +/** Position the resize handle on the correct edge based on panel anchorage. */ +function updateResizeHandlePosition(): void { + const resizeHandle = document.getElementById("annotation-panel-resize"); + if (!resizeHandle) return; + const isRight = floatingPanelCorner.includes("right"); + if (isRight) { + // Panel is on the right → resize handle on the left edge + resizeHandle.style.left = "-3px"; + resizeHandle.style.right = ""; + } else { + // Panel is on the left → resize handle on the right edge + resizeHandle.style.left = ""; + resizeHandle.style.right = "-3px"; + } +} + +/** Auto-dock the floating panel to the opposite side if it overlaps selected annotations. */ +export function autoDockPanel(): void { + const panelRect = annotationsPanelEl.getBoundingClientRect(); + let overlaps = false; + for (const selId of selectedAnnotationIds) { + const tracked = annotationMap.get(selId); + if (!tracked) continue; + for (const el of tracked.elements) { + const elRect = el.getBoundingClientRect(); + // Check overlap + if ( + panelRect.left < elRect.right && + panelRect.right > elRect.left && + panelRect.top < elRect.bottom && + panelRect.bottom > elRect.top + ) { + overlaps = true; + break; + } + } + if (overlaps) break; + } + if (overlaps) { + // Swap left ↔ right + if (floatingPanelCorner.includes("right")) { + floatingPanelCorner = floatingPanelCorner.replace( + "right", + "left", + ) as PanelCorner; + } else { + floatingPanelCorner = floatingPanelCorner.replace( + "left", + "right", + ) as PanelCorner; + } + applyFloatingPanelPosition(); + } +} + +export function setAnnotationPanelOpen(open: boolean): void { + panelState.open = open; + annotationsBtn.classList.toggle("active", open); + updateAnnotationsBadge(); + + // Always use floating panel (both inline and fullscreen) + annotationsPanelEl.classList.toggle("floating", true); + annotationsPanelEl.style.display = open ? "" : "none"; + if (open) { + applyFloatingPanelPosition(); + renderAnnotationPanel(); + } + deps.requestFitToContent(); +} + +function toggleAnnotationPanel(): void { + annotationPanelUserPref = !panelState.open; + try { + localStorage.setItem( + "pdf-annotation-panel", + annotationPanelUserPref ? "open" : "closed", + ); + } catch { + /* ignore */ + } + setAnnotationPanelOpen(annotationPanelUserPref); +} + +// ============================================================================= +// Field & item state helpers +// ============================================================================= + +/** + * Derived state of a form field relative to the PDF baseline. + * Not stored — computed on demand by comparing formFieldValues to + * pdfBaselineFormValues. + */ +type FieldState = + | "unchanged" // current === baseline (came from the PDF, untouched) + | "modified" // baseline exists but current differs + | "cleared" // baseline exists but current is absent/empty + | "added"; // no baseline — user-filled or fill_form + +function fieldState(name: string): FieldState { + const cur = formFieldValues.get(name); + const base = pdfBaselineFormValues.get(name); + if (base === undefined) return "added"; + if (cur === undefined || cur === "" || cur === false) return "cleared"; + return cur === base ? "unchanged" : "modified"; +} + +/** All field names that should appear in the panel: current ∪ baseline. + * Cleared baseline fields remain visible (crossed out) so they can be + * reverted individually. */ +function panelFieldNames(): Set { + return new Set([...formFieldValues.keys(), ...pdfBaselineFormValues.keys()]); +} + +/** Total count of annotations + form fields for the sidebar badge. + * Uses the union so cleared baseline items still contribute. */ +function sidebarItemCount(): number { + return annotationMap.size + panelFieldNames().size; +} + +export function updateAnnotationsBadge(): void { + const count = sidebarItemCount(); + if (count > 0 && !panelState.open) { + annotationsBadgeEl.textContent = String(count); + annotationsBadgeEl.style.display = ""; + } else { + annotationsBadgeEl.style.display = "none"; + } + // Show/hide the toolbar button based on whether items exist + annotationsBtn.style.display = count > 0 ? "" : "none"; + // Auto-close panel when all items are gone + if (count === 0 && panelState.open) { + setAnnotationPanelOpen(false); + } +} + +// ============================================================================= +// Label / preview helpers +// ============================================================================= + +/** Human-readable label for an annotation type (used in sidebar). */ +export function getAnnotationLabel(def: PdfAnnotationDef): string { + switch (def.type) { + case "highlight": + return "Highlight"; + case "underline": + return "Underline"; + case "strikethrough": + return "Strikethrough"; + case "note": + return "Note"; + case "freetext": + return "Text"; + case "rectangle": + return "Rectangle"; + case "stamp": + return `Stamp: ${def.label}`; + case "circle": + return "Circle"; + case "line": + return "Line"; + case "image": + return "Image"; + } +} + +/** Preview text for an annotation (shown after the label). */ +export function getAnnotationPreview(def: PdfAnnotationDef): string { + switch (def.type) { + case "note": + case "freetext": + return def.content || ""; + case "highlight": + return def.content || ""; + case "stamp": + return ""; + case "image": + return ""; + default: + return ""; + } +} + +export function getAnnotationColor(def: PdfAnnotationDef): string { + if ("color" in def && def.color) return def.color; + switch (def.type) { + case "highlight": + return "rgba(255, 255, 0, 0.7)"; + case "underline": + return "#ff0000"; + case "strikethrough": + return "#ff0000"; + case "note": + return "#f5a623"; + case "rectangle": + return "#0066cc"; + case "freetext": + return "#333"; + case "stamp": + return "#cc0000"; + case "circle": + return "#0066cc"; + case "line": + return "#333"; + case "image": + return "#999"; + } +} + +/** Return a human-readable label for a form field name. */ +export function getFormFieldLabel(name: string): string { + // Prefer the PDF's TU (alternativeText) if available + const alt = fieldNameToLabel.get(name); + if (alt) return alt; + // If the name looks mechanical (contains brackets, dots, or is all-caps with underscores), + // just show "Field" as a generic fallback + if (/[[\]().]/.test(name) || /^[A-Z0-9_]+$/.test(name)) { + return "Field"; + } + return name; +} + +function getAnnotationY(def: PdfAnnotationDef): number { + if ("y" in def && typeof def.y === "number") return def.y; + if ("rects" in def && def.rects.length > 0) return def.rects[0].y; + // LineAnnotation has only x1/y1/x2/y2 — sort by the higher endpoint + // (higher internal-y = closer to page top). + if ("y1" in def) return Math.max(def.y1, def.y2); + return 0; +} + +// ============================================================================= +// Panel rendering +// ============================================================================= + +export function renderAnnotationPanel(): void { + if (!panelState.open) return; + + annotationsPanelCountEl.textContent = String(sidebarItemCount()); + annotationsPanelResetBtn.disabled = !deps.state().isDirty; + annotationsPanelClearAllBtn.disabled = sidebarItemCount() === 0; + + // Group annotations by page, sorted by Y position within each page + const byPage = new Map(); + for (const tracked of annotationMap.values()) { + const page = tracked.def.page; + if (!byPage.has(page)) byPage.set(page, []); + byPage.get(page)!.push(tracked); + } + + // Group form fields by page — iterate the UNION so cleared baseline + // fields remain visible (crossed out) with a per-item revert button. + const fieldsByPage = new Map(); + for (const name of panelFieldNames()) { + const page = fieldNameToPage.get(name) ?? 1; + if (!fieldsByPage.has(page)) fieldsByPage.set(page, []); + fieldsByPage.get(page)!.push(name); + } + // Sort fields by their intrinsic document order within each page + for (const names of fieldsByPage.values()) { + names.sort( + (a, b) => (fieldNameToOrder.get(a) ?? 0) - (fieldNameToOrder.get(b) ?? 0), + ); + } + + // Collect all pages that have annotations or form fields + const allPages = new Set([...byPage.keys(), ...fieldsByPage.keys()]); + const sortedPages = [...allPages].sort((a, b) => a - b); + + // Sort annotations within each page by Y position (descending = top-first in PDF coords) + for (const annotations of byPage.values()) { + annotations.sort((a, b) => getAnnotationY(b.def) - getAnnotationY(a.def)); + } + + annotationsPanelListEl.innerHTML = ""; + + const { currentPage } = deps.state(); + + // Auto-open section for current page only on first render (before user interaction) + if (panelState.openAccordionSection === null && !accordionUserInteracted) { + if (allPages.has(currentPage)) { + panelState.openAccordionSection = `page-${currentPage}`; + } else if (sortedPages.length > 0) { + panelState.openAccordionSection = `page-${sortedPages[0]}`; + } + } + + for (const pageNum of sortedPages) { + const sectionKey = `page-${pageNum}`; + const isOpen = panelState.openAccordionSection === sectionKey; + const annotations = byPage.get(pageNum) ?? []; + const fields = fieldsByPage.get(pageNum) ?? []; + const itemCount = annotations.length + fields.length; + + appendAccordionSection( + `Page ${pageNum} (${itemCount})`, + sectionKey, + isOpen, + pageNum === currentPage, + (body) => { + // Form fields first + for (const name of fields) { + body.appendChild(createFormFieldCard(name)); + } + // Then annotations + for (const tracked of annotations) { + body.appendChild(createAnnotationCard(tracked)); + } + }, + ); + } +} + +function appendAccordionSection( + title: string, + sectionKey: string, + isOpen: boolean, + isCurrent: boolean, + populateBody: (body: HTMLElement) => void, +): void { + const header = document.createElement("div"); + header.className = + "annotation-section-header" + + (isCurrent ? " current-page" : "") + + (isOpen ? " open" : ""); + + const titleSpan = document.createElement("span"); + titleSpan.textContent = title; + header.appendChild(titleSpan); + + const chevron = document.createElement("span"); + chevron.className = "annotation-section-chevron"; + chevron.textContent = isOpen ? "▼" : "▶"; + header.appendChild(chevron); + + header.addEventListener("click", () => { + accordionUserInteracted = true; + const opening = panelState.openAccordionSection !== sectionKey; + panelState.openAccordionSection = opening ? sectionKey : null; + renderAnnotationPanel(); + // Navigate to the page when expanding a page section + if (opening) { + const pageMatch = sectionKey.match(/^page-(\d+)$/); + if (pageMatch) { + deps.goToPage(Number(pageMatch[1])); + } + } + }); + + annotationsPanelListEl.appendChild(header); + + const body = document.createElement("div"); + body.className = "annotation-section-body" + (isOpen ? " open" : ""); + if (isOpen) { + populateBody(body); + } + annotationsPanelListEl.appendChild(body); +} + +const TRASH_SVG = ``; +const REVERT_SVG = ``; + +function createAnnotationCard(tracked: TrackedAnnotation): HTMLElement { + const def = tracked.def; + const card = document.createElement("div"); + card.className = + "annotation-card" + (selectedAnnotationIds.has(def.id) ? " selected" : ""); + card.dataset.annotationId = def.id; + + const row = document.createElement("div"); + row.className = "annotation-card-row"; + + // Color swatch + const swatch = document.createElement("div"); + swatch.className = "annotation-card-swatch"; + swatch.style.background = getAnnotationColor(def); + row.appendChild(swatch); + + // Type label + const typeLabel = document.createElement("span"); + typeLabel.className = "annotation-card-type"; + typeLabel.textContent = getAnnotationLabel(def); + row.appendChild(typeLabel); + + // Preview text + const preview = getAnnotationPreview(def); + if (preview) { + const previewEl = document.createElement("span"); + previewEl.className = "annotation-card-preview"; + previewEl.textContent = preview; + row.appendChild(previewEl); + } + + // Delete button + const deleteBtn = document.createElement("button"); + deleteBtn.className = "annotation-card-delete"; + deleteBtn.title = "Delete annotation"; + deleteBtn.innerHTML = TRASH_SVG; + deleteBtn.addEventListener("click", (e) => { + e.stopPropagation(); + deps.removeAnnotation(def.id); + deps.persistAnnotations(); + }); + row.appendChild(deleteBtn); + + // Expand chevron (only for annotations with content) + const hasContent = "content" in def && def.content; + if (hasContent) { + const expand = document.createElement("span"); + expand.className = "annotation-card-expand"; + expand.textContent = "▼"; + row.appendChild(expand); + } + + card.appendChild(row); + + // Expandable content area + if (hasContent) { + const contentEl = document.createElement("div"); + contentEl.className = "annotation-card-content"; + contentEl.textContent = (def as { content: string }).content; + card.appendChild(contentEl); + } + + // Click handler: select + expand/collapse + navigate to page + pulse annotation + card.addEventListener("click", () => { + if (hasContent) { + card.classList.toggle("expanded"); + } + if (def.page !== deps.state().currentPage) { + deps.goToPage(def.page); + setTimeout(() => { + deps.selectAnnotation(def.id); + pulseAnnotation(def.id); + }, 300); + } else { + deps.selectAnnotation(def.id); + pulseAnnotation(def.id); + if (tracked.elements.length > 0) { + tracked.elements[0].scrollIntoView({ + behavior: "smooth", + block: "center", + }); + } + } + }); + + // Hover handler: pulse annotation on PDF + card.addEventListener("mouseenter", () => { + if (def.page === deps.state().currentPage) { + pulseAnnotation(def.id); + } + }); + + // Double-click handler: send message to modify annotation + card.addEventListener("dblclick", (e) => { + e.stopPropagation(); + // Select this annotation + update model context before sending message + deps.selectAnnotation(def.id); + const label = getAnnotationLabel(def); + const previewText = getAnnotationPreview(def); + const desc = previewText ? `${label}: ${previewText}` : label; + void deps + .sendMessage({ + role: "user", + content: [{ type: "text", text: `update ${desc}: ` }], + }) + .catch(log.error); + }); + + return card; +} + +/** Revert one field to its PDF-stored baseline value. */ +function revertFieldToBaseline(name: string): void { + const base = pdfBaselineFormValues.get(name); + if (base === undefined) return; + formFieldValues.set(name, base); + // Remove our storage override → widget falls back to PDF's /V = baseline + const { pdfDocument } = deps.state(); + if (pdfDocument) { + const ids = fieldNameToIds.get(name); + if (ids) for (const id of ids) pdfDocument.annotationStorage.remove(id); + } +} + +function createFormFieldCard(name: string): HTMLElement { + const state = fieldState(name); + const value = formFieldValues.get(name); + const baseValue = pdfBaselineFormValues.get(name); + + const card = document.createElement("div"); + card.className = "annotation-card"; + if (state === "cleared") card.classList.add("annotation-card-cleared"); + + const row = document.createElement("div"); + row.className = "annotation-card-row"; + + // Swatch: solid blue normally; crossed-out for cleared baseline fields + const swatch = document.createElement("div"); + swatch.className = "annotation-card-swatch"; + if (state === "cleared") { + swatch.classList.add("annotation-card-swatch-cleared"); + swatch.innerHTML = ``; + } else { + swatch.style.background = "#4a90d9"; + } + // Subtle modified marker + if (state === "modified") swatch.title = "Modified from file"; + row.appendChild(swatch); + + // Field label + const nameEl = document.createElement("span"); + nameEl.className = "annotation-card-type"; + nameEl.textContent = getFormFieldLabel(name); + row.appendChild(nameEl); + + // Value preview: show current, or struck-out baseline when cleared + const shown = state === "cleared" ? baseValue : value; + const displayValue = + typeof shown === "boolean" ? (shown ? "checked" : "unchecked") : shown; + if (displayValue) { + const valueEl = document.createElement("span"); + valueEl.className = "annotation-card-preview"; + valueEl.textContent = displayValue; + row.appendChild(valueEl); + } + + // Action button: revert for modified/cleared baseline fields, trash otherwise + const isRevertable = state === "modified" || state === "cleared"; + const actionBtn = document.createElement("button"); + actionBtn.className = "annotation-card-delete"; + actionBtn.title = isRevertable + ? "Revert to value stored in file" + : "Clear field"; + actionBtn.innerHTML = isRevertable ? REVERT_SVG : TRASH_SVG; + actionBtn.addEventListener("click", (e) => { + e.stopPropagation(); + if (isRevertable) { + revertFieldToBaseline(name); + } else { + formFieldValues.delete(name); + clearFieldInStorage(name); + } + updateAnnotationsBadge(); + renderAnnotationPanel(); + deps.renderPage(); + deps.persistAnnotations(); + }); + row.appendChild(actionBtn); + + // Click handler: navigate to page and focus form input + card.addEventListener("click", () => { + const fieldPage = fieldNameToPage.get(name) ?? 1; + // Auto-expand the page's accordion section + panelState.openAccordionSection = `page-${fieldPage}`; + const focusField = () => { + const input = formLayerEl.querySelector( + `[name="${CSS.escape(name)}"]`, + ) as HTMLElement | null; + if (input) { + input.focus(); + input.scrollIntoView({ behavior: "smooth", block: "center" }); + } + }; + if (fieldPage !== deps.state().currentPage) { + deps.goToPage(fieldPage); + setTimeout(focusField, 300); + } else { + focusField(); + } + }); + + // Double-click handler: send message to fill field + card.addEventListener("dblclick", (e) => { + e.stopPropagation(); + // Focus field + update model context before sending message + deps.setFocusedField(name); + deps.updatePageContext(); + const fieldLabel = getFormFieldLabel(name); + void deps + .sendMessage({ + role: "user", + content: [{ type: "text", text: `update ${fieldLabel}: ` }], + }) + .catch(log.error); + }); + + card.appendChild(row); + return card; +} + +function pulseAnnotation(id: string): void { + const tracked = annotationMap.get(id); + if (!tracked) return; + for (const el of tracked.elements) { + el.classList.remove("annotation-pulse"); + // Force reflow to restart animation + void el.offsetWidth; + el.classList.add("annotation-pulse"); + el.addEventListener( + "animationend", + () => { + el.classList.remove("annotation-pulse"); + }, + { once: true }, + ); + } +} + +/** Toggle the `.selected` class on every card to match selectedAnnotationIds. */ +export function syncSidebarSelection(): void { + for (const card of annotationsPanelListEl.querySelectorAll( + ".annotation-card", + )) { + const cardId = (card as HTMLElement).dataset.annotationId; + card.classList.toggle( + "selected", + !!cardId && selectedAnnotationIds.has(cardId), + ); + } +} + +// ============================================================================= +// Reset / Clear +// ============================================================================= + +/** Remove the DOM elements backing every annotation and clear the map. */ +function clearAnnotationMap(): void { + for (const [, tracked] of annotationMap) { + for (const el of tracked.elements) el.remove(); + } + annotationMap.clear(); +} + +/** + * Push a field's defaultValue (/DV) into annotationStorage so the widget + * renders cleared. annotationStorage.remove() only drops our override — + * the widget reverts to the PDF's /V (the stored value), not /DV. + * + * Widget IDs come from page.getAnnotations(); field metadata (types, + * defaultValue) comes from getFieldObjects(). We match them by field name. + */ +function clearFieldInStorage(name: string): void { + const { pdfDocument, cachedFieldObjects } = deps.state(); + if (!pdfDocument) return; + const ids = fieldNameToIds.get(name); + if (!ids) return; + const storage = pdfDocument.annotationStorage; + const meta = cachedFieldObjects?.[name]; + // defaultValue is per-field, not per-widget — take from first non-parent entry + const dv = + meta?.find((f) => f.defaultValue != null)?.defaultValue ?? + meta?.[0]?.defaultValue ?? + ""; + const type = meta?.find((f) => f.type)?.type; + const clearValue = + type === "checkbox" || type === "radiobutton" ? (dv ?? "Off") : (dv ?? ""); + for (const id of ids) storage.setValue(id, { value: clearValue }); +} + +/** + * Revert to what's in the PDF file: restore baseline annotations, restore + * baseline form values, discard all user edits. Result: diff is empty, clean. + * + * Form fields: remove ALL storage overrides — every field reverts to the + * PDF's /V (which IS baseline). We can't skip baseline-named fields: if the + * user edited one, our override is in storage under that name, and skipping + * it leaves the widget showing the stale edit. + */ +function resetToBaseline(): void { + clearAnnotationMap(); + const { pdfDocument, pdfBaselineAnnotations } = deps.state(); + for (const def of pdfBaselineAnnotations) { + annotationMap.set(def.id, { def: { ...def }, elements: [] }); + } + + if (pdfDocument) { + const storage = pdfDocument.annotationStorage; + for (const name of new Set([ + ...formFieldValues.keys(), + ...pdfBaselineFormValues.keys(), + ])) { + const ids = fieldNameToIds.get(name); + if (ids) for (const id of ids) storage.remove(id); + } + } + formFieldValues.clear(); + for (const [name, value] of pdfBaselineFormValues) { + formFieldValues.set(name, value); + } + + undoStack.length = 0; + redoStack.length = 0; + selectedAnnotationIds.clear(); + + updateAnnotationsBadge(); + deps.persistAnnotations(); // diff is now empty → setDirty(false) + deps.renderPage(); + renderAnnotationPanel(); +} + +/** + * Remove everything, including annotations and form values that came from + * the PDF file. Result: diff is non-empty (baseline items are "removed"), + * dirty — saving writes a stripped PDF. + * + * Form fields: annotationStorage.remove() only drops our override, so the + * widget reverts to the PDF's stored /V. To actually CLEAR we must push + * each field's defaultValue (/DV) — which is what the PDF's own Reset + * button would do. + * + * Note: baseline annotations are still baked into the canvas appearance + * stream — we can only remove them from our overlay and the panel. Saving + * will omit them from the output (getAnnotatedPdfBytes skips baseline). + */ +function clearAllItems(): void { + clearAnnotationMap(); + + for (const name of new Set([ + ...formFieldValues.keys(), + ...pdfBaselineFormValues.keys(), + ])) { + clearFieldInStorage(name); + } + formFieldValues.clear(); + + undoStack.length = 0; + redoStack.length = 0; + selectedAnnotationIds.clear(); + + updateAnnotationsBadge(); + deps.persistAnnotations(); + deps.renderPage(); + renderAnnotationPanel(); +} + +// ============================================================================= +// Init +// ============================================================================= + +export function initAnnotationPanel(panelDeps: PanelDeps): void { + deps = panelDeps; + + // Restore user preference + try { + const pref = localStorage.getItem("pdf-annotation-panel"); + if (pref === "open") annotationPanelUserPref = true; + else if (pref === "closed") annotationPanelUserPref = false; + } catch { + /* ignore */ + } + + // Restore saved panel width + try { + const savedWidth = localStorage.getItem("pdf-annotation-panel-width"); + if (savedWidth) { + const w = parseInt(savedWidth, 10); + if (w >= 120) { + annotationsPanelEl.style.width = `${w}px`; + } + } + } catch { + /* ignore */ + } + + // Resize handle — direction-aware based on anchorage + const resizeHandle = document.getElementById("annotation-panel-resize")!; + resizeHandle.addEventListener("mousedown", (e) => { + e.preventDefault(); + resizeHandle.classList.add("dragging"); + const startX = e.clientX; + const startWidth = annotationsPanelEl.offsetWidth; + const isRight = floatingPanelCorner.includes("right"); + + const onMouseMove = (ev: MouseEvent) => { + const dx = ev.clientX - startX; + // If panel is on the right, dragging left (negative dx) increases width + // If panel is on the left, dragging right (positive dx) increases width + const newWidth = Math.max(120, startWidth + (isRight ? -dx : dx)); + annotationsPanelEl.style.width = `${newWidth}px`; + }; + const onMouseUp = () => { + resizeHandle.classList.remove("dragging"); + document.removeEventListener("mousemove", onMouseMove); + document.removeEventListener("mouseup", onMouseUp); + try { + localStorage.setItem( + "pdf-annotation-panel-width", + String(annotationsPanelEl.offsetWidth), + ); + } catch { + /* ignore */ + } + deps.requestFitToContent(); + }; + document.addEventListener("mousemove", onMouseMove); + document.addEventListener("mouseup", onMouseUp); + }); + + // Floating panel drag-to-reposition + const panelHeader = annotationsPanelEl.querySelector( + ".annotation-panel-header", + ) as HTMLElement; + if (panelHeader) { + panelHeader.addEventListener("mousedown", (e) => { + if (!annotationsPanelEl.classList.contains("floating")) return; + // Ignore clicks on buttons within header + if ((e.target as HTMLElement).closest("button")) return; + e.preventDefault(); + const startX = e.clientX; + const startY = e.clientY; + const container = annotationsPanelEl.parentElement!; + const containerRect = container.getBoundingClientRect(); + let moved = false; + + // Temporarily position absolutely during drag + const panelRect = annotationsPanelEl.getBoundingClientRect(); + let curLeft = panelRect.left - containerRect.left; + let curTop = panelRect.top - containerRect.top; + + // Switch to left/top positioning for free drag + annotationsPanelEl.style.right = ""; + annotationsPanelEl.style.bottom = ""; + annotationsPanelEl.style.left = `${curLeft}px`; + annotationsPanelEl.style.top = `${curTop}px`; + annotationsPanelEl.style.transition = "none"; + annotationsPanelEl.classList.add("dragging"); + + const onMouseMove = (ev: MouseEvent) => { + const dx = ev.clientX - startX; + const dy = ev.clientY - startY; + if (Math.abs(dx) > 3 || Math.abs(dy) > 3) moved = true; + const newLeft = Math.max( + 0, + Math.min( + curLeft + dx, + containerRect.width - annotationsPanelEl.offsetWidth, + ), + ); + const newTop = Math.max( + 0, + Math.min( + curTop + dy, + containerRect.height - annotationsPanelEl.offsetHeight, + ), + ); + annotationsPanelEl.style.left = `${newLeft}px`; + annotationsPanelEl.style.top = `${newTop}px`; + }; + + const onMouseUp = () => { + document.removeEventListener("mousemove", onMouseMove); + document.removeEventListener("mouseup", onMouseUp); + annotationsPanelEl.classList.remove("dragging"); + annotationsPanelEl.style.transition = ""; + + if (!moved) return; + + // Snap to nearest corner (magnetic anchor) + const finalRect = annotationsPanelEl.getBoundingClientRect(); + const cx = finalRect.left + finalRect.width / 2 - containerRect.left; + const cy = finalRect.top + finalRect.height / 2 - containerRect.top; + const midX = containerRect.width / 2; + const midY = containerRect.height / 2; + + const isRight = cx > midX; + const isBottom = cy > midY; + floatingPanelCorner = isBottom + ? isRight + ? "bottom-right" + : "bottom-left" + : isRight + ? "top-right" + : "top-left"; + + applyFloatingPanelPosition(); + try { + localStorage.setItem("pdf-panel-corner", floatingPanelCorner); + } catch { + /* ignore */ + } + }; + + document.addEventListener("mousemove", onMouseMove); + document.addEventListener("mouseup", onMouseUp); + }); + } + + // Restore saved corner + try { + const saved = localStorage.getItem("pdf-panel-corner"); + if ( + saved && + ["top-right", "top-left", "bottom-right", "bottom-left"].includes(saved) + ) { + floatingPanelCorner = saved as PanelCorner; + } + } catch { + /* ignore */ + } + + // Toggle button + annotationsBtn.addEventListener("click", toggleAnnotationPanel); + annotationsPanelCloseBtn.addEventListener("click", toggleAnnotationPanel); + annotationsPanelResetBtn.addEventListener("click", resetToBaseline); + annotationsPanelClearAllBtn.addEventListener("click", clearAllItems); + + updateAnnotationsBadge(); +} diff --git a/examples/pdf-server/src/commands.ts b/examples/pdf-server/src/commands.ts new file mode 100644 index 0000000..fa657ca --- /dev/null +++ b/examples/pdf-server/src/commands.ts @@ -0,0 +1,68 @@ +/** + * PdfCommand — the wire protocol between server and viewer. + * + * The server enqueues these via the `interact` tool; the viewer polls + * `poll_pdf_commands` and receives them as `structuredContent.commands`. + * + * This file is the single source of truth for the command shape. Both + * `server.ts` (which enqueues) and `mcp-app.ts` (which consumes) import + * from here — a new command variant must be added exactly once. + * + * Uses `import type` so neither side pulls pdf-lib into its bundle. + */ + +import type { PdfAnnotationDef } from "./pdf-annotations.js"; + +/** Single form field assignment, as sent by `fill_form`. */ +export interface FormFieldFill { + name: string; + value: string | boolean; +} + +/** + * Partial annotation update: `id` + `type` pin the target, everything + * else is optional. Server validates shape; viewer merges into existing. + */ +export type PdfAnnotationPatch = Partial & { + id: string; + type: PdfAnnotationDef["type"]; +}; + +/** Page range for text/screenshot extraction. Omitted bound = open-ended. */ +export interface PageInterval { + start?: number; + end?: number; +} + +/** + * Commands the server can send to the viewer via the poll queue. + * Adding a variant here means adding a `case` in both the server's + * `interact` handler (to enqueue) and the viewer's `processCommands` + * (to execute). + */ +export type PdfCommand = + | { type: "navigate"; page: number } + | { type: "search"; query: string } + | { type: "find"; query: string } + | { type: "search_navigate"; matchIndex: number } + | { type: "zoom"; scale: number } + | { type: "add_annotations"; annotations: PdfAnnotationDef[] } + | { type: "update_annotations"; annotations: PdfAnnotationPatch[] } + | { type: "remove_annotations"; ids: string[] } + | { + type: "highlight_text"; + id: string; + query: string; + page?: number; + color?: string; + content?: string; + } + | { type: "fill_form"; fields: FormFieldFill[] } + | { + type: "get_pages"; + requestId: string; + intervals: PageInterval[]; + getText: boolean; + getScreenshots: boolean; + } + | { type: "file_changed"; mtimeMs: number }; diff --git a/examples/pdf-server/src/mcp-app.css b/examples/pdf-server/src/mcp-app.css index 77e3757..b307594 100644 --- a/examples/pdf-server/src/mcp-app.css +++ b/examples/pdf-server/src/mcp-app.css @@ -13,10 +13,7 @@ --text200: light-dark(#999999, #888888); /* Shadows */ - --shadow-page: light-dark( - 0 2px 8px rgba(0, 0, 0, 0.15), - 0 2px 8px rgba(0, 0, 0, 0.4) - ); + --shadow-page-color: light-dark(rgba(0 0 0 / 0.15), rgba(0 0 0 / 0.4)); --selection-bg: light-dark(rgba(0, 0, 255, 0.3), rgba(100, 150, 255, 0.4)); } @@ -223,7 +220,8 @@ body { /* Single Page Canvas Container */ .canvas-container { flex: 1; - overflow: visible; + overflow-x: auto; /* Allow horizontal scrolling when zoomed in inline mode */ + overflow-y: visible; display: flex; justify-content: center; align-items: flex-start; @@ -233,7 +231,9 @@ body { .page-wrapper { position: relative; - box-shadow: var(--shadow-page); + box-shadow: + 0 1px 4px var(--shadow-page-color), + 0 4px 16px var(--shadow-page-color); background: white; } @@ -319,6 +319,10 @@ body { min-height: 0; /* Allow flex item to shrink below content size */ } +.main.fullscreen .viewer-body { + min-height: 0; +} + .main.fullscreen .canvas-container { min-height: 0; /* Allow flex item to shrink below content size */ overflow: auto; /* Scroll within the document area only */ @@ -414,6 +418,361 @@ body { cursor: not-allowed; } +/* Annotation Layer */ +.annotation-layer { + position: absolute; + left: 0; + top: 0; + right: 0; + bottom: 0; + pointer-events: none; + z-index: 3; /* above text-layer (z-index: 2) so notes are clickable */ +} + +.annotation-highlight { + position: absolute; + background: rgba(255, 255, 0, 0.35); + mix-blend-mode: multiply; + border-radius: 1px; + pointer-events: auto; + cursor: pointer; +} + +.annotation-underline { + position: absolute; + border-bottom: 2px solid #ff0000; + box-sizing: border-box; + pointer-events: auto; + cursor: pointer; +} + +.annotation-strikethrough { + position: absolute; + box-sizing: border-box; + pointer-events: auto; + cursor: pointer; +} +.annotation-strikethrough::after { + content: ""; + position: absolute; + left: 0; + right: 0; + top: 50%; + border-top: 2px solid #ff0000; +} + +.annotation-note { + position: absolute; + width: 20px; + height: 20px; + cursor: pointer; + pointer-events: auto; +} +.annotation-note::after { + content: ""; + display: block; + width: 16px; + height: 16px; + margin: 2px; + background: currentColor; + -webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='black'%3E%3Cpath d='M3 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V5l-4-4H3zm7 1.5L13.5 6H11a1 1 0 0 1-1-1V2.5zM5 8.5h6v1H5v-1zm0 2.5h4v1H5v-1z'/%3E%3C/svg%3E") no-repeat center / contain; + mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='black'%3E%3Cpath d='M3 1a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h10a1 1 0 0 0 1-1V5l-4-4H3zm7 1.5L13.5 6H11a1 1 0 0 1-1-1V2.5zM5 8.5h6v1H5v-1zm0 2.5h4v1H5v-1z'/%3E%3C/svg%3E") no-repeat center / contain; +} +.annotation-note .annotation-tooltip { + display: none; + position: absolute; + bottom: 100%; + left: 0; + background: var(--bg000, #fff); + color: var(--text000, #000); + border: 1px solid var(--bg200, #ccc); + border-radius: 4px; + padding: 4px 8px; + font-size: 0.8rem; + white-space: pre-wrap; + max-width: 200px; + z-index: 100; /* Must float above all sibling annotation elements */ + pointer-events: none; + box-shadow: 0 2px 6px rgba(0, 0, 0, 0.2); +} +.annotation-note:hover .annotation-tooltip { + display: block; +} + +/* When hovering a note, raise the entire annotation layer above the form + layer so the tooltip isn't clipped by the z-index:4 form overlay. */ +.annotation-layer:has(.annotation-note:hover) { + z-index: 5; +} + +.annotation-rectangle { + position: absolute; + border: 2px solid #0066cc; + box-sizing: border-box; + pointer-events: auto; + cursor: grab; + user-select: none; +} + +.annotation-circle { + position: absolute; + border: 2px solid #0066cc; + border-radius: 50%; + box-sizing: border-box; + pointer-events: auto; + cursor: grab; + user-select: none; +} + +.annotation-line { + position: absolute; + height: 0; + border-top: 2px solid #333; + pointer-events: auto; + cursor: grab; + user-select: none; +} + +.annotation-freetext { + position: absolute; + font-family: Helvetica, Arial, sans-serif; + white-space: pre-wrap; + pointer-events: auto; + cursor: grab; + user-select: none; +} + +.annotation-stamp { + position: absolute; + font-family: Helvetica, Arial, sans-serif; + font-weight: bold; + font-size: 24px; + border: 3px solid currentColor; + padding: 4px 12px; + opacity: 0.6; + text-transform: uppercase; + white-space: nowrap; + pointer-events: auto; + cursor: grab; + user-select: none; +} + +.annotation-image { + position: absolute; + pointer-events: auto; + cursor: grab; + user-select: none; +} + +/* Selection visuals */ +.annotation-selected { + outline: 2px solid var(--accent, #2563eb); + outline-offset: 2px; + z-index: 10; +} + +.annotation-handle { + position: absolute; + width: 8px; + height: 8px; + background: white; + border: 2px solid var(--accent, #2563eb); + border-radius: 50%; + z-index: 11; + pointer-events: auto; +} +.annotation-handle.nw { top: -5px; left: -5px; cursor: nwse-resize; } +.annotation-handle.ne { top: -5px; right: -5px; cursor: nesw-resize; } +.annotation-handle.sw { bottom: -5px; left: -5px; cursor: nesw-resize; } +.annotation-handle.se { bottom: -5px; right: -5px; cursor: nwse-resize; } + +.annotation-handle-rotate { + position: absolute; + top: -20px; + left: 50%; + transform: translateX(-50%); + width: 10px; + height: 10px; + background: white; + border: 2px solid var(--accent, #2563eb); + border-radius: 50%; + z-index: 11; + pointer-events: auto; + cursor: grab; +} + +.annotation-card.selected { + background: var(--accent-bg, rgba(37, 99, 235, 0.08)); + border-left-color: var(--accent, #2563eb); +} + +.annotation-dragging { + cursor: grabbing !important; +} + +@media (prefers-color-scheme: dark) { + .annotation-highlight { + background: rgba(255, 255, 0, 0.3); + mix-blend-mode: screen; + } +} + +/* Save / Download Buttons */ +.save-btn, +.download-btn { + display: flex; + align-items: center; + justify-content: center; + width: 32px; + height: 32px; + border: 1px solid var(--bg200); + border-radius: 4px; + background: var(--bg000); + color: var(--text000); + cursor: pointer; + font-size: 1rem; + transition: all 0.15s ease; +} + +.save-btn:hover:not(:disabled), +.download-btn:hover:not(:disabled) { + background: var(--bg100); + border-color: var(--bg300); +} + +.save-btn:disabled, +.download-btn:disabled { + opacity: 0.4; + cursor: not-allowed; +} + +/* + * Confirmation Dialog + * + * Styled to match the host's native dialogs (e.g. the downloadFile prompt). + * Uses host-provided CSS variables (set via applyHostStyleVariables) with + * local fallbacks so it still looks reasonable in standalone dev. + */ +.confirm-dialog { + position: fixed; + inset: 0; + z-index: 1000; + display: flex; + align-items: center; + justify-content: center; + background: light-dark(rgba(0, 0, 0, 0.4), rgba(0, 0, 0, 0.6)); + font-family: var(--font-sans, inherit); +} + +.confirm-box { + background: var(--color-background-primary, var(--bg000)); + border-radius: var(--border-radius-xl, 20px); + padding: 1.75rem; + min-width: 360px; + max-width: 520px; + box-shadow: var(--shadow-lg, 0 20px 50px rgba(0, 0, 0, 0.3)); +} + +.confirm-title { + font-weight: var(--font-weight-bold, 700); + font-size: var(--font-heading-md-size, 1.5rem); + line-height: var(--font-heading-md-line-height, 1.25); + margin-bottom: 0.5rem; + color: var(--color-text-primary, var(--text000)); +} + +.confirm-body { + font-size: var(--font-text-md-size, 1rem); + line-height: var(--font-text-md-line-height, 1.5); + color: var(--color-text-secondary, var(--text100)); + margin-bottom: 1.5rem; + word-break: break-word; +} + +/* Optional monospace detail box (filename, path, etc.) */ +.confirm-detail { + font-family: var(--font-mono, ui-monospace, monospace); + font-size: var(--font-text-sm-size, 0.9rem); + padding: 0.75rem 1rem; + margin-bottom: 1.5rem; + border: var(--border-width-regular, 1px) solid + var(--color-border-secondary, var(--bg200)); + border-radius: var(--border-radius-md, 8px); + background: var(--color-background-secondary, var(--bg100)); + color: var(--color-text-primary, var(--text000)); + word-break: break-all; +} + +.confirm-detail:empty { + display: none; +} + +.confirm-buttons { + display: flex; + gap: 0.75rem; + justify-content: flex-end; +} + +.confirm-btn { + padding: 0.625rem 1.25rem; + border: var(--border-width-regular, 1px) solid + var(--color-border-primary, var(--bg200)); + border-radius: var(--border-radius-md, 8px); + background: var(--color-background-primary, var(--bg000)); + color: var(--color-text-primary, var(--text000)); + cursor: pointer; + font: inherit; + font-size: var(--font-text-md-size, 0.95rem); + font-weight: var(--font-weight-medium, 500); +} + +.confirm-btn:hover { + background: var(--color-background-secondary, var(--bg100)); +} + +.confirm-btn-primary { + /* Host's native primary buttons use inverse colors (dark bg, light text) */ + background: var(--color-background-inverse, var(--text000)); + border-color: var(--color-background-inverse, var(--text000)); + color: var(--color-text-inverse, var(--bg000)); +} + +.confirm-btn-primary:hover { + /* .confirm-btn:hover above would otherwise reset background */ + background: var(--color-background-inverse, var(--text000)); + filter: brightness(1.15); +} + +/* Form Layer (PDF.js AnnotationLayer for interactive form widgets) */ +#form-layer { + position: absolute; + left: 0; + top: 0; + right: 0; + bottom: 0; + z-index: 4; /* above annotation-layer (z-index: 3) so form inputs are clickable */ +} + +/* + * PDF.js AnnotationLayer renders interactive form inputs on top of the canvas. + * When the widget is transparent the canvas's static appearance bleeds through, + * causing double-text (the widget font never matches the PDF's font metrics). + * Fix: force widgets opaque. PDF.js also reads the annotation's /BC entry and + * writes it as an inline `background-color` on the element (typically + * `transparent` for unstyled forms) — inline style beats any selector, hence + * !important. + */ +#form-layer .textWidgetAnnotation :is(input, textarea), +#form-layer .choiceWidgetAnnotation select { + background-image: none !important; + background-color: light-dark(#fff, #2a2a2a) !important; +} + +#form-layer select option:checked { + background: light-dark(#d0e0ff, #335); +} + + /* Highlight Layer */ .highlight-layer { position: absolute; @@ -448,6 +807,346 @@ body { } } +/* Viewer Body (flex row for canvas + panel) */ +.viewer-body { + display: flex; + flex: 1; + min-height: 0; + overflow: visible; + position: relative; /* Anchor for floating annotation panel */ +} + +/* Annotations Toolbar Button */ +.annotations-btn { + display: flex; + align-items: center; + justify-content: center; + width: 32px; + height: 32px; + border: 1px solid var(--bg200); + border-radius: 4px; + background: var(--bg000); + color: var(--text000); + cursor: pointer; + font-size: 1rem; + transition: all 0.15s ease; + position: relative; +} +.annotations-btn:hover { + background: var(--bg100); + border-color: var(--bg300); +} +.annotations-btn.active { + background: var(--bg200); + border-color: var(--bg300); +} + +.annotations-badge { + position: absolute; + top: -4px; + right: -4px; + min-width: 16px; + height: 16px; + background: var(--accent, #2563eb); + color: #fff; + font-size: 0.65rem; + font-weight: 600; + border-radius: 8px; + display: flex; + align-items: center; + justify-content: center; + padding: 0 3px; + line-height: 1; +} + +/* Annotation Side Panel */ +.annotation-panel { + width: 500px; + min-width: 180px; + max-width: 50vw; + background: var(--bg000); + border-left: 1px solid var(--bg200); + display: flex; + flex-direction: column; + overflow: hidden; + position: relative; +} + +/* Resize handle on left edge */ +.annotation-panel-resize { + position: absolute; + left: -3px; + top: 0; + bottom: 0; + width: 6px; + cursor: col-resize; + z-index: 10; +} +.annotation-panel-resize:hover, +.annotation-panel-resize.dragging { + background: var(--text100); + opacity: 0.3; +} + +.annotation-panel-header { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0.5rem 0.75rem; + border-bottom: 1px solid var(--bg200); + flex-shrink: 0; +} + +.annotation-panel-title { + font-size: 0.85rem; + font-weight: 600; + color: var(--text000); +} + +.annotation-panel-header-actions { + display: flex; + align-items: center; + gap: 4px; +} + +.annotation-panel-reset, +.annotation-panel-clear-all { + border: none; + background: transparent; + color: var(--text100); + cursor: pointer; + border-radius: 4px; + padding: 4px; + display: flex; + align-items: center; + justify-content: center; +} +.annotation-panel-reset:hover { + color: var(--text000); + background: var(--bg100); +} +.annotation-panel-clear-all:hover { + color: #e74c3c; + background: var(--bg100); +} +.annotation-panel-reset:disabled, +.annotation-panel-clear-all:disabled { + opacity: 0.4; + cursor: not-allowed; +} + +.annotation-panel-close { + display: flex; + align-items: center; + justify-content: center; + width: 24px; + height: 24px; + border: none; + border-radius: 4px; + background: transparent; + color: var(--text100); + cursor: pointer; + font-size: 0.8rem; + transition: all 0.15s ease; +} +.annotation-panel-close:hover { + background: var(--bg100); + color: var(--text000); +} + +.annotation-panel-list { + flex: 1; + overflow-y: auto; + padding: 0.25rem 0; +} + +/* Floating annotation panel (used in both inline and fullscreen) */ +.annotation-panel.floating { + position: absolute; + z-index: 20; + border: 1px solid var(--bg200); + border-radius: 6px; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15); + max-height: 60%; + width: 135px; + transition: top 0.15s ease, left 0.15s ease, right 0.15s ease, bottom 0.15s ease; +} +.annotation-panel.floating .annotation-panel-header { + cursor: grab; +} +.annotation-panel.floating.dragging .annotation-panel-header { + cursor: grabbing; +} + +/* Accordion section headers */ +.annotation-section-header { + font-size: 0.7rem; + font-weight: 600; + color: var(--text100); + padding: 0.3rem 0.6rem; + text-transform: uppercase; + letter-spacing: 0.03em; + cursor: pointer; + display: flex; + align-items: center; + justify-content: space-between; + border-bottom: 1px solid var(--bg200); + user-select: none; + transition: background 0.1s ease; +} +.annotation-section-header:hover { + background: var(--bg100); +} +.annotation-section-header.current-page { + color: var(--text000); +} +.annotation-section-header.open { + color: var(--text000); +} +.annotation-section-chevron { + font-size: 0.55rem; + transition: transform 0.15s ease; +} +.annotation-section-body { + display: none; +} +.annotation-section-body.open { + display: block; +} + +/* Legacy page group headers (fullscreen mode) */ +.annotation-page-group { + font-size: 0.75rem; + font-weight: 600; + color: var(--text100); + padding: 0.5rem 0.75rem 0.25rem; + text-transform: uppercase; + letter-spacing: 0.03em; +} +.annotation-page-group.current-page { + color: var(--text000); +} + +/* Annotation cards */ +.annotation-card { + display: flex; + flex-direction: column; + padding: 0.4rem 0.75rem; + cursor: pointer; + transition: background 0.1s ease; + border-left: 3px solid transparent; +} +.annotation-card:hover { + background: var(--bg100); +} +.annotation-card.highlighted { + background: var(--bg100); + border-left-color: var(--text100); +} + +.annotation-card-row { + display: flex; + align-items: center; + gap: 0.4rem; + min-height: 24px; +} + +.annotation-card-swatch { + width: 10px; + height: 10px; + border-radius: 2px; + flex-shrink: 0; + border: 1px solid rgba(0, 0, 0, 0.15); +} + +/* Swatch for baseline items the user cleared — outlined with a cross + instead of solid fill, so the panel still shows "this existed in the + file and you removed it" rather than vanishing. */ +.annotation-card-swatch-cleared { + background: transparent; + border-color: #4a90d9; + display: flex; + align-items: center; + justify-content: center; +} + +.annotation-card-cleared .annotation-card-type, +.annotation-card-cleared .annotation-card-preview { + opacity: 0.55; + text-decoration: line-through; +} + +.annotation-card-type { + font-size: 0.7rem; + color: var(--text200); + text-transform: uppercase; + letter-spacing: 0.03em; + flex-shrink: 0; +} + +.annotation-card-preview { + flex: 1; + min-width: 0; + font-size: 0.8rem; + color: var(--text000); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +.annotation-card-delete { + flex-shrink: 0; + margin-left: auto; + background: none; + border: none; + padding: 2px; + cursor: pointer; + color: var(--text200); + opacity: 0; + transition: opacity 0.1s ease, color 0.1s ease; + display: flex; + align-items: center; +} +.annotation-card:hover .annotation-card-delete { + opacity: 1; +} +.annotation-card-delete:hover { + color: #d32f2f; +} + +.annotation-card-expand { + flex-shrink: 0; + font-size: 0.65rem; + color: var(--text200); + transition: transform 0.15s ease; +} +.annotation-card.expanded .annotation-card-expand { + transform: rotate(180deg); +} + +.annotation-card-content { + display: none; + font-size: 0.8rem; + color: var(--text100); + padding: 0.25rem 0 0.25rem 14px; + white-space: pre-wrap; + word-break: break-word; + line-height: 1.4; +} +.annotation-card.expanded .annotation-card-content { + display: block; +} + +/* Pulse animation for annotation elements on PDF */ +@keyframes annotation-pulse { + 0% { box-shadow: 0 0 0 0 rgba(255, 165, 0, 0.6); } + 70% { box-shadow: 0 0 0 8px rgba(255, 165, 0, 0); } + 100% { box-shadow: 0 0 0 0 rgba(255, 165, 0, 0); } +} +.annotation-pulse { + animation: annotation-pulse 0.6s ease-out 2; +} + /* Loading Indicator (pie) */ .loading-indicator { display: inline-flex; @@ -475,6 +1174,7 @@ body { stroke: #e74c3c; } + /* Compact toolbar on narrow screens */ @media (max-width: 480px) { .toolbar-left { @@ -505,4 +1205,4 @@ body { .toolbar-right { gap: 0.2rem; } -} +} \ No newline at end of file diff --git a/examples/pdf-server/src/mcp-app.ts b/examples/pdf-server/src/mcp-app.ts index 8b06a36..c8281c0 100644 --- a/examples/pdf-server/src/mcp-app.ts +++ b/examples/pdf-server/src/mcp-app.ts @@ -15,23 +15,114 @@ import { import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js"; import type { ContentBlock } from "@modelcontextprotocol/sdk/spec.types.js"; import * as pdfjsLib from "pdfjs-dist"; -import { TextLayer } from "pdfjs-dist"; +import { AnnotationLayer, AnnotationMode, TextLayer } from "pdfjs-dist"; +import "pdfjs-dist/web/pdf_viewer.css"; +import { + type PdfAnnotationDef, + type Rect, + type RectangleAnnotation, + type CircleAnnotation, + type LineAnnotation, + type StampAnnotation, + type ImageAnnotation, + type NoteAnnotation, + type FreetextAnnotation, + serializeDiff, + deserializeDiff, + mergeAnnotations, + computeDiff, + isDiffEmpty, + buildAnnotatedPdfBytes, + importPdfjsAnnotation, + uint8ArrayToBase64, + convertFromModelCoords, + convertToModelCoords, +} from "./pdf-annotations.js"; +import { + type TrackedAnnotation, + type EditEntry, + annotationMap, + formFieldValues, + pdfBaselineFormValues, + selectedAnnotationIds, + fieldNameToIds, + fieldNameToPage, + fieldNameToLabel, + fieldNameToOrder, + undoStack, + redoStack, + searchBarEl, + formLayerEl, +} from "./viewer-state.js"; +import { + panelState, + annotationsPanelEl, + annotationsPanelListEl, + renderAnnotationPanel, + updateAnnotationsBadge, + setAnnotationPanelOpen, + applyFloatingPanelPosition, + autoDockPanel, + initAnnotationPanel, + syncSidebarSelection, + getFormFieldLabel, + getAnnotationLabel, + getAnnotationPreview, + getAnnotationColor, +} from "./annotation-panel.js"; import "./global.css"; import "./mcp-app.css"; const MAX_MODEL_CONTEXT_LENGTH = 15000; -const MAX_MODEL_CONTEXT_UPDATE_IMAGE_DIMENSION = 768; // Max screenshot dimension // Configure PDF.js worker pdfjsLib.GlobalWorkerOptions.workerSrc = new URL( "pdfjs-dist/build/pdf.worker.mjs", import.meta.url, ).href; +// PDF Standard-14 fonts from CDN (requires unpkg.com in CSP connectDomains). +// Pinned to the bundled pdfjs-dist version so font glyph indices match. +const STANDARD_FONT_DATA_URL = `https://unpkg.com/pdfjs-dist@${pdfjsLib.version}/standard_fonts/`; + const log = { info: console.log.bind(console, "[PDF-VIEWER]"), error: console.error.bind(console, "[PDF-VIEWER]"), }; +/** + * Resolve an ImageAnnotation to a src string safe for ``. + * Returns the parsed-and-reserialized URL (`URL.href`) rather than the + * raw input so CodeQL's taint tracker recognises the sanitisation barrier + * (js/xss, js/client-side-unvalidated-url-redirection). Blocks + * `javascript:` / `vbscript:` etc. The server normally resolves + * imageUrl → imageData before enqueueing; the imageUrl branch here is + * defense-in-depth for the server-side fetch-failure fallback. + */ +function safeImageSrc(def: { + imageData?: string; + mimeType?: string; + imageUrl?: string; +}): string | undefined { + if (def.imageData) { + return `data:${def.mimeType || "image/png"};base64,${def.imageData}`; + } + if (!def.imageUrl) return undefined; + try { + const parsed = new URL(def.imageUrl, document.baseURI); + if ( + parsed.protocol === "https:" || + parsed.protocol === "http:" || + parsed.protocol === "data:" || + parsed.protocol === "blob:" + ) { + return parsed.href; + } + } catch { + // fall through + } + return undefined; +} + // State let pdfDocument: pdfjsLib.PDFDocumentProxy | null = null; let currentPage = 1; @@ -40,8 +131,45 @@ let scale = 1.0; let pdfUrl = ""; let pdfTitle: string | undefined; let viewUUID: string | undefined; +let interactEnabled = false; +/** Server-reported writability of the underlying file (fs.access W_OK). */ +let fileWritable = false; let currentRenderTask: { cancel: () => void } | null = null; +// Shared annotation state (annotationMap, formFieldValues, selectedAnnotationIds, +// undoStack, redoStack, fieldNameTo*) lives in ./viewer-state.ts — imported above. + +/** Cache loaded HTMLImageElement instances by annotation ID for canvas painting. */ +const imageCache = new Map(); + +/** Annotations imported from the PDF file (baseline for diff computation). */ +let pdfBaselineAnnotations: PdfAnnotationDef[] = []; + +// Dirty flag — tracks unsaved local changes +let isDirty = false; +/** Whether we're currently restoring annotations (suppress dirty flag). */ +let isRestoring = false; +/** Once the save button is shown, it stays visible (possibly disabled) until reload. */ +let saveBtnEverShown = false; +/** True between save_pdf call and resolution; suppresses file_changed handling. */ +let saveInProgress = false; +/** mtime returned by our most recent successful save_pdf. Compare against + * incoming file_changed.mtimeMs to suppress our own write's echo. */ +let lastSavedMtime: number | null = null; +/** Incremented on every reload. Fetches/preloads from an older generation are + * discarded — prevents stale rangeCache entries and stale page renders. */ +let loadGeneration = 0; + +let focusedFieldName: string | null = null; + +// Radio widget annotation ID → its export value (buttonValue). pdf.js +// creates without setting .value, so target.value +// defaults to "on"; this map lets the input listener report the real value. +const radioButtonValues = new Map(); +// Cached result of doc.getFieldObjects() — needed for AnnotationLayer reset button support +// eslint-disable-next-line @typescript-eslint/no-explicit-any +let cachedFieldObjects: Record | null = null; + // DOM Elements const mainEl = document.querySelector(".main") as HTMLElement; const loadingEl = document.getElementById("loading")!; @@ -65,7 +193,7 @@ const fullscreenBtn = document.getElementById( ) as HTMLButtonElement; const searchBtn = document.getElementById("search-btn") as HTMLButtonElement; searchBtn.innerHTML = ``; -const searchBarEl = document.getElementById("search-bar")!; +// searchBarEl → imported from ./viewer-state.js const searchInputEl = document.getElementById( "search-input", ) as HTMLInputElement; @@ -80,6 +208,21 @@ const searchCloseBtn = document.getElementById( "search-close-btn", ) as HTMLButtonElement; const highlightLayerEl = document.getElementById("highlight-layer")!; +const annotationLayerEl = document.getElementById("annotation-layer")!; +// formLayerEl → imported from ./viewer-state.js +const saveBtn = document.getElementById("save-btn") as HTMLButtonElement; +const downloadBtn = document.getElementById( + "download-btn", +) as HTMLButtonElement; +const confirmDialogEl = document.getElementById( + "confirm-dialog", +) as HTMLDivElement; +const confirmTitleEl = document.getElementById("confirm-title")!; +const confirmBodyEl = document.getElementById("confirm-body")!; +const confirmDetailEl = document.getElementById("confirm-detail")!; +const confirmButtonsEl = document.getElementById("confirm-buttons")!; + +// Annotation Panel DOM Elements & state → ./annotation-panel.ts (imported above) // Search state interface SearchMatch { @@ -178,7 +321,10 @@ function requestFitToContent() { const totalHeight = toolbarHeight + paddingTop + pageWrapperHeight + paddingBottom + BUFFER; - app.sendSizeChanged({ height: totalHeight }); + // In inline mode (this function early-returns for fullscreen) the side panel is hidden + const totalWidth = pageWrapperEl.offsetWidth + BUFFER; + + app.sendSizeChanged({ width: totalWidth, height: totalHeight }); } // --- Search Functions --- @@ -224,6 +370,46 @@ function performSearch(query: string) { goToPage(match.pageNum); } } + + // Update model context with search results + updatePageContext(); +} + +/** + * Silent search: populate matches and report via model context + * without opening the search bar or rendering highlights. + */ +function performSilentSearch(query: string) { + allMatches = []; + currentMatchIndex = -1; + searchQuery = query; + + if (!query) { + updatePageContext(); + return; + } + + const lowerQuery = query.toLowerCase(); + for (let pageNum = 1; pageNum <= totalPages; pageNum++) { + const pageText = pageTextCache.get(pageNum); + if (!pageText) continue; + const lowerText = pageText.toLowerCase(); + let startIdx = 0; + while (true) { + const idx = lowerText.indexOf(lowerQuery, startIdx); + if (idx === -1) break; + allMatches.push({ pageNum, index: idx, length: query.length }); + startIdx = idx + 1; + } + } + + if (allMatches.length > 0) { + const idx = allMatches.findIndex((m) => m.pageNum >= currentPage); + currentMatchIndex = idx >= 0 ? idx : 0; + } + + log.info(`Silent search "${query}": ${allMatches.length} matches`); + updatePageContext(); } function renderHighlights() { @@ -355,6 +541,9 @@ function openSearch() { searchBarEl.style.display = "flex"; updateSearchUI(); searchInputEl.focus(); + if (panelState.open && annotationsPanelEl.classList.contains("floating")) { + applyFloatingPanelPosition(); + } // Text extraction is handled by the background preloader } @@ -362,6 +551,9 @@ function closeSearch() { if (!searchOpen) return; searchOpen = false; searchBarEl.style.display = "none"; + if (panelState.open && annotationsPanelEl.classList.contains("floating")) { + applyFloatingPanelPosition(); + } searchQuery = ""; searchInputEl.value = ""; allMatches = []; @@ -432,10 +624,156 @@ function showViewer() { viewerEl.style.display = "flex"; } +// --------------------------------------------------------------------------- +// Confirm dialog +// --------------------------------------------------------------------------- + +interface ConfirmButton { + label: string; + primary?: boolean; +} + +let activeConfirmResolve: ((i: number) => void) | null = null; + +/** + * In-app confirmation overlay. Resolves to the clicked button index, the + * cancel index on Escape, or `-1` if pre-empted by another dialog. Callers + * should treat anything but the expected button index as "cancel". + * + * Button ordering follows the host's native convention: Cancel first, + * primary action last. + * + * @param detail Optional monospace string shown in a bordered box (e.g. + * a filename), matching the host's native dialog style. + */ +function showConfirmDialog( + title: string, + body: string, + buttons: ConfirmButton[], + detail?: string, +): Promise { + // Pre-empt any open dialog: resolve it as cancelled + if (activeConfirmResolve) { + activeConfirmResolve(-1); + activeConfirmResolve = null; + } + + // Escape → first non-primary button (native Cancel-first ordering) + const nonPrimary = buttons.findIndex((b) => !b.primary); + const escIndex = nonPrimary >= 0 ? nonPrimary : buttons.length - 1; + + confirmTitleEl.textContent = title; + confirmBodyEl.textContent = body; + confirmDetailEl.textContent = detail ?? ""; + confirmButtonsEl.innerHTML = ""; + confirmDialogEl.style.display = "flex"; + + return new Promise((resolve) => { + activeConfirmResolve = resolve; + + const done = (i: number): void => { + if (activeConfirmResolve !== resolve) return; // already pre-empted + activeConfirmResolve = null; + confirmDialogEl.style.display = "none"; + document.removeEventListener("keydown", onKey, true); + resolve(i); + }; + + const onKey = (e: KeyboardEvent): void => { + if (e.key === "Escape") { + e.preventDefault(); + e.stopPropagation(); + done(escIndex); + } + }; + document.addEventListener("keydown", onKey, true); + + buttons.forEach((btn, i) => { + const el = document.createElement("button"); + el.textContent = btn.label; + el.className = btn.primary + ? "confirm-btn confirm-btn-primary" + : "confirm-btn"; + el.addEventListener("click", () => done(i)); + confirmButtonsEl.appendChild(el); + if (btn.primary) setTimeout(() => el.focus(), 0); + }); + }); +} + +function setDirty(dirty: boolean): void { + if (isDirty === dirty) return; + isDirty = dirty; + updateTitleDisplay(); + updateSaveBtn(); +} + +function updateSaveBtn(): void { + if (!fileWritable) { + saveBtn.style.display = "none"; + return; + } + if (isDirty) { + saveBtn.style.display = ""; + saveBtn.disabled = false; + saveBtnEverShown = true; + } else if (saveBtnEverShown) { + saveBtn.style.display = ""; + saveBtn.disabled = true; + } else { + saveBtn.style.display = "none"; + } +} + +function updateTitleDisplay(): void { + const display = pdfTitle || pdfUrl; + titleEl.textContent = (isDirty ? "* " : "") + display; + titleEl.title = pdfUrl; +} + +/** + * Debug overlay: fixed-position bubble, bottom-left. Pretty-printed JSON + * dump of whatever the server stuffed into `_meta._debug`. Tooltips inside + * sandboxed iframes are unreliable; this survives the cross-origin barrier + * and shows up in screenshots. + */ +function showDebugBubble(debug: unknown): void { + const bubble = document.createElement("div"); + const base = + "position:fixed;bottom:8px;left:8px;z-index:99999;" + + "background:rgba(20,20,30,0.92);color:#cfe;padding:8px 12px;" + + "font:11px/1.4 monospace;border-radius:6px;" + + "box-shadow:0 2px 8px rgba(0,0,0,0.4);white-space:pre;cursor:pointer;" + + "transition:max-width 0.15s ease;"; + // Collapsed: clip to 60vw. Hover: expand to fit full paths (up to ~96vw), + // scrollable both axes in case the JSON is tall. + const collapsed = + base + + "max-width:60vw;max-height:40vh;overflow:hidden;text-overflow:ellipsis;"; + const expanded = + base + "max-width:calc(100vw - 32px);max-height:80vh;overflow:auto;"; + bubble.style.cssText = collapsed; + // Latch expanded on click so hover-collapse doesn't fight text selection. + let pinned = false; + bubble.onmouseenter = () => { + bubble.style.cssText = expanded; + }; + bubble.onmouseleave = () => { + if (!pinned) bubble.style.cssText = collapsed; + }; + bubble.onclick = () => { + pinned = true; + bubble.style.cssText = expanded; + }; + bubble.ondblclick = () => bubble.remove(); + bubble.title = "Click: pin open • Double-click: dismiss"; + bubble.textContent = "🐞 " + JSON.stringify(debug, null, 2); + document.body.appendChild(bubble); +} + function updateControls() { // Show URL with CSS ellipsis, full URL as tooltip, clickable to open - titleEl.textContent = pdfUrl; - titleEl.title = pdfUrl; + updateTitleDisplay(); titleEl.style.textDecoration = "underline"; titleEl.style.cursor = "pointer"; titleEl.onclick = () => app.openLink({ url: pdfUrl }); @@ -541,6 +879,50 @@ function findSelectionInText( return undefined; } +/** + * Format search results with excerpts for model context. + * Limits to first 20 matches to avoid overwhelming the context. + */ +function formatSearchResults(): string { + const MAX_RESULTS = 20; + const EXCERPT_RADIUS = 40; // characters around the match + + const lines: string[] = []; + const totalMatchCount = allMatches.length; + const currentIdx = currentMatchIndex >= 0 ? currentMatchIndex : -1; + + lines.push( + `\nSearch: "${searchQuery}" (${totalMatchCount} match${totalMatchCount !== 1 ? "es" : ""} across ${new Set(allMatches.map((m) => m.pageNum)).size} page${new Set(allMatches.map((m) => m.pageNum)).size !== 1 ? "s" : ""})`, + ); + + const displayed = allMatches.slice(0, MAX_RESULTS); + for (let i = 0; i < displayed.length; i++) { + const match = displayed[i]; + const pageText = pageTextCache.get(match.pageNum) || ""; + const start = Math.max(0, match.index - EXCERPT_RADIUS); + const end = Math.min( + pageText.length, + match.index + match.length + EXCERPT_RADIUS, + ); + const before = pageText.slice(start, match.index).replace(/\n/g, " "); + const matched = pageText.slice(match.index, match.index + match.length); + const after = pageText + .slice(match.index + match.length, end) + .replace(/\n/g, " "); + const prefix = start > 0 ? "..." : ""; + const suffix = end < pageText.length ? "..." : ""; + const current = i === currentIdx ? " (current)" : ""; + lines.push( + ` [${i}] p.${match.pageNum}, offset ${match.index}${current}: ${prefix}${before}«${matched}»${after}${suffix}`, + ); + } + if (totalMatchCount > MAX_RESULTS) { + lines.push(` ... and ${totalMatchCount - MAX_RESULTS} more matches`); + } + + return lines.join("\n"); +} + // Extract text from current page and update model context async function updatePageContext() { if (!pdfDocument) return; @@ -577,15 +959,79 @@ async function updatePageContext() { selection, ); + // Get page dimensions in PDF points for model context + const viewport = page.getViewport({ scale: 1.0 }); + const pageWidthPt = Math.round(viewport.width); + const pageHeightPt = Math.round(viewport.height); + // Build context with tool ID for multi-tool disambiguation const toolId = app.getHostContext()?.toolInfo?.id; const header = [ `PDF viewer${toolId ? ` (${toolId})` : ""}`, + viewUUID ? `viewUUID: ${viewUUID}` : null, pdfTitle ? `"${pdfTitle}"` : pdfUrl, `Current Page: ${currentPage}/${totalPages}`, - ].join(" | "); + `Page size: ${pageWidthPt}×${pageHeightPt}pt (coordinates: origin at top-left, Y increases downward)`, + ] + .filter(Boolean) + .join(" | "); - const contextText = `${header}\n\nPage content:\n${content}`; + // Include search status if active + let searchSection = ""; + if (searchOpen && searchQuery && allMatches.length > 0) { + searchSection = formatSearchResults(); + } else if (searchOpen && searchQuery) { + searchSection = `\nSearch: "${searchQuery}" (no matches found)`; + } + + // Include annotation details if any exist + let annotationSection = ""; + if (annotationMap.size > 0) { + const onThisPage = [...annotationMap.values()].filter( + (t) => t.def.page === currentPage, + ); + annotationSection = `\nAnnotations: ${onThisPage.length} on this page, ${annotationMap.size} total`; + if (formFieldValues.size > 0) { + annotationSection += ` | ${formFieldValues.size} form field(s) filled`; + } + // List annotations on current page with their coordinates (in model space) + if (onThisPage.length > 0) { + annotationSection += + "\nAnnotations on this page (visible in screenshot):"; + for (const t of onThisPage) { + const d = convertToModelCoords(t.def, pageHeightPt); + const selected = selectedAnnotationIds.has(d.id) ? " (SELECTED)" : ""; + if ("rects" in d && d.rects.length > 0) { + const r = d.rects[0]; + annotationSection += `\n [${d.id}] ${d.type} at (${Math.round(r.x)},${Math.round(r.y)}) ${Math.round(r.width)}x${Math.round(r.height)}${selected}`; + } else if ("x" in d && "y" in d) { + annotationSection += `\n [${d.id}] ${d.type} at (${Math.round(d.x)},${Math.round(d.y)})${selected}`; + } + } + } + } + + // Include focused field or selected annotation info + let focusSection = ""; + if (selectedAnnotationIds.size > 0) { + const ids = [...selectedAnnotationIds]; + const descs = ids.map((selId) => { + const tracked = annotationMap.get(selId); + if (!tracked) return selId; + return `[${selId}] (${tracked.def.type})`; + }); + focusSection = `\nSelected: ${descs.join(", ")}`; + } + if (focusedFieldName) { + const label = getFormFieldLabel(focusedFieldName); + const value = formFieldValues.get(focusedFieldName); + focusSection += `\nFocused field: "${label}" (name="${focusedFieldName}")`; + if (value !== undefined) { + focusSection += ` = ${JSON.stringify(value)}`; + } + } + + const contextText = `${header}${searchSection}${annotationSection}${focusSection}\n\nPage content:\n${content}`; // Build content array with text and optional screenshot const contentBlocks: ContentBlock[] = [{ type: "text", text: contextText }]; @@ -593,34 +1039,15 @@ async function updatePageContext() { // Add screenshot if host supports image content if (app.getHostCapabilities()?.updateModelContext?.image) { try { - // Scale down to reduce token usage (tokens depend on dimensions) - const sourceCanvas = canvasEl; - const scale = Math.min( - 1, - MAX_MODEL_CONTEXT_UPDATE_IMAGE_DIMENSION / - Math.max(sourceCanvas.width, sourceCanvas.height), - ); - const targetWidth = Math.round(sourceCanvas.width * scale); - const targetHeight = Math.round(sourceCanvas.height * scale); - - const tempCanvas = document.createElement("canvas"); - tempCanvas.width = targetWidth; - tempCanvas.height = targetHeight; - const ctx = tempCanvas.getContext("2d"); - if (ctx) { - ctx.drawImage(sourceCanvas, 0, 0, targetWidth, targetHeight); - const dataUrl = tempCanvas.toDataURL("image/png"); - const base64Data = dataUrl.split(",")[1]; - if (base64Data) { - contentBlocks.push({ - type: "image", - data: base64Data, - mimeType: "image/png", - }); - log.info( - `Added screenshot to model context (${targetWidth}x${targetHeight})`, - ); - } + // Render offscreen with ENABLE_STORAGE so filled form fields are visible + const base64Data = await renderPageOffscreen(currentPage); + if (base64Data) { + contentBlocks.push({ + type: "image", + data: base64Data, + mimeType: "image/jpeg", + }); + log.info("Added screenshot to model context"); } } catch (err) { log.info("Failed to capture screenshot:", err); @@ -633,6 +1060,1829 @@ async function updatePageContext() { } } +// ============================================================================= +// Annotation Rendering +// ============================================================================= + +/** + * Convert PDF coordinates (bottom-left origin) to screen coordinates + * relative to the page wrapper. PDF.js viewport handles rotation and scale. + */ +function pdfRectToScreen( + rect: Rect, + viewport: { width: number; height: number; scale: number }, +): { left: number; top: number; width: number; height: number } { + const s = viewport.scale; + // PDF origin is bottom-left, screen origin is top-left + const left = rect.x * s; + const top = viewport.height - (rect.y + rect.height) * s; + const width = rect.width * s; + const height = rect.height * s; + return { left, top, width, height }; +} + +function pdfPointToScreen( + x: number, + y: number, + viewport: { width: number; height: number; scale: number }, +): { left: number; top: number } { + const s = viewport.scale; + return { left: x * s, top: viewport.height - y * s }; +} + +/** Convert a screen-space delta (pixels) to a PDF-space delta. */ +function screenToPdfDelta(dx: number, dy: number): { dx: number; dy: number } { + return { dx: dx / scale, dy: -dy / scale }; +} + +// ============================================================================= +// Undo / Redo +// ============================================================================= + +function pushEdit(entry: EditEntry): void { + undoStack.push(entry); + redoStack.length = 0; +} + +function undo(): void { + const entry = undoStack.pop(); + if (!entry) return; + redoStack.push(entry); + applyEdit(entry, true); +} + +function redo(): void { + const entry = redoStack.pop(); + if (!entry) return; + undoStack.push(entry); + applyEdit(entry, false); +} + +function applyEdit(entry: EditEntry, reverse: boolean): void { + const state = reverse ? entry.before : entry.after; + if (entry.type === "add") { + if (reverse) { + removeAnnotation(entry.id, true); + } else { + addAnnotation(state!, true); + } + } else if (entry.type === "remove") { + if (reverse) { + addAnnotation(state!, true); + } else { + removeAnnotation(entry.id, true); + } + } else { + if (state) { + const tracked = annotationMap.get(entry.id); + if (tracked) { + tracked.def = { ...state }; + } else { + annotationMap.set(entry.id, { def: { ...state }, elements: [] }); + } + } + renderAnnotationsForPage(currentPage); + renderAnnotationPanel(); + } + persistAnnotations(); +} + +// ============================================================================= +// Selection +// ============================================================================= + +/** + * Select annotation(s). Pass null to deselect all. + * If additive is true, toggle the given id without clearing existing selection. + */ +function selectAnnotation(id: string | null, additive = false): void { + if (!additive) { + // Clear all existing selection visuals + for (const prevId of selectedAnnotationIds) { + const tracked = annotationMap.get(prevId); + if (tracked) { + for (const el of tracked.elements) { + el.classList.remove("annotation-selected"); + } + } + } + // Remove handles + for (const h of annotationLayerEl.querySelectorAll( + ".annotation-handle, .annotation-handle-rotate", + )) { + h.remove(); + } + selectedAnnotationIds.clear(); + } + + if (id) { + if (additive && selectedAnnotationIds.has(id)) { + // Toggle off + selectedAnnotationIds.delete(id); + const tracked = annotationMap.get(id); + if (tracked) { + for (const el of tracked.elements) { + el.classList.remove("annotation-selected"); + } + } + } else { + selectedAnnotationIds.add(id); + } + } + + // Apply selection visuals + handles on all selected + // Only show handles when exactly one annotation is selected + for (const selId of selectedAnnotationIds) { + const tracked = annotationMap.get(selId); + if (tracked) { + for (const el of tracked.elements) { + el.classList.add("annotation-selected"); + } + if (selectedAnnotationIds.size === 1) { + showHandles(tracked); + } + } + } + + // Auto-expand the accordion section for the selected annotation's page + if (id) { + const tracked = annotationMap.get(id); + if (tracked) { + panelState.openAccordionSection = `page-${tracked.def.page}`; + } + } + + // Re-render the panel so accordion sections open/close to match selection + renderAnnotationPanel(); + + // Scroll the selected card into view in the sidebar + if (id) { + const card = annotationsPanelListEl.querySelector( + `.annotation-card[data-annotation-id="${id}"]`, + ); + if (card) { + card.scrollIntoView({ behavior: "smooth", block: "nearest" }); + } + } + + // Sync sidebar + syncSidebarSelection(); + // Auto-dock floating panel away from selected annotation + if ( + selectedAnnotationIds.size > 0 && + annotationsPanelEl.classList.contains("floating") && + panelState.open + ) { + autoDockPanel(); + } + // Update model context with selection info + updatePageContext(); +} + +/** Types that support resize handles (need width/height). */ +const RESIZABLE_TYPES = new Set(["rectangle", "circle", "image"]); +/** Types that support rotation. */ +const ROTATABLE_TYPES = new Set(["rectangle", "stamp", "image"]); + +function showHandles(tracked: TrackedAnnotation): void { + const def = tracked.def; + if (tracked.elements.length === 0) return; + if (!RESIZABLE_TYPES.has(def.type) && !ROTATABLE_TYPES.has(def.type)) return; + + const el = tracked.elements[0]; + + // Resize handles (corners) for types with width/height + if (RESIZABLE_TYPES.has(def.type) && "width" in def && "height" in def) { + for (const corner of ["nw", "ne", "sw", "se"] as const) { + const handle = document.createElement("div"); + handle.className = `annotation-handle ${corner}`; + handle.dataset.corner = corner; + const isImagePreserve = + def.type === "image" && + ((def as ImageAnnotation).aspect ?? "preserve") === "preserve"; + handle.title = isImagePreserve + ? "Drag to resize (Shift for free resize)" + : "Drag to resize (Shift to keep proportions)"; + setupResizeHandle(handle, tracked, corner); + el.appendChild(handle); + } + } + + // Rotate handle for rotatable types + if (ROTATABLE_TYPES.has(def.type)) { + const handle = document.createElement("div"); + handle.className = "annotation-handle-rotate"; + handle.title = "Drag to rotate"; + setupRotateHandle(handle, tracked); + el.appendChild(handle); + } +} + +// ============================================================================= +// Drag (move) +// ============================================================================= + +const DRAGGABLE_TYPES = new Set([ + "rectangle", + "circle", + "line", + "freetext", + "stamp", + "note", + "image", +]); + +function setupAnnotationInteraction( + el: HTMLElement, + tracked: TrackedAnnotation, +): void { + // Click to select (Shift+click for additive multi-select) + el.addEventListener("mousedown", (e) => { + // Ignore if clicking on a handle + if ( + (e.target as HTMLElement).classList.contains("annotation-handle") || + (e.target as HTMLElement).classList.contains("annotation-handle-rotate") + ) { + return; + } + e.stopPropagation(); + selectAnnotation(tracked.def.id, e.shiftKey); + + // Start drag for draggable types (only single-select) + if (DRAGGABLE_TYPES.has(tracked.def.type) && !e.shiftKey) { + startDrag(e, tracked); + } + }); + + // Double-click to send message to modify annotation (same as sidebar card) + el.addEventListener("dblclick", (e) => { + e.stopPropagation(); + selectAnnotation(tracked.def.id); + const label = getAnnotationLabel(tracked.def); + const previewText = getAnnotationPreview(tracked.def); + const desc = previewText ? `${label}: ${previewText}` : label; + void app + .sendMessage({ + role: "user", + content: [{ type: "text", text: `update ${desc}: ` }], + }) + .catch(log.error); + }); +} + +function startDrag(e: MouseEvent, tracked: TrackedAnnotation): void { + const def = tracked.def; + const startX = e.clientX; + const startY = e.clientY; + const beforeDef = { ...def } as PdfAnnotationDef; + let moved = false; + + // Store original element positions + const originalPositions = tracked.elements.map((el) => ({ + left: parseFloat(el.style.left), + top: parseFloat(el.style.top), + })); + + document.body.style.cursor = "grabbing"; + for (const el of tracked.elements) { + el.classList.add("annotation-dragging"); + } + + const onMouseMove = (ev: MouseEvent) => { + const dx = ev.clientX - startX; + const dy = ev.clientY - startY; + if (Math.abs(dx) > 2 || Math.abs(dy) > 2) moved = true; + // Move elements directly for smooth feedback + for (let i = 0; i < tracked.elements.length; i++) { + tracked.elements[i].style.left = `${originalPositions[i].left + dx}px`; + tracked.elements[i].style.top = `${originalPositions[i].top + dy}px`; + } + }; + + const onMouseUp = (ev: MouseEvent) => { + document.removeEventListener("mousemove", onMouseMove); + document.removeEventListener("mouseup", onMouseUp); + document.body.style.cursor = ""; + for (const el of tracked.elements) { + el.classList.remove("annotation-dragging"); + } + + if (!moved) return; + + const dx = ev.clientX - startX; + const dy = ev.clientY - startY; + const pdfDelta = screenToPdfDelta(dx, dy); + + // Apply move to def + applyMoveToDef( + tracked.def as PdfAnnotationDef & { x: number; y: number }, + pdfDelta.dx, + pdfDelta.dy, + ); + + const afterDef = { ...tracked.def } as PdfAnnotationDef; + pushEdit({ + type: "update", + id: def.id, + before: beforeDef, + after: afterDef, + }); + persistAnnotations(); + // Re-render to get correct positions + renderAnnotationsForPage(currentPage); + // Re-select to show handles + selectAnnotation(def.id); + }; + + document.addEventListener("mousemove", onMouseMove); + document.addEventListener("mouseup", onMouseUp); +} + +function applyMoveToDef( + def: PdfAnnotationDef & { x?: number; y?: number }, + dx: number, + dy: number, +): void { + if (def.type === "line") { + def.x1 += dx; + def.y1 += dy; + def.x2 += dx; + def.y2 += dy; + } else if ("x" in def && "y" in def) { + def.x! += dx; + def.y! += dy; + } +} + +// ============================================================================= +// Resize (rectangle, circle, image) +// ============================================================================= + +function setupResizeHandle( + handle: HTMLElement, + tracked: TrackedAnnotation, + corner: "nw" | "ne" | "sw" | "se", +): void { + handle.addEventListener("mousedown", (e) => { + e.stopPropagation(); + e.preventDefault(); + + const def = tracked.def as + | RectangleAnnotation + | CircleAnnotation + | ImageAnnotation; + const beforeDef = { ...def }; + const startX = e.clientX; + const startY = e.clientY; + const aspectRatio = beforeDef.height / beforeDef.width; + + const onMouseMove = (ev: MouseEvent) => { + const dxScreen = ev.clientX - startX; + const dyScreen = ev.clientY - startY; + const pdfD = screenToPdfDelta(dxScreen, dyScreen); + + // Reset to before state then apply delta + let newX = beforeDef.x; + let newY = beforeDef.y; + let newW = beforeDef.width; + let newH = beforeDef.height; + + // In PDF coords: x goes right, y goes up + if (corner.includes("w")) { + newX += pdfD.dx; + newW -= pdfD.dx; + } else { + newW += pdfD.dx; + } + if (corner.includes("s")) { + newY += pdfD.dy; + newH -= pdfD.dy; + } else { + newH += pdfD.dy; + } + + // Constrain aspect ratio: + // - For images: preserve by default (Shift to ignore), unless aspect="ignore" + // - For other shapes: Shift to preserve + const isImage = def.type === "image"; + const imageAspect = isImage + ? ((def as ImageAnnotation).aspect ?? "preserve") + : undefined; + const constrainAspect = isImage + ? imageAspect === "preserve" + ? !ev.shiftKey // preserve by default, Shift to free-resize + : ev.shiftKey // ignore by default, Shift to constrain + : ev.shiftKey; // non-image: Shift to constrain + + if (constrainAspect) { + // Use the wider dimension to drive the other + const candidateH = newW * aspectRatio; + newH = candidateH; + // Adjust origin for corners that anchor at bottom/left + if (corner.includes("s")) { + newY = beforeDef.y + beforeDef.height - newH; + } + if (corner.includes("w")) { + // width changed by resize, x was already adjusted above + } + } + + // Enforce minimum size + if (newW < 5) { + newW = 5; + } + if (newH < 5) { + newH = 5; + } + + def.x = newX; + def.y = newY; + def.width = newW; + def.height = newH; + + // Re-render for live feedback + renderAnnotationsForPage(currentPage); + selectAnnotation(def.id); + }; + + const onMouseUp = () => { + document.removeEventListener("mousemove", onMouseMove); + document.removeEventListener("mouseup", onMouseUp); + + const afterDef = { ...def }; + pushEdit({ + type: "update", + id: def.id, + before: beforeDef, + after: afterDef, + }); + persistAnnotations(); + }; + + document.addEventListener("mousemove", onMouseMove); + document.addEventListener("mouseup", onMouseUp); + }); +} + +// ============================================================================= +// Rotate (stamp, rectangle) +// ============================================================================= + +function setupRotateHandle( + handle: HTMLElement, + tracked: TrackedAnnotation, +): void { + handle.addEventListener("mousedown", (e) => { + e.stopPropagation(); + e.preventDefault(); + + const def = tracked.def as + | StampAnnotation + | RectangleAnnotation + | ImageAnnotation; + const beforeDef = { ...def }; + const el = tracked.elements[0]; + const rect = el.getBoundingClientRect(); + const centerX = rect.left + rect.width / 2; + const centerY = rect.top + rect.height / 2; + + const onMouseMove = (ev: MouseEvent) => { + const angle = Math.atan2(ev.clientY - centerY, ev.clientX - centerX); + // Convert to degrees, offset so 0 = pointing up + let degrees = (angle * 180) / Math.PI + 90; + // Normalize + if (degrees < 0) degrees += 360; + if (degrees > 360) degrees -= 360; + // Snap to 15-degree increments when close + const snapped = Math.round(degrees / 15) * 15; + if (Math.abs(degrees - snapped) < 3) degrees = snapped; + + def.rotation = Math.round(degrees); + renderAnnotationsForPage(currentPage); + selectAnnotation(def.id); + }; + + const onMouseUp = () => { + document.removeEventListener("mousemove", onMouseMove); + document.removeEventListener("mouseup", onMouseUp); + + const afterDef = { ...def }; + pushEdit({ + type: "update", + id: def.id, + before: beforeDef, + after: afterDef, + }); + persistAnnotations(); + }; + + document.addEventListener("mousemove", onMouseMove); + document.addEventListener("mouseup", onMouseUp); + }); +} + +/** + * Paint annotations for a page onto a 2D canvas context. + * Used to include annotations in screenshots sent to the model. + */ +function paintAnnotationsOnCanvas( + ctx: CanvasRenderingContext2D, + pageNum: number, + viewport: { width: number; height: number; scale: number }, +): void { + for (const tracked of annotationMap.values()) { + const def = tracked.def; + if (def.page !== pageNum) continue; + + const color = getAnnotationColor(def); + + switch (def.type) { + case "highlight": + ctx.save(); + ctx.globalAlpha = 0.35; + ctx.fillStyle = def.color || "rgba(255, 255, 0, 1)"; + for (const rect of def.rects) { + const s = pdfRectToScreen(rect, viewport); + ctx.fillRect(s.left, s.top, s.width, s.height); + } + ctx.restore(); + break; + + case "underline": + ctx.save(); + ctx.strokeStyle = color; + ctx.lineWidth = 2; + for (const rect of def.rects) { + const s = pdfRectToScreen(rect, viewport); + ctx.beginPath(); + ctx.moveTo(s.left, s.top + s.height); + ctx.lineTo(s.left + s.width, s.top + s.height); + ctx.stroke(); + } + ctx.restore(); + break; + + case "strikethrough": + ctx.save(); + ctx.strokeStyle = color; + ctx.lineWidth = 2; + for (const rect of def.rects) { + const s = pdfRectToScreen(rect, viewport); + const midY = s.top + s.height / 2; + ctx.beginPath(); + ctx.moveTo(s.left, midY); + ctx.lineTo(s.left + s.width, midY); + ctx.stroke(); + } + ctx.restore(); + break; + + case "note": { + const pos = pdfPointToScreen(def.x, def.y, viewport); + ctx.save(); + ctx.fillStyle = color; + ctx.globalAlpha = 0.8; + ctx.fillRect(pos.left, pos.top - 16, 16, 16); + ctx.restore(); + break; + } + + case "rectangle": { + const s = pdfRectToScreen( + { x: def.x, y: def.y, width: def.width, height: def.height }, + viewport, + ); + ctx.save(); + if (def.rotation) { + const cx = s.left + s.width / 2; + const cy = s.top + s.height / 2; + ctx.translate(cx, cy); + ctx.rotate((def.rotation * Math.PI) / 180); + ctx.translate(-cx, -cy); + } + if (def.fillColor) { + ctx.globalAlpha = 0.3; + ctx.fillStyle = def.fillColor; + ctx.fillRect(s.left, s.top, s.width, s.height); + } + ctx.globalAlpha = 1; + ctx.strokeStyle = color; + ctx.lineWidth = 2; + ctx.strokeRect(s.left, s.top, s.width, s.height); + ctx.restore(); + break; + } + + case "freetext": { + const pos = pdfPointToScreen(def.x, def.y, viewport); + ctx.save(); + ctx.fillStyle = color; + ctx.font = `${(def.fontSize || 12) * viewport.scale}px Helvetica, Arial, sans-serif`; + ctx.fillText(def.content, pos.left, pos.top); + ctx.restore(); + break; + } + + case "stamp": { + const pos = pdfPointToScreen(def.x, def.y, viewport); + ctx.save(); + ctx.translate(pos.left, pos.top); + if (def.rotation) ctx.rotate((def.rotation * Math.PI) / 180); + ctx.strokeStyle = color; + ctx.fillStyle = color; + ctx.lineWidth = 3; + ctx.globalAlpha = 0.6; + ctx.font = `bold ${24 * viewport.scale}px Helvetica, Arial, sans-serif`; + const metrics = ctx.measureText(def.label); + const pad = 8 * viewport.scale; + ctx.strokeRect( + -pad, + -24 * viewport.scale - pad, + metrics.width + pad * 2, + 24 * viewport.scale + pad * 2, + ); + ctx.fillText(def.label, 0, 0); + ctx.restore(); + break; + } + + case "circle": { + const s = pdfRectToScreen( + { x: def.x, y: def.y, width: def.width, height: def.height }, + viewport, + ); + ctx.save(); + if (def.fillColor) { + ctx.globalAlpha = 0.3; + ctx.fillStyle = def.fillColor; + ctx.beginPath(); + ctx.ellipse( + s.left + s.width / 2, + s.top + s.height / 2, + s.width / 2, + s.height / 2, + 0, + 0, + Math.PI * 2, + ); + ctx.fill(); + } + ctx.globalAlpha = 1; + ctx.strokeStyle = color; + ctx.lineWidth = 2; + ctx.beginPath(); + ctx.ellipse( + s.left + s.width / 2, + s.top + s.height / 2, + s.width / 2, + s.height / 2, + 0, + 0, + Math.PI * 2, + ); + ctx.stroke(); + ctx.restore(); + break; + } + + case "line": { + const p1 = pdfPointToScreen(def.x1, def.y1, viewport); + const p2 = pdfPointToScreen(def.x2, def.y2, viewport); + ctx.save(); + ctx.strokeStyle = color; + ctx.lineWidth = 2; + ctx.beginPath(); + ctx.moveTo(p1.left, p1.top); + ctx.lineTo(p2.left, p2.top); + ctx.stroke(); + ctx.restore(); + break; + } + + case "image": { + const s = pdfRectToScreen( + { x: def.x, y: def.y, width: def.width, height: def.height }, + viewport, + ); + // Try to draw from cache + const cachedImg = imageCache.get(def.id); + if (cachedImg) { + ctx.save(); + if (def.rotation) { + const cx = s.left + s.width / 2; + const cy = s.top + s.height / 2; + ctx.translate(cx, cy); + ctx.rotate((def.rotation * Math.PI) / 180); + ctx.translate(-cx, -cy); + } + ctx.drawImage(cachedImg, s.left, s.top, s.width, s.height); + ctx.restore(); + } else { + // Load image asynchronously into cache for next paint + const src = safeImageSrc(def); + if (src) { + const img = new Image(); + img.onload = () => { + imageCache.set(def.id, img); + }; + img.src = src; + } + // Draw placeholder border + ctx.save(); + ctx.strokeStyle = "#999"; + ctx.lineWidth = 1; + ctx.setLineDash([4, 4]); + ctx.strokeRect(s.left, s.top, s.width, s.height); + ctx.restore(); + } + break; + } + } + } +} + +function renderAnnotationsForPage(pageNum: number): void { + // Clear existing annotation elements + annotationLayerEl.innerHTML = ""; + + // Remove tracked element refs for all annotations + for (const tracked of annotationMap.values()) { + tracked.elements = []; + } + + if (!pdfDocument) return; + + // Get viewport for coordinate conversion + const vp = { + width: parseFloat(annotationLayerEl.style.width) || 0, + height: parseFloat(annotationLayerEl.style.height) || 0, + scale, + }; + if (vp.width === 0 || vp.height === 0) return; + + for (const tracked of annotationMap.values()) { + const def = tracked.def; + if (def.page !== pageNum) continue; + + const elements = renderAnnotation(def, vp); + tracked.elements = elements; + for (const el of elements) { + // Set up selection + drag/resize/rotate interactions + setupAnnotationInteraction(el, tracked); + annotationLayerEl.appendChild(el); + } + // Restore selection state after re-render + if (selectedAnnotationIds.has(def.id)) { + for (const el of elements) { + el.classList.add("annotation-selected"); + } + if (selectedAnnotationIds.size === 1) { + showHandles(tracked); + } + } + } + + // Refresh panel to update current-page highlighting + renderAnnotationPanel(); +} + +function renderAnnotation( + def: PdfAnnotationDef, + viewport: { width: number; height: number; scale: number }, +): HTMLElement[] { + switch (def.type) { + case "highlight": + return renderRectsAnnotation( + def.rects, + "annotation-highlight", + viewport, + def.color ? { background: def.color } : {}, + ); + case "underline": + return renderRectsAnnotation( + def.rects, + "annotation-underline", + viewport, + def.color ? { borderBottomColor: def.color } : {}, + ); + case "strikethrough": + return renderRectsAnnotation( + def.rects, + "annotation-strikethrough", + viewport, + {}, + def.color, + ); + case "note": + return [renderNoteAnnotation(def, viewport)]; + case "rectangle": + return [renderRectangleAnnotation(def, viewport)]; + case "freetext": + return [renderFreetextAnnotation(def, viewport)]; + case "stamp": + return [renderStampAnnotation(def, viewport)]; + case "circle": + return [renderCircleAnnotation(def, viewport)]; + case "line": + return [renderLineAnnotation(def, viewport)]; + case "image": + return [renderImageAnnotation(def, viewport)]; + } +} + +function renderRectsAnnotation( + rects: Rect[], + className: string, + viewport: { width: number; height: number; scale: number }, + extraStyles: Record, + strikeColor?: string, +): HTMLElement[] { + return rects.map((rect) => { + const screen = pdfRectToScreen(rect, viewport); + const el = document.createElement("div"); + el.className = className; + el.style.left = `${screen.left}px`; + el.style.top = `${screen.top}px`; + el.style.width = `${screen.width}px`; + el.style.height = `${screen.height}px`; + for (const [k, v] of Object.entries(extraStyles)) { + (el.style as unknown as Record)[k] = v; + } + if (strikeColor) { + // Set color for the ::after pseudo-element via CSS custom property + el.style.setProperty("--strike-color", strikeColor); + el.querySelector("::after"); // no-op, style via CSS instead + // Actually use inline style on a child element for the line + const line = document.createElement("div"); + line.style.position = "absolute"; + line.style.left = "0"; + line.style.right = "0"; + line.style.top = "50%"; + line.style.borderTop = `2px solid ${strikeColor}`; + el.appendChild(line); + } + return el; + }); +} + +function renderNoteAnnotation( + def: NoteAnnotation, + viewport: { width: number; height: number; scale: number }, +): HTMLElement { + const pos = pdfPointToScreen(def.x, def.y, viewport); + const el = document.createElement("div"); + el.className = "annotation-note"; + el.style.left = `${pos.left}px`; + el.style.top = `${pos.top - 20}px`; // offset up so note icon is at the point + if (def.color) el.style.color = def.color; + + const tooltip = document.createElement("div"); + tooltip.className = "annotation-tooltip"; + tooltip.textContent = def.content; + el.appendChild(tooltip); + + return el; +} + +function renderRectangleAnnotation( + def: RectangleAnnotation, + viewport: { width: number; height: number; scale: number }, +): HTMLElement { + const screen = pdfRectToScreen( + { x: def.x, y: def.y, width: def.width, height: def.height }, + viewport, + ); + const el = document.createElement("div"); + el.className = "annotation-rectangle"; + el.style.left = `${screen.left}px`; + el.style.top = `${screen.top}px`; + el.style.width = `${screen.width}px`; + el.style.height = `${screen.height}px`; + if (def.color) el.style.borderColor = def.color; + if (def.fillColor) el.style.backgroundColor = def.fillColor; + if (def.rotation) { + el.style.transform = `rotate(${def.rotation}deg)`; + el.style.transformOrigin = "center center"; + } + return el; +} + +function renderFreetextAnnotation( + def: FreetextAnnotation, + viewport: { width: number; height: number; scale: number }, +): HTMLElement { + const pos = pdfPointToScreen(def.x, def.y, viewport); + const el = document.createElement("div"); + el.className = "annotation-freetext"; + el.style.left = `${pos.left}px`; + el.style.top = `${pos.top}px`; + el.style.fontSize = `${(def.fontSize || 12) * viewport.scale}px`; + if (def.color) el.style.color = def.color; + el.textContent = def.content; + return el; +} + +function renderStampAnnotation( + def: StampAnnotation, + viewport: { width: number; height: number; scale: number }, +): HTMLElement { + const pos = pdfPointToScreen(def.x, def.y, viewport); + const el = document.createElement("div"); + el.className = "annotation-stamp"; + el.style.left = `${pos.left}px`; + el.style.top = `${pos.top}px`; + el.style.fontSize = `${24 * viewport.scale}px`; + if (def.color) el.style.color = def.color; + if (def.rotation) { + el.style.transform = `rotate(${def.rotation}deg)`; + el.style.transformOrigin = "center center"; + } + el.textContent = def.label; + return el; +} + +function renderCircleAnnotation( + def: CircleAnnotation, + viewport: { width: number; height: number; scale: number }, +): HTMLElement { + const screen = pdfRectToScreen( + { x: def.x, y: def.y, width: def.width, height: def.height }, + viewport, + ); + const el = document.createElement("div"); + el.className = "annotation-circle"; + el.style.left = `${screen.left}px`; + el.style.top = `${screen.top}px`; + el.style.width = `${screen.width}px`; + el.style.height = `${screen.height}px`; + if (def.color) el.style.borderColor = def.color; + if (def.fillColor) el.style.backgroundColor = def.fillColor; + return el; +} + +function renderLineAnnotation( + def: LineAnnotation, + viewport: { width: number; height: number; scale: number }, +): HTMLElement { + const p1 = pdfPointToScreen(def.x1, def.y1, viewport); + const p2 = pdfPointToScreen(def.x2, def.y2, viewport); + const dx = p2.left - p1.left; + const dy = p2.top - p1.top; + const length = Math.sqrt(dx * dx + dy * dy); + const angle = Math.atan2(dy, dx); + + const el = document.createElement("div"); + el.className = "annotation-line"; + el.style.left = `${p1.left}px`; + el.style.top = `${p1.top}px`; + el.style.width = `${length}px`; + el.style.transform = `rotate(${angle}rad)`; + el.style.transformOrigin = "0 0"; + if (def.color) el.style.borderColor = def.color; + return el; +} + +function renderImageAnnotation( + def: ImageAnnotation, + viewport: { width: number; height: number; scale: number }, +): HTMLElement { + const screen = pdfRectToScreen( + { x: def.x, y: def.y, width: def.width, height: def.height }, + viewport, + ); + const el = document.createElement("div"); + el.className = "annotation-image"; + el.style.left = `${screen.left}px`; + el.style.top = `${screen.top}px`; + el.style.width = `${screen.width}px`; + el.style.height = `${screen.height}px`; + if (def.rotation) { + el.style.transform = `rotate(${def.rotation}deg)`; + el.style.transformOrigin = "center center"; + } + + const imgSrc = safeImageSrc(def); + if (imgSrc) { + const img = document.createElement("img"); + img.src = imgSrc; + img.style.width = "100%"; + img.style.height = "100%"; + img.style.display = "block"; + img.style.pointerEvents = "none"; + img.draggable = false; + el.appendChild(img); + } + return el; +} + +// ============================================================================= +// Annotation CRUD +// ============================================================================= + +function addAnnotation(def: PdfAnnotationDef, skipUndo = false): void { + // Remove existing if same id (without pushing to undo) + removeAnnotation(def.id, true); + annotationMap.set(def.id, { def, elements: [] }); + if (!skipUndo) { + pushEdit({ type: "add", id: def.id, before: null, after: { ...def } }); + } + // Re-render if on current page + if (def.page === currentPage) { + renderAnnotationsForPage(currentPage); + } + updateAnnotationsBadge(); + renderAnnotationPanel(); +} + +function updateAnnotation( + update: Partial & { id: string; type: string }, + skipUndo = false, +): void { + const tracked = annotationMap.get(update.id); + if (!tracked) return; + + const before = { ...tracked.def } as PdfAnnotationDef; + + // Merge partial update into existing def + const merged = { ...tracked.def, ...update } as PdfAnnotationDef; + tracked.def = merged; + + if (!skipUndo) { + pushEdit({ type: "update", id: update.id, before, after: { ...merged } }); + } + + // Re-render if on current page + if (merged.page === currentPage) { + renderAnnotationsForPage(currentPage); + } + renderAnnotationPanel(); +} + +function removeAnnotation(id: string, skipUndo = false): void { + const tracked = annotationMap.get(id); + if (!tracked) return; + if (!skipUndo) { + pushEdit({ type: "remove", id, before: { ...tracked.def }, after: null }); + } + for (const el of tracked.elements) el.remove(); + annotationMap.delete(id); + selectedAnnotationIds.delete(id); + updateAnnotationsBadge(); + renderAnnotationPanel(); +} +// ============================================================================= +// Annotation Panel → extracted to ./annotation-panel.ts +// ============================================================================= + +// ============================================================================= +// highlight_text Command +// ============================================================================= + +function handleHighlightText(cmd: { + id: string; + query: string; + page?: number; + color?: string; + content?: string; +}): void { + const pagesToSearch: number[] = []; + if (cmd.page) { + pagesToSearch.push(cmd.page); + } else { + // Search all pages that have cached text + for (const [pageNum, text] of pageTextCache) { + if (text.toLowerCase().includes(cmd.query.toLowerCase())) { + pagesToSearch.push(pageNum); + } + } + } + + let annotationIndex = 0; + for (const pageNum of pagesToSearch) { + // Find text positions using the text layer DOM if on current page, + // otherwise create approximate rects from text cache positions + const rects = findTextRects(cmd.query, pageNum); + if (rects.length > 0) { + const id = + pagesToSearch.length > 1 + ? `${cmd.id}_p${pageNum}_${annotationIndex++}` + : cmd.id; + addAnnotation({ + type: "highlight", + id, + page: pageNum, + rects, + color: cmd.color, + content: cmd.content, + }); + } + } +} + +/** + * Find text in a page and return PDF-coordinate rects. + * Uses the TextLayer DOM when the page is currently rendered, + * otherwise falls back to approximate character-based positioning. + */ +function findTextRects(query: string, pageNum: number): Rect[] { + if (pageNum !== currentPage) { + // For non-current pages, create approximate rects from page dimensions + // The text will be properly positioned when the user navigates to that page + return findTextRectsFromCache(query, pageNum); + } + + // Use text layer DOM for current page + const spans = Array.from( + textLayerEl.querySelectorAll("span"), + ) as HTMLElement[]; + if (spans.length === 0) return findTextRectsFromCache(query, pageNum); + + const lowerQuery = query.toLowerCase(); + const rects: Rect[] = []; + const wrapperEl = textLayerEl.parentElement!; + const wrapperRect = wrapperEl.getBoundingClientRect(); + + for (const span of spans) { + const text = span.textContent || ""; + if (text.length === 0) continue; + const lowerText = text.toLowerCase(); + + let pos = 0; + while (true) { + const idx = lowerText.indexOf(lowerQuery, pos); + if (idx === -1) break; + pos = idx + 1; + + const textNode = span.firstChild; + if (!textNode || textNode.nodeType !== Node.TEXT_NODE) continue; + + try { + const range = document.createRange(); + range.setStart(textNode, idx); + range.setEnd(textNode, Math.min(idx + lowerQuery.length, text.length)); + const clientRects = range.getClientRects(); + + for (let ri = 0; ri < clientRects.length; ri++) { + const r = clientRects[ri]; + // Convert screen coords back to PDF coords + const screenLeft = r.left - wrapperRect.left; + const screenTop = r.top - wrapperRect.top; + const pdfX = screenLeft / scale; + const pdfHeight = r.height / scale; + const pdfWidth = r.width / scale; + const pageHeight = parseFloat(annotationLayerEl.style.height) / scale; + const pdfY = pageHeight - (screenTop + r.height) / scale; + rects.push({ + x: pdfX, + y: pdfY, + width: pdfWidth, + height: pdfHeight, + }); + } + } catch { + // Range API errors with stale nodes + } + } + } + + return rects; +} + +function findTextRectsFromCache(query: string, pageNum: number): Rect[] { + const text = pageTextCache.get(pageNum); + if (!text) return []; + const lowerText = text.toLowerCase(); + const lowerQuery = query.toLowerCase(); + const idx = lowerText.indexOf(lowerQuery); + if (idx === -1) return []; + + // Text exists in the cache but the text-layer DOM for this page isn't + // rendered yet — we can't compute accurate rects. Returning a placeholder + // would persist wrong coordinates; return empty and let the caller skip. + return []; +} + +// ============================================================================= +// get_pages — Offscreen rendering for model analysis +// ============================================================================= + +const MAX_GET_PAGES = 20; +const SCREENSHOT_MAX_DIM = 768; // Max pixel dimension for screenshots + +/** + * Expand intervals into a sorted deduplicated list of page numbers, + * clamped to [1, totalPages]. + */ +function expandIntervals( + intervals: Array<{ start?: number; end?: number }>, +): number[] { + const pages = new Set(); + for (const iv of intervals) { + const s = Math.max(1, iv.start ?? 1); + const e = Math.min(totalPages, iv.end ?? totalPages); + for (let p = s; p <= e; p++) pages.add(p); + } + return [...pages].sort((a, b) => a - b); +} + +/** + * Render a single page to an offscreen canvas and return base64 JPEG. + * Does not affect the visible canvas or text layer. + */ +async function renderPageOffscreen(pageNum: number): Promise { + if (!pdfDocument) throw new Error("No PDF loaded"); + const page = await pdfDocument.getPage(pageNum); + const baseViewport = page.getViewport({ scale: 1.0 }); + + // Scale down to fit within SCREENSHOT_MAX_DIM + const maxDim = Math.max(baseViewport.width, baseViewport.height); + const renderScale = + maxDim > SCREENSHOT_MAX_DIM ? SCREENSHOT_MAX_DIM / maxDim : 1.0; + const viewport = page.getViewport({ scale: renderScale }); + + const canvas = document.createElement("canvas"); + const dpr = 1; // No retina scaling for model screenshots + canvas.width = viewport.width * dpr; + canvas.height = viewport.height * dpr; + const ctx = canvas.getContext("2d")!; + ctx.scale(dpr, dpr); + + // Render with ENABLE_STORAGE so filled form fields appear on the canvas + // eslint-disable-next-line @typescript-eslint/no-explicit-any + await (page.render as any)({ + canvasContext: ctx, + viewport, + annotationMode: AnnotationMode.ENABLE_STORAGE, + annotationStorage: pdfDocument.annotationStorage, + }).promise; + + // Paint annotations on top so the model can see them + paintAnnotationsOnCanvas(ctx, pageNum, { + width: viewport.width, + height: viewport.height, + scale: renderScale, + }); + + // Extract base64 JPEG (much smaller than PNG, well within body limits) + const dataUrl = canvas.toDataURL("image/jpeg", 0.85); + return dataUrl.split(",")[1]; +} + +async function handleGetPages(cmd: { + requestId: string; + intervals: Array<{ start?: number; end?: number }>; + getText: boolean; + getScreenshots: boolean; +}): Promise { + const allPages = expandIntervals(cmd.intervals); + const pages = allPages.slice(0, MAX_GET_PAGES); + + log.info( + `get_pages: ${pages.length} pages (${pages[0]}..${pages[pages.length - 1]}), text=${cmd.getText}, screenshots=${cmd.getScreenshots}`, + ); + + const results: Array<{ + page: number; + text?: string; + image?: string; + }> = []; + + for (const pageNum of pages) { + const entry: { page: number; text?: string; image?: string } = { + page: pageNum, + }; + + if (cmd.getText) { + // Use cached text if available, otherwise extract on the fly + let text = pageTextCache.get(pageNum); + if (text == null && pdfDocument) { + try { + const pg = await pdfDocument.getPage(pageNum); + const tc = await pg.getTextContent(); + text = (tc.items as Array<{ str?: string }>) + .map((item) => item.str || "") + .join(" "); + pageTextCache.set(pageNum, text); + } catch (err) { + log.error( + `get_pages: text extraction failed for page ${pageNum}:`, + err, + ); + text = ""; + } + } + entry.text = text ?? ""; + } + + if (cmd.getScreenshots) { + try { + entry.image = await renderPageOffscreen(pageNum); + } catch (err) { + log.error(`get_pages: screenshot failed for page ${pageNum}:`, err); + } + } + + results.push(entry); + } + + // Submit results back to server + try { + await app.callServerTool({ + name: "submit_page_data", + arguments: { requestId: cmd.requestId, pages: results }, + }); + log.info( + `get_pages: submitted ${results.length} page(s) for ${cmd.requestId}`, + ); + } catch (err) { + log.error("get_pages: failed to submit results:", err); + } +} + +// ============================================================================= +// Annotation Persistence +// ============================================================================= + +/** Storage key for annotations — uses toolInfo.id (available early) with viewUUID fallback */ +function annotationStorageKey(): string | null { + const toolId = app.getHostContext()?.toolInfo?.id; + if (toolId) return `pdf-annot:${toolId}`; + if (viewUUID) return `${viewUUID}:annotations`; + return null; +} + +/** + * Import annotations from the loaded PDF to establish the baseline. + * These are the annotations that exist in the PDF file itself. + */ +async function loadBaselineAnnotations( + doc: pdfjsLib.PDFDocumentProxy, +): Promise { + pdfBaselineAnnotations = []; + for (let pageNum = 1; pageNum <= doc.numPages; pageNum++) { + try { + const page = await doc.getPage(pageNum); + const annotations = await page.getAnnotations(); + for (let i = 0; i < annotations.length; i++) { + const ann = annotations[i]; + const def = importPdfjsAnnotation(ann, pageNum, i); + if (def) { + pdfBaselineAnnotations.push(def); + // Add to annotationMap if not already present (from localStorage restore) + if (!annotationMap.has(def.id)) { + annotationMap.set(def.id, { def, elements: [] }); + } + } else if (ann.annotationType !== 20) { + // Widget (type 20) is expected to be skipped; anything else we + // don't import will still be painted by page.render() onto the + // canvas as unselectable pixels. Log so we can diagnose + // "ghost annotations" (visible but not in panel, not clickable). + log.info( + `[WARN] Baseline: skipped PDF annotation on page ${pageNum}`, + `type=${ann.annotationType}`, + `subtype=${ann.subtype ?? "?"}`, + `name=${ann.name ?? "?"}`, + `rect=${ann.rect ? JSON.stringify(ann.rect) : "none"}`, + ); + } + } + } catch (err) { + // Log the error — a thrown import for one annotation silently + // drops the REST of that page's annotations too. + log.info( + `[WARN] Baseline: page ${pageNum} annotation import failed:`, + err, + ); + } + } + log.info( + `Loaded ${pdfBaselineAnnotations.length} baseline annotations from PDF`, + ); +} + +function persistAnnotations(): void { + // Compute diff relative to PDF baseline + const currentAnnotations: PdfAnnotationDef[] = []; + for (const tracked of annotationMap.values()) { + currentAnnotations.push(tracked.def); + } + const diff = computeDiff( + pdfBaselineAnnotations, + currentAnnotations, + formFieldValues, + pdfBaselineFormValues, + ); + + // Dirty tracks whether there are unsaved changes. Undoing back to baseline + // yields an empty diff → clean again → save button disables. + if (!isRestoring) setDirty(!isDiffEmpty(diff)); + + const key = annotationStorageKey(); + if (!key) return; + try { + localStorage.setItem(key, serializeDiff(diff)); + } catch { + // localStorage may be full or unavailable + } +} + +function restoreAnnotations(): void { + const key = annotationStorageKey(); + if (!key) return; + isRestoring = true; + try { + const raw = localStorage.getItem(key); + if (!raw) return; + + // Try new diff-based format first + const diff = deserializeDiff(raw); + + // Merge baseline + diff. The loop below is add-only, so we MUST also + // delete: loadBaselineAnnotations() runs between the two restore calls + // and re-seeds annotationMap with every baseline id — including the + // ones in diff.removed. Without this, the zombie survives the restore, + // and the next persistAnnotations() sees it in currentIds → computeDiff + // produces removed=[] → the deletion is permanently lost from storage. + const merged = mergeAnnotations(pdfBaselineAnnotations, diff); + for (const def of merged) { + if (!annotationMap.has(def.id)) { + annotationMap.set(def.id, { def, elements: [] }); + } + } + for (const id of diff.removed) { + annotationMap.delete(id); + } + + // Restore form fields + for (const [k, v] of Object.entries(diff.formFields)) { + formFieldValues.set(k, v); + } + + // If we have user changes (diff is not empty), mark dirty + if ( + diff.added.length > 0 || + diff.removed.length > 0 || + Object.keys(diff.formFields).length > 0 + ) { + setDirty(true); + } + log.info( + `Restored ${annotationMap.size} annotations (${diff.added.length} added, ${diff.removed.length} removed), ${formFieldValues.size} form fields`, + ); + } catch { + // Parse error or unavailable + } finally { + isRestoring = false; + } +} + +// ============================================================================= +// PDF.js Form Field Name → ID Mapping +// ============================================================================= + +/** + * Normalise a raw form field value into our string|boolean model. + * Returns null for empty/unfilled/button values so they don't clutter the + * panel or count as baseline. + * + * `type` is from getFieldObjects() (which knows field types); `raw` is + * preferably from page.getAnnotations().fieldValue (which is what the + * widget actually renders). A PDF can have the field-dict /V out of sync + * with the widget — AnnotationLayer trusts the widget, so we must too. + */ +function normaliseFieldValue( + type: string | undefined, + raw: unknown, +): string | boolean | null { + if (type === "button") return null; + // Checkbox/radio: fieldValue is the export string (e.g. "Yes"), "Off" = unset + if (type === "checkbox") { + return raw != null && raw !== "" && raw !== "Off" ? true : null; + } + if (type === "radiobutton") { + return raw != null && raw !== "" && raw !== "Off" ? String(raw) : null; + } + // Text/choice: fieldValue may be a string or an array of selections + if (Array.isArray(raw)) { + const joined = raw.filter(Boolean).join(", "); + return joined || null; + } + if (raw == null || raw === "") return null; + return String(raw); +} + +/** + * Build mapping from field names (used by fill_form) to widget annotation IDs + * (used by annotationStorage). + * + * CRITICAL: getFieldObjects() returns field-dictionary IDs (the /T tree), + * but annotationStorage is keyed by WIDGET annotation IDs (what + * page.getAnnotations() returns). The two differ for PDFs where fields and + * their widget /Kids are separate objects. Using the wrong key makes all + * storage writes silently miss. + */ +async function buildFieldNameMap( + doc: pdfjsLib.PDFDocumentProxy, +): Promise { + fieldNameToIds.clear(); + radioButtonValues.clear(); + fieldNameToPage.clear(); + fieldNameToLabel.clear(); + fieldNameToOrder.clear(); + cachedFieldObjects = null; + pdfBaselineFormValues.clear(); + + // getFieldObjects() gives us types, current values (/V), and defaults (/DV). + // We DON'T use its .id — that's the field dict ref, not the widget annot ref. + try { + cachedFieldObjects = + ((await doc.getFieldObjects()) as Record | null) ?? null; + } catch { + // getFieldObjects may fail on some PDFs + } + + // Scan every page's widget annotations to collect the CORRECT storage keys, + // plus labels, pages, positions, AND fieldValue (what the widget renders + // — which can differ from getFieldObjects().value if the PDF is internally + // inconsistent, e.g. after a pdf-lib setText silently failed). + const fieldPositions: Array<{ name: string; page: number; y: number }> = []; + const widgetFieldValues = new Map(); + for (let pageNum = 1; pageNum <= doc.numPages; pageNum++) { + let annotations; + try { + const page = await doc.getPage(pageNum); + annotations = await page.getAnnotations(); + } catch { + continue; + } + for (const ann of annotations) { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const a = ann as any; + if (!a.fieldName || !a.id) continue; + + // Widget annotation ID — this is what annotationStorage keys by + const ids = fieldNameToIds.get(a.fieldName) ?? []; + ids.push(a.id); + fieldNameToIds.set(a.fieldName, ids); + + // Radio buttons: pdf.js creates WITHOUT setting + // .value, so reading target.value gives the HTML default "on". + // Remember each widget's export value so the input listener can + // report it instead. + if (a.radioButton && a.buttonValue != null) { + radioButtonValues.set(a.id, String(a.buttonValue)); + } + + if (!fieldNameToPage.has(a.fieldName)) { + fieldNameToPage.set(a.fieldName, pageNum); + } + if (a.alternativeText) { + fieldNameToLabel.set(a.fieldName, a.alternativeText); + } + if (a.rect) { + fieldPositions.push({ name: a.fieldName, page: pageNum, y: a.rect[3] }); + } + // Capture the value the widget will actually render. First widget wins + // (radio groups share the field's /V so they all match anyway). + if (!widgetFieldValues.has(a.fieldName) && a.fieldValue !== undefined) { + widgetFieldValues.set(a.fieldName, a.fieldValue); + } + } + } + + // Ordering: page ascending, then Y descending (top-to-bottom on page) + fieldPositions.sort((a, b) => a.page - b.page || b.y - a.y); + const seen = new Set(); + let idx = 0; + for (const fp of fieldPositions) { + if (!seen.has(fp.name)) { + seen.add(fp.name); + fieldNameToOrder.set(fp.name, idx++); + } + } + + // Import baseline values AND remap cachedFieldObjects to widget IDs. + // + // Baseline: prefer the widget's fieldValue (what AnnotationLayer renders) + // over getFieldObjects().value. A PDF can have the field-dict /V out of + // sync with the widget — if we import the field-dict value, the panel + // disagrees with what's on screen. + // + // Remap: pdf.js _bindResetFormAction (the PDF's in-document Reset button) + // iterates this structure, using .id to key storage and find DOM elements + // via [data-element-id=...]. Both use WIDGET ids. pdf-lib's save splits + // merged field+widget objects, so we rebuild with widget ids. + if (cachedFieldObjects) { + const remapped: Record = {}; + for (const [name, fieldArr] of Object.entries(cachedFieldObjects)) { + const widgetIds = fieldNameToIds.get(name); + if (!widgetIds) continue; // no widget → not rendered anyway + + // Type comes from getFieldObjects (widget annot data doesn't have it). + // Value comes from the widget annotation (fall back to field-dict if + // the widget didn't expose one). + const type = fieldArr.find((f) => f.type)?.type; + const raw = widgetFieldValues.has(name) + ? widgetFieldValues.get(name) + : fieldArr.find((f) => f.value != null)?.value; + const v = normaliseFieldValue(type, raw); + if (v !== null) { + pdfBaselineFormValues.set(name, v); + // Seed current state from baseline so the panel shows it. A + // restored localStorage diff (applied in restoreAnnotations) will + // overwrite specific fields the user changed. + if (!formFieldValues.has(name)) formFieldValues.set(name, v); + } + + // Skip parent entries with no concrete id (radio groups: the /T tree + // has a parent with the export value, plus one child per widget). + const concrete = fieldArr.filter((f) => f.id && f.type); + remapped[name] = widgetIds.map((wid, i) => ({ + ...(concrete[i] ?? concrete[0] ?? fieldArr[0]), + id: wid, + })); + } + cachedFieldObjects = remapped; + } + + log.info(`Built field name map: ${fieldNameToIds.size} fields`); +} + +/** Sync formFieldValues into pdfDocument.annotationStorage so AnnotationLayer renders pre-filled values. + * Skips values that match the PDF's baseline — those are already in storage + * in pdf.js's native format (which may differ from our string/bool repr, + * e.g. checkbox stores "Yes" not `true`). Overwriting with our normalised + * form can break the Reset button's ability to restore defaults. */ +function syncFormValuesToStorage(): void { + if (!pdfDocument || fieldNameToIds.size === 0) return; + const storage = pdfDocument.annotationStorage; + for (const [name, value] of formFieldValues) { + if (pdfBaselineFormValues.get(name) === value) continue; + const ids = fieldNameToIds.get(name); + if (ids) { + for (const id of ids) { + storage.setValue(id, { + value: typeof value === "boolean" ? value : String(value), + }); + } + } + } +} + +// ============================================================================= +// PDF Save / Download with Annotations +// ============================================================================= + +/** Build annotated PDF bytes from the current state. */ +async function getAnnotatedPdfBytes(): Promise { + if (!pdfDocument) throw new Error("No PDF loaded"); + const fullBytes = await pdfDocument.getData(); + + // Only export user-added annotations; baseline ones are already in the PDF + const annotations: PdfAnnotationDef[] = []; + const baselineIds = new Set(pdfBaselineAnnotations.map((a) => a.id)); + for (const tracked of annotationMap.values()) { + if (!baselineIds.has(tracked.def.id)) { + annotations.push(tracked.def); + } + } + + // buildAnnotatedPdfBytes gates on formFields.size > 0 and only writes + // entries present in the map. After clearAllItems() the map is empty → + // zero setText/uncheck calls → pdf-lib leaves original /V intact → + // the "stripped PDF" we promised keeps all its form data. To actually + // clear, send an explicit sentinel for every baseline field the user + // dropped: "" for text, false for checkbox (matching baseline type). + const formFieldsOut = new Map(formFieldValues); + for (const [name, baselineValue] of pdfBaselineFormValues) { + if (!formFieldsOut.has(name)) { + formFieldsOut.set(name, typeof baselineValue === "boolean" ? false : ""); + } + } + return buildAnnotatedPdfBytes( + fullBytes as Uint8Array, + annotations, + formFieldsOut, + ); +} + +async function savePdf(): Promise { + if (!pdfDocument || !isDirty || saveInProgress) return; + + const fileName = + pdfUrl + .replace(/^(file|computer):\/\//, "") + .split(/[/\\]/) + .pop() || pdfUrl; + const choice = await showConfirmDialog( + "Save PDF", + "Overwrite this file with your annotations and form edits?", + [{ label: "Cancel" }, { label: "Save", primary: true }], + fileName, + ); + if (choice !== 1) return; + + saveInProgress = true; + saveBtn.disabled = true; + saveBtn.title = "Saving..."; + + try { + const pdfBytes = await getAnnotatedPdfBytes(); + const base64 = uint8ArrayToBase64(pdfBytes); + + const result = await app.callServerTool({ + name: "save_pdf", + arguments: { url: pdfUrl, data: base64 }, + }); + + if (result.isError) { + log.error("Save failed:", result.content); + saveBtn.disabled = false; // let user retry + } else { + log.info("PDF saved"); + // Record mtime so we recognize our own write in file_changed + const sc = result.structuredContent as { mtimeMs?: number } | undefined; + lastSavedMtime = sc?.mtimeMs ?? null; + + // Rebase: the file on disk now contains our annotations + form values. + // Update the baseline so future diffs are relative to what was saved. + pdfBaselineAnnotations = [...annotationMap.values()].map((t) => ({ + ...t.def, + })); + pdfBaselineFormValues.clear(); + for (const [k, v] of formFieldValues) pdfBaselineFormValues.set(k, v); + + setDirty(false); // → updateSaveBtn() disables button + const key = annotationStorageKey(); + if (key) { + try { + localStorage.removeItem(key); + } catch { + /* ignore */ + } + } + } + } catch (err) { + log.error("Save failed:", err); + saveBtn.disabled = false; + } finally { + saveInProgress = false; + saveBtn.title = "Save to file (overwrites original)"; + } +} + +async function downloadAnnotatedPdf(): Promise { + if (!pdfDocument) return; + downloadBtn.disabled = true; + downloadBtn.title = "Preparing download..."; + + try { + const pdfBytes = await getAnnotatedPdfBytes(); + + const hasEdits = annotationMap.size > 0 || formFieldValues.size > 0; + const baseName = (pdfTitle || "document").replace(/\.pdf$/i, ""); + const fileName = hasEdits ? `${baseName} - edited.pdf` : `${baseName}.pdf`; + + const base64 = uint8ArrayToBase64(pdfBytes); + + if (app.getHostCapabilities()?.downloadFile) { + const { isError } = await app.downloadFile({ + contents: [ + { + type: "resource", + resource: { + uri: `file:///${fileName}`, + mimeType: "application/pdf", + blob: base64, + }, + }, + ], + }); + if (isError) { + log.info("Download was cancelled or denied by host"); + } + } else { + // Fallback: create blob URL and trigger download + const blob = new Blob([pdfBytes.buffer as ArrayBuffer], { + type: "application/pdf", + }); + const url = URL.createObjectURL(blob); + const a = document.createElement("a"); + a.href = url; + a.download = fileName; + document.body.appendChild(a); + a.click(); + document.body.removeChild(a); + URL.revokeObjectURL(url); + } + } catch (err) { + log.error("Download error:", err); + } finally { + downloadBtn.disabled = false; + downloadBtn.title = "Download PDF"; + } +} + // Render state - prevents concurrent renders let isRendering = false; let pendingPage: number | null = null; @@ -728,15 +2978,122 @@ async function renderPage() { pageTextCache.set(pageToRender, items.join("")); } - // Size highlight layer to match canvas + // Size overlay layers to match canvas highlightLayerEl.style.width = `${viewport.width}px`; highlightLayerEl.style.height = `${viewport.height}px`; + annotationLayerEl.style.width = `${viewport.width}px`; + annotationLayerEl.style.height = `${viewport.height}px`; + + // Render PDF.js AnnotationLayer for interactive form widgets + formLayerEl.innerHTML = ""; + formLayerEl.style.width = `${viewport.width}px`; + formLayerEl.style.height = `${viewport.height}px`; + // Set CSS custom properties so AnnotationLayer font-size rules work correctly + formLayerEl.style.setProperty("--scale-factor", `${scale}`); + formLayerEl.style.setProperty("--total-scale-factor", `${scale}`); + try { + const annotations = await page.getAnnotations(); + if (annotations.length > 0) { + const linkService = { + getDestinationHash: () => "#", + getAnchorUrl: () => "#", + addLinkAttributes: () => {}, + isPageVisible: () => true, + isPageCached: () => true, + externalLinkEnabled: true, + }; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const annotationLayer = new AnnotationLayer({ + div: formLayerEl, + page, + viewport, + annotationStorage: pdfDocument.annotationStorage, + linkService, + accessibilityManager: null, + annotationCanvasMap: null, + annotationEditorUIManager: null, + structTreeLayer: null, + commentManager: null, + } as any); + // eslint-disable-next-line @typescript-eslint/no-explicit-any + await annotationLayer.render({ + annotations, + div: formLayerEl, + page, + viewport, + renderForms: true, + linkService, + annotationStorage: pdfDocument.annotationStorage, + fieldObjects: cachedFieldObjects, + } as any); + + // Fix combo reset: pdf.js's resetform handler sets all + // option.selected = (option.value === defaultFieldValue), and + // defaultFieldValue is typically null — nothing matches. On a + // non-multiple target.value on a multiselect is only the first option; join selectedOptions so the save path gets the full set. --- examples/pdf-server/src/annotation-panel.ts | 11 +- examples/pdf-server/src/mcp-app.ts | 28 +++- .../pdf-server/src/pdf-annotations.test.ts | 70 ++++++++ examples/pdf-server/src/pdf-annotations.ts | 158 ++++++++++++++---- 4 files changed, 222 insertions(+), 45 deletions(-) diff --git a/examples/pdf-server/src/annotation-panel.ts b/examples/pdf-server/src/annotation-panel.ts index 6b41095..081d5c8 100644 --- a/examples/pdf-server/src/annotation-panel.ts +++ b/examples/pdf-server/src/annotation-panel.ts @@ -831,8 +831,15 @@ function clearFieldInStorage(name: string): void { meta?.[0]?.defaultValue ?? ""; const type = meta?.find((f) => f.type)?.type; - const clearValue = - type === "checkbox" || type === "radiobutton" ? (dv ?? "Off") : (dv ?? ""); + // Radio: per-widget BOOLEANS, never a string. pdf.js's + // RadioButtonWidgetAnnotation render() has inverted string coercion (see + // setFieldInStorage), so writing the same string to every widget checks + // the wrong one. {value:false} on all = nothing selected. + if (type === "radiobutton") { + for (const id of ids) storage.setValue(id, { value: false }); + return; + } + const clearValue = type === "checkbox" ? (dv ?? "Off") : (dv ?? ""); for (const id of ids) storage.setValue(id, { value: clearValue }); } diff --git a/examples/pdf-server/src/mcp-app.ts b/examples/pdf-server/src/mcp-app.ts index fe30b14..678721d 100644 --- a/examples/pdf-server/src/mcp-app.ts +++ b/examples/pdf-server/src/mcp-app.ts @@ -2971,15 +2971,23 @@ async function getAnnotatedPdfBytes(): Promise { } } - // buildAnnotatedPdfBytes gates on formFields.size > 0 and only writes - // entries present in the map. After clearAllItems() the map is empty → - // zero setText/uncheck calls → pdf-lib leaves original /V intact → - // the "stripped PDF" we promised keeps all its form data. To actually - // clear, send an explicit sentinel for every baseline field the user - // dropped: "" for text, false for checkbox (matching baseline type). - const formFieldsOut = new Map(formFieldValues); + // Only write fields that actually changed vs. what's already in the PDF. + // Unchanged fields are no-ops at best, and at worst trip pdf-lib edge + // cases (max-length text, missing /Yes appearance, …) on fields the user + // never touched — which, before the per-field catch in + // buildAnnotatedPdfBytes, aborted every subsequent field. + // + // Fields the user cleared (present in baseline, absent from formFieldValues + // after clearAllItems()) still need an explicit "" / false so pdf-lib + // overwrites the original /V instead of leaving it intact. + const formFieldsOut = new Map(); + for (const [name, value] of formFieldValues) { + if (pdfBaselineFormValues.get(name) !== value) { + formFieldsOut.set(name, value); + } + } for (const [name, baselineValue] of pdfBaselineFormValues) { - if (!formFieldsOut.has(name)) { + if (!formFieldValues.has(name)) { formFieldsOut.set(name, typeof baselineValue === "boolean" ? false : ""); } } @@ -3499,6 +3507,10 @@ formLayerEl.addEventListener("input", (e) => { if (!target.checked) return; // unchecking siblings — ignore const wid = target.getAttribute("data-element-id"); value = (wid && radioButtonValues.get(wid)) ?? target.value; + } else if (target instanceof HTMLSelectElement && target.multiple) { + // .value on a { + readonly "~standard": StandardSchemaV1.Props & + StandardJSONSchemaV1.Props; +} + +export namespace StandardSchemaWithJSON { + export type InferInput = + StandardTypedV1.InferInput; + export type InferOutput = + StandardTypedV1.InferOutput; +} + +/** JSON-Schema target draft used for tool input/output schemas (matches core MCP). */ +const TARGET = { target: "draft-2020-12" } as const; + +/** + * Serialize a Standard Schema to JSON Schema for the given direction. + * + * Uses `~standard.jsonSchema` when present (zod v4, ArkType, Valibot, …). + * Falls back to a lazy `zod/v4` import for zod v3.25.x — which implements + * `~standard.validate` but not yet `~standard.jsonSchema` — so the existing + * `^3.25.0 || ^4.0.0` peer range keeps working. Non-zod schemas without + * `jsonSchema` throw. + */ +export async function standardSchemaToJsonSchema( + schema: StandardSchemaV1, + io: "input" | "output", +): Promise> { + const std = schema["~standard"] as Partial< + StandardSchemaWithJSON["~standard"] + >; + if (std.jsonSchema) { + return std.jsonSchema[io](TARGET); + } + if (std.vendor === "zod") { + const { z } = await import("zod/v4"); + // eslint-disable-next-line @typescript-eslint/no-explicit-any -- bridging StandardSchemaV1 → zod's $ZodType for the v3.25 fallback + return z.toJSONSchema(schema as any, { io }); + } + throw new Error( + `Schema (vendor: ${std.vendor}) does not implement Standard JSON Schema (~standard.jsonSchema). ` + + `Use a library that does (zod v4, ArkType, Valibot) or wrap your schema accordingly.`, + ); +} + +/** + * Validate a value against a Standard Schema. Returns the parsed value on + * success or throws with a formatted issue list (optionally prefixed). + */ +export async function validateStandardSchema( + schema: S, + value: unknown, + errorPrefix = "", +): Promise> { + const result = await schema["~standard"].validate(value); + if (result.issues) { + const msg = result.issues + .map((i) => { + const path = i.path + ?.map((p) => (typeof p === "object" ? p.key : p)) + .join("."); + return path ? `${path}: ${i.message}` : i.message; + }) + .join("; "); + throw new Error(errorPrefix + msg); + } + return result.value; +} diff --git a/typedoc.config.mjs b/typedoc.config.mjs index 793737c..4c5baa3 100644 --- a/typedoc.config.mjs +++ b/typedoc.config.mjs @@ -28,7 +28,7 @@ const config = { ], excludePrivate: true, excludeInternal: false, - intentionallyNotExported: ["MethodSchema"], + intentionallyNotExported: ["MethodSchema", "RequestHandlerExtra"], blockTags: [...OptionDefaults.blockTags, "@description"], jsDocCompatibility: { exampleTag: false, From 4995746759e01e10481e61cc33ebb227b7043450 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 21 Apr 2026 13:49:07 +0100 Subject: [PATCH 037/107] fix(types): forbid csp/permissions on McpUiToolMeta via never (#624) * fix(types): forbid csp/permissions on McpUiToolMeta via never Hosts read _meta.ui.csp and _meta.ui.permissions from the resource (resources/read content item, with resources/list entry as fallback), never from the tool. Typing them as `never` on McpUiToolMeta gives TypeScript users a compile-time error pointing at McpUiResourceMeta instead of silently accepting and ignoring them. Companion to anthropics/apps#38705 (host-side console.warn). Refs anthropics/claude-ai-mcp#40. * drop misleading #40 link from McpUiToolMeta.csp JSDoc --- src/generated/schema.json | 6 ++++++ src/generated/schema.ts | 11 +++++++++++ src/spec.types.ts | 11 +++++++++++ 3 files changed, 28 insertions(+) diff --git a/src/generated/schema.json b/src/generated/schema.json index a72ec2d..80b4ac6 100644 --- a/src/generated/schema.json +++ b/src/generated/schema.json @@ -5300,6 +5300,12 @@ ], "description": "Tool visibility scope - who can access the tool." } + }, + "csp": { + "not": {} + }, + "permissions": { + "not": {} } }, "additionalProperties": false diff --git a/src/generated/schema.ts b/src/generated/schema.ts index 707e185..0e0a390 100644 --- a/src/generated/schema.ts +++ b/src/generated/schema.ts @@ -730,6 +730,17 @@ export const McpUiToolMetaSchema = z.object({ .describe( 'Who can access this tool. Default: ["model", "app"]\n- "model": Tool visible to and callable by the agent\n- "app": Tool callable by the app from this server only', ), + /** + * `csp` belongs on the UI **resource** (see {@link McpUiResourceMeta}), + * not the tool. Hosts read it from the `resources/read` content item + * (with `resources/list` entry as fallback) and ignore it here. + */ + csp: z.never().optional(), + /** + * `permissions` belongs on the UI **resource** (see {@link McpUiResourceMeta}), + * not the tool. Hosts ignore it here. + */ + permissions: z.never().optional(), }); /** diff --git a/src/spec.types.ts b/src/spec.types.ts index 3678fb5..ad3d4d2 100644 --- a/src/spec.types.ts +++ b/src/spec.types.ts @@ -783,6 +783,17 @@ export interface McpUiToolMeta { * - "app": Tool callable by the app from this server only */ visibility?: McpUiToolVisibility[]; + /** + * `csp` belongs on the UI **resource** (see {@link McpUiResourceMeta}), + * not the tool. Hosts read it from the `resources/read` content item + * (with `resources/list` entry as fallback) and ignore it here. + */ + csp?: never; + /** + * `permissions` belongs on the UI **resource** (see {@link McpUiResourceMeta}), + * not the tool. Hosts ignore it here. + */ + permissions?: never; } /** From 9a75b891b2219cc988f08959966eccae6a57b5ef Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 21 Apr 2026 13:50:10 +0100 Subject: [PATCH 038/107] chore: drop GitHub issue URLs from pre-handshake guard log messages (#625) The runtime console.error/warn strings in App._assertInitialized and AppBridge.replaceRequestHandler linked to a tracking issue. Issue URLs in runtime logs are brittle and send developers to a discussion thread rather than actionable docs; the message itself already says what to do. JSDoc @see links retained. --- src/app-bridge.ts | 3 +-- src/app.ts | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/app-bridge.ts b/src/app-bridge.ts index 4c8be2e..5186112 100644 --- a/src/app-bridge.ts +++ b/src/app-bridge.ts @@ -336,8 +336,7 @@ export class AppBridge extends ProtocolWithEvents< `[ext-apps] AppBridge received '${request.method}' before ` + `ui/notifications/initialized. The View is calling host ` + `methods before completing the handshake; it should await ` + - `app.connect() first. See ` + - `https://github.com/anthropics/claude-ai-mcp/issues/149`, + `app.connect() first.`, ); } return handler(request, extra); diff --git a/src/app.ts b/src/app.ts index 09efadf..d8571ee 100644 --- a/src/app.ts +++ b/src/app.ts @@ -355,8 +355,7 @@ export class App extends ProtocolWithEvents< const msg = `[ext-apps] App.${method}() called before connect() completed the ` + `ui/initialize handshake. Await app.connect() before calling this ` + - `method, or move data loading to an ontoolresult handler. ` + - `See https://github.com/anthropics/claude-ai-mcp/issues/149`; + `method, or move data loading to an ontoolresult handler.`; if (this.options?.strict) { throw new Error(msg); } From 989ddc756894f2d86d100b267e62a9b6fc67df82 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 21 Apr 2026 13:53:20 +0100 Subject: [PATCH 039/107] chore: bump vite, hono, @hono/node-server to patched versions (#616) Lockfile-only bumps to address npm audit findings: - vite 6.4.1 -> 6.4.2 (high) - hono 4.12.9 -> 4.12.14 (moderate) - @hono/node-server 1.19.11 -> 1.19.14 (moderate) All within existing semver ranges; no package.json changes needed. --- package-lock.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 15d88de..9c8f52b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1994,9 +1994,9 @@ } }, "node_modules/@hono/node-server": { - "version": "1.19.11", - "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.11.tgz", - "integrity": "sha512-dr8/3zEaB+p0D2n/IUrlPF1HZm586qgJNXK1a9fhg/PzdtkK7Ksd5l312tJX2yBuALqDYBlG20QEbayqPyxn+g==", + "version": "1.19.14", + "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.14.tgz", + "integrity": "sha512-GwtvgtXxnWsucXvbQXkRgqksiH2Qed37H9xHZocE5sA3N8O8O8/8FA3uclQXxXVzc9XBZuEOMK7+r02FmSpHtw==", "license": "MIT", "engines": { "node": ">=18.14.1" @@ -6330,9 +6330,9 @@ } }, "node_modules/hono": { - "version": "4.12.9", - "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.9.tgz", - "integrity": "sha512-wy3T8Zm2bsEvxKZM5w21VdHDDcwVS1yUFFY6i8UobSsKfFceT7TOwhbhfKsDyx7tYQlmRM5FLpIuYvNFyjctiA==", + "version": "4.12.14", + "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.14.tgz", + "integrity": "sha512-am5zfg3yu6sqn5yjKBNqhnTX7Cv+m00ox+7jbaKkrLMRJ4rAdldd1xPd/JzbBWspqaQv6RSTrgFN95EsfhC+7w==", "license": "MIT", "engines": { "node": ">=16.9.0" @@ -9465,9 +9465,9 @@ } }, "node_modules/vite": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz", - "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.2.tgz", + "integrity": "sha512-2N/55r4JDJ4gdrCvGgINMy+HH3iRpNIz8K6SFwVsA+JbQScLiC+clmAxBgwiSPgcG9U15QmvqCGWzMbqda5zGQ==", "dev": true, "license": "MIT", "dependencies": { From b170150a8259f4561e36c734290cf6cce2eff454 Mon Sep 17 00:00:00 2001 From: Jonathan Hefner Date: Tue, 21 Apr 2026 07:53:58 -0500 Subject: [PATCH 040/107] Add examples policy to `CONTRIBUTING.md` (#550) New `examples/` are costly to review and maintain across SDK changes. Add a policy section stating that example PRs from outside contributors are not accepted, and redirect contributors to open an issue instead. Co-authored-by: Claude Opus 4.6 (1M context) --- CONTRIBUTING.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7ca6368..4c364a2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,6 +27,14 @@ We welcome contributions to the MCP Apps SDK! This document outlines the process - Provide a clear description of changes - **Keep "Allow edits by maintainers" checked** when opening your PR — this lets maintainers rebase your branch and lets the [`/update-snapshots` workflow](#updating-snapshots-in-ci) push updated screenshots to it +## Examples Policy + +The examples in `examples/` are maintained by the core team. **We do not accept pull requests that add new example servers from outside contributors.** Each example carries an ongoing maintenance cost — keeping it building, tested, and up to date with SDK changes — so we are deliberate about what we add. + +If you have an idea for an example that would provide significant educational value, please [open an issue](https://github.com/modelcontextprotocol/ext-apps/issues) describing what the example would demonstrate and why it would be useful, and maintainers will evaluate the request. + +PRs that add new examples without a prior approved issue may be closed. + ## Running Examples Start the development environment with hot reloading: From 5dfc88f113dca1cfe746cde9349e3aae89173d24 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 21 Apr 2026 14:48:52 +0100 Subject: [PATCH 041/107] docs(types): drop stale resourceUri JSDoc referencing deprecated flat key (#626) --- src/generated/schema.ts | 1 - src/spec.types.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/src/generated/schema.ts b/src/generated/schema.ts index 0e0a390..4368737 100644 --- a/src/generated/schema.ts +++ b/src/generated/schema.ts @@ -711,7 +711,6 @@ export const McpUiToolVisibilitySchema = z export const McpUiToolMetaSchema = z.object({ /** * URI of the UI resource to display for this tool, if any. - * This is converted to `_meta["ui/resourceUri"]`. * * @example * ```ts diff --git a/src/spec.types.ts b/src/spec.types.ts index ad3d4d2..7a8b337 100644 --- a/src/spec.types.ts +++ b/src/spec.types.ts @@ -769,7 +769,6 @@ export type McpUiToolVisibility = "model" | "app"; export interface McpUiToolMeta { /** * URI of the UI resource to display for this tool, if any. - * This is converted to `_meta["ui/resourceUri"]`. * * @example * ```ts From 9d68315720d021c448f55b57eac1f4395b3472ad Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 21 Apr 2026 14:49:09 +0100 Subject: [PATCH 042/107] feat(app): default Zod to jitless; add allowUnsafeEval opt-out (#618) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Zod v4's object parser compiles a fast path with `new Function()`, which violates CSP without `unsafe-eval`. Hosts that enforce the spec's default CSP (e.g. VS Code) cannot load any View that parses an incoming message — the SDK's generated schemas trip this on the very first ui/initialize roundtrip. The App constructor now sets `z.config({ jitless: true })` by default so Views work out of the box under strict CSP. New `AppOptions.allowUnsafeEval` (default false) skips this for Views that know their host permits `unsafe-eval` and want Zod's faster JIT path. Addresses #374. Also relevant to #199 (threejs-server has a separate `new Function()` use in its own shader compiler that this does not fix). --- src/app.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/app.ts b/src/app.ts index d8571ee..6168a1c 100644 --- a/src/app.ts +++ b/src/app.ts @@ -74,6 +74,7 @@ import { standardSchemaToJsonSchema, validateStandardSchema, } from "./standard-schema"; +import { z } from "zod/v4"; export type { StandardSchemaV1, @@ -187,6 +188,20 @@ export type AppOptions = ProtocolOptions & { * @default false */ strict?: boolean; + /** + * Allow code paths that require CSP `unsafe-eval` (e.g. `new Function()`). + * + * Views typically run under a strict CSP without `unsafe-eval`. Zod's JIT + * object parser uses `new Function()` and throws on the first message parse + * under such a policy. By default (`allowUnsafeEval: false`) the + * {@link App `App`} constructor sets `z.config({ jitless: true })` so the + * SDK works out of the box under the spec's default CSP. Set + * `allowUnsafeEval: true` to skip that and keep the faster JIT path when + * the host's CSP permits `unsafe-eval`. + * + * @default false + */ + allowUnsafeEval?: boolean; }; type RequestHandlerExtra = Parameters< @@ -403,6 +418,10 @@ export class App extends ProtocolWithEvents< ) { super(options); + if (!options.allowUnsafeEval) { + z.config({ jitless: true }); + } + this.setRequestHandler(PingRequestSchema, (request) => { console.log("Received ping:", request.params); return {}; From 6fa5d4e6edcfc7e921e7e95230120d937b756d60 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 21 Apr 2026 14:50:17 +0100 Subject: [PATCH 043/107] feat(app): warn when one-shot handlers are registered after connect() (#629) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mirrors the outbound-side guard from #623: registering a toolinput / toolinputpartial / toolresult / toolcancelled handler after the ui/initialize handshake has completed now logs a console.warn (or throws under { strict: true }), since the host may have already fired the notification by then. hostcontextchanged is exempt — late listeners for repeating events are legitimate. Covers both the on* setters and addEventListener. --- src/app-bridge.test.ts | 93 ++++++++++++++++++++++++++++++++++++++++++ src/app.ts | 43 +++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/src/app-bridge.test.ts b/src/app-bridge.test.ts index e7b32b3..4ea4b49 100644 --- a/src/app-bridge.test.ts +++ b/src/app-bridge.test.ts @@ -1965,6 +1965,99 @@ describe("App <-> AppBridge integration", () => { errSpy.mockRestore(); }); + describe("late handler registration", () => { + const lateMsg = + /handler registered after connect\(\) completed the ui\/initialize handshake/; + + it("warns when ontoolresult is set after connect() resolves", async () => { + const warnSpy = spyOn(console, "warn").mockImplementation(() => {}); + await bridge.connect(bridgeTransport); + await app.connect(appTransport); + + app.ontoolresult = () => {}; + + expect(warnSpy).toHaveBeenCalledTimes(1); + expect(warnSpy.mock.calls[0][0]).toMatch(lateMsg); + expect(warnSpy.mock.calls[0][0]).toContain('"toolresult"'); + warnSpy.mockRestore(); + }); + + it("warns when addEventListener('toolinput', …) is called after connect()", async () => { + const warnSpy = spyOn(console, "warn").mockImplementation(() => {}); + await bridge.connect(bridgeTransport); + await app.connect(appTransport); + + app.addEventListener("toolinput", () => {}); + + expect(warnSpy).toHaveBeenCalledTimes(1); + expect(warnSpy.mock.calls[0][0]).toContain('"toolinput"'); + warnSpy.mockRestore(); + }); + + it("does not warn for handlers set before connect()", async () => { + const warnSpy = spyOn(console, "warn").mockImplementation(() => {}); + app.ontoolinput = () => {}; + app.addEventListener("toolresult", () => {}); + + await bridge.connect(bridgeTransport); + await app.connect(appTransport); + + expect(warnSpy).not.toHaveBeenCalled(); + warnSpy.mockRestore(); + }); + + it("does not warn for hostcontextchanged (repeating event)", async () => { + const warnSpy = spyOn(console, "warn").mockImplementation(() => {}); + await bridge.connect(bridgeTransport); + await app.connect(appTransport); + + app.onhostcontextchanged = () => {}; + app.addEventListener("hostcontextchanged", () => {}); + + expect(warnSpy).not.toHaveBeenCalled(); + warnSpy.mockRestore(); + }); + + it("does not warn when clearing a handler (set to undefined)", async () => { + const warnSpy = spyOn(console, "warn").mockImplementation(() => {}); + app.ontoolinput = () => {}; + await bridge.connect(bridgeTransport); + await app.connect(appTransport); + + app.ontoolinput = undefined; + + expect(warnSpy).not.toHaveBeenCalled(); + warnSpy.mockRestore(); + }); + + it("throws instead of warning when strict: true", async () => { + const warnSpy = spyOn(console, "warn").mockImplementation(() => {}); + const [strictAppT, strictBridgeT] = + InMemoryTransport.createLinkedPair(); + const strictBridge = new AppBridge( + createMockClient() as Client, + testHostInfo, + testHostCapabilities, + ); + const strictApp = new App( + testAppInfo, + {}, + { autoResize: false, strict: true }, + ); + await strictBridge.connect(strictBridgeT); + await strictApp.connect(strictAppT); + + expect(() => { + strictApp.ontoolresult = () => {}; + }).toThrow(lateMsg); + expect(() => { + strictApp.addEventListener("toolinput", () => {}); + }).toThrow(lateMsg); + expect(warnSpy).not.toHaveBeenCalled(); + warnSpy.mockRestore(); + }); + }); + it("AppBridge warns on tools/call from a View that skipped the handshake", async () => { const warnSpy = spyOn(console, "warn").mockImplementation(() => {}); bridge.oncalltool = async () => ({ content: [] }); diff --git a/src/app.ts b/src/app.ts index 6168a1c..b703c3f 100644 --- a/src/app.ts +++ b/src/app.ts @@ -386,6 +386,49 @@ export class App extends ProtocolWithEvents< hostcontextchanged: McpUiHostContextChangedNotificationSchema, }; + /** + * Events the host typically sends once, shortly after the handshake. + * Registering a handler for one of these *after* {@link connect `connect`} + * resolves risks missing the notification entirely. + */ + private static readonly ONE_SHOT_EVENTS: ReadonlySet = + new Set(["toolinput", "toolinputpartial", "toolresult", "toolcancelled"]); + + /** + * Warn (or throw under `strict`) when a one-shot event handler is registered + * after the `ui/initialize` → `ui/notifications/initialized` handshake has + * completed. The host may have already fired the notification by then. + * + * Mirrors {@link _assertInitialized `_assertInitialized`} (the outbound-side guard). + */ + private _assertHandlerTiming(event: keyof AppEventMap): void { + if (!this._initializedSent || !App.ONE_SHOT_EVENTS.has(event)) return; + const msg = + `[ext-apps] "${String(event)}" handler registered after connect() ` + + `completed the ui/initialize handshake. The host may have already sent ` + + `this notification. Register handlers before calling app.connect().`; + if (this.options?.strict) { + throw new Error(msg); + } + console.warn(msg); + } + + protected override setEventHandler( + event: K, + handler: ((params: AppEventMap[K]) => void) | undefined, + ): void { + if (handler) this._assertHandlerTiming(event); + super.setEventHandler(event, handler); + } + + override addEventListener( + event: K, + handler: (params: AppEventMap[K]) => void, + ): void { + this._assertHandlerTiming(event); + super.addEventListener(event, handler); + } + protected override onEventDispatch( event: K, params: AppEventMap[K], From 9658678eaa9247e67cee523020ce772007621bd8 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 21 Apr 2026 15:06:49 +0100 Subject: [PATCH 044/107] refactor(app): unify pre-handshake guard to console.warn (#630) _assertInitialized used console.error while _assertHandlerTiming and the AppBridge override used console.warn. Align all three on console.warn for the non-strict path; strict still throws. Tests: hoist the console.warn spy to beforeEach/afterEach in the pre-handshake describe to avoid bun:test spy stacking now that all three guards target the same console method. --- src/app-bridge.test.ts | 77 +++++++++++++++++------------------------- src/app.ts | 6 ++-- 2 files changed, 34 insertions(+), 49 deletions(-) diff --git a/src/app-bridge.test.ts b/src/app-bridge.test.ts index 4ea4b49..15fa007 100644 --- a/src/app-bridge.test.ts +++ b/src/app-bridge.test.ts @@ -1907,9 +1907,18 @@ describe("App <-> AppBridge integration", () => { describe("pre-handshake guard (claude-ai-mcp#149)", () => { const guardMsg = /called before connect\(\) completed the ui\/initialize handshake/; + let warnSpy: ReturnType>; + + beforeEach(() => { + warnSpy = spyOn(console, "warn").mockImplementation(() => {}); + }); + afterEach(() => { + warnSpy.mockRestore(); + }); + + const warnings = () => warnSpy.mock.calls.map((c) => String(c[0])); it("callServerTool warns when called before connect() completes", async () => { - const errSpy = spyOn(console, "error").mockImplementation(() => {}); bridge.oncalltool = async () => ({ content: [] }); await bridge.connect(bridgeTransport); @@ -1917,40 +1926,34 @@ describe("App <-> AppBridge integration", () => { // Handshake is in flight; _initializedSent is still false. await app.callServerTool({ name: "t", arguments: {} }).catch(() => {}); - expect(errSpy).toHaveBeenCalledTimes(1); - expect(errSpy.mock.calls[0][0]).toMatch(guardMsg); - expect(errSpy.mock.calls[0][0]).toContain("App.callServerTool()"); + const appSide = warnings().filter((m) => guardMsg.test(m)); + expect(appSide).toHaveLength(1); + expect(appSide[0]).toContain("App.callServerTool()"); await connecting; - errSpy.mockRestore(); }); it("callServerTool does not warn after connect() resolves", async () => { - const errSpy = spyOn(console, "error").mockImplementation(() => {}); bridge.oncalltool = async () => ({ content: [] }); await bridge.connect(bridgeTransport); await app.connect(appTransport); await app.callServerTool({ name: "t", arguments: {} }); - expect(errSpy).not.toHaveBeenCalled(); - errSpy.mockRestore(); + expect(warnings()).toEqual([]); }); it("sendMessage and readServerResource also warn before handshake", async () => { - const errSpy = spyOn(console, "error").mockImplementation(() => {}); - await app.sendMessage({ role: "user", content: [] }).catch(() => {}); await app.readServerResource({ uri: "test://r" }).catch(() => {}); - expect(errSpy).toHaveBeenCalledTimes(2); - expect(errSpy.mock.calls[0][0]).toContain("App.sendMessage()"); - expect(errSpy.mock.calls[1][0]).toContain("App.readServerResource()"); - errSpy.mockRestore(); + const appSide = warnings().filter((m) => guardMsg.test(m)); + expect(appSide).toHaveLength(2); + expect(appSide[0]).toContain("App.sendMessage()"); + expect(appSide[1]).toContain("App.readServerResource()"); }); it("throws instead of warning when strict: true", async () => { - const errSpy = spyOn(console, "error").mockImplementation(() => {}); const strictApp = new App( testAppInfo, {}, @@ -1960,9 +1963,7 @@ describe("App <-> AppBridge integration", () => { await expect( strictApp.callServerTool({ name: "t", arguments: {} }), ).rejects.toThrow(guardMsg); - expect(errSpy).not.toHaveBeenCalled(); - - errSpy.mockRestore(); + expect(warnings()).toEqual([]); }); describe("late handler registration", () => { @@ -1970,68 +1971,57 @@ describe("App <-> AppBridge integration", () => { /handler registered after connect\(\) completed the ui\/initialize handshake/; it("warns when ontoolresult is set after connect() resolves", async () => { - const warnSpy = spyOn(console, "warn").mockImplementation(() => {}); await bridge.connect(bridgeTransport); await app.connect(appTransport); app.ontoolresult = () => {}; - expect(warnSpy).toHaveBeenCalledTimes(1); - expect(warnSpy.mock.calls[0][0]).toMatch(lateMsg); - expect(warnSpy.mock.calls[0][0]).toContain('"toolresult"'); - warnSpy.mockRestore(); + expect(warnings()).toHaveLength(1); + expect(warnings()[0]).toMatch(lateMsg); + expect(warnings()[0]).toContain('"toolresult"'); }); it("warns when addEventListener('toolinput', …) is called after connect()", async () => { - const warnSpy = spyOn(console, "warn").mockImplementation(() => {}); await bridge.connect(bridgeTransport); await app.connect(appTransport); app.addEventListener("toolinput", () => {}); - expect(warnSpy).toHaveBeenCalledTimes(1); - expect(warnSpy.mock.calls[0][0]).toContain('"toolinput"'); - warnSpy.mockRestore(); + expect(warnings()).toHaveLength(1); + expect(warnings()[0]).toContain('"toolinput"'); }); it("does not warn for handlers set before connect()", async () => { - const warnSpy = spyOn(console, "warn").mockImplementation(() => {}); app.ontoolinput = () => {}; app.addEventListener("toolresult", () => {}); await bridge.connect(bridgeTransport); await app.connect(appTransport); - expect(warnSpy).not.toHaveBeenCalled(); - warnSpy.mockRestore(); + expect(warnings()).toEqual([]); }); it("does not warn for hostcontextchanged (repeating event)", async () => { - const warnSpy = spyOn(console, "warn").mockImplementation(() => {}); await bridge.connect(bridgeTransport); await app.connect(appTransport); app.onhostcontextchanged = () => {}; app.addEventListener("hostcontextchanged", () => {}); - expect(warnSpy).not.toHaveBeenCalled(); - warnSpy.mockRestore(); + expect(warnings()).toEqual([]); }); it("does not warn when clearing a handler (set to undefined)", async () => { - const warnSpy = spyOn(console, "warn").mockImplementation(() => {}); app.ontoolinput = () => {}; await bridge.connect(bridgeTransport); await app.connect(appTransport); app.ontoolinput = undefined; - expect(warnSpy).not.toHaveBeenCalled(); - warnSpy.mockRestore(); + expect(warnings()).toEqual([]); }); it("throws instead of warning when strict: true", async () => { - const warnSpy = spyOn(console, "warn").mockImplementation(() => {}); const [strictAppT, strictBridgeT] = InMemoryTransport.createLinkedPair(); const strictBridge = new AppBridge( @@ -2053,13 +2043,11 @@ describe("App <-> AppBridge integration", () => { expect(() => { strictApp.addEventListener("toolinput", () => {}); }).toThrow(lateMsg); - expect(warnSpy).not.toHaveBeenCalled(); - warnSpy.mockRestore(); + expect(warnings()).toEqual([]); }); }); it("AppBridge warns on tools/call from a View that skipped the handshake", async () => { - const warnSpy = spyOn(console, "warn").mockImplementation(() => {}); bridge.oncalltool = async () => ({ content: [] }); await bridge.connect(bridgeTransport); @@ -2073,23 +2061,20 @@ describe("App <-> AppBridge integration", () => { }); await flush(); - expect(warnSpy).toHaveBeenCalledTimes(1); - expect(warnSpy.mock.calls[0][0]).toContain( + expect(warnings()).toHaveLength(1); + expect(warnings()[0]).toContain( "received 'tools/call' before ui/notifications/initialized", ); - warnSpy.mockRestore(); }); it("AppBridge does not warn after initialized is received", async () => { - const warnSpy = spyOn(console, "warn").mockImplementation(() => {}); bridge.oncalltool = async () => ({ content: [] }); await bridge.connect(bridgeTransport); await app.connect(appTransport); await app.callServerTool({ name: "t", arguments: {} }); - expect(warnSpy).not.toHaveBeenCalled(); - warnSpy.mockRestore(); + expect(warnings()).toEqual([]); }); }); diff --git a/src/app.ts b/src/app.ts index b703c3f..f35b43d 100644 --- a/src/app.ts +++ b/src/app.ts @@ -176,12 +176,12 @@ export type AppOptions = ProtocolOptions & { */ autoResize?: boolean; /** - * Throw on detected misuse instead of logging a console error. + * Throw on detected misuse instead of logging a console warning. * * Currently this affects calling host-bound methods (e.g. * {@link App.callServerTool `callServerTool`}, {@link App.sendMessage `sendMessage`}) * before {@link App.connect `connect`} has completed the `ui/initialize` - * handshake. With `strict: false` (default) a `console.error` is emitted; + * handshake. With `strict: false` (default) a `console.warn` is emitted; * with `strict: true` an `Error` is thrown. * * @remarks Throwing will become the default in a future release. @@ -375,7 +375,7 @@ export class App extends ProtocolWithEvents< throw new Error(msg); } // TODO(next-minor): make `strict: true` the default. - console.error(`${msg}. This will throw in a future release.`); + console.warn(`${msg}. This will throw in a future release.`); } protected readonly eventSchemas = { From cc02e17e21c34d38c49e6f189e2250d49299e529 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 21 Apr 2026 15:44:57 +0100 Subject: [PATCH 045/107] fix(react): StrictMode cleanup + relax late-handler guard for re-reg (#631) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(react): close App on useApp unmount; relax late-handler guard for re-registration useApp's effect cleanup now closes the App (and its transport) instead of only flipping a `mounted` flag. Under React StrictMode dev double-invoke, the abandoned first instance's PostMessageTransport otherwise keeps a window `message` listener and receives every host postMessage alongside the second instance. The late-handler guard from #629 now tracks `_everHadListener` per event and only flags the *first* registration of a one-shot event post-handshake. Re-registration (React useEffect cleanup + re-add on dep change) of an event that had a pre-connect handler is silent, including under `strict: true`. * feat(app-bridge): warn on second ui/initialize If a View double-mounts (e.g. React StrictMode in dev) without closing the previous App, AppBridge now logs a console.warn when it receives a second ui/initialize. Behavior is unchanged — it still responds and the latest appInfo/appCapabilities replace the previous values — this is purely a diagnostic for host implementers. --- src/app-bridge.test.ts | 92 +++++++++++++++++++++++++++++++++++++++++- src/app-bridge.ts | 9 +++++ src/app.ts | 22 ++++++++-- src/react/useApp.tsx | 22 ++++++---- 4 files changed, 133 insertions(+), 12 deletions(-) diff --git a/src/app-bridge.test.ts b/src/app-bridge.test.ts index 15fa007..38f7d30 100644 --- a/src/app-bridge.test.ts +++ b/src/app-bridge.test.ts @@ -15,6 +15,7 @@ import { import { z } from "zod/v4"; import { App } from "./app"; +import { LATEST_PROTOCOL_VERSION } from "./types"; import { AppBridge, getToolUiResourceUri, @@ -2021,6 +2022,45 @@ describe("App <-> AppBridge integration", () => { expect(warnings()).toEqual([]); }); + it("does not warn on re-registration when a handler existed pre-connect", async () => { + const h = () => {}; + app.addEventListener("toolresult", h); + await bridge.connect(bridgeTransport); + await app.connect(appTransport); + + // React-style: useEffect cleanup removes, dep change re-adds. + app.removeEventListener("toolresult", h); + app.addEventListener("toolresult", () => {}); + + expect(warnings().filter((m) => lateMsg.test(m))).toEqual([]); + }); + + it("warns once for the first late registration, not on subsequent ones", async () => { + await bridge.connect(bridgeTransport); + await app.connect(appTransport); + + app.addEventListener("toolinput", () => {}); + app.addEventListener("toolinput", () => {}); + app.addEventListener("toolinput", () => {}); + + const late = warnings().filter((m) => lateMsg.test(m)); + expect(late).toHaveLength(1); + expect(late[0]).toContain('"toolinput"'); + }); + + it("tracks first-handler per event independently", async () => { + app.addEventListener("toolinput", () => {}); + await bridge.connect(bridgeTransport); + await app.connect(appTransport); + + app.addEventListener("toolinput", () => {}); // had pre-connect handler → silent + app.addEventListener("toolresult", () => {}); // first reg, late → warns + + const late = warnings().filter((m) => lateMsg.test(m)); + expect(late).toHaveLength(1); + expect(late[0]).toContain('"toolresult"'); + }); + it("throws instead of warning when strict: true", async () => { const [strictAppT, strictBridgeT] = InMemoryTransport.createLinkedPair(); @@ -2034,6 +2074,9 @@ describe("App <-> AppBridge integration", () => { {}, { autoResize: false, strict: true }, ); + // Pre-connect registration for toolcancelled — later swap must not throw. + strictApp.addEventListener("toolcancelled", () => {}); + await strictBridge.connect(strictBridgeT); await strictApp.connect(strictAppT); @@ -2043,10 +2086,57 @@ describe("App <-> AppBridge integration", () => { expect(() => { strictApp.addEventListener("toolinput", () => {}); }).toThrow(lateMsg); - expect(warnings()).toEqual([]); + // Swapping a handler that existed pre-connect is allowed under strict. + expect(() => { + strictApp.addEventListener("toolcancelled", () => {}); + }).not.toThrow(); + expect(warnings().filter((m) => lateMsg.test(m))).toEqual([]); }); }); + it("AppBridge warns on a second ui/initialize (View double-mount)", async () => { + await bridge.connect(bridgeTransport); + await app.connect(appTransport); + expect(warnings()).toEqual([]); + + // Simulate a second View instance re-running the handshake. + appTransport.send({ + jsonrpc: "2.0", + id: 99, + method: "ui/initialize", + params: { + protocolVersion: LATEST_PROTOCOL_VERSION, + appInfo: testAppInfo, + appCapabilities: {}, + }, + }); + await flush(); + + const doubleInit = warnings().filter((m) => + /second ui\/initialize/.test(m), + ); + expect(doubleInit).toHaveLength(1); + }); + + it("close() stops further notification delivery (StrictMode cleanup relies on this)", async () => { + const received: unknown[] = []; + app.addEventListener("toolresult", (r) => received.push(r)); + await bridge.connect(bridgeTransport); + await app.connect(appTransport); + + await bridge.sendToolResult({ + content: [{ type: "text", text: "before" }], + }); + expect(received).toHaveLength(1); + + await app.close(); + + await bridge + .sendToolResult({ content: [{ type: "text", text: "after" }] }) + .catch(() => {}); + expect(received).toHaveLength(1); + }); + it("AppBridge warns on tools/call from a View that skipped the handshake", async () => { bridge.oncalltool = async () => ({ content: [] }); await bridge.connect(bridgeTransport); diff --git a/src/app-bridge.ts b/src/app-bridge.ts index 5186112..23383c4 100644 --- a/src/app-bridge.ts +++ b/src/app-bridge.ts @@ -1463,6 +1463,15 @@ export class AppBridge extends ProtocolWithEvents< ): Promise { const requestedVersion = request.params.protocolVersion; + if (this._appInfo !== undefined) { + console.warn( + "[ext-apps] AppBridge received a second ui/initialize. The View may " + + "be double-mounting (e.g. React StrictMode in dev) without closing " + + "the previous App instance. Responding normally; the latest " + + "appInfo/appCapabilities replace the previous values.", + ); + } + this._appCapabilities = request.params.appCapabilities; this._appInfo = request.params.appInfo; diff --git a/src/app.ts b/src/app.ts index f35b43d..adfad5c 100644 --- a/src/app.ts +++ b/src/app.ts @@ -395,14 +395,28 @@ export class App extends ProtocolWithEvents< new Set(["toolinput", "toolinputpartial", "toolresult", "toolcancelled"]); /** - * Warn (or throw under `strict`) when a one-shot event handler is registered - * after the `ui/initialize` → `ui/notifications/initialized` handshake has - * completed. The host may have already fired the notification by then. + * One-shot events that have had at least one handler registered (via `on*` + * setter or `addEventListener`) at any point. Once an event is in this set, + * subsequent late registrations are not flagged — only the *first* handler + * matters for the missed-notification race, and re-registration (e.g. React + * `useEffect` cleanup → re-add on dep change) is a legitimate pattern. + */ + private readonly _everHadListener = new Set(); + + /** + * Warn (or throw under `strict`) when the *first* handler for a one-shot + * event is registered after the `ui/initialize` → `ui/notifications/initialized` + * handshake has completed. The host may have already fired the notification + * by then. Subsequent registrations for the same event are not flagged. * * Mirrors {@link _assertInitialized `_assertInitialized`} (the outbound-side guard). */ private _assertHandlerTiming(event: keyof AppEventMap): void { - if (!this._initializedSent || !App.ONE_SHOT_EVENTS.has(event)) return; + if (!App.ONE_SHOT_EVENTS.has(event) || this._everHadListener.has(event)) { + return; + } + this._everHadListener.add(event); + if (!this._initializedSent) return; const msg = `[ext-apps] "${String(event)}" handler registered after connect() ` + `completed the ui/initialize handshake. The host may have already sent ` + diff --git a/src/react/useApp.tsx b/src/react/useApp.tsx index 518d6ca..6189246 100644 --- a/src/react/useApp.tsx +++ b/src/react/useApp.tsx @@ -138,6 +138,7 @@ export function useApp({ useEffect(() => { let mounted = true; + let appInstance: App | undefined; async function connect() { try { @@ -145,18 +146,24 @@ export function useApp({ window.parent, window.parent, ); - const app = new App(appInfo, capabilities, { autoResize, strict }); + appInstance = new App(appInfo, capabilities, { autoResize, strict }); // Register handlers BEFORE connecting - onAppCreated?.(app); + onAppCreated?.(appInstance); - await app.connect(transport); + await appInstance.connect(transport); - if (mounted) { - setApp(app); - setIsConnected(true); - setError(null); + if (!mounted) { + // Unmounted during the handshake (e.g. React StrictMode dev + // double-invoke). Close so the abandoned transport's window + // `message` listener doesn't keep receiving host postMessages + // alongside the second mount's instance. + void appInstance.close(); + return; } + setApp(appInstance); + setIsConnected(true); + setError(null); } catch (error) { if (mounted) { setApp(null); @@ -172,6 +179,7 @@ export function useApp({ return () => { mounted = false; + void appInstance?.close(); }; }, []); // Intentionally not including options to avoid reconnection From 3e9950062b1345f926a744d9c8250e5f85c12f37 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 21 Apr 2026 16:03:27 +0100 Subject: [PATCH 046/107] build: add npm run bump; parallel npm-publish approval (#568) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ci: automate release process with workflow-driven version bumps and PR flow Adds a Release workflow that bumps all package versions, generates release notes, and opens a PR. Merging the PR auto-tags and creates the GitHub Release, which triggers npm-publish. Also adds `npm run bump` for local use and a release.yml config for categorized auto-generated notes. * ci: simplify release workflow and flatten npm-publish approval chain - Drop auto-generated RELEASES.md prepending (notes are written manually in PR) - Flatten npm-publish job dependencies so all publish jobs wait for approval together instead of sequentially, reducing 3 approval clicks to 1 - Remove Release environment from publish-mcpb (only needs GH_TOKEN) - Use --generate-notes for GitHub Release creation * fix: address review findings in release automation - release.yml: use RELEASE_TOKEN PAT for gh release create so the release:published event triggers npm-publish (GITHUB_TOKEN events don't cascade to other workflows) - release.yml: checkout merge_commit_sha in tag job instead of ref:main to avoid tagging later commits - release.yml: checkout ref:main in prepare job so dispatching from a feature branch doesn't pollute the release PR - release.yml: constrain preid to type:choice[beta] to match npm-publish.yml's tag detection - release.yml: drop -f on push so re-runs fail loudly instead of clobbering manual RELEASES.md edits; drop pr-edit fallback - release.yml: ensure release label exists before gh pr create - release.yml: make tag push idempotent for re-runs after partial failure - bump-version.mjs: update workspace dependency ranges so major bumps don't leave examples pointing at the old major - bump-version.mjs: run npm install --package-lock-only so npm ci on the release PR doesn't fail on lockfile mismatch - npm-publish.yml: add npm-tag detection to publish-examples so beta example releases don't overwrite latest - .github/release.yml: use [bot] suffix in author excludes so dependabot PRs are actually filtered from release notes - CONTRIBUTING.md: document RELEASE_TOKEN setup; fix npm run -- syntax * style: auto-fix prettier formatting * build: add npm run bump; parallel npm-publish approval - scripts/bump-version.mjs (+ npm run bump): bumps root and all workspace package versions, updates examples' ^X.Y.0 dependency range on the root package (matters on major bumps), and refreshes package-lock so npm ci accepts the release PR. - npm-publish.yml: all publish jobs now depend directly on [build, test] instead of chaining, so they enter "waiting for approval" together and a single Review-deployments click approves the lot. Prerelease versions (any X.Y.Z-…) publish under --tag beta so they don't take latest. - CONTRIBUTING.md: release steps now use npm run bump. Dropped from the original change: the workflow_dispatch release.yml (required a long-lived PAT to cascade events), label-based .github/release.yml auto-notes (PRs aren't labeled today), and the release-X.Y npm-tag for non-main branches (no backport branches yet). --------- Co-authored-by: Claude Co-authored-by: github-actions[bot] --- .github/workflows/npm-publish.yml | 20 +++++++++++-- CONTRIBUTING.md | 33 ++++------------------ package.json | 1 + scripts/bump-version.mjs | 47 +++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 31 deletions(-) create mode 100644 scripts/bump-version.mjs diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index ece35d3..0667bbd 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -42,6 +42,10 @@ jobs: - run: npm ci - run: npm test + # All publish jobs depend directly on [build, test] (not on each other) so + # they all enter "waiting for approval" together and can be approved in a + # single "Review deployments" click. + publish: runs-on: ubuntu-latest if: github.event_name == 'release' @@ -88,7 +92,7 @@ jobs: runs-on: ubuntu-latest if: github.event_name == 'release' environment: Release - needs: [publish] + needs: [build, test] permissions: contents: read @@ -134,8 +138,18 @@ jobs: - name: Build example run: npm run build --workspace examples/${{ matrix.example }} + - name: Determine npm tag + id: npm-tag + run: | + VERSION=$(node -p "require('./package.json').version") + if [[ "$VERSION" == *"-"* ]]; then + echo "tag=--tag beta" >> $GITHUB_OUTPUT + else + echo "tag=" >> $GITHUB_OUTPUT + fi + - name: Publish example - run: npm publish --workspace examples/${{ matrix.example }} --provenance --access public + run: npm publish --workspace examples/${{ matrix.example }} --provenance --access public ${{ steps.npm-tag.outputs.tag }} env: NODE_AUTH_TOKEN: ${{ secrets.NPM_SECRET }} @@ -143,7 +157,7 @@ jobs: runs-on: ubuntu-latest if: github.event_name == 'release' environment: Release - needs: [publish-examples] + needs: [build, test] permissions: contents: write diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4c364a2..6a3102b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -539,40 +539,17 @@ Before publishing releases, ensure the following are configured: ### Publishing a Release -Releases are published automatically via GitHub Actions when a GitHub Release is created. - -#### Steps to publish: - -1. **Update the version** in `package.json`: +1. **Bump the version** across the root and all workspace packages: ```bash - # For a regular release - npm version patch # or minor, or major - - # For a beta release - npm version prerelease --preid=beta + npm run bump -- minor # or: patch | major | prerelease --preid=beta | 1.7.0 ``` -2. **Commit the version bump** (if not done by `npm version`): + Commit and open a PR with a grouped changelog in the body (see prior `chore: bump …` PRs for the format). - ```bash - git add package.json - git commit -m "Bump version to X.Y.Z" - git push origin main - ``` +2. **Merge the PR**, then [draft a GitHub Release](https://github.com/modelcontextprotocol/ext-apps/releases/new) — create a `vX.Y.Z` tag on `main`, paste the changelog, publish. -3. **Create a GitHub Release**: - - Go to [Releases](https://github.com/modelcontextprotocol/ext-apps/releases) - - Click "Draft a new release" - - Create a new tag matching the version (e.g., `v0.1.0`) - - Set the target branch (usually `main`) - - Write release notes describing the changes - - Click "Publish release" - -4. **Monitor the workflow**: - - The [npm-publish workflow](https://github.com/modelcontextprotocol/ext-apps/actions/workflows/npm-publish.yml) will trigger automatically - - It runs build and test jobs before publishing - - On success, the package is published to npm with provenance +3. **Approve the deployment** — publishing the Release triggers the [npm-publish workflow](https://github.com/modelcontextprotocol/ext-apps/actions/workflows/npm-publish.yml); all publish jobs wait together for a single "Review deployments" approval. #### npm Tags diff --git a/package.json b/package.json index d1fa9df..bb824ff 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,7 @@ "prettier": "prettier -u \"**/*.{js,jsx,ts,tsx,mjs,json,md,yml,yaml}\" --check", "prettier:fix": "prettier -u \"**/*.{js,jsx,ts,tsx,mjs,json,md,yml,yaml}\" --write", "check:versions": "node scripts/check-versions.mjs", + "bump": "node scripts/bump-version.mjs", "update-lock:docker": "rm -rf node_modules package-lock.json examples/*/node_modules && docker run --rm --platform linux/amd64 -v $(pwd):/work -w /work -e HOME=/tmp node:latest npm i --registry=https://registry.npmjs.org/ --ignore-scripts && rm -rf node_modules examples/*/node_modules && npm i --registry=https://registry.npmjs.org/" }, "author": "Olivier Chafik", diff --git a/scripts/bump-version.mjs b/scripts/bump-version.mjs new file mode 100644 index 0000000..65c878f --- /dev/null +++ b/scripts/bump-version.mjs @@ -0,0 +1,47 @@ +#!/usr/bin/env node +/** + * Bump the version in the root package.json and sync all workspace packages + * to the same version. + * + * Usage: + * node scripts/bump-version.mjs patch + * node scripts/bump-version.mjs minor + * node scripts/bump-version.mjs major + * node scripts/bump-version.mjs 1.4.0 + * node scripts/bump-version.mjs prerelease --preid=beta + * + * Writes the new version to stdout (logs go to stderr). + */ + +import { execSync } from "node:child_process"; +import { readFileSync } from "node:fs"; + +const args = process.argv.slice(2); +if (!args[0]) { + console.error( + "Usage: node scripts/bump-version.mjs [--preid=]", + ); + process.exit(1); +} + +const exec = (cmd) => + execSync(cmd, { stdio: ["inherit", "pipe", "inherit"] }) + .toString() + .trim(); + +const pkgName = JSON.parse(readFileSync("package.json", "utf-8")).name; + +const newVersion = exec( + `npm version ${args.join(" ")} --no-git-tag-version`, +).replace(/^v/, ""); +exec(`npm pkg set version=${newVersion} --workspaces`); + +// Keep workspace dependency ranges compatible (needed on major bumps) +const [major, minor] = newVersion.split("."); +exec(`npm pkg set "dependencies.${pkgName}=^${major}.${minor}.0" --workspaces`); + +// Sync package-lock.json so `npm ci` doesn't reject the release PR +exec("npm install --package-lock-only --ignore-scripts"); + +console.error(`Bumped root + workspaces to ${newVersion}`); +console.log(newVersion); From 64b4fa16de4a4694dbec5514b866802a1825f919 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 21 Apr 2026 16:19:22 +0100 Subject: [PATCH 047/107] chore: bump ext-apps to 1.7.0 (#628) --- examples/basic-host/package.json | 2 +- examples/basic-server-preact/package.json | 2 +- examples/basic-server-react/package.json | 2 +- examples/basic-server-solid/package.json | 2 +- examples/basic-server-svelte/package.json | 2 +- examples/basic-server-vanillajs/package.json | 2 +- examples/basic-server-vue/package.json | 2 +- examples/budget-allocator-server/package.json | 2 +- examples/cohort-heatmap-server/package.json | 2 +- .../customer-segmentation-server/package.json | 2 +- examples/debug-server/package.json | 2 +- examples/integration-server/package.json | 2 +- examples/map-server/package.json | 2 +- examples/pdf-server/package.json | 2 +- examples/qr-server/package.json | 2 +- examples/quickstart/package.json | 2 +- examples/say-server/package.json | 2 +- examples/scenario-modeler-server/package.json | 2 +- examples/shadertoy-server/package.json | 2 +- examples/sheet-music-server/package.json | 2 +- examples/system-monitor-server/package.json | 2 +- examples/threejs-server/package.json | 2 +- examples/transcript-server/package.json | 2 +- examples/video-resource-server/package.json | 2 +- examples/wiki-explorer-server/package.json | 2 +- package-lock.json | 54 +++++++++---------- package.json | 2 +- 27 files changed, 53 insertions(+), 53 deletions(-) diff --git a/examples/basic-host/package.json b/examples/basic-host/package.json index 0153242..8045f36 100644 --- a/examples/basic-host/package.json +++ b/examples/basic-host/package.json @@ -1,7 +1,7 @@ { "homepage": "https://github.com/modelcontextprotocol/ext-apps/tree/main/examples/basic-host", "name": "@modelcontextprotocol/ext-apps-basic-host", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "scripts": { "build": "tsc --noEmit && concurrently \"cross-env INPUT=index.html vite build\" \"cross-env INPUT=sandbox.html vite build\"", diff --git a/examples/basic-server-preact/package.json b/examples/basic-server-preact/package.json index 9b79e20..dbe0e07 100644 --- a/examples/basic-server-preact/package.json +++ b/examples/basic-server-preact/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-preact", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "Basic MCP App Server example using Preact", "repository": { diff --git a/examples/basic-server-react/package.json b/examples/basic-server-react/package.json index b53c2bd..63d7656 100644 --- a/examples/basic-server-react/package.json +++ b/examples/basic-server-react/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-react", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "Basic MCP App Server example using React", "repository": { diff --git a/examples/basic-server-solid/package.json b/examples/basic-server-solid/package.json index efb64d4..b39d041 100644 --- a/examples/basic-server-solid/package.json +++ b/examples/basic-server-solid/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-solid", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "Basic MCP App Server example using Solid", "repository": { diff --git a/examples/basic-server-svelte/package.json b/examples/basic-server-svelte/package.json index 238efe8..46c38e6 100644 --- a/examples/basic-server-svelte/package.json +++ b/examples/basic-server-svelte/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-svelte", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "Basic MCP App Server example using Svelte", "repository": { diff --git a/examples/basic-server-vanillajs/package.json b/examples/basic-server-vanillajs/package.json index f89331c..d41a72e 100644 --- a/examples/basic-server-vanillajs/package.json +++ b/examples/basic-server-vanillajs/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-vanillajs", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "Basic MCP App Server example using vanilla JavaScript", "repository": { diff --git a/examples/basic-server-vue/package.json b/examples/basic-server-vue/package.json index 8423293..4e8022e 100644 --- a/examples/basic-server-vue/package.json +++ b/examples/basic-server-vue/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-vue", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "Basic MCP App Server example using Vue", "repository": { diff --git a/examples/budget-allocator-server/package.json b/examples/budget-allocator-server/package.json index d2b1221..d8d0e3c 100644 --- a/examples/budget-allocator-server/package.json +++ b/examples/budget-allocator-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-budget-allocator", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "Budget allocator MCP App Server with interactive visualization", "repository": { diff --git a/examples/cohort-heatmap-server/package.json b/examples/cohort-heatmap-server/package.json index 08c7048..a42ba0b 100644 --- a/examples/cohort-heatmap-server/package.json +++ b/examples/cohort-heatmap-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-cohort-heatmap", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "Cohort heatmap MCP App Server for retention analysis", "repository": { diff --git a/examples/customer-segmentation-server/package.json b/examples/customer-segmentation-server/package.json index 16d3322..46c8037 100644 --- a/examples/customer-segmentation-server/package.json +++ b/examples/customer-segmentation-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-customer-segmentation", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "Customer segmentation MCP App Server with filtering", "repository": { diff --git a/examples/debug-server/package.json b/examples/debug-server/package.json index 6c3f52a..b0a7d54 100644 --- a/examples/debug-server/package.json +++ b/examples/debug-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-debug", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "Debug MCP App Server for testing all SDK capabilities", "repository": { diff --git a/examples/integration-server/package.json b/examples/integration-server/package.json index fb8cc99..f1173ed 100644 --- a/examples/integration-server/package.json +++ b/examples/integration-server/package.json @@ -1,6 +1,6 @@ { "name": "integration-server", - "version": "1.6.0", + "version": "1.7.0", "private": true, "type": "module", "scripts": { diff --git a/examples/map-server/package.json b/examples/map-server/package.json index e6c2124..d39648b 100644 --- a/examples/map-server/package.json +++ b/examples/map-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-map", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "MCP App Server example with CesiumJS 3D globe and geocoding", "repository": { diff --git a/examples/pdf-server/package.json b/examples/pdf-server/package.json index 0180f7b..57af047 100644 --- a/examples/pdf-server/package.json +++ b/examples/pdf-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-pdf", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "MCP server for loading and extracting text from PDF files with chunked pagination and interactive viewer", "repository": { diff --git a/examples/qr-server/package.json b/examples/qr-server/package.json index a71f39f..f74e671 100644 --- a/examples/qr-server/package.json +++ b/examples/qr-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-qr", - "version": "1.6.0", + "version": "1.7.0", "private": true, "scripts": { "start": "uv run server.py", diff --git a/examples/quickstart/package.json b/examples/quickstart/package.json index 31c4d6f..036b66e 100644 --- a/examples/quickstart/package.json +++ b/examples/quickstart/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/quickstart", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "private": true, "description": "Quickstart MCP App Server example", diff --git a/examples/say-server/package.json b/examples/say-server/package.json index c9c268d..283c4d5 100644 --- a/examples/say-server/package.json +++ b/examples/say-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-say", - "version": "1.6.0", + "version": "1.7.0", "private": true, "description": "Streaming TTS MCP App Server with karaoke-style text highlighting", "repository": { diff --git a/examples/scenario-modeler-server/package.json b/examples/scenario-modeler-server/package.json index b7fbcef..2d626cf 100644 --- a/examples/scenario-modeler-server/package.json +++ b/examples/scenario-modeler-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-scenario-modeler", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "Financial scenario modeling MCP App Server", "repository": { diff --git a/examples/shadertoy-server/package.json b/examples/shadertoy-server/package.json index 6e5899a..4924d63 100644 --- a/examples/shadertoy-server/package.json +++ b/examples/shadertoy-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-shadertoy", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "MCP App Server example for rendering ShaderToy-compatible GLSL shaders", "repository": { diff --git a/examples/sheet-music-server/package.json b/examples/sheet-music-server/package.json index 756ed33..b5f2370 100644 --- a/examples/sheet-music-server/package.json +++ b/examples/sheet-music-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-sheet-music", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "MCP App Server for rendering and playing sheet music from ABC notation", "repository": { diff --git a/examples/system-monitor-server/package.json b/examples/system-monitor-server/package.json index 5f9d333..05243db 100644 --- a/examples/system-monitor-server/package.json +++ b/examples/system-monitor-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-system-monitor", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "System monitor MCP App Server with real-time stats", "repository": { diff --git a/examples/threejs-server/package.json b/examples/threejs-server/package.json index 50ff990..0c2d5f5 100644 --- a/examples/threejs-server/package.json +++ b/examples/threejs-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-threejs", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "Three.js 3D visualization MCP App Server", "repository": { diff --git a/examples/transcript-server/package.json b/examples/transcript-server/package.json index 0660aa4..f0daa38 100644 --- a/examples/transcript-server/package.json +++ b/examples/transcript-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-transcript", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "MCP App Server for live speech transcription", "repository": { diff --git a/examples/video-resource-server/package.json b/examples/video-resource-server/package.json index 88f3b97..9e70d24 100644 --- a/examples/video-resource-server/package.json +++ b/examples/video-resource-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-video-resource", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "MCP App Server demonstrating video resources served as base64 blobs", "repository": { diff --git a/examples/wiki-explorer-server/package.json b/examples/wiki-explorer-server/package.json index a2aea7a..a6a8f19 100644 --- a/examples/wiki-explorer-server/package.json +++ b/examples/wiki-explorer-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-wiki-explorer", - "version": "1.6.0", + "version": "1.7.0", "type": "module", "description": "Wikipedia link explorer MCP App Server with graph visualization", "repository": { diff --git a/package-lock.json b/package-lock.json index 9c8f52b..c0c0c47 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@modelcontextprotocol/ext-apps", - "version": "1.6.0", + "version": "1.7.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@modelcontextprotocol/ext-apps", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "workspaces": [ "examples/*" @@ -66,7 +66,7 @@ }, "examples/basic-host": { "name": "@modelcontextprotocol/ext-apps-basic-host", - "version": "1.6.0", + "version": "1.7.0", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", "@modelcontextprotocol/sdk": "^1.29.0", @@ -109,7 +109,7 @@ }, "examples/basic-server-preact": { "name": "@modelcontextprotocol/server-basic-preact", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -153,7 +153,7 @@ }, "examples/basic-server-react": { "name": "@modelcontextprotocol/server-basic-react", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -200,7 +200,7 @@ }, "examples/basic-server-solid": { "name": "@modelcontextprotocol/server-basic-solid", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -244,7 +244,7 @@ }, "examples/basic-server-svelte": { "name": "@modelcontextprotocol/server-basic-svelte", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -288,7 +288,7 @@ }, "examples/basic-server-vanillajs": { "name": "@modelcontextprotocol/server-basic-vanillajs", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -330,7 +330,7 @@ }, "examples/basic-server-vue": { "name": "@modelcontextprotocol/server-basic-vue", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -374,7 +374,7 @@ }, "examples/budget-allocator-server": { "name": "@modelcontextprotocol/server-budget-allocator", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -417,7 +417,7 @@ }, "examples/cohort-heatmap-server": { "name": "@modelcontextprotocol/server-cohort-heatmap", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -464,7 +464,7 @@ }, "examples/customer-segmentation-server": { "name": "@modelcontextprotocol/server-customer-segmentation", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -507,7 +507,7 @@ }, "examples/debug-server": { "name": "@modelcontextprotocol/server-debug", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -548,7 +548,7 @@ "license": "MIT" }, "examples/integration-server": { - "version": "1.6.0", + "version": "1.7.0", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", "@modelcontextprotocol/sdk": "^1.29.0", @@ -593,7 +593,7 @@ }, "examples/map-server": { "name": "@modelcontextprotocol/server-map", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -635,7 +635,7 @@ }, "examples/pdf-server": { "name": "@modelcontextprotocol/server-pdf", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -679,7 +679,7 @@ }, "examples/qr-server": { "name": "@modelcontextprotocol/server-qr", - "version": "1.6.0", + "version": "1.7.0", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", "@modelcontextprotocol/sdk": "^1.29.0" @@ -687,7 +687,7 @@ }, "examples/quickstart": { "name": "@modelcontextprotocol/quickstart", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -719,7 +719,7 @@ }, "examples/say-server": { "name": "@modelcontextprotocol/server-say", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -728,7 +728,7 @@ }, "examples/scenario-modeler-server": { "name": "@modelcontextprotocol/server-scenario-modeler", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -776,7 +776,7 @@ }, "examples/shadertoy-server": { "name": "@modelcontextprotocol/server-shadertoy", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -818,7 +818,7 @@ }, "examples/sheet-music-server": { "name": "@modelcontextprotocol/server-sheet-music", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -861,7 +861,7 @@ }, "examples/system-monitor-server": { "name": "@modelcontextprotocol/server-system-monitor", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -931,7 +931,7 @@ }, "examples/threejs-server": { "name": "@modelcontextprotocol/server-threejs", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -980,7 +980,7 @@ }, "examples/transcript-server": { "name": "@modelcontextprotocol/server-transcript", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -1023,7 +1023,7 @@ }, "examples/video-resource-server": { "name": "@modelcontextprotocol/server-video-resource", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -1065,7 +1065,7 @@ }, "examples/wiki-explorer-server": { "name": "@modelcontextprotocol/server-wiki-explorer", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", diff --git a/package.json b/package.json index bb824ff..5072e5b 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "url": "https://github.com/modelcontextprotocol/ext-apps" }, "homepage": "https://github.com/modelcontextprotocol/ext-apps", - "version": "1.6.0", + "version": "1.7.0", "license": "MIT", "description": "MCP Apps SDK — Enable MCP servers to display interactive user interfaces in conversational clients.", "type": "module", From 77b8daa1e8ac86f0c826162af6763acabc6a9990 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Fri, 24 Apr 2026 11:27:32 +0100 Subject: [PATCH 048/107] test: add unit coverage for PostMessageTransport source validation (#536) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test: add unit coverage for PostMessageTransport source validation PostMessageTransport is the iframe↔host communication layer and contains the primary security boundary (event.source validation). Previously it had zero unit coverage — only exercised indirectly via E2E tests, where the cross-app injection test is a no-op due to cross-origin contentDocument restrictions. Covers 18 test cases across: - Source validation: trusted source delivers, untrusted/null sources dropped silently (no onerror DoS vector), transport survives rejection - Message format: valid requests/notifications delivered; ambient non-JSON-RPC traffic (devtools, extensions) silently ignored; malformed jsonrpc:'2.0' payloads surface via onerror - send(): posts to configured target with '*' targetOrigin - Lifecycle: start() registers listener, close() removes it and fires onclose, post-close messages ignored, multi-transport isolation Uses a minimal in-memory window stub rather than jsdom/happy-dom — consistent with the existing bun test setup which has no DOM configured. Note: the transport validates event.source (window identity), NOT event.origin. send() posts with '*'. Origin is intentionally not part of this transport's trust model. * fix: resolve TS diagnostics in message-transport tests - TS2352: cast `{ id: string }` through `unknown` before `MessageEventSource` (lines 366, 370) — no structural overlap - TS80007: drop ineffective `await` on bun's `.resolves` matcher (line 355) — it returns void, not Promise * docs: clarify origin validation lives in sandbox proxy, not transport --- src/message-transport.test.ts | 390 ++++++++++++++++++++++++++++++++++ 1 file changed, 390 insertions(+) create mode 100644 src/message-transport.test.ts diff --git a/src/message-transport.test.ts b/src/message-transport.test.ts new file mode 100644 index 0000000..d5f5092 --- /dev/null +++ b/src/message-transport.test.ts @@ -0,0 +1,390 @@ +import { describe, it, expect, beforeEach, afterEach, mock } from "bun:test"; +import type { JSONRPCMessage } from "@modelcontextprotocol/sdk/types.js"; + +import { PostMessageTransport } from "./message-transport"; + +/** + * Minimal `window` stub for bun's DOM-less test environment. + * + * Captures listeners registered via `addEventListener` so tests can dispatch + * fake `MessageEvent`-like objects directly. We deliberately avoid pulling in + * jsdom/happy-dom — this file tests the transport's contract, not the browser. + */ +type Listener = (event: MessageEvent) => void; + +function createFakeWindow() { + const listeners = new Map>(); + return { + addEventListener(type: string, listener: Listener) { + if (!listeners.has(type)) listeners.set(type, new Set()); + listeners.get(type)!.add(listener); + }, + removeEventListener(type: string, listener: Listener) { + listeners.get(type)?.delete(listener); + }, + /** Test helper: invoke all listeners for `type` with the given event. */ + dispatch(type: string, event: unknown) { + listeners.get(type)?.forEach((l) => l(event as MessageEvent)); + }, + /** Test helper: how many listeners are registered for `type`? */ + listenerCount(type: string) { + return listeners.get(type)?.size ?? 0; + }, + }; +} + +/** + * A valid JSON-RPC request payload. Used by most happy-path tests. + * Kept deliberately minimal — we care that *a* valid message is delivered, + * not about exercising every JSON-RPC shape (that's the schema's job). + */ +const validRequest: JSONRPCMessage = { + jsonrpc: "2.0", + id: 1, + method: "ping", +}; + +describe("PostMessageTransport", () => { + let fakeWindow: ReturnType; + let trustedSource: object; + let untrustedSource: object; + + /** Stand-in for the target window (e.g. window.parent or iframe.contentWindow). */ + let targetPostMessage: ReturnType; + let eventTarget: { postMessage: typeof targetPostMessage }; + + // The transport logs liberally at debug/error level. Silence during tests + // so failures are readable; restore afterwards so we don't leak state. + let restoreConsole: () => void; + + beforeEach(() => { + fakeWindow = createFakeWindow(); + (globalThis as { window?: unknown }).window = fakeWindow; + + // Distinct object identities — the transport compares with `!==`. + trustedSource = { id: "trusted" }; + untrustedSource = { id: "untrusted" }; + + targetPostMessage = mock(() => {}); + eventTarget = { postMessage: targetPostMessage }; + + const origDebug = console.debug; + const origError = console.error; + console.debug = () => {}; + console.error = () => {}; + restoreConsole = () => { + console.debug = origDebug; + console.error = origError; + }; + }); + + afterEach(() => { + restoreConsole(); + delete (globalThis as { window?: unknown }).window; + }); + + /** Create and start a transport wired to the shared fakes. */ + async function createStartedTransport() { + const transport = new PostMessageTransport( + eventTarget as unknown as Window, + trustedSource as MessageEventSource, + ); + await transport.start(); + return transport; + } + + // ========================================================================== + // Source validation — the security boundary at this layer. + // The transport validates `event.source` (window identity), not `event.origin`. + // Origin checks live in the sandbox proxy relay between the two endpoints + // (see examples/basic-host/src/sandbox.ts). Here, source===contentWindow is + // the narrower check; the app side can't know its sandbox's origin anyway. + // ========================================================================== + describe("source validation", () => { + it("delivers messages from the configured eventSource", async () => { + const transport = await createStartedTransport(); + const received: JSONRPCMessage[] = []; + transport.onmessage = (msg) => received.push(msg); + + fakeWindow.dispatch("message", { + source: trustedSource, + data: validRequest, + }); + + expect(received).toEqual([validRequest]); + }); + + it("drops messages from a different source", async () => { + const transport = await createStartedTransport(); + const received: JSONRPCMessage[] = []; + const errors: Error[] = []; + transport.onmessage = (msg) => received.push(msg); + transport.onerror = (err) => errors.push(err); + + fakeWindow.dispatch("message", { + source: untrustedSource, + data: validRequest, + }); + + // The message is silently dropped — neither delivered nor surfaced as + // an error. An attacker flooding us with forged messages should not be + // able to DoS the error handler. + expect(received).toEqual([]); + expect(errors).toEqual([]); + }); + + it("drops messages with a null source", async () => { + // Some browser-injected messages (extensions, devtools) arrive with + // source === null. These must not reach the protocol layer. + const transport = await createStartedTransport(); + const received: JSONRPCMessage[] = []; + transport.onmessage = (msg) => received.push(msg); + + fakeWindow.dispatch("message", { + source: null, + data: validRequest, + }); + + expect(received).toEqual([]); + }); + + it("continues delivering trusted messages after dropping an untrusted one", async () => { + // Regression guard: a rejected message must not break the listener or + // close the transport. + const transport = await createStartedTransport(); + const received: JSONRPCMessage[] = []; + transport.onmessage = (msg) => received.push(msg); + + fakeWindow.dispatch("message", { + source: untrustedSource, + data: validRequest, + }); + fakeWindow.dispatch("message", { + source: trustedSource, + data: validRequest, + }); + + expect(received).toEqual([validRequest]); + }); + }); + + // ========================================================================== + // Message format validation. + // Three paths: valid → onmessage, non-JSON-RPC → silent, malformed → onerror. + // ========================================================================== + describe("message format validation", () => { + it("delivers valid JSON-RPC requests via onmessage", async () => { + const transport = await createStartedTransport(); + const received: JSONRPCMessage[] = []; + transport.onmessage = (msg) => received.push(msg); + + fakeWindow.dispatch("message", { + source: trustedSource, + data: { jsonrpc: "2.0", id: 42, method: "tools/call" }, + }); + + expect(received).toHaveLength(1); + expect(received[0]).toMatchObject({ id: 42, method: "tools/call" }); + }); + + it("delivers valid JSON-RPC notifications via onmessage", async () => { + const transport = await createStartedTransport(); + const received: JSONRPCMessage[] = []; + transport.onmessage = (msg) => received.push(msg); + + fakeWindow.dispatch("message", { + source: trustedSource, + data: { jsonrpc: "2.0", method: "notifications/initialized" }, + }); + + expect(received).toHaveLength(1); + expect(received[0]).toMatchObject({ + method: "notifications/initialized", + }); + }); + + it("silently ignores non-JSON-RPC payloads", async () => { + // Real iframes receive all sorts of ambient postMessage traffic: + // React DevTools, browser extensions, ad frames. These must not crash + // the transport or surface as protocol errors. + const transport = await createStartedTransport(); + const received: JSONRPCMessage[] = []; + const errors: Error[] = []; + transport.onmessage = (msg) => received.push(msg); + transport.onerror = (err) => errors.push(err); + + fakeWindow.dispatch("message", { + source: trustedSource, + data: { type: "react-devtools-hook", payload: {} }, + }); + fakeWindow.dispatch("message", { source: trustedSource, data: "hello" }); + fakeWindow.dispatch("message", { source: trustedSource, data: null }); + fakeWindow.dispatch("message", { source: trustedSource, data: 42 }); + + expect(received).toEqual([]); + expect(errors).toEqual([]); + }); + + it("calls onerror for malformed messages claiming to be JSON-RPC", async () => { + // `jsonrpc: "2.0"` but missing required fields — this IS a protocol + // violation worth surfacing, unlike ambient noise. + const transport = await createStartedTransport(); + const received: JSONRPCMessage[] = []; + const errors: Error[] = []; + transport.onmessage = (msg) => received.push(msg); + transport.onerror = (err) => errors.push(err); + + fakeWindow.dispatch("message", { + source: trustedSource, + data: { jsonrpc: "2.0" }, // no id/method/result — invalid + }); + + expect(received).toEqual([]); + expect(errors).toHaveLength(1); + expect(errors[0]).toBeInstanceOf(Error); + }); + + it("does not throw when onerror is unset and a malformed message arrives", async () => { + const transport = await createStartedTransport(); + transport.onmessage = () => {}; + // onerror deliberately left unset + + expect(() => + fakeWindow.dispatch("message", { + source: trustedSource, + data: { jsonrpc: "2.0" }, + }), + ).not.toThrow(); + }); + + it("does not throw when onmessage is unset and a valid message arrives", async () => { + await createStartedTransport(); + // onmessage deliberately left unset — may happen briefly during wiring + + expect(() => + fakeWindow.dispatch("message", { + source: trustedSource, + data: validRequest, + }), + ).not.toThrow(); + }); + }); + + // ========================================================================== + // send() + // ========================================================================== + describe("send()", () => { + it("posts the message to the configured eventTarget with '*' origin", async () => { + const transport = await createStartedTransport(); + + const msg: JSONRPCMessage = { + jsonrpc: "2.0", + id: 7, + method: "ui/initialize", + }; + await transport.send(msg); + + expect(targetPostMessage).toHaveBeenCalledTimes(1); + expect(targetPostMessage).toHaveBeenCalledWith(msg, "*"); + }); + + it("posts multiple messages in order", async () => { + const transport = await createStartedTransport(); + + const a: JSONRPCMessage = { jsonrpc: "2.0", id: 1, method: "a" }; + const b: JSONRPCMessage = { jsonrpc: "2.0", id: 2, method: "b" }; + await transport.send(a); + await transport.send(b); + + expect(targetPostMessage).toHaveBeenCalledTimes(2); + expect(targetPostMessage.mock.calls[0][0]).toEqual(a); + expect(targetPostMessage.mock.calls[1][0]).toEqual(b); + }); + }); + + // ========================================================================== + // Lifecycle: start() / close() + // ========================================================================== + describe("lifecycle", () => { + it("start() registers a message listener on window", async () => { + const transport = new PostMessageTransport( + eventTarget as unknown as Window, + trustedSource as MessageEventSource, + ); + + expect(fakeWindow.listenerCount("message")).toBe(0); + await transport.start(); + expect(fakeWindow.listenerCount("message")).toBe(1); + }); + + it("close() removes the message listener", async () => { + const transport = await createStartedTransport(); + + expect(fakeWindow.listenerCount("message")).toBe(1); + await transport.close(); + expect(fakeWindow.listenerCount("message")).toBe(0); + }); + + it("messages dispatched after close() are not delivered", async () => { + const transport = await createStartedTransport(); + const received: JSONRPCMessage[] = []; + transport.onmessage = (msg) => received.push(msg); + + await transport.close(); + fakeWindow.dispatch("message", { + source: trustedSource, + data: validRequest, + }); + + expect(received).toEqual([]); + }); + + it("close() invokes onclose when set", async () => { + const transport = await createStartedTransport(); + const onclose = mock(() => {}); + transport.onclose = onclose; + + await transport.close(); + + expect(onclose).toHaveBeenCalledTimes(1); + }); + + it("close() does not throw when onclose is unset", async () => { + const transport = await createStartedTransport(); + // onclose deliberately left unset + + expect(transport.close()).resolves.toBeUndefined(); + }); + + it("two transports listen independently", async () => { + // Host scenario: multiple iframes, each with its own transport. + // Each transport must only accept messages from its own iframe. + const sourceA = { id: "iframe-a" }; + const sourceB = { id: "iframe-b" }; + + const transportA = new PostMessageTransport( + eventTarget as unknown as Window, + sourceA as unknown as MessageEventSource, + ); + const transportB = new PostMessageTransport( + eventTarget as unknown as Window, + sourceB as unknown as MessageEventSource, + ); + await transportA.start(); + await transportB.start(); + + const receivedA: JSONRPCMessage[] = []; + const receivedB: JSONRPCMessage[] = []; + transportA.onmessage = (msg) => receivedA.push(msg); + transportB.onmessage = (msg) => receivedB.push(msg); + + fakeWindow.dispatch("message", { source: sourceA, data: validRequest }); + + expect(receivedA).toHaveLength(1); + expect(receivedB).toHaveLength(0); + + await transportA.close(); + await transportB.close(); + }); + }); +}); From 0b836799091c758c8de902a43e67a4019b29389a Mon Sep 17 00:00:00 2001 From: Maurizio Albari Date: Fri, 24 Apr 2026 12:35:13 +0200 Subject: [PATCH 049/107] fix(qr-server): pass host/port to FastMCP for Docker compatibility (#372) When FastMCP is created with the default host=127.0.0.1, MCP SDK 1.26+ automatically enables DNS rebinding protection that only allows requests from localhost. This breaks Docker where requests come from host.docker.internal, causing 421 Invalid Host header errors. By passing host=HOST (0.0.0.0 for Docker), DNS rebinding protection is not auto-enabled, allowing requests from any host. --- examples/qr-server/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/qr-server/server.py b/examples/qr-server/server.py index d282d1a..c1c302e 100755 --- a/examples/qr-server/server.py +++ b/examples/qr-server/server.py @@ -26,7 +26,7 @@ VIEW_URI = "ui://qr-server/view.html" HOST = os.environ.get("HOST", "0.0.0.0") # 0.0.0.0 for Docker compatibility PORT = int(os.environ.get("PORT", "3001")) -mcp = FastMCP("QR Code Server", stateless_http=True) +mcp = FastMCP("QR Code Server", stateless_http=True, host=HOST, port=PORT) # Embedded View HTML for self-contained usage (uv run or unbundled) EMBEDDED_VIEW_HTML = """ From 0f6d653b4a511f6c8057842e93399b7b4aba0f2f Mon Sep 17 00:00:00 2001 From: Suriya Prakash Date: Fri, 24 Apr 2026 16:06:00 +0530 Subject: [PATCH 050/107] test: add unit tests for buildAllowAttribute (#541) --- src/app-bridge.test.ts | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/app-bridge.test.ts b/src/app-bridge.test.ts index 38f7d30..a4fe1de 100644 --- a/src/app-bridge.test.ts +++ b/src/app-bridge.test.ts @@ -18,6 +18,7 @@ import { App } from "./app"; import { LATEST_PROTOCOL_VERSION } from "./types"; import { AppBridge, + buildAllowAttribute, getToolUiResourceUri, isToolVisibilityModelOnly, isToolVisibilityAppOnly, @@ -2786,3 +2787,54 @@ describe("isToolVisibilityAppOnly", () => { }); }); }); + +describe("buildAllowAttribute", () => { + describe("returns empty string", () => { + it("when permissions is undefined", () => { + expect(buildAllowAttribute(undefined)).toBe(""); + }); + + it("when permissions object is empty", () => { + expect(buildAllowAttribute({})).toBe(""); + }); + }); + + describe("returns a single permission directive", () => { + it("when only camera is set", () => { + expect(buildAllowAttribute({ camera: {} })).toBe("camera"); + }); + + it("when only microphone is set", () => { + expect(buildAllowAttribute({ microphone: {} })).toBe("microphone"); + }); + + it("when only geolocation is set", () => { + expect(buildAllowAttribute({ geolocation: {} })).toBe("geolocation"); + }); + + it("when only clipboardWrite is set, maps to clipboard-write", () => { + expect(buildAllowAttribute({ clipboardWrite: {} })).toBe( + "clipboard-write", + ); + }); + }); + + describe("returns multiple directives joined with '; '", () => { + it("when camera and microphone are set", () => { + expect(buildAllowAttribute({ camera: {}, microphone: {} })).toBe( + "camera; microphone", + ); + }); + + it("when all permissions are set", () => { + expect( + buildAllowAttribute({ + camera: {}, + microphone: {}, + geolocation: {}, + clipboardWrite: {}, + }), + ).toBe("camera; microphone; geolocation; clipboard-write"); + }); + }); +}); From 7344d4c966b9e9c0aff9524c9a474eeab754fb23 Mon Sep 17 00:00:00 2001 From: Cameron Yick Date: Fri, 24 Apr 2026 06:36:43 -0400 Subject: [PATCH 051/107] fix(docs): update contributing guide on package preview (#601) --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6a3102b..6592106 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -573,7 +573,7 @@ To release a patch for an older version: ### Testing Pre-releases -Every commit and PR automatically publishes a preview package via [pkg-pr-new](https://github.com/pkg-pr-new/pkg-pr-new). Check the PR comments or workflow logs for the install command. +Every commit and PR automatically publishes a preview package via [pkg-pr-new](https://github.com/stackblitz-labs/pkg.pr.new). Check the PR comments or workflow logs for the install command. --- From 30a78b60b4829282656daf10c298e2f5f6510f58 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Fri, 24 Apr 2026 15:57:58 +0100 Subject: [PATCH 052/107] perf(pdf-server): share cache across server instances and dedupe form parsing (#637) * perf(pdf-server): share cache across server instances and dedupe form parsing In stateless HTTP deployments createServer() is called per request, so the per-instance pdfCache and the 4 MB viewer HTML were discarded after every call. Hoist both to module scope. Also refactor extractFormSchema/extractFormFieldInfo to accept an already-parsed PDFDocumentProxy so display_pdf downloads and parses the PDF once instead of twice. * perf(pdf-server): cap total cache bytes with LRU eviction The module-level sharedPdfCache could grow unbounded within the 60s lifetime window under a burst of distinct URLs. Track running total bytes and evict least-recently-used entries on insert when it would exceed CACHE_MAX_TOTAL_BYTES (256MB). getCacheEntry now bumps the accessed entry to the end of insertion order so eviction targets the LRU entry rather than the oldest insert. createPdfCache takes an optional maxTotalBytes for testability. --- examples/pdf-server/server.test.ts | 66 +++++++++ examples/pdf-server/server.ts | 215 +++++++++++++---------------- 2 files changed, 165 insertions(+), 116 deletions(-) diff --git a/examples/pdf-server/server.test.ts b/examples/pdf-server/server.test.ts index a2f64ee..f63ae67 100644 --- a/examples/pdf-server/server.test.ts +++ b/examples/pdf-server/server.test.ts @@ -71,6 +71,72 @@ describe("PDF Cache with Timeouts", () => { }); }); + describe("byte-cap LRU eviction", () => { + const tenBytes = new Uint8Array(10); + + async function fill(cache: PdfCache, url: string): Promise { + const m = spyOn(globalThis, "fetch").mockResolvedValueOnce( + new Response(tenBytes, { status: 200 }), + ); + try { + await cache.readPdfRange(url, 0, 1024); + } finally { + m.mockRestore(); + } + } + + it("evicts least-recently-used entry when total exceeds cap", async () => { + const cache = createPdfCache(25); + try { + await fill(cache, "https://arxiv.org/pdf/a"); + await fill(cache, "https://arxiv.org/pdf/b"); + expect(cache.getCacheSize()).toBe(2); + + // Touch A so B becomes least-recently-used + await cache.readPdfRange("https://arxiv.org/pdf/a", 0, 1); + + // Inserting C (10B) pushes total to 30 > 25 → evict LRU (B) + await fill(cache, "https://arxiv.org/pdf/c"); + expect(cache.getCacheSize()).toBe(2); + + // A and C still served from cache; B re-fetches + const m = spyOn(globalThis, "fetch").mockResolvedValue( + new Response(tenBytes, { status: 200 }), + ); + try { + await cache.readPdfRange("https://arxiv.org/pdf/a", 0, 1); + await cache.readPdfRange("https://arxiv.org/pdf/c", 0, 1); + expect(m).toHaveBeenCalledTimes(0); + await cache.readPdfRange("https://arxiv.org/pdf/b", 0, 1); + expect(m).toHaveBeenCalledTimes(1); + } finally { + m.mockRestore(); + } + } finally { + cache.clearCache(); + } + }); + + it("evicts multiple entries if a single insert exceeds the cap", async () => { + const cache = createPdfCache(25); + try { + await fill(cache, "https://arxiv.org/pdf/a"); + await fill(cache, "https://arxiv.org/pdf/b"); + const big = spyOn(globalThis, "fetch").mockResolvedValueOnce( + new Response(new Uint8Array(20), { status: 200 }), + ); + try { + await cache.readPdfRange("https://arxiv.org/pdf/big", 0, 1024); + } finally { + big.mockRestore(); + } + expect(cache.getCacheSize()).toBe(1); + } finally { + cache.clearCache(); + } + }); + }); + describe("readPdfRange caching behavior", () => { const testUrl = "https://arxiv.org/pdf/test-pdf"; const testData = new Uint8Array([0x25, 0x50, 0x44, 0x46]); // %PDF header diff --git a/examples/pdf-server/server.ts b/examples/pdf-server/server.ts index 80a5499..062b263 100644 --- a/examples/pdf-server/server.ts +++ b/examples/pdf-server/server.ts @@ -34,6 +34,7 @@ import { VerbosityLevel, version as PDFJS_VERSION, } from "pdfjs-dist/legacy/build/pdf.mjs"; +import type { PDFDocumentProxy } from "pdfjs-dist/types/src/display/api.js"; /** * PDF Standard-14 fonts from CDN. Used by both server and viewer so we @@ -83,6 +84,9 @@ export const CACHE_MAX_LIFETIME_MS = 60_000; // 60 seconds /** Max size for cached PDFs (defensive limit to prevent memory exhaustion) */ export const CACHE_MAX_PDF_SIZE_BYTES = 50 * 1024 * 1024; // 50MB +/** Max total bytes across all cache entries; oldest evicted first when exceeded. */ +export const CACHE_MAX_TOTAL_BYTES = 256 * 1024 * 1024; // 256MB + /** Allowed local file paths (CLI args + file roots — read access). */ export const allowedLocalFiles = new Set(); @@ -695,8 +699,11 @@ export interface PdfCache { * - CACHE_INACTIVITY_TIMEOUT_MS of no access (resets on each access) * - CACHE_MAX_LIFETIME_MS from creation (absolute timeout) */ -export function createPdfCache(): PdfCache { +export function createPdfCache( + maxTotalBytes: number = CACHE_MAX_TOTAL_BYTES, +): PdfCache { const cache = new Map(); + let totalBytes = 0; /** Delete a cache entry and clear its timers */ function deleteCacheEntry(url: string): void { @@ -704,6 +711,7 @@ export function createPdfCache(): PdfCache { if (entry) { clearTimeout(entry.inactivityTimer); clearTimeout(entry.maxLifetimeTimer); + totalBytes -= entry.data.length; cache.delete(url); } } @@ -719,6 +727,10 @@ export function createPdfCache(): PdfCache { deleteCacheEntry(url); }, CACHE_INACTIVITY_TIMEOUT_MS); + // Move to end of insertion order so size-cap eviction is LRU. + cache.delete(url); + cache.set(url, entry); + return entry.data; } @@ -727,6 +739,12 @@ export function createPdfCache(): PdfCache { // Clear any existing entry first deleteCacheEntry(url); + // Evict least-recently-used entries until under the byte cap. + for (const oldest of cache.keys()) { + if (totalBytes + data.length <= maxTotalBytes) break; + deleteCacheEntry(oldest); + } + const entry: CacheEntry = { data, createdAt: Date.now(), @@ -739,6 +757,7 @@ export function createPdfCache(): PdfCache { }; cache.set(url, entry); + totalBytes += data.length; } /** Slice a cached or freshly-fetched full body to the requested range. */ @@ -943,112 +962,69 @@ interface FormFieldInfo { * from a PDF. Bounding boxes are converted to model coordinates (top-left origin). */ async function extractFormFieldInfo( - url: string, - readRange: ( - url: string, - offset: number, - byteCount: number, - ) => Promise<{ data: Uint8Array; totalBytes: number }>, + pdfDoc: PDFDocumentProxy, ): Promise { - const { totalBytes } = await readRange(url, 0, 1); - const { data } = await readRange(url, 0, totalBytes); - - const loadingTask = getDocument({ - data, - standardFontDataUrl: STANDARD_FONT_DATA_URL, - StandardFontDataFactory: FetchStandardFontDataFactory, - // We only introspect form fields (never render) — silence residual - // warnings like "Unimplemented border style: inset". - verbosity: VerbosityLevel.ERRORS, - }); - const pdfDoc = await loadingTask.promise; - const fields: FormFieldInfo[] = []; - try { - for (let i = 1; i <= pdfDoc.numPages; i++) { - const page = await pdfDoc.getPage(i); - const pageHeight = page.getViewport({ scale: 1.0 }).height; - const annotations = await page.getAnnotations(); - for (const ann of annotations) { - // Only include form widgets (annotationType 20) - if (ann.annotationType !== 20) continue; - if (!ann.rect) continue; + for (let i = 1; i <= pdfDoc.numPages; i++) { + const page = await pdfDoc.getPage(i); + const pageHeight = page.getViewport({ scale: 1.0 }).height; + const annotations = await page.getAnnotations(); + for (const ann of annotations) { + // Only include form widgets (annotationType 20) + if (ann.annotationType !== 20) continue; + if (!ann.rect) continue; - const fieldName = ann.fieldName || ""; - const fieldType = ann.fieldType || "unknown"; + const fieldName = ann.fieldName || ""; + const fieldType = ann.fieldType || "unknown"; - // PDF rect is [x1, y1, x2, y2] in bottom-left origin - const x1 = Math.min(ann.rect[0], ann.rect[2]); - const y1 = Math.min(ann.rect[1], ann.rect[3]); - const x2 = Math.max(ann.rect[0], ann.rect[2]); - const y2 = Math.max(ann.rect[1], ann.rect[3]); - const width = x2 - x1; - const height = y2 - y1; + // PDF rect is [x1, y1, x2, y2] in bottom-left origin + const x1 = Math.min(ann.rect[0], ann.rect[2]); + const y1 = Math.min(ann.rect[1], ann.rect[3]); + const x2 = Math.max(ann.rect[0], ann.rect[2]); + const y2 = Math.max(ann.rect[1], ann.rect[3]); + const width = x2 - x1; + const height = y2 - y1; - // Convert to model coords (top-left origin): modelY = pageHeight - pdfY - height - const modelY = pageHeight - y2; + // Convert to model coords (top-left origin): modelY = pageHeight - pdfY - height + const modelY = pageHeight - y2; - // Choice widgets (combo/listbox) carry `options` as - // [{exportValue, displayValue}]. Expose export values — that's - // what fill_form needs. - let options: string[] | undefined; - if (Array.isArray(ann.options) && ann.options.length > 0) { - options = ann.options - .map((o: { exportValue?: string }) => o?.exportValue) - .filter((v: unknown): v is string => typeof v === "string"); - } - - fields.push({ - name: fieldName, - type: fieldType, - page: i, - x: Math.round(x1), - y: Math.round(modelY), - width: Math.round(width), - height: Math.round(height), - ...(ann.alternativeText ? { label: ann.alternativeText } : undefined), - // Radio: buttonValue is the per-widget export value — the only - // thing distinguishing three `size [Btn]` lines from each other. - ...(ann.radioButton && ann.buttonValue != null - ? { exportValue: String(ann.buttonValue) } - : undefined), - ...(options?.length ? { options } : undefined), - }); + // Choice widgets (combo/listbox) carry `options` as + // [{exportValue, displayValue}]. Expose export values — that's + // what fill_form needs. + let options: string[] | undefined; + if (Array.isArray(ann.options) && ann.options.length > 0) { + options = ann.options + .map((o: { exportValue?: string }) => o?.exportValue) + .filter((v: unknown): v is string => typeof v === "string"); } + + fields.push({ + name: fieldName, + type: fieldType, + page: i, + x: Math.round(x1), + y: Math.round(modelY), + width: Math.round(width), + height: Math.round(height), + ...(ann.alternativeText ? { label: ann.alternativeText } : undefined), + // Radio: buttonValue is the per-widget export value — the only + // thing distinguishing three `size [Btn]` lines from each other. + ...(ann.radioButton && ann.buttonValue != null + ? { exportValue: String(ann.buttonValue) } + : undefined), + ...(options?.length ? { options } : undefined), + }); } - } finally { - pdfDoc.destroy(); } return fields; } -async function extractFormSchema( - url: string, - readRange: ( - url: string, - offset: number, - byteCount: number, - ) => Promise<{ data: Uint8Array; totalBytes: number }>, -): Promise<{ +async function extractFormSchema(pdfDoc: PDFDocumentProxy): Promise<{ type: "object"; properties: Record; required?: string[]; } | null> { - // Read full PDF bytes - const { totalBytes } = await readRange(url, 0, 1); - const { data } = await readRange(url, 0, totalBytes); - - const loadingTask = getDocument({ - data, - standardFontDataUrl: STANDARD_FONT_DATA_URL, - StandardFontDataFactory: FetchStandardFontDataFactory, - // We only introspect form fields (never render) — silence residual - // warnings like "Unimplemented border style: inset". - verbosity: VerbosityLevel.ERRORS, - }); - const pdfDoc = await loadingTask.promise; - let fieldObjects: Record | null; try { fieldObjects = (await pdfDoc.getFieldObjects()) as Record< @@ -1056,11 +1032,9 @@ async function extractFormSchema( PdfJsFieldObject[] > | null; } catch { - pdfDoc.destroy(); return null; } if (!fieldObjects || Object.keys(fieldObjects).length === 0) { - pdfDoc.destroy(); return null; } @@ -1131,7 +1105,6 @@ async function extractFormSchema( return /[[\]().]/.test(name) || /^[A-Z0-9_]+$/.test(name); }); - pdfDoc.destroy(); if (Object.keys(properties).length === 0) return null; if (hasMechanicalNames) return null; @@ -1178,6 +1151,12 @@ export interface CreateServerOptions { debug?: boolean; } +// Module-level singletons so they survive across createServer() calls — in +// stateless HTTP deployments a fresh server is created per request, and +// per-instance caches are discarded immediately. +const sharedPdfCache = createPdfCache(); +let cachedAppHtml: string | undefined; + export function createServer(options: CreateServerOptions = {}): McpServer { const { enableInteract = false, useClientRoots = false } = options; const debug = options.debug ?? false; @@ -1197,8 +1176,7 @@ export function createServer(options: CreateServerOptions = {}): McpServer { ); } - // Create session-local cache (isolated per server instance) - const { readPdfRange } = createPdfCache(); + const { readPdfRange } = sharedPdfCache; // Tool: list_pdfs - List available PDFs server.tool( @@ -1484,33 +1462,38 @@ Set \`elicit_form_inputs\` to true to prompt the user to fill form fields before } } - // Extract form field schema (used for elicitation and field name validation) + // Extract form field schema + detailed field info from a single + // download/parse pass. let formSchema: Awaited> = null; + let fieldInfo: FormFieldInfo[] = []; try { - formSchema = await extractFormSchema(normalized, readPdfRange); + const { data } = await readPdfRange(normalized, 0, totalBytes); + const pdfDoc = await getDocument({ + data, + standardFontDataUrl: STANDARD_FONT_DATA_URL, + StandardFontDataFactory: FetchStandardFontDataFactory, + verbosity: VerbosityLevel.ERRORS, + }).promise; + try { + formSchema = await extractFormSchema(pdfDoc); + fieldInfo = await extractFormFieldInfo(pdfDoc); + } finally { + pdfDoc.destroy(); + } } catch { - // Non-fatal — PDF may not have form fields + // Non-fatal — PDF may not have form fields or may fail to parse } if (formSchema) { viewFieldNames.set(uuid, new Set(Object.keys(formSchema.properties))); } - - // Extract detailed form field info (page, bounding box, label) - let fieldInfo: FormFieldInfo[] = []; - try { - fieldInfo = await extractFormFieldInfo(normalized, readPdfRange); - if (fieldInfo.length > 0) { - viewFieldInfo.set(uuid, fieldInfo); - // Also populate viewFieldNames from field info if not already set - if (!viewFieldNames.has(uuid)) { - viewFieldNames.set( - uuid, - new Set(fieldInfo.map((f) => f.name).filter(Boolean)), - ); - } + if (fieldInfo.length > 0) { + viewFieldInfo.set(uuid, fieldInfo); + if (!viewFieldNames.has(uuid)) { + viewFieldNames.set( + uuid, + new Set(fieldInfo.map((f) => f.name).filter(Boolean)), + ); } - } catch { - // Non-fatal } // Elicit form field values if requested and client supports it @@ -2833,10 +2816,10 @@ Example — add a signature image and a stamp, then screenshot to verify: RESOURCE_URI, { mimeType: RESOURCE_MIME_TYPE }, async (): Promise => { - const html = await fs.promises.readFile( + const html = (cachedAppHtml ??= await fs.promises.readFile( path.join(DIST_DIR, "mcp-app.html"), "utf-8", - ); + )); return { contents: [ { From ba31be1f912f98e0e85049f16fe8a015eb5278c6 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 27 Apr 2026 15:32:53 +0100 Subject: [PATCH 053/107] perf(pdf-server): lazy form extraction via range transport + incremental viewer scans (#639) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * perf(pdf-server): lazy form extraction via range transport + incremental viewer scans Server: display_pdf now opens the document via PDFDataRangeTransport (disableAutoFetch) and only runs the per-page form/annotation walk when getFieldObjects() is non-empty, so form-free PDFs are probed with ~10-25% of bytes instead of a full download. The unused viewFieldInfo Map is removed. Viewer: getDocument sets disableAutoFetch/disableStream; baseline annotation scan and field-name mapping run lazily per rendered page instead of walking every page after load, so first paint no longer schedules a full-file pull. E2E: new range-counting HTTPS fixture (W-9 for forms, generated text+image PDF for no-forms) with stallAfterBytes control, and four regression tests asserting form fields are returned, <30% served on no-forms display_pdf, first page renders while later ranges are stalled, and overlap stays bounded. * fix(pdf-server): handle separated field/widget trees in extractFormSchema pdfjs getFieldObjects() returns the full field-tree array. For PDFs with a separated structure (pdf-lib, some authoring tools) the typed widget sits at fields[1+] behind a typeless container at fields[0]; the previous code only inspected fields[0] and skipped them all. Pick the first entry with a non-empty type instead. Makes the e2e forms.pdf fixture fully generated (no checked-in third-party asset on the hot path); fw9.pdf stays as a unit-test fixture for the hierarchical/XFA case. * fix(pdf-server): address range-transport hangs and lazy-scan tombstone loss PdfCacheRangeTransport: - abort() is a no-op stub on PDFDataRangeTransport (it's the hook pdfjs calls *on* the transport, not an upstream error channel). Expose a .failed promise that rejects on the first fetch error and race every pdfjs await against it in display_pdf, so transient network errors surface into the existing catch instead of hanging the tool call. - pdfjs coalesces adjacent missing chunks into one unbounded requestDataRange; readPdfRange clamps each call to MAX_CHUNK_BYTES. Loop and deliver in slices so every requested chunk is marked loaded. Viewer (mcp-app.ts): - The lazy per-page baseline scan left pdfBaselineAnnotations incomplete, so persistAnnotations and getAnnotatedPdfBytes silently dropped restoredRemovedIds tombstones for unvisited pages. Union those ids into the computed diff and removedRefs. Test fixture: release stalled handlers before resetStats/close so a failing stalled test doesn't hang afterAll; fail fast if started with NODE_ENV=production. NODE_TLS_REJECT_UNAUTHORIZED scope documented (full per-process scoping needs a validateUrl localhost allow, tracked separately). * test(pdf-server): bridge coverage gaps and switch fixture to gated loopback HTTP PdfCacheRangeTransport.deliver(): pdf.js's reader is keyed by the original begin and removed after one delivery, so accumulate slices and call onDataRange once with the full buffer (the previous multi-call approach threw inside pdfjs). Covered by a new integration test that drives getDocument()/getPage(1) on a >1MB PDF through a clamping in-memory readPdfRange. validateUrl: allow http://127.0.0.1|localhost|[::1] only when PDF_SERVER_ALLOW_LOOPBACK_HTTP is set, so a remote deploy can't be made to probe its own ports. Covered by env-on/off unit tests. Fixture switched to plain HTTP (no openssl, no NODE_TLS_REJECT_UNAUTHORIZED). Adds /error.pdf (500s after 50KB) and two e2e tests: page 2 renders after stall release (>512KB object path), and display_pdf returns gracefully on mid-load 500. Existing <30% test now samples stats before the iframe loads. New unit tests: display_pdf returns (not hangs) on mid-load fetch failure via in-memory MCP client; computeDiff/serializeDiff contract tests pinning the restoredRemovedIds tombstone-preservation behaviour. * test(pdf-server): e2e for restoredRemovedIds tombstone preservation through viewer Adds /with-native-annot.pdf fixture (2 pages, native /Text annot on page 2) and a Playwright test that drives delete on page 2 → iframe reload → interact add_annotations on page 1 (persist with page 2 unscanned) → assert localStorage diff still contains the removed id → page 2 still shows it gone. Covers the mcp-app.ts glue the unit tests can't reach. * refactor(pdf-server): simplify per round-2 review and fix false-pass test server.ts: extract probeFormFields() so display_pdf calls one helper instead of inlining 40 lines of transport/orFail plumbing; make extractFormSchema's fieldObjects param required (the optional branch only existed for a test helper). server.test.ts: the >1MB integration test now forces the image XObject fetch via getOperatorList() and asserts max requestDataRange span > MAX_CHUNK_BYTES, so it can't go vacuous. Dedupe makeRandomJpeg by importing from the fixture. mcp-app.ts: restore per-annotation try/catch isolation in the lazy baseline scan (a throw was skipping AnnotationLayer.render); only carry forward restoredRemovedIds while the baseline scan is incomplete so a stale id can't pin dirty=true once every page is scanned. tests: bump fixture JPEG to 1.1MB; consolidate 7 e2e tests to 4 (merge overlap into the byte-budget test, merge stall+page-2, drop the error-e2e duplicate of the unit integration test); delete run-fixture.mjs; drop /error.pdf and ERROR_AFTER_BYTES; rename tombstone test's describe and clarify page-2 covers the viewer transport. * fix(pdf-server): preserve partial probeFormFields results when extractFormFieldInfo throws * test(pdf-server): fix tombstone e2e — deleted native annotations become a cleared card, not removed from DOM * test(pdf-server): mark tombstone e2e as fixme — needs basic-host iframe-reload replay support * test(pdf-server): link tombstone fixme to tracking issue #642 --- examples/pdf-server/server.test.ts | 266 +++++++++++++++++ examples/pdf-server/server.ts | 192 +++++++++---- examples/pdf-server/src/mcp-app.ts | 171 +++++++---- .../pdf-server/src/pdf-annotations.test.ts | 86 ++++++ playwright.config.ts | 4 + tests/e2e/pdf-incremental-load.spec.ts | 271 ++++++++++++++++++ tests/helpers/assets/fw9.pdf | Bin 0 -> 140815 bytes tests/helpers/range-counting-server.ts | 249 ++++++++++++++++ 8 files changed, 1133 insertions(+), 106 deletions(-) create mode 100644 tests/e2e/pdf-incremental-load.spec.ts create mode 100644 tests/helpers/assets/fw9.pdf create mode 100644 tests/helpers/range-counting-server.ts diff --git a/examples/pdf-server/server.test.ts b/examples/pdf-server/server.test.ts index f63ae67..8a0790a 100644 --- a/examples/pdf-server/server.test.ts +++ b/examples/pdf-server/server.test.ts @@ -4,9 +4,15 @@ import os from "node:os"; import path from "node:path"; import { Client } from "@modelcontextprotocol/sdk/client/index.js"; import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js"; +import { getDocument } from "pdfjs-dist/legacy/build/pdf.mjs"; +import { PDFDocument } from "pdf-lib"; +import { makeRandomJpeg } from "../../tests/helpers/range-counting-server"; import { createPdfCache, createServer, + extractFormSchema, + PdfCacheRangeTransport, + MAX_CHUNK_BYTES, validateUrl, isAncestorDir, allowedLocalFiles, @@ -289,6 +295,266 @@ describe("PDF Cache with Timeouts", () => { // through manual testing or E2E tests. }); +describe("PdfCacheRangeTransport", () => { + it("accumulates ranges larger than MAX_CHUNK_BYTES into one onDataRange call", async () => { + const big = MAX_CHUNK_BYTES * 2 + 100; + const reads: Array<[number, number]> = []; + const t = new PdfCacheRangeTransport("u", big, async (_u, off, n) => { + reads.push([off, n]); + return { + data: new Uint8Array(Math.min(n, MAX_CHUNK_BYTES)), + totalBytes: big, + }; + }); + const delivered: Array<[number, number]> = []; + t.addRangeListener((begin: number, chunk: Uint8Array) => + delivered.push([begin, chunk.length]), + ); + t.requestDataRange(0, big); + await new Promise((r) => setTimeout(r, 10)); + // pdf.js's reader is keyed by the original begin and removed after one + // delivery, so deliver() must call onDataRange exactly once with the + // accumulated buffer — multiple calls would throw inside pdfjs. + expect(delivered).toEqual([[0, big]]); + expect(reads).toEqual([ + [0, MAX_CHUNK_BYTES], + [MAX_CHUNK_BYTES, MAX_CHUNK_BYTES], + [MAX_CHUNK_BYTES * 2, 100], + ]); + }); + + it("rejects .failed when a range fetch errors instead of hanging", async () => { + const t = new PdfCacheRangeTransport("u", 1000, async () => { + throw new Error("network down"); + }); + t.requestDataRange(0, 100); + await expect( + Promise.race([ + t.failed, + new Promise((r) => setTimeout(() => r("timeout"), 200)), + ]), + ).rejects.toThrow("network down"); + }); + + it("rejects .failed on zero-length response (would otherwise spin)", async () => { + const t = new PdfCacheRangeTransport("u", 1000, async () => ({ + data: new Uint8Array(0), + totalBytes: 1000, + })); + t.requestDataRange(0, 100); + await expect(t.failed).rejects.toThrow(/empty range/); + }); + + it("getDocument resolves on a >1MB PDF when readPdfRange clamps to MAX_CHUNK_BYTES", async () => { + // pdfjs coalesces adjacent missing chunks into one requestDataRange that + // can exceed MAX_CHUNK_BYTES. deliver() must accumulate clamped reads and + // hand pdfjs a single onDataRange(begin, fullBuffer). This test fails if + // deliver() either truncates or calls onDataRange more than once per + // requestDataRange (pdf.mjs _onReceiveData matches by exact begin). + const d = await PDFDocument.create(); + const img = await d.embedJpg(makeRandomJpeg(1_100_000)); + const page = d.addPage([612, 792]); + page.drawImage(img, { x: 36, y: 36, width: 540, height: 720 }); + const bytes = await d.save(); + expect(bytes.length).toBeGreaterThan(2 * MAX_CHUNK_BYTES); + + const readClamped: PdfCache["readPdfRange"] = async (_u, off, n) => { + const len = Math.min(n, MAX_CHUNK_BYTES, bytes.length - off); + return { data: bytes.slice(off, off + len), totalBytes: bytes.length }; + }; + // Record the spans pdfjs actually requests so the test fails fast if it + // never asks for >MAX_CHUNK_BYTES (i.e. can't go vacuously green). + const spans: number[] = []; + class RecordingTransport extends PdfCacheRangeTransport { + override requestDataRange(begin: number, end: number): void { + spans.push(end - begin); + super.requestDataRange(begin, end); + } + } + const transport = new RecordingTransport( + "mem://big", + bytes.length, + readClamped, + ); + + const orHang = (p: Promise, what: string): Promise => + Promise.race([ + p, + transport.failed, + new Promise((_, rej) => + setTimeout(() => rej(new Error(`${what} hung`)), 5000), + ), + ]); + + const doc = await orHang( + getDocument({ + range: transport, + length: bytes.length, + disableAutoFetch: true, + disableStream: true, + rangeChunkSize: 64 * 1024, + }).promise, + "getDocument", + ); + const p1 = await orHang(doc.getPage(1), "getPage"); + // getPage() alone doesn't decode the image XObject; getOperatorList() does, + // which is what triggers the >512KB coalesced range request. + await orHang(p1.getOperatorList(), "getOperatorList"); + expect(Math.max(...spans)).toBeGreaterThan(MAX_CHUNK_BYTES); + doc.destroy(); + }); +}); + +describe("display_pdf transport-error handling", () => { + it("returns (does not hang) when range fetches fail mid-load", async () => { + // First fetch = the 1-byte size probe → 206 with Content-Range so + // display_pdf gets totalBytes. Every subsequent fetch (made by + // PdfCacheRangeTransport via readPdfRange) rejects, which must surface + // through transport.failed → orFail() → outer catch, not hang. + let calls = 0; + const mockFetch = spyOn(globalThis, "fetch").mockImplementation( + async () => { + if (calls++ === 0) { + return new Response(new Uint8Array(1), { + status: 206, + headers: { "Content-Range": "bytes 0-0/50000" }, + }); + } + throw new Error("network down"); + }, + ); + + const server = createServer(); + const client = new Client({ name: "t", version: "1" }); + const [ct, st] = InMemoryTransport.createLinkedPair(); + await Promise.all([server.connect(st), client.connect(ct)]); + + try { + const result = await Promise.race([ + client.callTool({ + name: "display_pdf", + arguments: { url: "https://arxiv.org/pdf/err-test" }, + }), + new Promise((_, rej) => + setTimeout( + () => rej(new Error("display_pdf hung on transport error")), + 3000, + ), + ), + ]); + expect(result.isError).toBeFalsy(); + const sc = result.structuredContent as { formFields?: unknown }; + expect(sc.formFields).toBeUndefined(); + expect(calls).toBeGreaterThan(1); + } finally { + mockFetch.mockRestore(); + await client.close(); + await server.close(); + } + }); +}); + +describe("extractFormSchema field-tree handling", () => { + async function schemaFor(bytes: Uint8Array) { + const doc = await getDocument({ data: bytes }).promise; + try { + const fo = (await doc.getFieldObjects()) as Parameters< + typeof extractFormSchema + >[1]; + return await extractFormSchema(doc, fo); + } finally { + doc.destroy(); + } + } + + it("handles pdf-lib separated field/widget structure", async () => { + const d = await PDFDocument.create(); + const form = d.getForm(); + d.addPage([612, 792]); + form + .createTextField("alpha") + .addToPage(d.getPage(0), { x: 50, y: 700, width: 200, height: 20 }); + form + .createCheckBox("agree") + .addToPage(d.getPage(0), { x: 50, y: 660, width: 20, height: 20 }); + form + .createDropdown("choice") + .addToPage(d.getPage(0), { x: 50, y: 620, width: 100, height: 20 }); + + const schema = await schemaFor(await d.save()); + expect(schema).not.toBeNull(); + expect(schema!.properties.alpha).toEqual({ + type: "string", + title: "alpha", + }); + expect(schema!.properties.agree).toEqual({ + type: "boolean", + title: "agree", + }); + expect(schema!.properties.choice.type).toBe("string"); + }); + + it("handles fields with multiple widgets across pages", async () => { + const d = await PDFDocument.create(); + const form = d.getForm(); + d.addPage([612, 792]); + d.addPage([612, 792]); + const tf = form.createTextField("shared"); + tf.addToPage(d.getPage(0), { x: 50, y: 700, width: 200, height: 20 }); + tf.addToPage(d.getPage(1), { x: 50, y: 700, width: 200, height: 20 }); + + const schema = await schemaFor(await d.save()); + expect(schema?.properties.shared).toEqual({ + type: "string", + title: "shared", + }); + }); + + it("skips container nodes and finds leaf fields (W-9 style)", async () => { + const bytes = fs.readFileSync( + path.join(__dirname, "../../tests/helpers/assets/fw9.pdf"), + ); + const doc = await getDocument({ data: new Uint8Array(bytes) }).promise; + try { + const fo = (await doc.getFieldObjects()) as Parameters< + typeof extractFormSchema + >[1]; + // Container nodes (no leaf type) should not crash extraction + expect(fo!["topmostSubform[0]"]).toBeDefined(); + // Schema is null for W-9 (mechanical names), but extraction must not throw + const schema = await extractFormSchema(doc, fo); + expect(schema).toBeNull(); + } finally { + doc.destroy(); + } + }); + + it("returns null when no AcroForm present", async () => { + const d = await PDFDocument.create(); + d.addPage([612, 792]); + const schema = await schemaFor(await d.save()); + expect(schema).toBeNull(); + }); +}); + +describe("validateUrl loopback HTTP allow (PDF_SERVER_ALLOW_LOOPBACK_HTTP)", () => { + it("rejects http://127.0.0.1 by default", () => { + expect(validateUrl("http://127.0.0.1:9999/x.pdf").valid).toBe(false); + }); + + it("accepts http://127.0.0.1 only when the env gate is set, and never non-loopback http", () => { + const prev = process.env.PDF_SERVER_ALLOW_LOOPBACK_HTTP; + process.env.PDF_SERVER_ALLOW_LOOPBACK_HTTP = "1"; + try { + expect(validateUrl("http://127.0.0.1:9999/x.pdf").valid).toBe(true); + expect(validateUrl("http://169.254.169.254/").valid).toBe(false); + } finally { + if (prev === undefined) delete process.env.PDF_SERVER_ALLOW_LOOPBACK_HTTP; + else process.env.PDF_SERVER_ALLOW_LOOPBACK_HTTP = prev; + } + }); +}); + describe("validateUrl with MCP roots (allowedLocalDirs)", () => { const savedFiles = new Set(allowedLocalFiles); const savedDirs = new Set(allowedLocalDirs); diff --git a/examples/pdf-server/server.ts b/examples/pdf-server/server.ts index 062b263..93dedfd 100644 --- a/examples/pdf-server/server.ts +++ b/examples/pdf-server/server.ts @@ -31,6 +31,7 @@ import { import "./pdfjs-polyfill.js"; import { getDocument, + PDFDataRangeTransport, VerbosityLevel, version as PDFJS_VERSION, } from "pdfjs-dist/legacy/build/pdf.mjs"; @@ -368,9 +369,6 @@ export const viewSourcePaths = new Map(); /** Valid form field names per viewer UUID (populated during display_pdf) */ const viewFieldNames = new Map>(); -/** Detailed form field info per viewer UUID (populated during display_pdf) */ -const viewFieldInfo = new Map(); - /** * Active fs.watch per view. Only created for local files when interact is * enabled (stdio). Watcher is re-established on `rename` events to survive @@ -387,7 +385,7 @@ const viewFileWatches = new Map(); /** * Per-view heartbeat. THIS is what the sweep iterates — not commandQueues. * - * Why not commandQueues: display_pdf populates viewFieldNames/viewFieldInfo/ + * Why not commandQueues: display_pdf populates viewFieldNames/ * viewFileWatches but never touches commandQueues (only enqueueCommand does, * and it's triply gated). And dequeueCommands deletes the entry on every poll, * so even when it exists the sweep's TTL window is ~200ms wide. Net effect: @@ -409,7 +407,6 @@ function pruneStaleQueues(): void { viewLastActivity.delete(uuid); commandQueues.delete(uuid); viewFieldNames.delete(uuid); - viewFieldInfo.delete(uuid); viewsPolled.delete(uuid); viewSourcePaths.delete(uuid); stopFileWatch(uuid); @@ -644,10 +641,19 @@ export function validateUrl(url: string): { // Remote URL - require HTTPS try { const parsed = new URL(url); - if (parsed.protocol !== "https:") { - return { valid: false, error: `Only HTTPS URLs are allowed: ${url}` }; + if (parsed.protocol === "https:") return { valid: true }; + // Loopback HTTP is opt-in (test fixtures, local dev). Off by default so a + // remotely-deployed server can't be made to probe its own internal ports. + if ( + process.env.PDF_SERVER_ALLOW_LOOPBACK_HTTP && + parsed.protocol === "http:" && + (parsed.hostname === "127.0.0.1" || + parsed.hostname === "localhost" || + parsed.hostname === "[::1]") + ) { + return { valid: true }; } - return { valid: true }; + return { valid: false, error: `Only HTTPS URLs are allowed: ${url}` }; } catch { return { valid: false, error: `Invalid URL: ${url}` }; } @@ -882,6 +888,61 @@ export function createPdfCache( }; } +/** + * pdf.js range transport backed by {@link PdfCache.readPdfRange}. Lets + * getDocument() fetch only the byte ranges it needs (xref, /AcroForm dict) + * instead of the whole file. With disableAutoFetch, a PDF without form + * fields is opened with ~5% of bytes fetched. + * + * pdf.js has no upstream error channel on PDFDataRangeTransport (its + * `abort()` is a no-op stub it calls *on* us, not the other way). Callers + * must `Promise.race` their pdf.js awaits against {@link failed}, which + * rejects on the first fetch error. + */ +export class PdfCacheRangeTransport extends PDFDataRangeTransport { + /** Rejects on the first range-fetch error; never resolves. */ + readonly failed: Promise; + private fail!: (e: unknown) => void; + + constructor( + private url: string, + length: number, + private readPdfRange: PdfCache["readPdfRange"], + ) { + super(length, null); + this.failed = new Promise((_, reject) => { + this.fail = reject; + }); + // Don't crash the process if no one is racing yet. + this.failed.catch(() => {}); + } + + override requestDataRange(begin: number, end: number): void { + void this.deliver(begin, end).catch((e) => this.fail(e)); + } + + /** + * pdf.js coalesces adjacent missing chunks into one unbounded request, but + * readPdfRange clamps each call to MAX_CHUNK_BYTES. Its reader is keyed by + * the original `begin` and removed after one delivery, so we must accumulate + * slices and call onDataRange exactly once with the full buffer. + */ + private async deliver(begin: number, end: number): Promise { + const buf = new Uint8Array(end - begin); + let off = 0; + while (off < buf.length) { + const want = Math.min(buf.length - off, MAX_CHUNK_BYTES); + const { data } = await this.readPdfRange(this.url, begin + off, want); + if (data.length === 0) { + throw new Error(`empty range at ${begin + off} for ${this.url}`); + } + buf.set(data.subarray(0, Math.min(data.length, buf.length - off)), off); + off += data.length; + } + this.onDataRange(begin, buf); + } +} + // ============================================================================= // MCP Roots // ============================================================================= @@ -957,6 +1018,60 @@ interface FormFieldInfo { options?: string[]; } +/** + * Open `url` via {@link PdfCacheRangeTransport} and return form metadata. + * Uses `disableAutoFetch` so PDFs without an AcroForm are probed with only + * the trailer/xref/catalog (~5-25% of bytes); PDFs with forms still walk + * every page via {@link extractFormFieldInfo} but those are typically small. + * All errors (including range-fetch failures surfaced via + * {@link PdfCacheRangeTransport.failed}) resolve to empty results. + */ +async function probeFormFields( + url: string, + totalBytes: number, + readPdfRange: PdfCache["readPdfRange"], +): Promise<{ + formSchema: Awaited>; + fieldInfo: FormFieldInfo[]; +}> { + // Assigned sequentially below so a throw in extractFormFieldInfo (no per-page + // guard, unlike extractFormSchema) doesn't discard an already-computed schema. + let formSchema: Awaited> = null; + let fieldInfo: FormFieldInfo[] = []; + try { + const transport = new PdfCacheRangeTransport(url, totalBytes, readPdfRange); + const orFail = (p: Promise): Promise => + Promise.race([p, transport.failed]); + const pdfDoc = await orFail( + getDocument({ + range: transport, + length: totalBytes, + disableAutoFetch: true, + disableStream: true, + rangeChunkSize: 64 * 1024, + standardFontDataUrl: STANDARD_FONT_DATA_URL, + StandardFontDataFactory: FetchStandardFontDataFactory, + verbosity: VerbosityLevel.ERRORS, + }).promise, + ); + try { + const fieldObjects = (await orFail(pdfDoc.getFieldObjects())) as Record< + string, + PdfJsFieldObject[] + > | null; + if (fieldObjects && Object.keys(fieldObjects).length > 0) { + formSchema = await orFail(extractFormSchema(pdfDoc, fieldObjects)); + fieldInfo = await orFail(extractFormFieldInfo(pdfDoc)); + } + } finally { + pdfDoc.destroy(); + } + } catch { + // Non-fatal — return whatever was assigned before the throw. + } + return { formSchema, fieldInfo }; +} + /** * Extract detailed form field info (name, type, page, bounding box, label) * from a PDF. Bounding boxes are converted to model coordinates (top-left origin). @@ -1020,27 +1135,25 @@ async function extractFormFieldInfo( return fields; } -async function extractFormSchema(pdfDoc: PDFDocumentProxy): Promise<{ +export async function extractFormSchema( + pdfDoc: PDFDocumentProxy, + fieldObjects: Record | null, +): Promise<{ type: "object"; properties: Record; required?: string[]; } | null> { - let fieldObjects: Record | null; - try { - fieldObjects = (await pdfDoc.getFieldObjects()) as Record< - string, - PdfJsFieldObject[] - > | null; - } catch { - return null; - } if (!fieldObjects || Object.keys(fieldObjects).length === 0) { return null; } const properties: Record = {}; for (const [name, fields] of Object.entries(fieldObjects)) { - const field = fields[0]; // first widget determines the type + // pdfjs returns the full field-tree array: for separated structures + // (pdf-lib) the typed widget is at [1+] behind a container at [0]; for + // merged/leaf entries (W-9, most authoring tools) it's at [0]. Pick the + // first entry that actually has a field type. + const field = fields.find((f) => f.type) ?? fields[0]; if (!field.editable) continue; switch (field.type) { @@ -1434,7 +1547,7 @@ Set \`elicit_form_inputs\` to true to prompt the user to fill form fields before const { totalBytes } = await readPdfRange(normalized, 0, 1); const uuid = randomUUID(); // Start the heartbeat now so the sweep can clean up viewFieldNames/ - // viewFieldInfo/viewFileWatches even if no interact calls ever happen. + // viewFileWatches even if no interact calls ever happen. if (!disableInteract) touchView(uuid); // Check writability (governs save button; see isWritablePath doc). @@ -1462,38 +1575,19 @@ Set \`elicit_form_inputs\` to true to prompt the user to fill form fields before } } - // Extract form field schema + detailed field info from a single - // download/parse pass. - let formSchema: Awaited> = null; - let fieldInfo: FormFieldInfo[] = []; - try { - const { data } = await readPdfRange(normalized, 0, totalBytes); - const pdfDoc = await getDocument({ - data, - standardFontDataUrl: STANDARD_FONT_DATA_URL, - StandardFontDataFactory: FetchStandardFontDataFactory, - verbosity: VerbosityLevel.ERRORS, - }).promise; - try { - formSchema = await extractFormSchema(pdfDoc); - fieldInfo = await extractFormFieldInfo(pdfDoc); - } finally { - pdfDoc.destroy(); - } - } catch { - // Non-fatal — PDF may not have form fields or may fail to parse - } + const { formSchema, fieldInfo } = await probeFormFields( + normalized, + totalBytes, + readPdfRange, + ); if (formSchema) { viewFieldNames.set(uuid, new Set(Object.keys(formSchema.properties))); } - if (fieldInfo.length > 0) { - viewFieldInfo.set(uuid, fieldInfo); - if (!viewFieldNames.has(uuid)) { - viewFieldNames.set( - uuid, - new Set(fieldInfo.map((f) => f.name).filter(Boolean)), - ); - } + if (fieldInfo.length > 0 && !viewFieldNames.has(uuid)) { + viewFieldNames.set( + uuid, + new Set(fieldInfo.map((f) => f.name).filter(Boolean)), + ); } // Elicit form field values if requested and client supports it diff --git a/examples/pdf-server/src/mcp-app.ts b/examples/pdf-server/src/mcp-app.ts index 500879a..a953e24 100644 --- a/examples/pdf-server/src/mcp-app.ts +++ b/examples/pdf-server/src/mcp-app.ts @@ -150,6 +150,11 @@ const imageCache = new Map(); /** Annotations imported from the PDF file (baseline for diff computation). */ let pdfBaselineAnnotations: PdfAnnotationDef[] = []; +/** Pages whose native annotations have already been imported into the baseline. */ +const baselineScannedPages = new Set(); +/** Native-annotation ids the user deleted (from restored localStorage diff) — + * the lazy per-page scan must NOT re-add these to annotationMap. */ +const restoredRemovedIds = new Set(); // Dirty flag — tracks unsaved local changes let isDirty = false; @@ -2679,52 +2684,60 @@ function annotationStorageKey(): string | null { } /** - * Import annotations from the loaded PDF to establish the baseline. - * These are the annotations that exist in the PDF file itself. + * Import one page's native annotations into the baseline. Called lazily from + * renderPage() so we don't walk every page (and pull most of the file via + * range requests) before the user sees anything. Idempotent per page. */ -async function loadBaselineAnnotations( - doc: pdfjsLib.PDFDocumentProxy, -): Promise { - pdfBaselineAnnotations = []; - for (let pageNum = 1; pageNum <= doc.numPages; pageNum++) { +function scanPageBaselineAnnotations( + pageNum: number, + annotations: unknown[], +): void { + if (baselineScannedPages.has(pageNum)) return; + baselineScannedPages.add(pageNum); + let imported = 0; + for (let i = 0; i < annotations.length; i++) { + // Isolate each annotation: a malformed one must not bubble up to the + // caller's form-layer try in renderPage() (which would skip + // AnnotationLayer.render and hide form widgets for the whole page). try { - const page = await doc.getPage(pageNum); - const annotations = await page.getAnnotations(); - for (let i = 0; i < annotations.length; i++) { - const ann = annotations[i]; - const def = importPdfjsAnnotation(ann, pageNum, i); - if (def) { - pdfBaselineAnnotations.push(def); - // Add to annotationMap if not already present (from localStorage restore) - if (!annotationMap.has(def.id)) { - annotationMap.set(def.id, { def, elements: [] }); - } - } else if (ann.annotationType !== 20) { - // Widget (type 20) is expected to be skipped; anything else we - // don't import will still be painted by page.render() onto the - // canvas as unselectable pixels. Log so we can diagnose - // "ghost annotations" (visible but not in panel, not clickable). - log.info( - `[WARN] Baseline: skipped PDF annotation on page ${pageNum}`, - `type=${ann.annotationType}`, - `subtype=${ann.subtype ?? "?"}`, - `name=${ann.name ?? "?"}`, - `rect=${ann.rect ? JSON.stringify(ann.rect) : "none"}`, - ); + const ann = annotations[i] as { + annotationType?: number; + subtype?: string; + name?: string; + rect?: number[]; + }; + const def = importPdfjsAnnotation(ann, pageNum, i); + if (def) { + pdfBaselineAnnotations.push(def); + imported++; + if (!annotationMap.has(def.id) && !restoredRemovedIds.has(def.id)) { + annotationMap.set(def.id, { def, elements: [] }); } + } else if (ann.annotationType !== 20) { + // Widget (type 20) is expected to be skipped; anything else we + // don't import will still be painted by page.render() onto the + // canvas as unselectable pixels. Log so we can diagnose + // "ghost annotations" (visible but not in panel, not clickable). + log.info( + `[WARN] Baseline: skipped PDF annotation on page ${pageNum}`, + `type=${ann.annotationType}`, + `subtype=${ann.subtype ?? "?"}`, + `name=${ann.name ?? "?"}`, + `rect=${ann.rect ? JSON.stringify(ann.rect) : "none"}`, + ); } } catch (err) { - // Log the error — a thrown import for one annotation silently - // drops the REST of that page's annotations too. - log.info( - `[WARN] Baseline: page ${pageNum} annotation import failed:`, - err, - ); + log.info(`Baseline: page ${pageNum} annotation import failed`, err); + } + } + if (imported > 0) { + try { + updateAnnotationsBadge(); + renderAnnotationPanel(); + } catch (err) { + log.info(`Baseline: page ${pageNum} panel update failed`, err); } } - log.info( - `Loaded ${pdfBaselineAnnotations.length} baseline annotations from PDF`, - ); } function persistAnnotations(): void { @@ -2740,6 +2753,20 @@ function persistAnnotations(): void { pdfBaselineFormValues, ); + // computeDiff only sees baseline ids from pages we've already scanned. + // Carry forward restored tombstones for unvisited pages so the first + // persist after restore doesn't drop them. Once every page is scanned the + // baseline is complete and computeDiff is authoritative on its own — + // dropping the carry-forward then also stops a stale id (no longer in the + // file) from pinning dirty=true forever. + if (baselineScannedPages.size < totalPages) { + for (const id of restoredRemovedIds) { + if (!annotationMap.has(id) && !diff.removed.includes(id)) { + diff.removed.push(id); + } + } + } + // Dirty tracks whether there are unsaved changes. Undoing back to baseline // yields an empty diff → clean again → save button disables. if (!isRestoring) setDirty(!isDiffEmpty(diff)); @@ -2765,11 +2792,11 @@ function restoreAnnotations(): void { const diff = deserializeDiff(raw); // Merge baseline + diff. The loop below is add-only, so we MUST also - // delete: loadBaselineAnnotations() runs between the two restore calls - // and re-seeds annotationMap with every baseline id — including the - // ones in diff.removed. Without this, the zombie survives the restore, - // and the next persistAnnotations() sees it in currentIds → computeDiff - // produces removed=[] → the deletion is permanently lost from storage. + // delete: the per-page baseline scan re-seeds annotationMap with every + // native id it encounters — including ones in diff.removed. Without the + // deletes here AND the restoredRemovedIds tombstones below, the zombie + // survives, and the next persistAnnotations() sees it in currentIds → + // computeDiff produces removed=[] → the deletion is permanently lost. const merged = mergeAnnotations(pdfBaselineAnnotations, diff); for (const def of merged) { if (!annotationMap.has(def.id)) { @@ -2778,6 +2805,9 @@ function restoreAnnotations(): void { } for (const id of diff.removed) { annotationMap.delete(id); + // Tombstone so the lazy per-page baseline scan (which runs AFTER this + // restore) doesn't resurrect it. + restoredRemovedIds.add(id); } // Restore form fields @@ -2869,6 +2899,14 @@ async function buildFieldNameMap( // getFieldObjects may fail on some PDFs } + // No AcroForm → nothing to map. Skip the per-page widget walk so form-free + // PDFs (the common large case) don't pull every page after first paint. + // getFieldObjects() itself only reads the catalog/AcroForm dict via range + // transport, so this gate is cheap. + if (!cachedFieldObjects || Object.keys(cachedFieldObjects).length === 0) { + return false; + } + // Scan every page's widget annotations to collect the CORRECT storage keys, // plus labels, pages, positions, AND fieldValue (what the widget renders // — which can differ from getFieldObjects().value if the PDF is internally @@ -3074,11 +3112,19 @@ async function getAnnotatedPdfBytes(): Promise { } // Baseline annotations the user deleted: strip their refs from /Annots so - // they don't reappear on reload. Ids without a recoverable ref (page-index - // fallback) can't be removed by-ref and are skipped. - const removedRefs = pdfBaselineAnnotations - .filter((a) => !annotationMap.has(a.id)) - .map((a) => parseAnnotationRef(a.id)) + // they don't reappear on reload. Include restored tombstones for pages we + // haven't scanned yet — those ids aren't in pdfBaselineAnnotations but the + // ref is still parseable from the id string. Ids without a recoverable ref + // (page-index fallback) can't be removed by-ref and are skipped. + const removedIds = new Set(); + for (const a of pdfBaselineAnnotations) { + if (!annotationMap.has(a.id)) removedIds.add(a.id); + } + for (const id of restoredRemovedIds) { + if (!annotationMap.has(id)) removedIds.add(id); + } + const removedRefs = [...removedIds] + .map(parseAnnotationRef) .filter((r): r is NonNullable => r !== null); // Only write fields that actually changed vs. what's already in the PDF. @@ -3362,6 +3408,9 @@ async function renderPage() { formLayerEl.style.setProperty("--total-scale-factor", `${scale}`); try { const annotations = await page.getAnnotations(); + // Lazy baseline import — piggyback on the annotations we just fetched + // for this page instead of walking all pages upfront. + scanPageBaselineAnnotations(pageToRender, annotations); if (annotations.length > 0) { const linkService = { getDestinationHash: () => "#", @@ -4406,6 +4455,8 @@ async function reloadPdf(): Promise { undoStack.length = 0; redoStack.length = 0; pdfBaselineAnnotations = []; + baselineScannedPages.clear(); + restoredRemovedIds.clear(); pdfBaselineFormValues.clear(); pageTextCache.clear(); pageTextItemsCache.clear(); @@ -4449,11 +4500,11 @@ async function reloadPdf(): Promise { log.info("PDF reloaded:", totalPages, "pages,", totalBytes, "bytes"); showViewer(); - // Render immediately — annotation/form scans below are O(numPages) and - // do NOT block the canvas. See same pattern in the initial-load path. + // Render immediately — baseline-annotation scan now happens per-page + // inside renderPage(); buildFieldNameMap below early-returns when no + // AcroForm is present. See same pattern in the initial-load path. await renderPage(); - await loadBaselineAnnotations(document); const seeded = await buildFieldNameMap(document); syncFormValuesToStorage(); if (seeded) await renderPage(); @@ -4509,6 +4560,11 @@ async function loadPdfProgressively(urlToLoad: string): Promise<{ const loadingTask = pdfjsLib.getDocument({ range: transport, standardFontDataUrl: STANDARD_FONT_DATA_URL, + // Only fetch ranges renderPage()/getFieldObjects() actually ask for. + // Without these pdfjs background-prefetches the whole file regardless of + // the per-page lazy scans below. + disableAutoFetch: true, + disableStream: true, }); try { @@ -4673,12 +4729,13 @@ app.ontoolresult = async (result: CallToolResult) => { scale = fitScale; log.info("Initial fit scale:", scale); } - await renderPage(); - - // Import annotations from the PDF to establish baseline - await loadBaselineAnnotations(document); - // Restore any persisted user diff + // Restore any persisted user diff BEFORE first render so the per-page + // baseline scan inside renderPage() can honour the removed-id tombstones + // and not resurrect annotations the user deleted last session. + // restoreAnnotations is sync (localStorage read) so first paint is not + // delayed. restoreAnnotations(); + await renderPage(); // Build field name → annotation ID mapping for form filling const seeded = await buildFieldNameMap(document); diff --git a/examples/pdf-server/src/pdf-annotations.test.ts b/examples/pdf-server/src/pdf-annotations.test.ts index 38ef27b..239777a 100644 --- a/examples/pdf-server/src/pdf-annotations.test.ts +++ b/examples/pdf-server/src/pdf-annotations.test.ts @@ -367,6 +367,92 @@ describe("computeDiff", () => { current.map((a) => a.id).sort(), ); }); + + // Backs the post-computeDiff union step in mcp-app.ts persistAnnotations / + // getAnnotatedPdfBytes: with the lazy per-page baseline scan, computeDiff + // alone cannot produce `removed` for natives on pages not yet visited, so + // callers must union restoredRemovedIds. These tests pin the contract those + // call sites depend on. + describe("partial baseline (lazy-scan tombstone preservation)", () => { + const tombstoned = "pdf-5-0"; + const userNote: PdfAnnotationDef = { + type: "note", + id: "u1", + page: 1, + x: 10, + y: 10, + content: "unrelated edit", + }; + + /** Mirrors the union loop in mcp-app.ts persistAnnotations. */ + function unionRestored( + diff: AnnotationDiff, + restored: Iterable, + currentIds: Set, + ): void { + for (const id of restored) { + if (!currentIds.has(id) && !diff.removed.includes(id)) { + diff.removed.push(id); + } + } + } + + it("computeDiff alone drops tombstones for unscanned pages; the union step preserves them", () => { + const baseline: PdfAnnotationDef[] = []; // page with the native not yet scanned + const current = [userNote]; + const diff = computeDiff(baseline, current, new Map()); + expect(diff.removed).toEqual([]); // proves the union step is load-bearing + + unionRestored(diff, [tombstoned], new Set(current.map((a) => a.id))); + + expect(diff.removed).toEqual([tombstoned]); + expect(isDiffEmpty(diff)).toBe(false); + expect(deserializeDiff(serializeDiff(diff)).removed).toEqual([ + tombstoned, + ]); + }); + + it("a tombstone the user re-added is excluded from the union", () => { + const reAdded: PdfAnnotationDef = { + type: "note", + id: tombstoned, + page: 3, + x: 0, + y: 0, + content: "back", + }; + const current = [userNote, reAdded]; + const diff = computeDiff([], current, new Map()); + unionRestored(diff, [tombstoned], new Set(current.map((a) => a.id))); + expect(diff.removed).toEqual([]); + }); + + it("union does not duplicate ids once the page is scanned and computeDiff produces them", () => { + const native: PdfAnnotationDef = { + type: "note", + id: tombstoned, + page: 3, + x: 0, + y: 0, + content: "native", + }; + const diff = computeDiff([native], [userNote], new Map()); + expect(diff.removed).toEqual([tombstoned]); + unionRestored(diff, [tombstoned], new Set([userNote.id])); + expect(diff.removed).toEqual([tombstoned]); + }); + + it("removedRefs from restored tombstones parse for buildAnnotatedPdfBytes; non-ref ids are skipped", () => { + const restored = new Set(["pdf-5-0", "pdf-12R", "pdf-2-idx-7"]); + const removedRefs = [...restored] + .map(parseAnnotationRef) + .filter((r): r is NonNullable => r !== null); + expect(removedRefs).toEqual([ + { objectNumber: 5, generationNumber: 0 }, + { objectNumber: 12, generationNumber: 0 }, + ]); + }); + }); }); // ============================================================================= diff --git a/playwright.config.ts b/playwright.config.ts index 6f6cb65..ecf1e13 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -47,6 +47,10 @@ export default defineConfig({ env: { ...process.env, EXAMPLE: process.env.EXAMPLE ?? "", + // Let pdf-server fetch from the http://127.0.0.1 range-counting fixture + // (validateUrl rejects loopback HTTP unless this is set). Scoped to this + // server's check only — does not touch Node's TLS verification. + PDF_SERVER_ALLOW_LOOPBACK_HTTP: "1", }, }, // Snapshot configuration diff --git a/tests/e2e/pdf-incremental-load.spec.ts b/tests/e2e/pdf-incremental-load.spec.ts new file mode 100644 index 0000000..52a99ee --- /dev/null +++ b/tests/e2e/pdf-incremental-load.spec.ts @@ -0,0 +1,271 @@ +import { test, expect, type Page } from "@playwright/test"; +import { + startRangeServer, + type RangeServer, +} from "../helpers/range-counting-server"; + +/** + * Regression guard for incremental PDF loading. + * + * Asserts that display_pdf does not pull the entire file before the viewer + * starts streaming, that form schema is still returned in the initial response, + * and that no byte range is fetched server-side more than once. + * + * The "noforms <30%" test is the load-bearing regression check: it fails on the + * pre-range-transport implementation (which downloads 100% during display_pdf + * for form analysis) and passes once form extraction uses range transport. + */ + +test.setTimeout(120_000); + +let rangeServer: RangeServer; + +test.beforeAll(async () => { + rangeServer = await startRangeServer(); +}); + +test.afterAll(async () => { + await rangeServer.close(); +}); + +test.beforeEach(() => { + rangeServer.resetStats(); +}); + +function getAppFrame(page: Page) { + return page.frameLocator("iframe").first().frameLocator("iframe").first(); +} + +async function waitForAppLoad(page: Page) { + const outerFrame = page.frameLocator("iframe").first(); + await expect(outerFrame.locator("iframe")).toBeVisible({ timeout: 30_000 }); +} + +/** + * Load basic-host, select PDF Server, call display_pdf with a custom URL. + * Resolves once the tool result panel appears (server-side display_pdf done); + * does NOT wait for the viewer iframe — call waitForAppLoad separately so + * byte-count assertions can isolate server-side fetches from viewer fetches. + */ +async function displayPdf(page: Page, url: string) { + await page.goto("/?theme=hide"); + await expect(page.locator("select").first()).toBeEnabled({ timeout: 30_000 }); + await page.locator("select").first().selectOption({ label: "PDF Server" }); + await page.locator("textarea").fill(JSON.stringify({ url })); + await page.click('button:has-text("Call Tool")'); + await expect(page.locator('text="📤 Tool Result"').first()).toBeVisible({ + timeout: 30_000, + }); +} + +/** Read and parse the most recent tool result's structuredContent. */ +async function readStructuredContent( + page: Page, +): Promise> { + const resultPanel = page.locator('text="📤 Tool Result"').first(); + await expect(resultPanel).toBeVisible({ timeout: 30_000 }); + await resultPanel.click(); + const pre = page.locator("pre").last(); + await expect(pre).toBeVisible({ timeout: 5_000 }); + const raw = (await pre.textContent()) ?? "{}"; + const parsed = JSON.parse(raw) as { structuredContent?: object }; + return (parsed.structuredContent ?? {}) as Record; +} + +async function waitForFirstPageRendered(page: Page) { + const canvas = getAppFrame(page).locator("canvas").first(); + await expect(canvas).toBeVisible({ timeout: 30_000 }); + await expect + .poll(async () => canvas.evaluate((c: HTMLCanvasElement) => c.width)) + .toBeGreaterThan(0); +} + +test.describe("PDF Server — incremental loading", () => { + test("display_pdf on a form PDF returns form fields in initial response", async ({ + page, + }) => { + await displayPdf(page, `${rangeServer.baseUrl}/forms.pdf`); + await waitForAppLoad(page); + const sc = await readStructuredContent(page); + const fields = sc.formFields as Array<{ name: string }> | undefined; + expect(fields?.map((f) => f.name).sort()).toEqual([ + "city", + "email", + "name", + "notes", + "phone", + ]); + }); + + test("display_pdf on a no-forms PDF stays under byte budget and bounded overlap", async ({ + page, + }) => { + const fileSize = rangeServer.fileSizes["/noforms.pdf"]; + await displayPdf(page, `${rangeServer.baseUrl}/noforms.pdf`); + + // Measure before the viewer iframe loads so the count reflects only the + // server-side display_pdf range fetches. + expect(rangeServer.stats().totalBytesServed).toBeLessThan(fileSize * 0.3); + + await waitForAppLoad(page); + const sc = await readStructuredContent(page); + expect(sc.formFields).toBeUndefined(); + + await waitForFirstPageRendered(page); + // Server-side display_pdf and the viewer each open the document + // independently, so the xref/trailer/catalog is fetched twice (≈25%). + // This guards against the pre-range-transport behavior where the server + // alone pulled 100% (then 200% with the double-parse), giving overlap >> + // file size once the viewer also loaded. + expect(rangeServer.stats().overlapBytes).toBeLessThan(fileSize * 0.5); + }); + + test("first page renders under stall, then page 2 renders the >512KB image after release", async ({ + page, + }) => { + const fileSize = rangeServer.fileSizes["/noforms.pdf"]; + // Allow ~40% through (header + trailer/xref + page-1 content) then stall. + // The 1.1MB image stream referenced only by pages 2+ is the bulk. + const budget = Math.floor(fileSize * 0.4); + await displayPdf( + page, + `${rangeServer.baseUrl}/noforms.pdf?stallAfterBytes=${budget}`, + ); + await waitForAppLoad(page); + await waitForFirstPageRendered(page); + expect(rangeServer.stats().totalBytesServed).toBeLessThan(fileSize); + + rangeServer.release(); + const app = getAppFrame(page); + await app.locator("#next-btn").click(); + await expect(app.locator("#page-input")).toHaveValue("2", { + timeout: 30_000, + }); + // Page 2 references the ~1.1MB embedded JPEG. Rendering it exercises the + // viewer's range transport on a >MAX_CHUNK_BYTES object after the stall + // is released. (The server-side PdfCacheRangeTransport accumulate-once + // path is covered by the unit test in server.test.ts; on noforms.pdf + // display_pdf bails at the empty getFieldObjects() check before touching + // the image stream, so this test does not exercise it.) + await waitForFirstPageRendered(page); + expect(rangeServer.stats().totalBytesServed).toBeGreaterThan( + fileSize * 0.9, + ); + }); +}); + +// Kept in this spec because the test needs an HTTP-served PDF and the +// range-counting fixture is the convenient place; it does not use any +// byte-accounting features. +test.describe("PDF Server — annotation tombstone preservation", () => { + // FIXME(https://github.com/modelcontextprotocol/ext-apps/issues/642): + // basic-host doesn't replay the cached tool result on inner-iframe reload, + // and a fresh display_pdf call gets a new toolId → new storage key, so the + // restore-from-localStorage path can't be reached. The fix itself is covered + // by the computeDiff/serializeDiff contract tests in + // src/pdf-annotations.test.ts. + test.fixme("deleted native annotation tombstone survives a persist before its page is scanned", async ({ + page, + }) => { + // Regression for the lazy baseline scan: restoredRemovedIds must be + // unioned into persistAnnotations() and getAnnotatedPdfBytes() so a + // delete on page 2 isn't silently dropped when an unrelated edit on + // page 1 triggers a persist before page 2 has been re-scanned. + + await displayPdf(page, `${rangeServer.baseUrl}/with-native-annot.pdf`); + await waitForAppLoad(page); + await waitForFirstPageRendered(page); + const sc = await readStructuredContent(page); + const viewUUID = sc.viewUUID as string; + expect(viewUUID).toBeTruthy(); + + const app = getAppFrame(page); + + // 1. Go to page 2, open the panel, delete the native annotation via UI. + await app.locator("#next-btn").click(); + await expect(app.locator("#page-input")).toHaveValue("2"); + await app.locator("#annotations-btn").click(); + const nativeCard = app.locator( + '.annotation-card[data-annotation-id^="pdf-"]', + ); + await expect(nativeCard).toBeVisible({ timeout: 10_000 }); + const nativeId = await nativeCard.getAttribute("data-annotation-id"); + expect(nativeId).toMatch(/^pdf-\d+R?$/); + await nativeCard.locator(".annotation-card-delete").click(); + // Deleting a native annotation re-renders the card as a crossed-out + // tombstone (annotation-panel.ts createRemovedAnnotationCard) with the + // same data-annotation-id — it doesn't disappear from the DOM. + await expect(nativeCard).toHaveClass(/annotation-card-cleared/); + + // 2. Back to page 1 so the post-reload viewer restores there (page 2 + // must stay unscanned until the very end). + await app.locator("#page-input").fill("1"); + await app.locator("#page-input").press("Enter"); + await expect(app.locator("#page-input")).toHaveValue("1"); + + // 3. Capture the annotation localStorage key and confirm the delete was + // persisted. + const storageKey = await app + .locator("body") + .evaluate( + () => + Object.keys(localStorage).find( + (k) => k.startsWith("pdf-annot:") || k.endsWith(":annotations"), + ) ?? null, + ); + expect(storageKey).toBeTruthy(); + const diffBefore = await app + .locator("body") + .evaluate((_, k) => localStorage.getItem(k), storageKey!); + expect(JSON.parse(diffBefore!).removed).toContain(nativeId); + + // 4. Reload the inner viewer iframe ONLY (basic-host keeps the same + // cached tool result → same viewUUID/toolId → same storage key). + // restoreAnnotations() now seeds restoredRemovedIds from localStorage + // while the lazy scan has only seen page 1. + await app.locator("body").evaluate(() => location.reload()); + await waitForFirstPageRendered(page); + await expect(app.locator("#page-input")).toHaveValue("1"); + + // 5. Trigger persistAnnotations() via an unrelated edit on page 1 — the + // bug scenario: page 2 has not been scanned yet. + const toolSelect = page.locator("select").nth(1); + await toolSelect.selectOption("interact"); + await page.locator("textarea").fill( + JSON.stringify({ + viewUUID, + action: "add_annotations", + annotations: [ + { + id: "probe-on-page-1", + type: "highlight", + page: 1, + rects: [{ x: 50, y: 700, width: 100, height: 12 }], + }, + ], + }), + ); + await page.click('button:has-text("Call Tool")'); + await expect( + app.locator('[data-annotation-id="probe-on-page-1"]'), + ).toHaveCount(1, { timeout: 10_000 }); + + // 6. Load-bearing assertion: the persisted diff still carries the + // tombstone. Pre-fix, computeDiff() over the page-1-only baseline + // yielded removed=[], overwriting it. + const diffAfter = await app + .locator("body") + .evaluate((_, k) => localStorage.getItem(k), storageKey!); + const removedAfter: string[] = JSON.parse(diffAfter!).removed; + expect(removedAfter).toContain(nativeId); + + // 7. Belt-and-suspenders: navigate to page 2 (lazy scan now sees the + // native annotation) and confirm the panel shows it as a cleared + // tombstone, not a live (resurrected) card. + await app.locator("#next-btn").click(); + await expect(app.locator("#page-input")).toHaveValue("2"); + await expect( + app.locator(`.annotation-card[data-annotation-id="${nativeId}"]`), + ).toHaveClass(/annotation-card-cleared/); + }); +}); diff --git a/tests/helpers/assets/fw9.pdf b/tests/helpers/assets/fw9.pdf new file mode 100644 index 0000000000000000000000000000000000000000..c5eb6467893181c1d481e0748893877b015d5db0 GIT binary patch literal 140815 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

yE%Wu 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 OTiEw}s+GC7E&l*P; + stats(): RangeServerStats; + resetStats(): void; + /** Resolve any requests currently stalled by ?stallAfterBytes=N. */ + release(): void; + close(): Promise; +} + +const LOREM = + "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod " + + "tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim " + + "veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea " + + "commodo consequat. "; + +async function buildNoFormsPdf(): Promise { + const doc = await PDFDocument.create(); + const font = await doc.embedFont(StandardFonts.Helvetica); + // Page 1 is text-only (small) so first paint needs minimal bytes. Pages 2+ + // each reference a large embedded JPEG so the bulk of the file is in image + // streams page 1 doesn't need. The stallAfterBytes test holds those back + // and asserts page 1 still renders. The image is >MAX_CHUNK_BYTES (512KB) + // so rendering page 2 also exercises the viewer's >512KB range path. + const big = await doc.embedJpg(makeRandomJpeg(1_100 * 1024)); + const page1 = doc.addPage([612, 792]); + for (let line = 0; line < 30; line++) { + page1.drawText(`1.${line + 1} ${LOREM}`, { + x: 36, + y: 760 - line * 22, + size: 10, + font, + }); + } + for (let p = 1; p < 20; p++) { + const page = doc.addPage([612, 792]); + page.drawImage(big, { x: 36, y: 200, width: 540, height: 540 }); + page.drawText(`Page ${p + 1}`, { x: 36, y: 760, size: 10, font }); + } + return doc.save(); +} + +/** Minimal valid JPEG with `len` bytes of incompressible scan data. */ +export function makeRandomJpeg(len: number): Uint8Array { + // SOI, APP0 (JFIF), SOF0 (baseline 8x8 1-component), DHT (minimal), + // SOS, , EOI. pdf-lib only needs to parse the headers + // to embed; the scan data is opaque. + const header = Uint8Array.from([ + 0xff, 0xd8, 0xff, 0xe0, 0x00, 0x10, 0x4a, 0x46, 0x49, 0x46, 0x00, 0x01, + 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x0b, + 0x08, 0x00, 0x08, 0x00, 0x08, 0x01, 0x01, 0x11, 0x00, 0xff, 0xc4, 0x00, + 0x14, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xda, 0x00, 0x08, 0x01, + 0x01, 0x00, 0x00, 0x3f, 0x00, + ]); + const scan = new Uint8Array(len); + for (let i = 0; i < len; i++) scan[i] = (i * 1103515245 + 12345) & 0xff; + // Avoid 0xFF in scan data so we don't accidentally form a marker. + for (let i = 0; i < len; i++) if (scan[i] === 0xff) scan[i] = 0xfe; + const eoi = Uint8Array.from([0xff, 0xd9]); + const out = new Uint8Array(header.length + scan.length + eoi.length); + out.set(header, 0); + out.set(scan, header.length); + out.set(eoi, header.length + scan.length); + return out; +} + +/** + * Two pages, page 1 text-only, page 2 carries one native /Text (sticky-note) + * annotation. Used by the tombstone-preservation e2e: the viewer's lazy + * baseline scan must not have visited page 2 when persistAnnotations runs. + */ +async function buildWithNativeAnnotPdf(): Promise { + const doc = await PDFDocument.create(); + const font = await doc.embedFont(StandardFonts.Helvetica); + const page1 = doc.addPage([612, 792]); + page1.drawText("Page 1 — no native annotations here.", { + x: 36, + y: 740, + size: 12, + font, + }); + const page2 = doc.addPage([612, 792]); + page2.drawText("Page 2 — has one native /Text annot.", { + x: 36, + y: 740, + size: 12, + font, + }); + const annotRef = doc.context.register( + doc.context.obj({ + Type: "Annot", + Subtype: "Text", + Rect: [100, 700, 120, 720], + Contents: PDFString.of("native sticky note"), + Open: false, + Name: "Comment", + }), + ); + page2.node.set(PDFName.of("Annots"), doc.context.obj([annotRef])); + return doc.save(); +} + +async function buildFormsPdf(): Promise { + const doc = await PDFDocument.create(); + const form = doc.getForm(); + for (let p = 0; p < 2; p++) doc.addPage([612, 792]); + const [page1] = doc.getPages(); + const fields = ["name", "email", "phone", "city", "notes"]; + fields.forEach((name, i) => { + const f = form.createTextField(name); + f.addToPage(page1, { x: 100, y: 650 - i * 60, width: 300, height: 24 }); + }); + return doc.save(); +} + +export async function startRangeServer(): Promise { + if (process.env.NODE_ENV === "production") { + throw new Error( + "range-counting-server is a test fixture; refusing to start with NODE_ENV=production", + ); + } + const files: Record = { + "/noforms.pdf": await buildNoFormsPdf(), + "/forms.pdf": await buildFormsPdf(), + "/with-native-annot.pdf": await buildWithNativeAnnotPdf(), + }; + const fileSizes = Object.fromEntries( + Object.entries(files).map(([k, v]) => [k, v.length]), + ); + + // Per-path hit count per byte, for overlap accounting. + const hitCounts: Record = {}; + const initHits = () => { + for (const [k, v] of Object.entries(files)) { + hitCounts[k] = new Uint8Array(v.length); + } + }; + initHits(); + + let totalBytesServed = 0; + let releaseResolve: (() => void) | undefined; + let releasePromise = new Promise((r) => (releaseResolve = r)); + + const server = http.createServer(async (req, res) => { + const url = new URL(req.url ?? "/", "http://127.0.0.1"); + const body = files[url.pathname]; + if (!body) { + res.writeHead(404).end(); + return; + } + + const stallAfterBytes = url.searchParams.get("stallAfterBytes"); + const total = body.length; + const range = req.headers.range; + + let begin = 0; + let end = total; // exclusive + let status = 200; + if (range) { + const m = /^bytes=(\d+)-(\d*)$/.exec(range); + if (m) { + begin = parseInt(m[1], 10); + end = m[2] ? parseInt(m[2], 10) + 1 : total; + begin = Math.min(begin, total); + end = Math.min(end, total); + status = 206; + } + } + + // Stall once N bytes have already been served — lets pdfjs read the + // header/trailer/xref (scattered across the file) before blocking the + // bulk content streams. + if (stallAfterBytes !== null) { + if (totalBytesServed >= parseInt(stallAfterBytes, 10)) { + await releasePromise; + } + } + + const slice = body.subarray(begin, end); + totalBytesServed += slice.length; + const hits = hitCounts[url.pathname]; + for (let i = begin; i < end; i++) hits[i]++; + + const headers: Record = { + "Content-Type": "application/pdf", + "Accept-Ranges": "bytes", + "Content-Length": String(slice.length), + }; + if (status === 206) { + headers["Content-Range"] = `bytes ${begin}-${end - 1}/${total}`; + } + res.writeHead(status, headers); + res.end(slice); + }); + + await new Promise((resolve) => server.listen(0, resolve)); + const port = (server.address() as AddressInfo).port; + + return { + port, + baseUrl: `http://127.0.0.1:${port}`, + fileSizes, + stats() { + let overlapBytes = 0; + for (const hits of Object.values(hitCounts)) { + for (let i = 0; i < hits.length; i++) if (hits[i] > 1) overlapBytes++; + } + return { totalBytesServed, overlapBytes }; + }, + resetStats() { + totalBytesServed = 0; + initHits(); + // Unblock any handlers parked on the previous stall before re-arming, + // otherwise they hold sockets open forever and close() hangs. + releaseResolve?.(); + releasePromise = new Promise((r) => (releaseResolve = r)); + }, + release() { + releaseResolve?.(); + }, + close() { + releaseResolve?.(); + server.closeAllConnections?.(); + return new Promise((resolve) => server.close(() => resolve())); + }, + }; +} From 0008d3b78f94e37bb970673cbc33baecc481ae18 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 27 Apr 2026 16:16:33 +0100 Subject: [PATCH 054/107] chore: bump ext-apps to 1.7.1 (#643) --- examples/basic-host/package.json | 2 +- examples/basic-server-preact/package.json | 2 +- examples/basic-server-react/package.json | 2 +- examples/basic-server-solid/package.json | 2 +- examples/basic-server-svelte/package.json | 2 +- examples/basic-server-vanillajs/package.json | 2 +- examples/basic-server-vue/package.json | 2 +- examples/budget-allocator-server/package.json | 2 +- examples/cohort-heatmap-server/package.json | 2 +- .../customer-segmentation-server/package.json | 2 +- examples/debug-server/package.json | 2 +- examples/integration-server/package.json | 2 +- examples/map-server/package.json | 2 +- examples/pdf-server/package.json | 2 +- examples/qr-server/package.json | 2 +- examples/quickstart/package.json | 2 +- examples/say-server/package.json | 2 +- examples/scenario-modeler-server/package.json | 2 +- examples/shadertoy-server/package.json | 2 +- examples/sheet-music-server/package.json | 2 +- examples/system-monitor-server/package.json | 2 +- examples/threejs-server/package.json | 2 +- examples/transcript-server/package.json | 2 +- examples/video-resource-server/package.json | 2 +- examples/wiki-explorer-server/package.json | 2 +- package-lock.json | 54 +++++++++---------- package.json | 2 +- 27 files changed, 53 insertions(+), 53 deletions(-) diff --git a/examples/basic-host/package.json b/examples/basic-host/package.json index 8045f36..fa215ec 100644 --- a/examples/basic-host/package.json +++ b/examples/basic-host/package.json @@ -1,7 +1,7 @@ { "homepage": "https://github.com/modelcontextprotocol/ext-apps/tree/main/examples/basic-host", "name": "@modelcontextprotocol/ext-apps-basic-host", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "scripts": { "build": "tsc --noEmit && concurrently \"cross-env INPUT=index.html vite build\" \"cross-env INPUT=sandbox.html vite build\"", diff --git a/examples/basic-server-preact/package.json b/examples/basic-server-preact/package.json index dbe0e07..71eb352 100644 --- a/examples/basic-server-preact/package.json +++ b/examples/basic-server-preact/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-preact", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "Basic MCP App Server example using Preact", "repository": { diff --git a/examples/basic-server-react/package.json b/examples/basic-server-react/package.json index 63d7656..19094cf 100644 --- a/examples/basic-server-react/package.json +++ b/examples/basic-server-react/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-react", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "Basic MCP App Server example using React", "repository": { diff --git a/examples/basic-server-solid/package.json b/examples/basic-server-solid/package.json index b39d041..ed0b35c 100644 --- a/examples/basic-server-solid/package.json +++ b/examples/basic-server-solid/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-solid", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "Basic MCP App Server example using Solid", "repository": { diff --git a/examples/basic-server-svelte/package.json b/examples/basic-server-svelte/package.json index 46c38e6..c8ae3b6 100644 --- a/examples/basic-server-svelte/package.json +++ b/examples/basic-server-svelte/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-svelte", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "Basic MCP App Server example using Svelte", "repository": { diff --git a/examples/basic-server-vanillajs/package.json b/examples/basic-server-vanillajs/package.json index d41a72e..52b857e 100644 --- a/examples/basic-server-vanillajs/package.json +++ b/examples/basic-server-vanillajs/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-vanillajs", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "Basic MCP App Server example using vanilla JavaScript", "repository": { diff --git a/examples/basic-server-vue/package.json b/examples/basic-server-vue/package.json index 4e8022e..d336dbb 100644 --- a/examples/basic-server-vue/package.json +++ b/examples/basic-server-vue/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-vue", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "Basic MCP App Server example using Vue", "repository": { diff --git a/examples/budget-allocator-server/package.json b/examples/budget-allocator-server/package.json index d8d0e3c..cd746e7 100644 --- a/examples/budget-allocator-server/package.json +++ b/examples/budget-allocator-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-budget-allocator", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "Budget allocator MCP App Server with interactive visualization", "repository": { diff --git a/examples/cohort-heatmap-server/package.json b/examples/cohort-heatmap-server/package.json index a42ba0b..e8490bd 100644 --- a/examples/cohort-heatmap-server/package.json +++ b/examples/cohort-heatmap-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-cohort-heatmap", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "Cohort heatmap MCP App Server for retention analysis", "repository": { diff --git a/examples/customer-segmentation-server/package.json b/examples/customer-segmentation-server/package.json index 46c8037..940bc5f 100644 --- a/examples/customer-segmentation-server/package.json +++ b/examples/customer-segmentation-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-customer-segmentation", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "Customer segmentation MCP App Server with filtering", "repository": { diff --git a/examples/debug-server/package.json b/examples/debug-server/package.json index b0a7d54..93fecef 100644 --- a/examples/debug-server/package.json +++ b/examples/debug-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-debug", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "Debug MCP App Server for testing all SDK capabilities", "repository": { diff --git a/examples/integration-server/package.json b/examples/integration-server/package.json index f1173ed..7020168 100644 --- a/examples/integration-server/package.json +++ b/examples/integration-server/package.json @@ -1,6 +1,6 @@ { "name": "integration-server", - "version": "1.7.0", + "version": "1.7.1", "private": true, "type": "module", "scripts": { diff --git a/examples/map-server/package.json b/examples/map-server/package.json index d39648b..de7a1b9 100644 --- a/examples/map-server/package.json +++ b/examples/map-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-map", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "MCP App Server example with CesiumJS 3D globe and geocoding", "repository": { diff --git a/examples/pdf-server/package.json b/examples/pdf-server/package.json index 57af047..fef9ad1 100644 --- a/examples/pdf-server/package.json +++ b/examples/pdf-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-pdf", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "MCP server for loading and extracting text from PDF files with chunked pagination and interactive viewer", "repository": { diff --git a/examples/qr-server/package.json b/examples/qr-server/package.json index f74e671..35d6082 100644 --- a/examples/qr-server/package.json +++ b/examples/qr-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-qr", - "version": "1.7.0", + "version": "1.7.1", "private": true, "scripts": { "start": "uv run server.py", diff --git a/examples/quickstart/package.json b/examples/quickstart/package.json index 036b66e..7b324a1 100644 --- a/examples/quickstart/package.json +++ b/examples/quickstart/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/quickstart", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "private": true, "description": "Quickstart MCP App Server example", diff --git a/examples/say-server/package.json b/examples/say-server/package.json index 283c4d5..2226793 100644 --- a/examples/say-server/package.json +++ b/examples/say-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-say", - "version": "1.7.0", + "version": "1.7.1", "private": true, "description": "Streaming TTS MCP App Server with karaoke-style text highlighting", "repository": { diff --git a/examples/scenario-modeler-server/package.json b/examples/scenario-modeler-server/package.json index 2d626cf..1bf80c6 100644 --- a/examples/scenario-modeler-server/package.json +++ b/examples/scenario-modeler-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-scenario-modeler", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "Financial scenario modeling MCP App Server", "repository": { diff --git a/examples/shadertoy-server/package.json b/examples/shadertoy-server/package.json index 4924d63..4964478 100644 --- a/examples/shadertoy-server/package.json +++ b/examples/shadertoy-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-shadertoy", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "MCP App Server example for rendering ShaderToy-compatible GLSL shaders", "repository": { diff --git a/examples/sheet-music-server/package.json b/examples/sheet-music-server/package.json index b5f2370..e405bc8 100644 --- a/examples/sheet-music-server/package.json +++ b/examples/sheet-music-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-sheet-music", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "MCP App Server for rendering and playing sheet music from ABC notation", "repository": { diff --git a/examples/system-monitor-server/package.json b/examples/system-monitor-server/package.json index 05243db..23554a0 100644 --- a/examples/system-monitor-server/package.json +++ b/examples/system-monitor-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-system-monitor", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "System monitor MCP App Server with real-time stats", "repository": { diff --git a/examples/threejs-server/package.json b/examples/threejs-server/package.json index 0c2d5f5..4ba813b 100644 --- a/examples/threejs-server/package.json +++ b/examples/threejs-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-threejs", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "Three.js 3D visualization MCP App Server", "repository": { diff --git a/examples/transcript-server/package.json b/examples/transcript-server/package.json index f0daa38..43ad9c6 100644 --- a/examples/transcript-server/package.json +++ b/examples/transcript-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-transcript", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "MCP App Server for live speech transcription", "repository": { diff --git a/examples/video-resource-server/package.json b/examples/video-resource-server/package.json index 9e70d24..2487313 100644 --- a/examples/video-resource-server/package.json +++ b/examples/video-resource-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-video-resource", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "MCP App Server demonstrating video resources served as base64 blobs", "repository": { diff --git a/examples/wiki-explorer-server/package.json b/examples/wiki-explorer-server/package.json index a6a8f19..540da43 100644 --- a/examples/wiki-explorer-server/package.json +++ b/examples/wiki-explorer-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-wiki-explorer", - "version": "1.7.0", + "version": "1.7.1", "type": "module", "description": "Wikipedia link explorer MCP App Server with graph visualization", "repository": { diff --git a/package-lock.json b/package-lock.json index c0c0c47..719cb27 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@modelcontextprotocol/ext-apps", - "version": "1.7.0", + "version": "1.7.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@modelcontextprotocol/ext-apps", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "workspaces": [ "examples/*" @@ -66,7 +66,7 @@ }, "examples/basic-host": { "name": "@modelcontextprotocol/ext-apps-basic-host", - "version": "1.7.0", + "version": "1.7.1", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", "@modelcontextprotocol/sdk": "^1.29.0", @@ -109,7 +109,7 @@ }, "examples/basic-server-preact": { "name": "@modelcontextprotocol/server-basic-preact", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -153,7 +153,7 @@ }, "examples/basic-server-react": { "name": "@modelcontextprotocol/server-basic-react", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -200,7 +200,7 @@ }, "examples/basic-server-solid": { "name": "@modelcontextprotocol/server-basic-solid", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -244,7 +244,7 @@ }, "examples/basic-server-svelte": { "name": "@modelcontextprotocol/server-basic-svelte", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -288,7 +288,7 @@ }, "examples/basic-server-vanillajs": { "name": "@modelcontextprotocol/server-basic-vanillajs", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -330,7 +330,7 @@ }, "examples/basic-server-vue": { "name": "@modelcontextprotocol/server-basic-vue", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -374,7 +374,7 @@ }, "examples/budget-allocator-server": { "name": "@modelcontextprotocol/server-budget-allocator", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -417,7 +417,7 @@ }, "examples/cohort-heatmap-server": { "name": "@modelcontextprotocol/server-cohort-heatmap", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -464,7 +464,7 @@ }, "examples/customer-segmentation-server": { "name": "@modelcontextprotocol/server-customer-segmentation", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -507,7 +507,7 @@ }, "examples/debug-server": { "name": "@modelcontextprotocol/server-debug", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -548,7 +548,7 @@ "license": "MIT" }, "examples/integration-server": { - "version": "1.7.0", + "version": "1.7.1", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", "@modelcontextprotocol/sdk": "^1.29.0", @@ -593,7 +593,7 @@ }, "examples/map-server": { "name": "@modelcontextprotocol/server-map", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -635,7 +635,7 @@ }, "examples/pdf-server": { "name": "@modelcontextprotocol/server-pdf", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -679,7 +679,7 @@ }, "examples/qr-server": { "name": "@modelcontextprotocol/server-qr", - "version": "1.7.0", + "version": "1.7.1", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", "@modelcontextprotocol/sdk": "^1.29.0" @@ -687,7 +687,7 @@ }, "examples/quickstart": { "name": "@modelcontextprotocol/quickstart", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -719,7 +719,7 @@ }, "examples/say-server": { "name": "@modelcontextprotocol/server-say", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -728,7 +728,7 @@ }, "examples/scenario-modeler-server": { "name": "@modelcontextprotocol/server-scenario-modeler", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -776,7 +776,7 @@ }, "examples/shadertoy-server": { "name": "@modelcontextprotocol/server-shadertoy", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -818,7 +818,7 @@ }, "examples/sheet-music-server": { "name": "@modelcontextprotocol/server-sheet-music", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -861,7 +861,7 @@ }, "examples/system-monitor-server": { "name": "@modelcontextprotocol/server-system-monitor", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -931,7 +931,7 @@ }, "examples/threejs-server": { "name": "@modelcontextprotocol/server-threejs", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -980,7 +980,7 @@ }, "examples/transcript-server": { "name": "@modelcontextprotocol/server-transcript", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -1023,7 +1023,7 @@ }, "examples/video-resource-server": { "name": "@modelcontextprotocol/server-video-resource", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -1065,7 +1065,7 @@ }, "examples/wiki-explorer-server": { "name": "@modelcontextprotocol/server-wiki-explorer", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", diff --git a/package.json b/package.json index 5072e5b..47160db 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "url": "https://github.com/modelcontextprotocol/ext-apps" }, "homepage": "https://github.com/modelcontextprotocol/ext-apps", - "version": "1.7.0", + "version": "1.7.1", "license": "MIT", "description": "MCP Apps SDK — Enable MCP servers to display interactive user interfaces in conversational clients.", "type": "module", From 3cf5b588a15dd67b7ceb1f69a2346ba84ad2780d Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Fri, 8 May 2026 13:01:54 +0100 Subject: [PATCH 055/107] chore(pdf-server): switch pdf-lib to maintained @cantoo/pdf-lib fork (#651) The original pdf-lib package has been unmaintained since Nov 2021. @cantoo/pdf-lib is an actively maintained, API-compatible fork with ongoing releases and accumulated bugfixes. Also updates test assertions from the deprecated PDFNumber.value() to PDFNumber.asNumber() per the fork's API guidance. --- examples/pdf-server/package.json | 2 +- examples/pdf-server/server.test.ts | 2 +- .../pdf-server/src/pdf-annotations.test.ts | 26 ++++-- examples/pdf-server/src/pdf-annotations.ts | 2 +- package-lock.json | 92 ++++++++++++++----- tests/helpers/range-counting-server.ts | 7 +- 6 files changed, 94 insertions(+), 37 deletions(-) diff --git a/examples/pdf-server/package.json b/examples/pdf-server/package.json index fef9ad1..f732988 100644 --- a/examples/pdf-server/package.json +++ b/examples/pdf-server/package.json @@ -25,11 +25,11 @@ "build:mcpb": "npm run build && node build-mcpb.mjs" }, "dependencies": { + "@cantoo/pdf-lib": "^2.6.5", "@modelcontextprotocol/ext-apps": "^1.0.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", - "pdf-lib": "^1.17.1", "pdfjs-dist": "^5.0.0", "zod": "^4.1.13" }, diff --git a/examples/pdf-server/server.test.ts b/examples/pdf-server/server.test.ts index 8a0790a..33a03f1 100644 --- a/examples/pdf-server/server.test.ts +++ b/examples/pdf-server/server.test.ts @@ -5,7 +5,7 @@ import path from "node:path"; import { Client } from "@modelcontextprotocol/sdk/client/index.js"; import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js"; import { getDocument } from "pdfjs-dist/legacy/build/pdf.mjs"; -import { PDFDocument } from "pdf-lib"; +import { PDFDocument } from "@cantoo/pdf-lib"; import { makeRandomJpeg } from "../../tests/helpers/range-counting-server"; import { createPdfCache, diff --git a/examples/pdf-server/src/pdf-annotations.test.ts b/examples/pdf-server/src/pdf-annotations.test.ts index 239777a..40e63ff 100644 --- a/examples/pdf-server/src/pdf-annotations.test.ts +++ b/examples/pdf-server/src/pdf-annotations.test.ts @@ -18,7 +18,13 @@ import { type PdfAnnotationDef, type AnnotationDiff, } from "./pdf-annotations"; -import { PDFDocument, PDFDict, PDFName, PDFArray, PDFNumber } from "pdf-lib"; +import { + PDFDocument, + PDFDict, + PDFName, + PDFArray, + PDFNumber, +} from "@cantoo/pdf-lib"; // ============================================================================= // Diff Model @@ -1074,16 +1080,16 @@ describe("buildAnnotatedPdfBytes", () => { // Check /C (stroke color) = [1, 0, 0] for #ff0000 const cArr = annotDict.get(PDFName.of("C")) as PDFArray; expect(cArr).toBeDefined(); - expect((cArr.get(0) as PDFNumber).value()).toBe(1); // r - expect((cArr.get(1) as PDFNumber).value()).toBe(0); // g - expect((cArr.get(2) as PDFNumber).value()).toBe(0); // b + expect((cArr.get(0) as PDFNumber).asNumber()).toBe(1); // r + expect((cArr.get(1) as PDFNumber).asNumber()).toBe(0); // g + expect((cArr.get(2) as PDFNumber).asNumber()).toBe(0); // b // Check /IC (fill color) = [0, 1, 0] for #00ff00 const icArr = annotDict.get(PDFName.of("IC")) as PDFArray; expect(icArr).toBeDefined(); - expect((icArr.get(0) as PDFNumber).value()).toBe(0); // r - expect((icArr.get(1) as PDFNumber).value()).toBe(1); // g - expect((icArr.get(2) as PDFNumber).value()).toBe(0); // b + expect((icArr.get(0) as PDFNumber).asNumber()).toBe(0); // r + expect((icArr.get(1) as PDFNumber).asNumber()).toBe(1); // g + expect((icArr.get(2) as PDFNumber).asNumber()).toBe(0); // b }); it("adds freetext annotation to PDF", async () => { @@ -1159,9 +1165,9 @@ describe("buildAnnotatedPdfBytes", () => { // Check /C color const cArr = annotDict.get(PDFName.of("C")) as PDFArray; expect(cArr).toBeDefined(); - expect((cArr.get(0) as PDFNumber).value()).toBe(0); - expect((cArr.get(1) as PDFNumber).value()).toBe(1); - expect((cArr.get(2) as PDFNumber).value()).toBe(0); + expect((cArr.get(0) as PDFNumber).asNumber()).toBe(0); + expect((cArr.get(1) as PDFNumber).asNumber()).toBe(1); + expect((cArr.get(2) as PDFNumber).asNumber()).toBe(0); // Check appearance stream exists and contains the color const ap = annotDict.get(PDFName.of("AP")) as PDFDict; diff --git a/examples/pdf-server/src/pdf-annotations.ts b/examples/pdf-server/src/pdf-annotations.ts index 73b9b8d..201fe8d 100644 --- a/examples/pdf-server/src/pdf-annotations.ts +++ b/examples/pdf-server/src/pdf-annotations.ts @@ -24,7 +24,7 @@ import { PDFOptionList, PDFRadioGroup, type PDFForm, -} from "pdf-lib"; +} from "@cantoo/pdf-lib"; // ============================================================================= // Types diff --git a/package-lock.json b/package-lock.json index 719cb27..ffda363 100644 --- a/package-lock.json +++ b/package-lock.json @@ -638,11 +638,11 @@ "version": "1.7.1", "license": "MIT", "dependencies": { + "@cantoo/pdf-lib": "^2.6.5", "@modelcontextprotocol/ext-apps": "^1.0.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", - "pdf-lib": "^1.17.1", "pdfjs-dist": "^5.0.0", "zod": "^4.1.13" }, @@ -1489,6 +1489,21 @@ } } }, + "node_modules/@cantoo/pdf-lib": { + "version": "2.6.5", + "resolved": "https://registry.npmjs.org/@cantoo/pdf-lib/-/pdf-lib-2.6.5.tgz", + "integrity": "sha512-3eMHEaqKHt/G/q+6QjT06A3lz0S/a8x3+myiSN7FNeL3uWcedO0lpfs6TWofa4C03Z1wz3tWeHoa4CsI7DrTSA==", + "license": "MIT", + "dependencies": { + "@pdf-lib/standard-fonts": "^1.0.0", + "@pdf-lib/upng": "^1.0.1", + "color": "^4.2.3", + "crypto-js": "^4.2.0", + "node-html-better-parser": ">=1.4.0", + "pako": "^1.0.11", + "tslib": ">=2" + } + }, "node_modules/@clack/core": { "version": "1.0.0-alpha.4", "resolved": "https://registry.npmjs.org/@clack/core/-/core-1.0.0-alpha.4.tgz", @@ -5115,11 +5130,23 @@ "node": ">=6" } }, + "node_modules/color": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", + "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1", + "color-string": "^1.9.0" + }, + "engines": { + "node": ">=12.5.0" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -5132,9 +5159,18 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, "license": "MIT" }, + "node_modules/color-string": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", + "license": "MIT", + "dependencies": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, "node_modules/colorette": { "version": "2.0.20", "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", @@ -5266,6 +5302,12 @@ "node": ">= 8" } }, + "node_modules/crypto-js": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", + "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==", + "license": "MIT" + }, "node_modules/css-select": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.2.2.tgz", @@ -6342,7 +6384,6 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==", - "dev": true, "license": "MIT" }, "node_modules/htmlparser2": { @@ -6489,6 +6530,12 @@ "node": ">= 0.10" } }, + "node_modules/is-arrayish": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.4.tgz", + "integrity": "sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==", + "license": "MIT" + }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -7127,6 +7174,15 @@ "node": ">= 0.6" } }, + "node_modules/node-html-better-parser": { + "version": "1.5.8", + "resolved": "https://registry.npmjs.org/node-html-better-parser/-/node-html-better-parser-1.5.8.tgz", + "integrity": "sha512-t/wAKvaTSKco43X+yf9+76RiMt18MtMmzd4wc7rKj+fWav6DV4ajDEKdWlLzSE8USDF5zr/06uGj0Wr/dGAFtw==", + "license": "MIT", + "dependencies": { + "html-entities": "^2.3.2" + } + }, "node_modules/node-html-parser": { "version": "6.1.13", "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.13.tgz", @@ -7377,24 +7433,6 @@ "node": ">= 14.16" } }, - "node_modules/pdf-lib": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/pdf-lib/-/pdf-lib-1.17.1.tgz", - "integrity": "sha512-V/mpyJAoTsN4cnP31vc0wfNA1+p20evqqnap0KLoRUN0Yk/p3wN52DOEsL4oBFcLdb76hlpKPtzJIgo67j/XLw==", - "license": "MIT", - "dependencies": { - "@pdf-lib/standard-fonts": "^1.0.0", - "@pdf-lib/upng": "^1.0.1", - "pako": "^1.0.11", - "tslib": "^1.11.1" - } - }, - "node_modules/pdf-lib/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "license": "0BSD" - }, "node_modules/pdfjs-dist": { "version": "5.4.530", "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-5.4.530.tgz", @@ -8067,6 +8105,15 @@ "kolorist": "^1.6.0" } }, + "node_modules/simple-swizzle": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.4.tgz", + "integrity": "sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw==", + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.3.1" + } + }, "node_modules/simple-update-notifier": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", @@ -8751,7 +8798,6 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "dev": true, "license": "0BSD" }, "node_modules/tsutils": { diff --git a/tests/helpers/range-counting-server.ts b/tests/helpers/range-counting-server.ts index 529ef33..6f0dcd7 100644 --- a/tests/helpers/range-counting-server.ts +++ b/tests/helpers/range-counting-server.ts @@ -8,7 +8,12 @@ */ import http from "node:http"; import type { AddressInfo } from "node:net"; -import { PDFDocument, PDFName, PDFString, StandardFonts } from "pdf-lib"; +import { + PDFDocument, + PDFName, + PDFString, + StandardFonts, +} from "@cantoo/pdf-lib"; export interface RangeServerStats { /** Total bytes written across all responses (sum of slice lengths). */ From 1d091e21321c0680564f19fea9c82a805a352a9c Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Fri, 8 May 2026 15:55:06 +0100 Subject: [PATCH 056/107] chore: bump example transitives to latest patches (#658) - vite-plugin-solid 2.11.10 -> 2.11.12 (basic-server-solid) - babel-preset-solid 1.9.10 -> 1.9.12 - babel-plugin-jsx-dom-expressions 0.40.3 -> 0.40.6 - vite-prerender-plugin 0.5.12 -> 0.5.13 (basic-server-preact) - @modelcontextprotocol/ext-apps 1.0.0 -> 1.7.1 (lockfile had a stale registry pin of the repo's own published package that was never bumped alongside package.json's version field) Tighten the basic-server-solid range to ^2.11.12 to track the patch series with current Solid HMR fixes. --- examples/basic-server-solid/package.json | 2 +- package-lock.json | 83 ++++++++++++------------ 2 files changed, 44 insertions(+), 41 deletions(-) diff --git a/examples/basic-server-solid/package.json b/examples/basic-server-solid/package.json index ed0b35c..a98ce34 100644 --- a/examples/basic-server-solid/package.json +++ b/examples/basic-server-solid/package.json @@ -40,7 +40,7 @@ "typescript": "^5.9.3", "vite": "^6.0.0", "vite-plugin-singlefile": "^2.3.0", - "vite-plugin-solid": "^2.0.0" + "vite-plugin-solid": "^2.11.12" }, "types": "dist/server.d.ts", "exports": { diff --git a/package-lock.json b/package-lock.json index ffda363..559992b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -222,7 +222,7 @@ "typescript": "^5.9.3", "vite": "^6.0.0", "vite-plugin-singlefile": "^2.3.0", - "vite-plugin-solid": "^2.0.0" + "vite-plugin-solid": "^2.11.12" } }, "examples/basic-server-solid/node_modules/@types/node": { @@ -2562,35 +2562,21 @@ "license": "MIT" }, "node_modules/@modelcontextprotocol/ext-apps": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/ext-apps/-/ext-apps-1.0.0.tgz", - "integrity": "sha512-d5vGKBhWkRoa3xlKOynF8kd+sTSY2D3QSjTMCs46/ddOUOSn5e/E0SaShixFm7H7mNlj4uY0RuU0jAsPM/0qwA==", - "hasInstallScript": true, + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/ext-apps/-/ext-apps-1.7.1.tgz", + "integrity": "sha512-J3WdG1A4JSSKnSWKyU+895dBVYBV2Utgtf7fUsUK45mlkETm53a/1DR6Pm3hUGKqLLQthZLmpxOg8VPzJi/lyg==", "license": "MIT", "workspaces": [ "examples/*" ], - "optionalDependencies": { - "@oven/bun-darwin-aarch64": "^1.2.21", - "@oven/bun-darwin-x64": "^1.2.21", - "@oven/bun-darwin-x64-baseline": "^1.2.21", - "@oven/bun-linux-aarch64": "^1.2.21", - "@oven/bun-linux-aarch64-musl": "^1.2.21", - "@oven/bun-linux-x64": "^1.2.21", - "@oven/bun-linux-x64-baseline": "^1.2.21", - "@oven/bun-linux-x64-musl": "^1.2.21", - "@oven/bun-linux-x64-musl-baseline": "^1.2.21", - "@oven/bun-windows-x64": "^1.2.21", - "@oven/bun-windows-x64-baseline": "^1.2.21", - "@rollup/rollup-darwin-arm64": "^4.53.3", - "@rollup/rollup-darwin-x64": "^4.53.3", - "@rollup/rollup-linux-arm64-gnu": "^4.53.3", - "@rollup/rollup-linux-x64-gnu": "^4.53.3", - "@rollup/rollup-win32-arm64-msvc": "^4.53.3", - "@rollup/rollup-win32-x64-msvc": "^4.53.3" + "dependencies": { + "@standard-schema/spec": "^1.1.0" + }, + "engines": { + "node": ">=20" }, "peerDependencies": { - "@modelcontextprotocol/sdk": "^1.24.0", + "@modelcontextprotocol/sdk": "^1.29.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0", "zod": "^3.25.0 || ^4.0.0" @@ -3053,6 +3039,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3066,6 +3053,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3079,6 +3067,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3092,6 +3081,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3105,6 +3095,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3118,6 +3109,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3131,6 +3123,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3144,6 +3137,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3157,6 +3151,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3184,6 +3179,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3197,6 +3193,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3356,6 +3353,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3369,6 +3367,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3438,6 +3437,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3563,6 +3563,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3618,6 +3619,7 @@ "cpu": [ "arm64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -3659,6 +3661,7 @@ "cpu": [ "x64" ], + "dev": true, "license": "MIT", "optional": true, "os": [ @@ -4538,9 +4541,9 @@ } }, "node_modules/babel-plugin-jsx-dom-expressions": { - "version": "0.40.3", - "resolved": "https://registry.npmjs.org/babel-plugin-jsx-dom-expressions/-/babel-plugin-jsx-dom-expressions-0.40.3.tgz", - "integrity": "sha512-5HOwwt0BYiv/zxl7j8Pf2bGL6rDXfV6nUhLs8ygBX+EFJXzBPHM/euj9j/6deMZ6wa52Wb2PBaAV5U/jKwIY1w==", + "version": "0.40.6", + "resolved": "https://registry.npmjs.org/babel-plugin-jsx-dom-expressions/-/babel-plugin-jsx-dom-expressions-0.40.6.tgz", + "integrity": "sha512-v3P1MW46Lm7VMpAkq0QfyzLWWkC8fh+0aE5Km4msIgDx5kjenHU0pF2s+4/NH8CQn/kla6+Hvws+2AF7bfV5qQ==", "dev": true, "license": "MIT", "dependencies": { @@ -4578,17 +4581,17 @@ } }, "node_modules/babel-preset-solid": { - "version": "1.9.10", - "resolved": "https://registry.npmjs.org/babel-preset-solid/-/babel-preset-solid-1.9.10.tgz", - "integrity": "sha512-HCelrgua/Y+kqO8RyL04JBWS/cVdrtUv/h45GntgQY+cJl4eBcKkCDV3TdMjtKx1nXwRaR9QXslM/Npm1dxdZQ==", + "version": "1.9.12", + "resolved": "https://registry.npmjs.org/babel-preset-solid/-/babel-preset-solid-1.9.12.tgz", + "integrity": "sha512-LLqnuKVDlKpyBlMPcH6qEvs/wmS9a+NczppxJ3ryS/c0O5IiSFOIBQi9GzyiGDSbcJpx4Gr87jyFTos1MyEuWg==", "dev": true, "license": "MIT", "dependencies": { - "babel-plugin-jsx-dom-expressions": "^0.40.3" + "babel-plugin-jsx-dom-expressions": "^0.40.6" }, "peerDependencies": { "@babel/core": "^7.0.0", - "solid-js": "^1.9.10" + "solid-js": "^1.9.12" }, "peerDependenciesMeta": { "solid-js": { @@ -9626,9 +9629,9 @@ } }, "node_modules/vite-plugin-solid": { - "version": "2.11.10", - "resolved": "https://registry.npmjs.org/vite-plugin-solid/-/vite-plugin-solid-2.11.10.tgz", - "integrity": "sha512-Yr1dQybmtDtDAHkii6hXuc1oVH9CPcS/Zb2jN/P36qqcrkNnVPsMTzQ06jyzFPFjj3U1IYKMVt/9ZqcwGCEbjw==", + "version": "2.11.12", + "resolved": "https://registry.npmjs.org/vite-plugin-solid/-/vite-plugin-solid-2.11.12.tgz", + "integrity": "sha512-FgjPcx2OwX9h6f28jli7A4bG7PP3te8uyakE5iqsmpq3Jqi1TWLgSroC9N6cMfGRU2zXsl4Q6ISvTr2VL0QHpA==", "dev": true, "license": "MIT", "dependencies": { @@ -9642,7 +9645,7 @@ "peerDependencies": { "@testing-library/jest-dom": "^5.16.6 || ^5.17.0 || ^6.*", "solid-js": "^1.7.2", - "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0" + "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "@testing-library/jest-dom": { @@ -9651,9 +9654,9 @@ } }, "node_modules/vite-prerender-plugin": { - "version": "0.5.12", - "resolved": "https://registry.npmjs.org/vite-prerender-plugin/-/vite-prerender-plugin-0.5.12.tgz", - "integrity": "sha512-EiwhbMn+flg14EysbLTmZSzq8NGTxhytgK3bf4aGRF1evWLGwZiHiUJ1KZDvbxgKbMf2pG6fJWGEa3UZXOnR1g==", + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/vite-prerender-plugin/-/vite-prerender-plugin-0.5.13.tgz", + "integrity": "sha512-IKSpYkzDBsKAxa05naRbj7GvNVMSdww/Z/E89oO3xndz+gWnOBOKOAbEXv7qDhktY/j3vHgJmoV1pPzqU2tx9g==", "dev": true, "license": "MIT", "dependencies": { @@ -9665,7 +9668,7 @@ "stack-trace": "^1.0.0-pre2" }, "peerDependencies": { - "vite": "5.x || 6.x || 7.x" + "vite": "5.x || 6.x || 7.x || 8.x" } }, "node_modules/vite/node_modules/fdir": { From 9a37ad71827d076af06978fa7f7f510449687061 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Fri, 15 May 2026 19:01:25 +0100 Subject: [PATCH 057/107] chore: bump ext-apps to 1.7.2 (#660) No SDK API changes since 1.7.1. Examples: - pdf-server: switch pdf-lib to maintained @cantoo/pdf-lib fork (#651) - bump example transitives to latest patches (#658) --- examples/basic-host/package.json | 2 +- examples/basic-server-preact/package.json | 2 +- examples/basic-server-react/package.json | 2 +- examples/basic-server-solid/package.json | 2 +- examples/basic-server-svelte/package.json | 2 +- examples/basic-server-vanillajs/package.json | 2 +- examples/basic-server-vue/package.json | 2 +- examples/budget-allocator-server/package.json | 2 +- examples/cohort-heatmap-server/package.json | 2 +- .../customer-segmentation-server/package.json | 2 +- examples/debug-server/package.json | 2 +- examples/integration-server/package.json | 2 +- examples/map-server/package.json | 2 +- examples/pdf-server/package.json | 2 +- examples/qr-server/package.json | 2 +- examples/quickstart/package.json | 2 +- examples/say-server/package.json | 2 +- examples/scenario-modeler-server/package.json | 2 +- examples/shadertoy-server/package.json | 2 +- examples/sheet-music-server/package.json | 2 +- examples/system-monitor-server/package.json | 2 +- examples/threejs-server/package.json | 2 +- examples/transcript-server/package.json | 2 +- examples/video-resource-server/package.json | 2 +- examples/wiki-explorer-server/package.json | 2 +- package-lock.json | 54 +++++++++---------- package.json | 2 +- 27 files changed, 53 insertions(+), 53 deletions(-) diff --git a/examples/basic-host/package.json b/examples/basic-host/package.json index fa215ec..a7939a6 100644 --- a/examples/basic-host/package.json +++ b/examples/basic-host/package.json @@ -1,7 +1,7 @@ { "homepage": "https://github.com/modelcontextprotocol/ext-apps/tree/main/examples/basic-host", "name": "@modelcontextprotocol/ext-apps-basic-host", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "scripts": { "build": "tsc --noEmit && concurrently \"cross-env INPUT=index.html vite build\" \"cross-env INPUT=sandbox.html vite build\"", diff --git a/examples/basic-server-preact/package.json b/examples/basic-server-preact/package.json index 71eb352..9d0b4d5 100644 --- a/examples/basic-server-preact/package.json +++ b/examples/basic-server-preact/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-preact", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "Basic MCP App Server example using Preact", "repository": { diff --git a/examples/basic-server-react/package.json b/examples/basic-server-react/package.json index 19094cf..1be79c5 100644 --- a/examples/basic-server-react/package.json +++ b/examples/basic-server-react/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-react", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "Basic MCP App Server example using React", "repository": { diff --git a/examples/basic-server-solid/package.json b/examples/basic-server-solid/package.json index a98ce34..ac4c197 100644 --- a/examples/basic-server-solid/package.json +++ b/examples/basic-server-solid/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-solid", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "Basic MCP App Server example using Solid", "repository": { diff --git a/examples/basic-server-svelte/package.json b/examples/basic-server-svelte/package.json index c8ae3b6..4f124f3 100644 --- a/examples/basic-server-svelte/package.json +++ b/examples/basic-server-svelte/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-svelte", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "Basic MCP App Server example using Svelte", "repository": { diff --git a/examples/basic-server-vanillajs/package.json b/examples/basic-server-vanillajs/package.json index 52b857e..cfb7c1b 100644 --- a/examples/basic-server-vanillajs/package.json +++ b/examples/basic-server-vanillajs/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-vanillajs", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "Basic MCP App Server example using vanilla JavaScript", "repository": { diff --git a/examples/basic-server-vue/package.json b/examples/basic-server-vue/package.json index d336dbb..4f7d19c 100644 --- a/examples/basic-server-vue/package.json +++ b/examples/basic-server-vue/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-vue", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "Basic MCP App Server example using Vue", "repository": { diff --git a/examples/budget-allocator-server/package.json b/examples/budget-allocator-server/package.json index cd746e7..ad217c8 100644 --- a/examples/budget-allocator-server/package.json +++ b/examples/budget-allocator-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-budget-allocator", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "Budget allocator MCP App Server with interactive visualization", "repository": { diff --git a/examples/cohort-heatmap-server/package.json b/examples/cohort-heatmap-server/package.json index e8490bd..4c20844 100644 --- a/examples/cohort-heatmap-server/package.json +++ b/examples/cohort-heatmap-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-cohort-heatmap", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "Cohort heatmap MCP App Server for retention analysis", "repository": { diff --git a/examples/customer-segmentation-server/package.json b/examples/customer-segmentation-server/package.json index 940bc5f..fada75e 100644 --- a/examples/customer-segmentation-server/package.json +++ b/examples/customer-segmentation-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-customer-segmentation", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "Customer segmentation MCP App Server with filtering", "repository": { diff --git a/examples/debug-server/package.json b/examples/debug-server/package.json index 93fecef..5bbbad4 100644 --- a/examples/debug-server/package.json +++ b/examples/debug-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-debug", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "Debug MCP App Server for testing all SDK capabilities", "repository": { diff --git a/examples/integration-server/package.json b/examples/integration-server/package.json index 7020168..0244bad 100644 --- a/examples/integration-server/package.json +++ b/examples/integration-server/package.json @@ -1,6 +1,6 @@ { "name": "integration-server", - "version": "1.7.1", + "version": "1.7.2", "private": true, "type": "module", "scripts": { diff --git a/examples/map-server/package.json b/examples/map-server/package.json index de7a1b9..3050e1e 100644 --- a/examples/map-server/package.json +++ b/examples/map-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-map", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "MCP App Server example with CesiumJS 3D globe and geocoding", "repository": { diff --git a/examples/pdf-server/package.json b/examples/pdf-server/package.json index f732988..fc4cdb1 100644 --- a/examples/pdf-server/package.json +++ b/examples/pdf-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-pdf", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "MCP server for loading and extracting text from PDF files with chunked pagination and interactive viewer", "repository": { diff --git a/examples/qr-server/package.json b/examples/qr-server/package.json index 35d6082..3c183d0 100644 --- a/examples/qr-server/package.json +++ b/examples/qr-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-qr", - "version": "1.7.1", + "version": "1.7.2", "private": true, "scripts": { "start": "uv run server.py", diff --git a/examples/quickstart/package.json b/examples/quickstart/package.json index 7b324a1..5063a6a 100644 --- a/examples/quickstart/package.json +++ b/examples/quickstart/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/quickstart", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "private": true, "description": "Quickstart MCP App Server example", diff --git a/examples/say-server/package.json b/examples/say-server/package.json index 2226793..aca5e3d 100644 --- a/examples/say-server/package.json +++ b/examples/say-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-say", - "version": "1.7.1", + "version": "1.7.2", "private": true, "description": "Streaming TTS MCP App Server with karaoke-style text highlighting", "repository": { diff --git a/examples/scenario-modeler-server/package.json b/examples/scenario-modeler-server/package.json index 1bf80c6..e7e1d28 100644 --- a/examples/scenario-modeler-server/package.json +++ b/examples/scenario-modeler-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-scenario-modeler", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "Financial scenario modeling MCP App Server", "repository": { diff --git a/examples/shadertoy-server/package.json b/examples/shadertoy-server/package.json index 4964478..1aa1fd3 100644 --- a/examples/shadertoy-server/package.json +++ b/examples/shadertoy-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-shadertoy", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "MCP App Server example for rendering ShaderToy-compatible GLSL shaders", "repository": { diff --git a/examples/sheet-music-server/package.json b/examples/sheet-music-server/package.json index e405bc8..ffc5c8a 100644 --- a/examples/sheet-music-server/package.json +++ b/examples/sheet-music-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-sheet-music", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "MCP App Server for rendering and playing sheet music from ABC notation", "repository": { diff --git a/examples/system-monitor-server/package.json b/examples/system-monitor-server/package.json index 23554a0..5a55817 100644 --- a/examples/system-monitor-server/package.json +++ b/examples/system-monitor-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-system-monitor", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "System monitor MCP App Server with real-time stats", "repository": { diff --git a/examples/threejs-server/package.json b/examples/threejs-server/package.json index 4ba813b..be3b293 100644 --- a/examples/threejs-server/package.json +++ b/examples/threejs-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-threejs", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "Three.js 3D visualization MCP App Server", "repository": { diff --git a/examples/transcript-server/package.json b/examples/transcript-server/package.json index 43ad9c6..d4e4ce9 100644 --- a/examples/transcript-server/package.json +++ b/examples/transcript-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-transcript", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "MCP App Server for live speech transcription", "repository": { diff --git a/examples/video-resource-server/package.json b/examples/video-resource-server/package.json index 2487313..68c890e 100644 --- a/examples/video-resource-server/package.json +++ b/examples/video-resource-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-video-resource", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "MCP App Server demonstrating video resources served as base64 blobs", "repository": { diff --git a/examples/wiki-explorer-server/package.json b/examples/wiki-explorer-server/package.json index 540da43..96ce612 100644 --- a/examples/wiki-explorer-server/package.json +++ b/examples/wiki-explorer-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-wiki-explorer", - "version": "1.7.1", + "version": "1.7.2", "type": "module", "description": "Wikipedia link explorer MCP App Server with graph visualization", "repository": { diff --git a/package-lock.json b/package-lock.json index 559992b..54af40d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@modelcontextprotocol/ext-apps", - "version": "1.7.1", + "version": "1.7.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@modelcontextprotocol/ext-apps", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "workspaces": [ "examples/*" @@ -66,7 +66,7 @@ }, "examples/basic-host": { "name": "@modelcontextprotocol/ext-apps-basic-host", - "version": "1.7.1", + "version": "1.7.2", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", "@modelcontextprotocol/sdk": "^1.29.0", @@ -109,7 +109,7 @@ }, "examples/basic-server-preact": { "name": "@modelcontextprotocol/server-basic-preact", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -153,7 +153,7 @@ }, "examples/basic-server-react": { "name": "@modelcontextprotocol/server-basic-react", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -200,7 +200,7 @@ }, "examples/basic-server-solid": { "name": "@modelcontextprotocol/server-basic-solid", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -244,7 +244,7 @@ }, "examples/basic-server-svelte": { "name": "@modelcontextprotocol/server-basic-svelte", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -288,7 +288,7 @@ }, "examples/basic-server-vanillajs": { "name": "@modelcontextprotocol/server-basic-vanillajs", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -330,7 +330,7 @@ }, "examples/basic-server-vue": { "name": "@modelcontextprotocol/server-basic-vue", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -374,7 +374,7 @@ }, "examples/budget-allocator-server": { "name": "@modelcontextprotocol/server-budget-allocator", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -417,7 +417,7 @@ }, "examples/cohort-heatmap-server": { "name": "@modelcontextprotocol/server-cohort-heatmap", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -464,7 +464,7 @@ }, "examples/customer-segmentation-server": { "name": "@modelcontextprotocol/server-customer-segmentation", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -507,7 +507,7 @@ }, "examples/debug-server": { "name": "@modelcontextprotocol/server-debug", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -548,7 +548,7 @@ "license": "MIT" }, "examples/integration-server": { - "version": "1.7.1", + "version": "1.7.2", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", "@modelcontextprotocol/sdk": "^1.29.0", @@ -593,7 +593,7 @@ }, "examples/map-server": { "name": "@modelcontextprotocol/server-map", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -635,7 +635,7 @@ }, "examples/pdf-server": { "name": "@modelcontextprotocol/server-pdf", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@cantoo/pdf-lib": "^2.6.5", @@ -679,7 +679,7 @@ }, "examples/qr-server": { "name": "@modelcontextprotocol/server-qr", - "version": "1.7.1", + "version": "1.7.2", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", "@modelcontextprotocol/sdk": "^1.29.0" @@ -687,7 +687,7 @@ }, "examples/quickstart": { "name": "@modelcontextprotocol/quickstart", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -719,7 +719,7 @@ }, "examples/say-server": { "name": "@modelcontextprotocol/server-say", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -728,7 +728,7 @@ }, "examples/scenario-modeler-server": { "name": "@modelcontextprotocol/server-scenario-modeler", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -776,7 +776,7 @@ }, "examples/shadertoy-server": { "name": "@modelcontextprotocol/server-shadertoy", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -818,7 +818,7 @@ }, "examples/sheet-music-server": { "name": "@modelcontextprotocol/server-sheet-music", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -861,7 +861,7 @@ }, "examples/system-monitor-server": { "name": "@modelcontextprotocol/server-system-monitor", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -931,7 +931,7 @@ }, "examples/threejs-server": { "name": "@modelcontextprotocol/server-threejs", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -980,7 +980,7 @@ }, "examples/transcript-server": { "name": "@modelcontextprotocol/server-transcript", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -1023,7 +1023,7 @@ }, "examples/video-resource-server": { "name": "@modelcontextprotocol/server-video-resource", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", @@ -1065,7 +1065,7 @@ }, "examples/wiki-explorer-server": { "name": "@modelcontextprotocol/server-wiki-explorer", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.0.0", diff --git a/package.json b/package.json index 47160db..2f31c24 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "url": "https://github.com/modelcontextprotocol/ext-apps" }, "homepage": "https://github.com/modelcontextprotocol/ext-apps", - "version": "1.7.1", + "version": "1.7.2", "license": "MIT", "description": "MCP Apps SDK — Enable MCP servers to display interactive user interfaces in conversational clients.", "type": "module", From fcc4b03bde93e56cd66fe234bf644ced59aab3f5 Mon Sep 17 00:00:00 2001 From: Mel Ludowise Date: Mon, 1 Jun 2026 03:19:53 -0700 Subject: [PATCH 058/107] Add lazy-auth-server example (#679) Adds an example MCP App server demonstrating lazy (on-demand) OAuth: the server connects and lists tools without authentication, and only prompts for auth when a protected tool is called, by responding 401 with a WWW-Authenticate header pointing at protected-resource metadata. - Public `show_auth_button` app calls the protected `get_secret` tool via callServerTool; the host runs the OAuth flow on 401 and retries - Embedded mock authorization server (authorization-code + PKCE, short-lived HS256 tokens, refresh + session revocation) so the whole flow runs from a single process - TTL-scoped endpoint paths (/ttl//mcp) let slow or automated clients request longer-lived tokens per connection, threaded through OAuth via RFC 8707 resource indicators - `elicit_url` / `elicit_by_error` tools demonstrating URL elicitation --- examples/lazy-auth-server/README.md | 78 ++ examples/lazy-auth-server/main.ts | 42 + examples/lazy-auth-server/mcp-app.html | 27 + examples/lazy-auth-server/package.json | 51 + examples/lazy-auth-server/secret-app.html | 16 + examples/lazy-auth-server/server.ts | 1068 +++++++++++++++++ examples/lazy-auth-server/src/global.css | 100 ++ examples/lazy-auth-server/src/mcp-app.css | 66 + examples/lazy-auth-server/src/mcp-app.ts | 126 ++ examples/lazy-auth-server/src/secret-app.ts | 57 + examples/lazy-auth-server/tsconfig.json | 19 + .../lazy-auth-server/tsconfig.server.json | 17 + examples/lazy-auth-server/vite.config.ts | 24 + package-lock.json | 46 + 14 files changed, 1737 insertions(+) create mode 100644 examples/lazy-auth-server/README.md create mode 100644 examples/lazy-auth-server/main.ts create mode 100644 examples/lazy-auth-server/mcp-app.html create mode 100644 examples/lazy-auth-server/package.json create mode 100644 examples/lazy-auth-server/secret-app.html create mode 100644 examples/lazy-auth-server/server.ts create mode 100644 examples/lazy-auth-server/src/global.css create mode 100644 examples/lazy-auth-server/src/mcp-app.css create mode 100644 examples/lazy-auth-server/src/mcp-app.ts create mode 100644 examples/lazy-auth-server/src/secret-app.ts create mode 100644 examples/lazy-auth-server/tsconfig.json create mode 100644 examples/lazy-auth-server/tsconfig.server.json create mode 100644 examples/lazy-auth-server/vite.config.ts diff --git a/examples/lazy-auth-server/README.md b/examples/lazy-auth-server/README.md new file mode 100644 index 0000000..769ac18 --- /dev/null +++ b/examples/lazy-auth-server/README.md @@ -0,0 +1,78 @@ +# Example: Lazy Auth Server + +An MCP App example demonstrating **lazy (on-demand) auth**: the server connects and lists tools without any authentication, and only asks for OAuth when a _protected_ tool is actually called — by answering `401` with a `WWW-Authenticate` header. A public MCP App renders an "Auth me" button; clicking it calls a protected tool via [`callServerTool`](https://apps.extensions.modelcontextprotocol.io/api/classes/app.App.html#callservertool). The host sees the 401, runs the OAuth flow, retries, and the result renders inline. + +The embedded OAuth authorization server is a deliberately minimal mock (HS256 JWTs, stateless auth codes, auto-approve consent page) so the whole flow runs from a single process with no external dependencies. It is **not** a production authorization server. + +## Tools + +| Tool | Auth | Description | +| ------------------- | ------------- | ----------------------------------------------------------------------------------------------------- | +| `show_auth_button` | public | Renders buttons: "Auth me" (calls `get_secret`), "Revoke token" (calls `revoke_auth_token`) | +| `get_secret` | **protected** | Returns secret data (requires Bearer token) | +| `revoke_auth_token` | **protected** | Revokes the caller's **entire auth session** (access + refresh token) → forces full re-auth | +| `elicit_url` | public | URL elicitation via `elicitInput` (blocks until the elicitation completes) | +| `elicit_by_error` | public | URL elicitation via the `-32042` (`UrlElicitationRequired`) error; succeeds on retry after completion | + +## Getting Started + +```bash +npm install +npm start +# → MCP endpoint at http://localhost:3097/mcp +``` + +To test with a remote MCP host, expose the server through a public tunnel (see [Testing MCP Apps](../../docs/testing-mcp-apps.md)) and set `PUBLIC_URL` to the tunnel URL so OAuth metadata and callback URLs use it: + +```bash +PUBLIC_URL=https:// npm start +``` + +This example is HTTP-only (no stdio mode): the lazy-auth flow relies on HTTP status codes and OAuth endpoints. + +## Environment Variables + +| Var | Required | Description | +| --------------------------- | ----------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `JWT_SECRET` | recommended | 32+ byte secret for HS256 signing (`openssl rand -hex 32`). A dev-only default is used if unset. | +| `PORT` | no | Local port (default 3097) | +| `PUBLIC_URL` | non-local | Public base URL of the server (e.g. your tunnel URL). Required for non-localhost deployments; client-supplied `Host` headers are only trusted for loopback hosts | +| `ACCESS_TOKEN_TTL_SECONDS` | no | Default access-token lifetime (default **30**, short on purpose so you can watch the host's refresh flow kick in) | +| `REFRESH_TOKEN_TTL_SECONDS` | no | Default refresh-token lifetime (default **300**). Between the access and refresh TTLs, calls succeed via silent refresh; past it, a full re-auth is required | +| `REACTIVE_AUTH_ONLY` | no | Set `1` to remove auth metadata from the root `/.well-known/oauth-*` paths so hosts can't discover auth preemptively — discovery then only happens via the 401 | + +### Per-connection token lifetimes + +The short defaults are great for watching the refresh flow, but slow or automated clients may want tokens that survive a whole session. Any client can request a different access-token lifetime by connecting to a TTL-scoped MCP endpoint path (capped at 24 hours): + +``` +https:///ttl/3600/mcp ← tokens for this connection live 1 hour +``` + +This works through [RFC 8707 resource indicators](https://www.rfc-editor.org/rfc/rfc8707): MCP hosts send the MCP server URL as the `resource` parameter in OAuth authorization and token requests, and this server issues tokens for that grant with the lifetime encoded in the path (refresh tokens are extended to at least match). The TTL is a _path_ segment rather than a query param because hosts canonicalize resource indicators and strip query strings. Each TTL endpoint also enforces its value as a maximum token age, so connecting to a path with a _lower_ TTL than a token's issued lifetime forces the refresh flow. To exercise the full **re-auth** flow, call the `revoke_auth_token` tool. + +## How It Works + +1. **Connect without auth** — `initialize`, `tools/list`, and public tool calls succeed with no `Authorization` header. +2. **Protected tool → 401** — when `get_secret` or `revoke_auth_token` is called without a (valid) Bearer token, the server responds `401` with `WWW-Authenticate: Bearer resource_metadata="…/auth/prm"`. +3. **Discovery** — the host follows `resource_metadata` to the protected-resource metadata (RFC 9728), which points at the authorization server metadata (RFC 8414). +4. **OAuth flow** — the host runs the authorization-code + PKCE flow against the mock `/authorize` and `/token` endpoints (a small consent page keeps the popup visible). +5. **Retry** — the host retries the tool call with the Bearer token and the secret renders inline in the app. +6. **Refresh + revocation** — access tokens expire after 30 seconds and refresh tokens after 5 minutes by default, so all three states are easy to observe: direct success (<30s), silent refresh (30s–5min), and full re-auth (>5min). Connections can request different lifetimes via the `/ttl//mcp` endpoint path (see [Per-connection token lifetimes](#per-connection-token-lifetimes)), and `revoke_auth_token` invalidates the whole session immediately. + +The two `elicit_*` tools demonstrate the complementary pattern of [URL elicitation](https://modelcontextprotocol.io/specification/draft/client/elicitation), where the server asks the user to open a URL (e.g. to complete sign-in) either by blocking inside the tool call (`elicit_url`) or by failing with the `-32042` error and succeeding on retry (`elicit_by_error`). + +## Architecture + +- **Stateless auth codes** — grant details are encoded _inside_ the authorization code as a 5-minute JWT, so nothing needs to be stored between requests. +- **Short-lived tokens** — access tokens default to a **30 second** TTL and refresh tokens to **5 minutes**: first `get_secret` succeeds → wait >30s → next call 401s → host refreshes → retry succeeds → wait >5min → full re-auth. Per-connection overrides via the `/ttl//mcp` endpoint path. +- **HS256** — a single shared secret; no key-pair persistence. +- **Per-request MCP server** — each `/mcp` request gets a fresh `McpServer` + `StreamableHTTPServerTransport` (stateless, no session IDs). +- **Session revocation** — all tokens from one OAuth session share a `sid` claim; `revoke_auth_token` adds the sid to an in-memory revocation list checked by both token verification and the refresh grant. + +## Key Files + +- [`server.ts`](server.ts) - OAuth endpoints, discovery metadata, and the MCP server with public + protected tools +- [`main.ts`](main.ts) - HTTP entry point +- [`mcp-app.html`](mcp-app.html) / [`src/mcp-app.ts`](src/mcp-app.ts) - Public app with the "Auth me" button +- [`secret-app.html`](secret-app.html) / [`src/secret-app.ts`](src/secret-app.ts) - Protected app rendered for `get_secret` diff --git a/examples/lazy-auth-server/main.ts b/examples/lazy-auth-server/main.ts new file mode 100644 index 0000000..a96f34c --- /dev/null +++ b/examples/lazy-auth-server/main.ts @@ -0,0 +1,42 @@ +/** + * Entry point for running the Lazy Auth demo MCP server. + * Run with: npx mcp-server-lazy-auth + * Or: node dist/index.js + * + * This example is HTTP-only (no stdio mode): the lazy-auth flow it demonstrates + * relies on HTTP status codes (401 + WWW-Authenticate) and OAuth endpoints. + * + * To test with a remote MCP host, expose the server through a public tunnel + * and set PUBLIC_URL to the tunnel URL so OAuth metadata and callback URLs + * use it (see docs/testing-mcp-apps.md in the repository root). + */ +import { createApp, PORT } from "./server.js"; + +async function main() { + const app = createApp(); + + const httpServer = app.listen(PORT, (err) => { + if (err) { + console.error("Failed to start server:", err); + process.exit(1); + } + console.log( + `Lazy Auth demo MCP server listening on http://localhost:${PORT}/mcp`, + ); + console.log( + ` Tools: show_auth_button, get_secret [PROTECTED], revoke_auth_token [PROTECTED], elicit_url, elicit_by_error`, + ); + }); + + const shutdown = () => { + console.log("\nShutting down..."); + httpServer.close(() => process.exit(0)); + }; + process.on("SIGINT", shutdown); + process.on("SIGTERM", shutdown); +} + +main().catch((e) => { + console.error(e); + process.exit(1); +}); diff --git a/examples/lazy-auth-server/mcp-app.html b/examples/lazy-auth-server/mcp-app.html new file mode 100644 index 0000000..7040f15 --- /dev/null +++ b/examples/lazy-auth-server/mcp-app.html @@ -0,0 +1,27 @@ + + + + + + + Lazy Auth Demo + + +

+

Public App

+

+ No auth was needed to render this view. Click below to invoke the + protected + get_secret tool — the host will run the OAuth flow on 401 + and retry. +

+
+ + + +
+
+
+ + + diff --git a/examples/lazy-auth-server/package.json b/examples/lazy-auth-server/package.json new file mode 100644 index 0000000..74f8b02 --- /dev/null +++ b/examples/lazy-auth-server/package.json @@ -0,0 +1,51 @@ +{ + "name": "@modelcontextprotocol/server-lazy-auth", + "version": "1.7.2", + "type": "module", + "description": "MCP App example demonstrating lazy (on-demand) OAuth: public tools work unauthenticated, protected tools return 401 + WWW-Authenticate so the host runs the OAuth flow only when needed", + "repository": { + "type": "git", + "url": "https://github.com/modelcontextprotocol/ext-apps", + "directory": "examples/lazy-auth-server" + }, + "license": "MIT", + "main": "dist/server.js", + "files": [ + "dist" + ], + "scripts": { + "build": "tsc --noEmit && cross-env INPUT=mcp-app.html vite build && cross-env INPUT=secret-app.html vite build && tsc -p tsconfig.server.json && bun build server.ts --outdir dist --target node && bun build main.ts --outfile dist/index.js --target node --external \"./server.js\" --banner \"#!/usr/bin/env node\"", + "watch": "concurrently \"cross-env INPUT=mcp-app.html vite build --watch\" \"cross-env INPUT=secret-app.html vite build --watch\"", + "serve": "bun --watch main.ts", + "start": "cross-env NODE_ENV=development npm run build && npm run serve", + "dev": "cross-env NODE_ENV=development concurrently \"npm run watch\" \"npm run serve\"", + "prepublishOnly": "npm run build" + }, + "dependencies": { + "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/sdk": "^1.29.0", + "cors": "^2.8.5", + "express": "^5.1.0", + "jose": "^6.0.0" + }, + "devDependencies": { + "@types/cors": "^2.8.19", + "@types/express": "^5.0.0", + "@types/node": "22.10.0", + "concurrently": "^9.2.1", + "cross-env": "^10.1.0", + "typescript": "^5.9.3", + "vite": "^6.0.0", + "vite-plugin-singlefile": "^2.3.0" + }, + "types": "dist/server.d.ts", + "exports": { + ".": { + "types": "./dist/server.d.ts", + "default": "./dist/server.js" + } + }, + "bin": { + "mcp-server-lazy-auth": "dist/index.js" + } +} diff --git a/examples/lazy-auth-server/secret-app.html b/examples/lazy-auth-server/secret-app.html new file mode 100644 index 0000000..b2ab00b --- /dev/null +++ b/examples/lazy-auth-server/secret-app.html @@ -0,0 +1,16 @@ + + + + + + + Lazy Auth Demo — Secret + + +
+

Protected App

+
Waiting for secret data…
+
+ + + diff --git a/examples/lazy-auth-server/server.ts b/examples/lazy-auth-server/server.ts new file mode 100644 index 0000000..fa46d67 --- /dev/null +++ b/examples/lazy-auth-server/server.ts @@ -0,0 +1,1068 @@ +/** + * Lazy Auth demo MCP server. + * + * Demonstrates "lazy" (on-demand) OAuth for MCP servers and Apps: + * + * - The server connects without authentication: `initialize`, `tools/list`, + * and public tool calls all succeed with no Bearer token. + * - Protected tools (`get_secret`, `revoke_auth_token`) return 401 with a + * `WWW-Authenticate` header pointing at protected-resource metadata, so the + * host only runs the OAuth flow when a protected tool is actually called. + * - The `show_auth_button` MCP App is public; clicking its button calls the + * protected `get_secret` tool via `callServerTool`. The host sees the 401, + * runs OAuth, retries, and the result renders inline. + * + * The embedded OAuth authorization server is intentionally minimal and + * stateless (HS256 JWTs, auth codes encoded as short-lived JWTs) so the demo + * can run anywhere with a single env var. It is NOT a production AS. + */ +import { + registerAppResource, + registerAppTool, + RESOURCE_MIME_TYPE, +} from "@modelcontextprotocol/ext-apps/server"; +import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; +import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { UrlElicitationRequiredError } from "@modelcontextprotocol/sdk/types.js"; +import type { + CallToolResult, + ReadResourceResult, +} from "@modelcontextprotocol/sdk/types.js"; +import cors from "cors"; +import express, { type Express, type Request, type Response } from "express"; +import { SignJWT, jwtVerify } from "jose"; +import crypto from "node:crypto"; +import fs from "node:fs/promises"; +import path from "node:path"; + +// Works both from source (server.ts) and compiled (dist/server.js) +const DIST_DIR = import.meta.filename.endsWith(".ts") + ? path.join(import.meta.dirname, "dist") + : import.meta.dirname; + +// ─── Config ────────────────────────────────────────────────────────────────── + +export const PORT = parseInt(process.env.PORT ?? "3097", 10); +const JWT_SECRET = new TextEncoder().encode( + process.env.JWT_SECRET ?? + "dev-insecure-secret-do-not-use-in-production-" + "x".repeat(20), +); +const PROTECTED_TOOLS = new Set(["get_secret", "revoke_auth_token"]); +// Token lifetimes. Defaults are deliberately short so the host's refresh flow +// (30s–5min after auth) and full re-auth (>5min) are easy to observe in a demo. +// Slow or automated clients can request longer-lived tokens per connection by +// connecting to a TTL-scoped endpoint path (/ttl//mcp) — see +// ttlFromResource() and the README. +const ACCESS_TOKEN_TTL_SECONDS = parseInt( + process.env.ACCESS_TOKEN_TTL_SECONDS ?? "30", + 10, +); +const REFRESH_TOKEN_TTL_SECONDS = parseInt( + process.env.REFRESH_TOKEN_TTL_SECONDS ?? "300", + 10, +); +// Cap on per-connection `?token_ttl_s=` requests. +const MAX_TOKEN_TTL_SECONDS = 86400; +// When true: root well-known PRM returns *stub* metadata WITHOUT authorization_servers, +// and root well-known AS is 404. Hosts probing well-known on connect see "resource has +// PRM but no auth configured" → connect without OAuth. Real PRM (with authorization_servers) +// is only at /auth/prm, reachable via WWW-Authenticate on 401. Default false = standard. +const REACTIVE_AUTH_ONLY = process.env.REACTIVE_AUTH_ONLY === "1"; + +/** Hostname is localhost / a loopback address (URL-style, so IPv6 keeps its brackets). */ +function isLoopbackHostname(hostname: string): boolean { + return ( + ["localhost", "127.0.0.1", "[::1]"].includes(hostname) || + hostname.endsWith(".localhost") + ); +} + +/** + * Resolve the public base URL for this deployment. + * + * Precedence: the PUBLIC_URL env var, then the request's Host header (loopback + * hosts only), then http://localhost:PORT. Host / X-Forwarded-* headers naming + * non-loopback hosts are deliberately NOT trusted — a client could spoof them + * to make OAuth metadata and callback URLs point at a host it controls. + * Non-localhost deployments (e.g. behind a public tunnel) must set PUBLIC_URL + * explicitly. + */ +function resolvePublicUrl(req?: Request): URL { + const envUrl = process.env.PUBLIC_URL; + if (envUrl) return new URL(envUrl.endsWith("/") ? envUrl : envUrl + "/"); + const host = req?.headers.host; + if (host) { + try { + const url = new URL(`http://${host}/`); + if (isLoopbackHostname(url.hostname)) return url; + } catch { + // Malformed Host header → fall through to the localhost default. + } + } + return new URL(`http://localhost:${PORT}/`); +} + +/** OAuth issuer. In REACTIVE_AUTH_ONLY mode, uses a /auth subpath so root well-known 404s. + * Otherwise uses the root origin (standard). */ +const ISSUER_SUFFIX = REACTIVE_AUTH_ONLY ? "/auth" : ""; +function resolveIssuer(req?: Request): string { + return resolvePublicUrl(req).origin + ISSUER_SUFFIX; +} + +// ─── Mock OAuth (HS256, stateless codes) ───────────────────────────────────── + +interface CodePayload { + client_id: string; + redirect_uri: string; + code_challenge?: string; + code_challenge_method?: string; + scope?: string; + /** Requested access-token TTL, from `?token_ttl_s=` on the resource indicator. */ + token_ttl_s?: number; +} + +/** Validate + cap a raw TTL value (from a path segment or query param). */ +function parseTtlSeconds(raw: string | undefined): number | undefined { + const ttl = parseInt(raw ?? "", 10); + return Number.isFinite(ttl) && ttl > 0 + ? Math.min(ttl, MAX_TOKEN_TTL_SECONDS) + : undefined; +} + +/** + * Extract the requested access-token TTL from a resource indicator (RFC 8707). + * + * MCP hosts send `resource=` — the URL the client connected + * to — in authorization and token requests. Clients opt into a non-default + * token lifetime by connecting to a TTL-scoped MCP endpoint path: + * + * /ttl//mcp (e.g. /ttl/3600/mcp for 1-hour tokens) + * + * The TTL lives in the PATH because hosts canonicalize resource indicators and + * strip query strings (verified against real hosts), so `?token_ttl_s=` query + * params would never reach this server's OAuth endpoints. The query param is + * still honored as a fallback for clients that preserve it. + */ +function ttlFromResource(resource: string | undefined): number | undefined { + if (!resource) return undefined; + try { + const url = new URL(resource); + const pathMatch = url.pathname.match(/\/ttl\/(\d+)\/mcp$/); + return ( + parseTtlSeconds(pathMatch?.[1]) ?? + parseTtlSeconds(url.searchParams.get("token_ttl_s") ?? undefined) + ); + } catch { + return undefined; + } +} + +interface AuthInfo { + token: string; + sub: string; + sid: string; +} + +// ─── Session revocation ─────────────────────────────────────────────────────── +// +// Each OAuth session (authorize → code → tokens) gets a single `sid`; all access & +// refresh tokens in that session carry it. Revoking the sid invalidates both → host +// must do a full re-OAuth (refresh grant also fails). +// +// Storage is an in-memory Map, which is fine for a single-process demo server. If +// you deploy this to a multi-instance/serverless environment, back it with a +// shared store instead. + +const revokedSids = new Map(); // sid → unix GC time +// Revoked-sid entries need only outlive the longest token TTL; add small clock-skew grace. +const REVOCATION_GC_TTL_SECONDS = + Math.max( + ACCESS_TOKEN_TTL_SECONDS, + REFRESH_TOKEN_TTL_SECONDS, + MAX_TOKEN_TTL_SECONDS, + ) + 10; + +function revokeSession(sid: string): void { + revokedSids.set( + sid, + Math.floor(Date.now() / 1000) + REVOCATION_GC_TTL_SECONDS, + ); + const now = Math.floor(Date.now() / 1000); + for (const [k, gc] of revokedSids) if (gc < now) revokedSids.delete(k); +} + +function isSessionRevoked(sid: string | undefined): boolean { + if (!sid) return false; + return revokedSids.has(sid); +} + +async function signAccessToken( + sub: string, + scope: string, + sid: string, + issuer: string, + audience: string, + ttlSeconds: number = ACCESS_TOKEN_TTL_SECONDS, +): Promise { + return new SignJWT({ sub, scope, sid }) + .setProtectedHeader({ alg: "HS256" }) + .setIssuedAt() + .setIssuer(issuer) + .setAudience(audience) + .setExpirationTime(`${ttlSeconds}s`) + .sign(JWT_SECRET); +} + +async function signRefreshToken( + sub: string, + scope: string, + sid: string, + issuer: string, + ttlSeconds: number = REFRESH_TOKEN_TTL_SECONDS, + accessTtlSeconds?: number, +): Promise { + // access_ttl_s carries the grant's requested access-token TTL forward so + // refreshed access tokens keep the same lifetime as the original. + return new SignJWT({ + sub, + scope, + sid, + typ: "refresh", + ...(accessTtlSeconds !== undefined + ? { access_ttl_s: accessTtlSeconds } + : {}), + }) + .setProtectedHeader({ alg: "HS256" }) + .setIssuedAt() + .setIssuer(issuer) + .setExpirationTime(`${ttlSeconds}s`) + .sign(JWT_SECRET); +} + +async function verifyRefreshToken( + token: string, + issuer: string, +): Promise< + | { sub: string; scope: string; sid: string; accessTtlSeconds?: number } + | undefined +> { + try { + const { payload } = await jwtVerify(token, JWT_SECRET, { issuer }); + if (payload.typ !== "refresh") return undefined; + const sid = payload.sid as string | undefined; + if (isSessionRevoked(sid)) return undefined; // session revoked → refresh fails + return { + sub: payload.sub ?? "", + scope: (payload.scope as string) ?? "", + sid: sid ?? "", + accessTtlSeconds: + typeof payload.access_ttl_s === "number" + ? payload.access_ttl_s + : undefined, + }; + } catch { + return undefined; + } +} + +/** Encode grant details inside the code itself (5min expiry) — no server storage. */ +async function signAuthCode( + payload: CodePayload, + issuer: string, +): Promise { + return new SignJWT({ ...payload, typ: "code" }) + .setProtectedHeader({ alg: "HS256" }) + .setIssuedAt() + .setIssuer(issuer) + .setExpirationTime("5m") + .sign(JWT_SECRET); +} + +async function verifyAuthCode( + code: string, + issuer: string, +): Promise { + try { + const { payload } = await jwtVerify(code, JWT_SECRET, { issuer }); + if (payload.typ !== "code") return undefined; + return payload as unknown as CodePayload; + } catch { + return undefined; + } +} + +async function verifyAccessToken( + token: string, + issuer: string, + maxAgeSeconds?: number, +): Promise { + try { + const { payload } = await jwtVerify(token, JWT_SECRET, { issuer }); + if (payload.typ === "code" || payload.typ === "refresh") return undefined; // only plain access tokens + const sid = payload.sid as string | undefined; + if (isSessionRevoked(sid)) return undefined; // session revoked + // Per-connection TTL override (?token_ttl_s= on the MCP URL): treat tokens + // older than maxAgeSeconds as expired even though their exp claim is still + // in the future. Lets one deployment serve both long-TTL (default) and + // short-TTL (refresh-flow testing) connections. + if (maxAgeSeconds !== undefined && typeof payload.iat === "number") { + const ageSeconds = Math.floor(Date.now() / 1000) - payload.iat; + if (ageSeconds > maxAgeSeconds) return undefined; + } + return { token, sub: payload.sub ?? "", sid: sid ?? "" }; + } catch { + return undefined; + } +} + +function escapeHtml(s: string) { + return s.replace( + /[&<>"']/g, + (c) => + ({ "&": "&", "<": "<", ">": ">", '"': """, "'": "'" })[ + c + ]!, + ); +} + +/** + * This demo AS has no client registry, so it can't check redirect URIs against + * pre-registered values. At minimum, only allow https targets (or http on + * loopback for local development hosts) so the consent page never links to, + * or redirects the authorization code to, an unexpected scheme. + */ +function isAllowedRedirectUri(redirectUri: string): boolean { + try { + const url = new URL(redirectUri); + if (url.protocol === "https:") return true; + return url.protocol === "http:" && isLoopbackHostname(url.hostname); + } catch { + return false; + } +} + +async function handleAuthorize(req: Request, res: Response) { + const { + client_id, + redirect_uri, + state, + code_challenge, + code_challenge_method, + scope, + approved, + resource, + } = req.query as Record; + if (!redirect_uri) { + res.status(400).json({ + error: "invalid_request", + error_description: "Missing redirect_uri", + }); + return; + } + if (!isAllowedRedirectUri(redirect_uri)) { + res.status(400).json({ + error: "invalid_request", + error_description: "redirect_uri must use https (or http on localhost)", + }); + return; + } + const issuer = resolveIssuer(req); + + if (approved !== "1") { + // Show consent page. Keeps the OAuth popup visible so users can see the flow. + const approveUrl = new URL(resolvePublicUrl(req).origin + "/authorize"); + for (const [k, v] of Object.entries(req.query)) + if (v) approveUrl.searchParams.set(k, String(v)); + approveUrl.searchParams.set("approved", "1"); + const denyUrl = new URL(redirect_uri); + denyUrl.searchParams.set("error", "access_denied"); + if (state) denyUrl.searchParams.set("state", state); + res.type("text/html").send(/*html*/ ` +Authorize + +
+

🔑 Mock Authorization

+

An application is requesting access:

+
Client
${escapeHtml(client_id ?? "(none)")}
+
Scope
${escapeHtml(scope ?? "(default)")}
+
Redirect
${escapeHtml(redirect_uri)}
+ + +
`); + return; + } + + // Per-grant token TTL, requested via `?token_ttl_s=` on the resource + // indicator (the MCP URL the host is authorizing for). Encoded into the + // auth code so /token can issue tokens with the requested lifetime. + const tokenTtl = ttlFromResource(resource); + const code = await signAuthCode( + { + client_id, + redirect_uri, + code_challenge, + code_challenge_method, + scope, + ...(tokenTtl !== undefined ? { token_ttl_s: tokenTtl } : {}), + }, + issuer, + ); + const redirectUrl = new URL(redirect_uri); + redirectUrl.searchParams.set("code", code); + if (state) redirectUrl.searchParams.set("state", state); + console.log( + `[auth] issued code for client_id=${client_id}` + + (tokenTtl !== undefined ? ` (token_ttl_s=${tokenTtl})` : ""), + ); + res.redirect(redirectUrl.href); +} + +async function handleToken(req: Request, res: Response) { + const { grant_type, code, code_verifier, refresh_token, resource } = req.body; + const issuer = resolveIssuer(req); + const audience = resolvePublicUrl(req).href; + + if (grant_type === "refresh_token") { + const refreshClaims = await verifyRefreshToken(refresh_token, issuer); + if (!refreshClaims) { + console.log(`[auth] refresh rejected (invalid/revoked)`); + res.status(400).json({ + error: "invalid_grant", + error_description: "Refresh token invalid or revoked", + }); + return; + } + // Refreshed access tokens keep the grant's requested TTL: prefer the + // resource indicator on this request, else the TTL carried in the refresh + // token, else the default. + const accessTtl = + ttlFromResource(resource) ?? + refreshClaims.accessTtlSeconds ?? + ACCESS_TOKEN_TTL_SECONDS; + const access_token = await signAccessToken( + refreshClaims.sub, + refreshClaims.scope, + refreshClaims.sid, + issuer, + audience, + accessTtl, + ); + console.log( + `[auth] refreshed access token (sid=${refreshClaims.sid}, ttl=${accessTtl}s)`, + ); + res.json({ + access_token, + token_type: "Bearer", + expires_in: accessTtl, + scope: refreshClaims.scope, + refresh_token, + }); + return; + } + if (grant_type !== "authorization_code") { + res.status(400).json({ error: "unsupported_grant_type" }); + return; + } + const stored = await verifyAuthCode(code, issuer); + if (!stored) { + res.status(400).json({ + error: "invalid_grant", + error_description: "Invalid or expired code", + }); + return; + } + if (stored.code_challenge) { + if (!code_verifier) { + res.status(400).json({ + error: "invalid_grant", + error_description: "Missing code_verifier", + }); + return; + } + const hash = crypto + .createHash("sha256") + .update(code_verifier) + .digest("base64url"); + if (hash !== stored.code_challenge) { + res.status(400).json({ + error: "invalid_grant", + error_description: "PKCE verification failed", + }); + return; + } + } + const scope = stored.scope ?? "read:secret"; + const sid = crypto.randomBytes(16).toString("hex"); // new session per authorization_code grant + // Per-grant TTL: prefer the resource indicator on this request (RFC 8707), + // else the TTL encoded in the auth code at /authorize, else the default. + // Refresh tokens must outlive the access tokens they can mint. + const accessTtl = + ttlFromResource(resource) ?? stored.token_ttl_s ?? ACCESS_TOKEN_TTL_SECONDS; + const refreshTtl = Math.max(REFRESH_TOKEN_TTL_SECONDS, accessTtl); + const access_token = await signAccessToken( + "mock-user-123", + scope, + sid, + issuer, + audience, + accessTtl, + ); + const refresh = await signRefreshToken( + "mock-user-123", + scope, + sid, + issuer, + refreshTtl, + accessTtl, + ); + console.log( + `[auth] exchanged code → token (client_id=${stored.client_id}, scope=${scope}, sid=${sid}, access_ttl=${accessTtl}s, refresh_ttl=${refreshTtl}s)`, + ); + res.json({ + access_token, + token_type: "Bearer", + expires_in: accessTtl, + scope, + refresh_token: refresh, + }); +} + +// ─── Elicitation state (module-level — survives across SHTTP requests) ────── +// +// Streamable HTTP creates a fresh McpServer per request, so state must live at +// module scope. This is fine for a single-process demo server; back it with a +// shared store if you deploy multiple instances. + +/** elicitationIds the user has completed via /elicitation-callback */ +const completedElicitations = new Set(); +/** elicit_by_error: remember the last-issued eid so retries can check it */ +let lastIssuedElicitationId: string | undefined; + +// ─── MCP Server ────────────────────────────────────────────────────────────── + +/** + * Creates a new MCP server instance with tools and resources registered. + * + * @param authInfo - Verified Bearer token info, if the request carried one. + * @param req - The inbound HTTP request (used to resolve the public URL). + */ +export function createServer(authInfo?: AuthInfo, req?: Request): McpServer { + const server = new McpServer({ name: "Lazy Auth Demo", version: "1.0.0" }); + + const buttonUri = "ui://lazy-auth/mcp-app.html"; + registerAppTool( + server, + "show_auth_button", + { + title: "Show Auth Button", + description: + "Public tool: shows a button that triggers the protected get_secret tool.", + inputSchema: {}, + _meta: { ui: { resourceUri: buttonUri } }, + }, + async (): Promise => ({ + content: [{ type: "text", text: "ok" }], + }), + ); + registerAppResource( + server, + buttonUri, + buttonUri, + { mimeType: RESOURCE_MIME_TYPE }, + async (): Promise => { + const html = await fs.readFile( + path.join(DIST_DIR, "mcp-app.html"), + "utf-8", + ); + return { + contents: [ + { uri: buttonUri, mimeType: RESOURCE_MIME_TYPE, text: html }, + ], + }; + }, + ); + + const secretUri = "ui://lazy-auth/secret-app.html"; + registerAppTool( + server, + "get_secret", + { + title: "Get Secret", + description: + "Protected tool: returns secret data. Requires authentication.", + inputSchema: {}, + _meta: { ui: { resourceUri: secretUri } }, + }, + async (): Promise => { + if (!authInfo) { + return { + isError: true, + content: [{ type: "text", text: "Authentication required." }], + }; + } + const secret = { + subject: authInfo.sub, + secret: "the-answer-is-42", + issuedAt: new Date().toISOString(), + }; + return { + content: [{ type: "text", text: JSON.stringify(secret, null, 2) }], + }; + }, + ); + registerAppResource( + server, + secretUri, + secretUri, + { mimeType: RESOURCE_MIME_TYPE }, + async (): Promise => { + const html = await fs.readFile( + path.join(DIST_DIR, "secret-app.html"), + "utf-8", + ); + return { + contents: [ + { uri: secretUri, mimeType: RESOURCE_MIME_TYPE, text: html }, + ], + }; + }, + ); + + server.registerTool( + "revoke_auth_token", + { + title: "Revoke Auth Token", + description: + "Protected tool: revokes the caller's entire auth session (access + refresh token).", + inputSchema: {}, + }, + async (): Promise => { + if (!authInfo) { + return { + isError: true, + content: [{ type: "text", text: "Authentication required." }], + }; + } + revokeSession(authInfo.sid); + console.log( + `[auth] revoked session sid=${authInfo.sid} (total revoked sessions: ${revokedSids.size})`, + ); + return { + content: [ + { + type: "text", + text: `Session revoked (sid: ${authInfo.sid}). Access + refresh token invalid → full re-auth required.`, + }, + ], + }; + }, + ); + + // ── Elicitation test tools ──────────────────────────────────────────────── + // Public tools — no auth. Used to exercise a host's URL-elicitation flow + // end-to-end over Streamable HTTP. + + const base = resolvePublicUrl(req); + const callbackUrl = (eid: string) => + `${base.origin}/elicitation-callback?id=${encodeURIComponent(eid)}`; + + server.registerTool( + "elicit_url", + { + title: "Elicit URL (session-callback)", + description: + "URL elicitation via elicitInput. Blocks until the client accepts; sends ElicitCompleteNotification before returning.", + inputSchema: {}, + }, + async (_args, extra): Promise => { + const eid = crypto.randomUUID(); + // Defer notifier creation — checks client capabilities which throws if + // client doesn't advertise elicitation. Create lazily after elicitInput + // succeeds (implies client supports it). + console.log(`[elicit_url] eid=${eid} — blocking on elicitInput`); + const result = await server.server.elicitInput( + { + mode: "url", + url: callbackUrl(eid), + message: "Please open this URL to continue.", + elicitationId: eid, + }, + { relatedRequestId: extra.requestId, timeout: 300_000 }, + ); + // Send completion notification before returning — lands on the same SSE + // stream as this tool response. For Streamable HTTP this is the ONLY + // window where the server can push a notification (stream closes right + // after). The notification is optional per spec — skip if the client + // doesn't support it. + try { + const notifier = server.server.createElicitationCompletionNotifier(eid); + await notifier(); + console.log( + `[elicit_url] eid=${eid} — notified, result=${result.action}`, + ); + } catch (e) { + console.log( + `[elicit_url] eid=${eid} — notify skipped: ${e instanceof Error ? e.message : e}, result=${result.action}`, + ); + } + return { + content: [ + { type: "text", text: `elicit_url: ${JSON.stringify(result)}` }, + ], + }; + }, + ); + + server.registerTool( + "elicit_by_error", + { + title: "Elicit by -32042 Error", + description: + "Throws UrlElicitationRequiredError (-32042). Client must open the URL, then retry. On retry, if the last-issued elicitationId was completed, sends ElicitCompleteNotification and succeeds.", + inputSchema: {}, + }, + async (): Promise => { + // Retry path: check if the user completed the elicitation we last issued. + // Module-level state survives across Streamable HTTP requests in a single + // process. Checking ANY completed eid (not just last-issued) would be more + // forgiving, but last-issued is the stricter real-world pattern hosts must + // handle. + if ( + lastIssuedElicitationId && + completedElicitations.has(lastIssuedElicitationId) + ) { + const eid = lastIssuedElicitationId; + completedElicitations.delete(eid); + lastIssuedElicitationId = undefined; + // Send notification DURING this (retry) tool call — only window where + // the Streamable HTTP stream is open. The notification is optional per + // spec — createElicitationCompletionNotifier throws if the client + // doesn't advertise the capability, but the tool still succeeds. + try { + const notifier = + server.server.createElicitationCompletionNotifier(eid); + await notifier(); + console.log( + `[elicit_by_error] eid=${eid} — completed on retry, notified`, + ); + } catch (e) { + console.log( + `[elicit_by_error] eid=${eid} — completed on retry, notify skipped: ${e instanceof Error ? e.message : e}`, + ); + } + return { + content: [ + { + type: "text", + text: `Auth completed (${eid}). Tool succeeded on retry.`, + }, + ], + }; + } + const eid = crypto.randomUUID(); + lastIssuedElicitationId = eid; + console.log(`[elicit_by_error] eid=${eid} — throwing -32042`); + throw new UrlElicitationRequiredError([ + { + mode: "url", + url: callbackUrl(eid), + message: + "This tool requires authentication. Please open the link to continue.", + elicitationId: eid, + }, + ]); + }, + ); + + return server; +} + +// ─── Express app ───────────────────────────────────────────────────────────── + +/** + * Creates the Express app: OAuth endpoints, discovery metadata, and the /mcp + * endpoint with lazy (401-triggered) auth on protected tools. + */ +export function createApp(): Express { + const app = express(); + app.use(cors({ exposedHeaders: ["WWW-Authenticate"] })); + app.use(express.json()); + app.use(express.urlencoded({ extended: true })); + + // Request tracing: log every inbound request (incl. query params) so we can + // see what hosts probe during connect and what they send through OAuth. + app.use((req, _res, next) => { + const ua = (req.headers["user-agent"] ?? "").slice(0, 80); + const auth = req.headers.authorization ? "[Bearer]" : "[no-auth]"; + const query = Object.keys(req.query).length + ? ` query=${JSON.stringify(req.query)}` + : ""; + console.log(`[req] ${req.method} ${req.path} ${auth}${query} ua=${ua}`); + next(); + }); + + // OAuth endpoints + app.get("/authorize", handleAuthorize); + app.post("/token", handleToken); + + // OAuth discovery metadata. In REACTIVE_AUTH_ONLY mode, PRM + AS are kept off the + // ROOT /.well-known paths so MCP hosts can't proactively probe them and trigger + // preemptive auth during connection — discovery is purely reactive: + // 401 → WWW-Authenticate → PRM → AS → OAuth flow. + const PRM_PATH = "/auth/prm"; + + function buildAsMetadata(req: Request) { + const base = resolvePublicUrl(req); + return { + issuer: resolveIssuer(req), // subpath issuer → well-known at /.well-known/.../auth + authorization_endpoint: `${base.origin}/authorize`, + token_endpoint: `${base.origin}/token`, + response_types_supported: ["code"], + grant_types_supported: ["authorization_code", "refresh_token"], + code_challenge_methods_supported: ["S256"], + token_endpoint_auth_methods_supported: ["none"], + scopes_supported: ["read:secret"], + client_id_metadata_document_supported: true, + }; + } + + // AS metadata: serve at the issuer's well-known location. + // - REACTIVE_AUTH_ONLY: only at /.well-known/.../auth (subpath); root 404s. + // - Default: also at root /.well-known/... (standard; some hosts probe this on connect). + if (ISSUER_SUFFIX) { + // Per RFC 8414 §3: issuer /auth → /.well-known/oauth-authorization-server/auth + app.get( + `/.well-known/oauth-authorization-server${ISSUER_SUFFIX}`, + (req, res) => res.json(buildAsMetadata(req)), + ); + // RFC 8615 style (well-known between host and path): + app.get( + `${ISSUER_SUFFIX}/.well-known/oauth-authorization-server`, + (req, res) => res.json(buildAsMetadata(req)), + ); + } + if (!REACTIVE_AUTH_ONLY) { + // Default mode: full AS metadata at root well-known (standard). + app.get("/.well-known/oauth-authorization-server", (req, res) => + res.json(buildAsMetadata(req)), + ); + } + + // PRM: full version at custom path (referenced via WWW-Authenticate on 401). + function buildPrm(req: Request, includeAuth: boolean, resourcePath = "/mcp") { + const base = resolvePublicUrl(req); + return { + resource: `${base.origin}${resourcePath}`, + ...(includeAuth + ? { + authorization_servers: [resolveIssuer(req)], + scopes_supported: ["read:secret"], + bearer_methods_supported: ["header"], + } + : {}), + }; + } + /** Resource path for a TTL-scoped MCP endpoint, validating the TTL segment. */ + function ttlResourcePath(rawTtl: string): string | undefined { + const ttl = parseTtlSeconds(rawTtl); + return ttl !== undefined ? `/ttl/${ttl}/mcp` : undefined; + } + app.get(PRM_PATH, (req, res) => res.json(buildPrm(req, true))); + app.get(`${PRM_PATH}/ttl/:ttl`, (req, res) => { + const resourcePath = ttlResourcePath(String(req.params.ttl)); + if (!resourcePath) { + res.status(404).json({ error: "invalid_ttl" }); + return; + } + res.json(buildPrm(req, true, resourcePath)); + }); + // Root + path-dependent well-known PRM: in REACTIVE mode these 404 so hosts don't + // interpret their presence as "server has OAuth". In default mode, full PRM. + if (!REACTIVE_AUTH_ONLY) { + app.get("/.well-known/oauth-protected-resource", (req, res) => + res.json(buildPrm(req, true)), + ); + app.get("/.well-known/oauth-protected-resource/mcp", (req, res) => + res.json(buildPrm(req, true)), + ); + // Well-known PRM for TTL-scoped MCP endpoints (RFC 9728 derives this URL + // from the resource path, so each TTL path has its own). + app.get( + "/.well-known/oauth-protected-resource/ttl/:ttl/mcp", + (req, res) => { + const resourcePath = ttlResourcePath(String(req.params.ttl)); + if (!resourcePath) { + res.status(404).json({ error: "invalid_ttl" }); + return; + } + res.json(buildPrm(req, true, resourcePath)); + }, + ); + } + + // /register: some MCP hosts fall through to OAuth dynamic client registration (RFC 7591) + // when all well-known probes 404. We don't support it — return a proper OAuth error so + // the host concludes "auth not available here" and connects without OAuth, instead of + // treating a generic 404 as a connection failure. + app.post("/register", (_req, res) => { + res.status(400).json({ + error: "invalid_request", + error_description: + "Dynamic client registration is not supported. This server uses per-tool auth triggered via WWW-Authenticate on 401.", + }); + }); + + // MCP endpoint handler, shared by the default and TTL-scoped paths. + // pathTtl (from /ttl//mcp) doubles as the acceptance window for + // Bearer tokens: tokens older than it are rejected even if their issued + // lifetime was longer. + async function handleMcp( + req: Request, + res: Response, + pathTtl: number | undefined, + ) { + const base = resolvePublicUrl(req); + const resourceMetadataUrl = + pathTtl !== undefined + ? `${base.origin}${PRM_PATH}/ttl/${pathTtl}` + : `${base.origin}${PRM_PATH}`; + + const body = req.body; + const messages = Array.isArray(body) ? body : body ? [body] : []; + const needsAuth = messages.some( + (msg: { method?: string; params?: { name?: string } }) => + msg?.method === "tools/call" && + PROTECTED_TOOLS.has(msg.params?.name ?? ""), + ); + + // Acceptance window: the path TTL, else the `?token_ttl_s=` query param + // (fallback for clients that preserve query strings). + const tokenMaxAgeSeconds = + pathTtl ?? parseTtlSeconds(String(req.query.token_ttl_s ?? "")); + + let authInfo: AuthInfo | undefined; + const authHeader = req.headers.authorization; + if (authHeader?.startsWith("Bearer ")) { + authInfo = await verifyAccessToken( + authHeader.slice(7), + resolveIssuer(req), + tokenMaxAgeSeconds, + ); + if (!authInfo && needsAuth) { + console.log(`[mcp] 401: invalid token for protected tool`); + res + .status(401) + .set( + "WWW-Authenticate", + `Bearer error="invalid_token", error_description="The access token is invalid", resource_metadata="${resourceMetadataUrl}"`, + ) + .json({ + error: "invalid_token", + error_description: "The access token is invalid", + }); + return; + } + } else if (needsAuth) { + console.log(`[mcp] 401: no token for protected tool`); + res + .status(401) + .set( + "WWW-Authenticate", + `Bearer resource_metadata="${resourceMetadataUrl}"`, + ) + .json({ + error: "invalid_token", + error_description: "Authorization required", + }); + return; + } + + const server = createServer(authInfo, req); + const transport = new StreamableHTTPServerTransport({ + sessionIdGenerator: undefined, + }); + res.on("close", () => { + transport.close().catch(() => {}); + server.close().catch(() => {}); + }); + + try { + await server.connect(transport); + await transport.handleRequest(req, res, req.body); + } catch (error) { + console.error("[mcp] Error:", error); + if (!res.headersSent) { + res.status(500).json({ + jsonrpc: "2.0", + error: { code: -32603, message: "Internal server error" }, + id: null, + }); + } + } + } + + // Default MCP endpoint (default token TTLs). + app.all("/mcp", (req: Request, res: Response) => + handleMcp(req, res, undefined), + ); + // TTL-scoped MCP endpoint: tokens for connections made through this path are + // issued with (and limited to) the requested lifetime, e.g. /ttl/3600/mcp. + app.all("/ttl/:ttl/mcp", (req: Request, res: Response) => { + const pathTtl = parseTtlSeconds(String(req.params.ttl)); + if (pathTtl === undefined) { + res.status(404).json({ error: "invalid_ttl" }); + return; + } + return handleMcp(req, res, pathTtl); + }); + + // Elicitation callback — marks an eid as completed. Module-level state; + // the next elicit_by_error retry reads it. Minimal confirmation page so + // the popup shows something. + app.get("/elicitation-callback", (req, res) => { + const id = String(req.query.id ?? ""); + if (!id) { + res.status(400).type("text/plain").send("missing ?id="); + return; + } + completedElicitations.add(id); + console.log( + `[callback] eid=${id} completed (total: ${completedElicitations.size})`, + ); + res + .type("text/html") + .send( + `Done` + + `` + + `

✓ Elicitation completed

` + + `

${escapeHtml(id)}

` + + `

You can close this tab. The tool will succeed on the next retry.

`, + ); + }); + + // Simple landing page + app.get("/", (req, res) => { + const base = resolvePublicUrl(req); + res + .type("text/plain") + .send( + `Lazy Auth Demo — MCP server\n\n` + + ` MCP endpoint: ${base.origin}/mcp\n` + + ` ${base.origin}/ttl//mcp (custom token TTL, e.g. /ttl/3600/mcp)\n` + + ` AS metadata: ${base.origin}/.well-known/oauth-authorization-server${ISSUER_SUFFIX}\n` + + ` PRM metadata: ${base.origin}${PRM_PATH}\n\n` + + `Tools:\n` + + ` - show_auth_button (public)\n` + + ` - get_secret (protected, requires Bearer token)\n` + + ` - revoke_auth_token (protected, revokes caller's auth session)\n` + + ` - elicit_url (public, URL elicitation via elicitInput)\n` + + ` - elicit_by_error (public, URL elicitation via -32042 error)\n`, + ); + }); + + return app; +} diff --git a/examples/lazy-auth-server/src/global.css b/examples/lazy-auth-server/src/global.css new file mode 100644 index 0000000..54a9860 --- /dev/null +++ b/examples/lazy-auth-server/src/global.css @@ -0,0 +1,100 @@ +:root { + color-scheme: light dark; + + /* + * Fallbacks for host style variables used by this app. + * The host may provide these (and many more) via the host context. + */ + --color-text-primary: light-dark(#1f2937, #f3f4f6); + --color-text-inverse: light-dark(#f3f4f6, #1f2937); + --color-text-info: light-dark(#1d4ed8, #60a5fa); + --color-background-primary: light-dark(#ffffff, #1a1a1a); + --color-background-inverse: light-dark(#1a1a1a, #ffffff); + --color-background-info: light-dark(#eff6ff, #1e3a5f); + --color-ring-primary: light-dark(#3b82f6, #60a5fa); + --border-radius-md: 6px; + --border-width-regular: 1px; + --font-sans: + ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", + "Segoe UI Symbol", "Noto Color Emoji"; + --font-mono: + ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", + "Courier New", monospace; + --font-weight-normal: 400; + --font-weight-bold: 700; + --font-text-md-size: 1rem; + --font-text-md-line-height: 1.5; + --font-heading-3xl-size: 2.25rem; + --font-heading-3xl-line-height: 1.1; + --font-heading-2xl-size: 1.875rem; + --font-heading-2xl-line-height: 1.2; + --font-heading-xl-size: 1.5rem; + --font-heading-xl-line-height: 1.25; + --font-heading-lg-size: 1.25rem; + --font-heading-lg-line-height: 1.3; + --font-heading-md-size: 1rem; + --font-heading-md-line-height: 1.4; + --font-heading-sm-size: 0.875rem; + --font-heading-sm-line-height: 1.4; + + /* Spacing derived from host typography */ + --spacing-unit: var(--font-text-md-size); + --spacing-xs: calc(var(--spacing-unit) * 0.25); + --spacing-sm: calc(var(--spacing-unit) * 0.5); + --spacing-md: var(--spacing-unit); + --spacing-lg: calc(var(--spacing-unit) * 1.5); + + /* App accent color (customize for your brand) */ + --color-accent: #2563eb; + --color-text-on-accent: #ffffff; +} + +* { + box-sizing: border-box; +} + +html, +body { + font-family: var(--font-sans); + font-size: var(--font-text-md-size); + font-weight: var(--font-weight-normal); + line-height: var(--font-text-md-line-height); + color: var(--color-text-primary); +} + +h1 { + font-size: var(--font-heading-3xl-size); + line-height: var(--font-heading-3xl-line-height); +} +h2 { + font-size: var(--font-heading-2xl-size); + line-height: var(--font-heading-2xl-line-height); +} +h3 { + font-size: var(--font-heading-xl-size); + line-height: var(--font-heading-xl-line-height); +} +h4 { + font-size: var(--font-heading-lg-size); + line-height: var(--font-heading-lg-line-height); +} +h5 { + font-size: var(--font-heading-md-size); + line-height: var(--font-heading-md-line-height); +} +h6 { + font-size: var(--font-heading-sm-size); + line-height: var(--font-heading-sm-line-height); +} + +code, +pre, +kbd { + font-family: var(--font-mono); + font-size: 1em; +} + +b, +strong { + font-weight: var(--font-weight-bold); +} diff --git a/examples/lazy-auth-server/src/mcp-app.css b/examples/lazy-auth-server/src/mcp-app.css new file mode 100644 index 0000000..ba4f323 --- /dev/null +++ b/examples/lazy-auth-server/src/mcp-app.css @@ -0,0 +1,66 @@ +.main { + width: 100%; + max-width: 480px; + box-sizing: border-box; + + > * { + margin-top: 0; + margin-bottom: 0; + } + + > * + * { + margin-top: var(--spacing-md); + } +} + +.actions { + display: flex; + flex-wrap: wrap; + gap: var(--spacing-sm); +} + +button { + padding: var(--spacing-sm) var(--spacing-md); + border: none; + border-radius: var(--border-radius-md); + color: var(--color-text-on-accent); + font-weight: var(--font-weight-bold); + background-color: var(--color-accent); + cursor: pointer; + + &:disabled { + opacity: 0.5; + cursor: not-allowed; + } + + &:hover:not(:disabled) { + background-color: color-mix( + in srgb, + var(--color-accent) 85%, + var(--color-background-inverse) + ); + } + + &:focus-visible { + outline: calc(var(--border-width-regular) * 2) solid + var(--color-ring-primary); + outline-offset: var(--border-width-regular); + } +} + +.result { + padding: var(--spacing-sm) var(--spacing-md); + border: var(--border-width-regular) solid + color-mix(in srgb, var(--color-text-primary) 25%, transparent); + border-radius: var(--border-radius-md); + font-family: var(--font-mono); + font-size: 0.875em; + white-space: pre-wrap; + word-break: break-word; +} + +.error { + color: var(--color-text-danger, light-dark(#b91c1c, #f87171)); + white-space: pre-wrap; + word-break: break-word; +} diff --git a/examples/lazy-auth-server/src/mcp-app.ts b/examples/lazy-auth-server/src/mcp-app.ts new file mode 100644 index 0000000..f959d71 --- /dev/null +++ b/examples/lazy-auth-server/src/mcp-app.ts @@ -0,0 +1,126 @@ +/** + * @file Public app view: buttons that call the protected tools. + * + * The view itself renders without auth. Clicking "Auth me" calls the protected + * `get_secret` tool via `callServerTool`; the host receives a 401 from the + * server, runs the OAuth flow, retries the call, and the result renders here. + */ +import { + App, + applyDocumentTheme, + applyHostFonts, + applyHostStyleVariables, + type McpUiHostContext, +} from "@modelcontextprotocol/ext-apps"; +import "./global.css"; +import "./mcp-app.css"; + +const mainEl = document.querySelector(".main") as HTMLElement; +const authBtn = document.getElementById("auth-btn") as HTMLButtonElement; +const revokeBtn = document.getElementById("revoke-btn") as HTMLButtonElement; +const fullscreenBtn = document.getElementById( + "fullscreen-btn", +) as HTMLButtonElement; +const outputEl = document.getElementById("output")!; + +function handleHostContextChanged(ctx: McpUiHostContext) { + if (ctx.theme) { + applyDocumentTheme(ctx.theme); + } + if (ctx.styles?.variables) { + applyHostStyleVariables(ctx.styles.variables); + } + if (ctx.styles?.css?.fonts) { + applyHostFonts(ctx.styles.css.fonts); + } + if (ctx.safeAreaInsets) { + mainEl.style.paddingTop = `${ctx.safeAreaInsets.top}px`; + mainEl.style.paddingRight = `${ctx.safeAreaInsets.right}px`; + mainEl.style.paddingBottom = `${ctx.safeAreaInsets.bottom}px`; + mainEl.style.paddingLeft = `${ctx.safeAreaInsets.left}px`; + } +} + +const app = new App( + { name: "Lazy Auth Demo", version: "1.0.0" }, + { availableDisplayModes: ["inline", "fullscreen"] }, +); + +// The host echoes the result of the originating `show_auth_button` call; nothing to render. +app.ontoolresult = () => {}; +app.onerror = console.error; +app.onhostcontextchanged = handleHostContextChanged; + +function renderOutput(text: string, isError: boolean) { + const div = document.createElement("div"); + div.className = isError ? "error" : "result"; + div.textContent = text; + outputEl.replaceChildren(div); +} + +/** + * Calls a (protected) server tool. The interesting part happens on the host: + * the server answers 401 + WWW-Authenticate, the host runs the OAuth flow, + * then retries the call and returns the result here. + * + * The default MCP request timeout is 60s; the OAuth flow involves a human + * approving a consent page, which can easily take longer. Use a generous + * timeout so the pending call survives the sign-in round trip. + */ +const AUTH_FLOW_TIMEOUT_MS = 5 * 60_000; + +async function callTool(name: string) { + outputEl.replaceChildren(); + try { + console.info(`Calling ${name} tool...`); + const result = await app.callServerTool( + { name, arguments: {} }, + { timeout: AUTH_FLOW_TIMEOUT_MS }, + ); + const text = + result.content?.find((c) => c.type === "text")?.text ?? "(no content)"; + renderOutput(text, result.isError === true); + } catch (e) { + renderOutput(String(e instanceof Error ? e.message : e), true); + } +} + +authBtn.addEventListener("click", async () => { + authBtn.disabled = true; + try { + await callTool("get_secret"); + } finally { + authBtn.disabled = false; + } +}); + +revokeBtn.addEventListener("click", async () => { + revokeBtn.disabled = true; + try { + await callTool("revoke_auth_token"); + } finally { + revokeBtn.disabled = false; + } +}); + +let displayMode = "inline"; +fullscreenBtn.addEventListener("click", async () => { + fullscreenBtn.disabled = true; + try { + const next = displayMode === "fullscreen" ? "inline" : "fullscreen"; + const { mode } = await app.requestDisplayMode({ mode: next }); + displayMode = mode; + } catch (e) { + console.warn("Display mode not supported:", e); + } finally { + fullscreenBtn.disabled = false; + } +}); + +app.connect().then(() => { + const ctx = app.getHostContext(); + if (ctx) { + handleHostContextChanged(ctx); + displayMode = ctx.displayMode ?? "inline"; + } +}); diff --git a/examples/lazy-auth-server/src/secret-app.ts b/examples/lazy-auth-server/src/secret-app.ts new file mode 100644 index 0000000..aeb6857 --- /dev/null +++ b/examples/lazy-auth-server/src/secret-app.ts @@ -0,0 +1,57 @@ +/** + * @file Protected app view: renders the result of the `get_secret` tool. + * + * This view is only reached after the host has completed the OAuth flow + * (the tool call that produces it requires a Bearer token). + */ +import { + App, + applyDocumentTheme, + applyHostFonts, + applyHostStyleVariables, + type McpUiHostContext, +} from "@modelcontextprotocol/ext-apps"; +import "./global.css"; +import "./mcp-app.css"; + +const mainEl = document.querySelector(".main") as HTMLElement; +const outputEl = document.getElementById("output")!; + +function handleHostContextChanged(ctx: McpUiHostContext) { + if (ctx.theme) { + applyDocumentTheme(ctx.theme); + } + if (ctx.styles?.variables) { + applyHostStyleVariables(ctx.styles.variables); + } + if (ctx.styles?.css?.fonts) { + applyHostFonts(ctx.styles.css.fonts); + } + if (ctx.safeAreaInsets) { + mainEl.style.paddingTop = `${ctx.safeAreaInsets.top}px`; + mainEl.style.paddingRight = `${ctx.safeAreaInsets.right}px`; + mainEl.style.paddingBottom = `${ctx.safeAreaInsets.bottom}px`; + mainEl.style.paddingLeft = `${ctx.safeAreaInsets.left}px`; + } +} + +const app = new App({ name: "Lazy Auth Demo (Secret)", version: "1.0.0" }); + +app.onerror = console.error; +app.onhostcontextchanged = handleHostContextChanged; + +app.ontoolresult = (result) => { + const text = + result.content?.find((c) => c.type === "text")?.text ?? "(no content)"; + const div = document.createElement("div"); + div.className = result.isError ? "error" : "result"; + div.textContent = text; + outputEl.replaceChildren(div); +}; + +app.connect().then(() => { + const ctx = app.getHostContext(); + if (ctx) { + handleHostContextChanged(ctx); + } +}); diff --git a/examples/lazy-auth-server/tsconfig.json b/examples/lazy-auth-server/tsconfig.json new file mode 100644 index 0000000..6c553b5 --- /dev/null +++ b/examples/lazy-auth-server/tsconfig.json @@ -0,0 +1,19 @@ +{ + "compilerOptions": { + "target": "ESNext", + "lib": ["ESNext", "DOM", "DOM.Iterable"], + "module": "ESNext", + "moduleResolution": "bundler", + "allowImportingTsExtensions": true, + "resolveJsonModule": true, + "isolatedModules": true, + "verbatimModuleSyntax": true, + "noEmit": true, + "strict": true, + "skipLibCheck": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true + }, + "include": ["src", "server.ts", "main.ts"] +} diff --git a/examples/lazy-auth-server/tsconfig.server.json b/examples/lazy-auth-server/tsconfig.server.json new file mode 100644 index 0000000..05ddd8e --- /dev/null +++ b/examples/lazy-auth-server/tsconfig.server.json @@ -0,0 +1,17 @@ +{ + "compilerOptions": { + "target": "ES2022", + "lib": ["ES2022"], + "module": "NodeNext", + "moduleResolution": "NodeNext", + "declaration": true, + "emitDeclarationOnly": true, + "outDir": "./dist", + "rootDir": ".", + "strict": true, + "skipLibCheck": true, + "esModuleInterop": true, + "resolveJsonModule": true + }, + "include": ["server.ts"] +} diff --git a/examples/lazy-auth-server/vite.config.ts b/examples/lazy-auth-server/vite.config.ts new file mode 100644 index 0000000..6ff6d99 --- /dev/null +++ b/examples/lazy-auth-server/vite.config.ts @@ -0,0 +1,24 @@ +import { defineConfig } from "vite"; +import { viteSingleFile } from "vite-plugin-singlefile"; + +const INPUT = process.env.INPUT; +if (!INPUT) { + throw new Error("INPUT environment variable is not set"); +} + +const isDevelopment = process.env.NODE_ENV === "development"; + +export default defineConfig({ + plugins: [viteSingleFile()], + build: { + sourcemap: isDevelopment ? "inline" : undefined, + cssMinify: !isDevelopment, + minify: !isDevelopment, + + rollupOptions: { + input: INPUT, + }, + outDir: "dist", + emptyOutDir: false, + }, +}); diff --git a/package-lock.json b/package-lock.json index 54af40d..be26ff8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -591,6 +591,48 @@ "dev": true, "license": "MIT" }, + "examples/lazy-auth-server": { + "name": "@modelcontextprotocol/server-lazy-auth", + "version": "1.7.2", + "license": "MIT", + "dependencies": { + "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/sdk": "^1.29.0", + "cors": "^2.8.5", + "express": "^5.1.0", + "jose": "^6.0.0" + }, + "bin": { + "mcp-server-lazy-auth": "dist/index.js" + }, + "devDependencies": { + "@types/cors": "^2.8.19", + "@types/express": "^5.0.0", + "@types/node": "22.10.0", + "concurrently": "^9.2.1", + "cross-env": "^10.1.0", + "typescript": "^5.9.3", + "vite": "^6.0.0", + "vite-plugin-singlefile": "^2.3.0" + } + }, + "examples/lazy-auth-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/lazy-auth-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/map-server": { "name": "@modelcontextprotocol/server-map", "version": "1.7.2", @@ -2678,6 +2720,10 @@ "resolved": "examples/debug-server", "link": true }, + "node_modules/@modelcontextprotocol/server-lazy-auth": { + "resolved": "examples/lazy-auth-server", + "link": true + }, "node_modules/@modelcontextprotocol/server-map": { "resolved": "examples/map-server", "link": true From 7d4434e991516d91286dded5bb10266cd6cddd02 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 1 Jun 2026 12:10:47 +0100 Subject: [PATCH 059/107] chore: bump ext-apps to 1.7.3 (#680) No SDK API changes since 1.7.2. Examples: - Add lazy-auth-server example (#679) - Publish lazy-auth-server to npm (added to publish workflows) Also syncs example dependency ranges to ^1.7.0 (output of npm run bump). --- .github/workflows/npm-publish.yml | 1 + .github/workflows/publish.yml | 1 + examples/basic-host/package.json | 4 +- examples/basic-server-preact/package.json | 4 +- examples/basic-server-react/package.json | 4 +- examples/basic-server-solid/package.json | 4 +- examples/basic-server-svelte/package.json | 4 +- examples/basic-server-vanillajs/package.json | 4 +- examples/basic-server-vue/package.json | 4 +- examples/budget-allocator-server/package.json | 4 +- examples/cohort-heatmap-server/package.json | 4 +- .../customer-segmentation-server/package.json | 4 +- examples/debug-server/package.json | 4 +- examples/integration-server/package.json | 4 +- examples/lazy-auth-server/package.json | 4 +- examples/map-server/package.json | 4 +- examples/pdf-server/package.json | 4 +- examples/qr-server/package.json | 4 +- examples/quickstart/package.json | 4 +- examples/say-server/package.json | 4 +- examples/scenario-modeler-server/package.json | 4 +- examples/shadertoy-server/package.json | 4 +- examples/sheet-music-server/package.json | 4 +- examples/system-monitor-server/package.json | 4 +- examples/threejs-server/package.json | 4 +- examples/transcript-server/package.json | 4 +- examples/video-resource-server/package.json | 4 +- examples/wiki-explorer-server/package.json | 4 +- package-lock.json | 108 +++++++++--------- package.json | 2 +- 30 files changed, 109 insertions(+), 107 deletions(-) diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index 0667bbd..ed36c15 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -112,6 +112,7 @@ jobs: - cohort-heatmap-server - customer-segmentation-server - debug-server + - lazy-auth-server - map-server - pdf-server - scenario-modeler-server diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5f1d3ac..478c5b8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -34,6 +34,7 @@ jobs: ./examples/cohort-heatmap-server \ ./examples/customer-segmentation-server \ ./examples/debug-server \ + ./examples/lazy-auth-server \ ./examples/map-server \ ./examples/pdf-server \ ./examples/scenario-modeler-server \ diff --git a/examples/basic-host/package.json b/examples/basic-host/package.json index a7939a6..117beca 100644 --- a/examples/basic-host/package.json +++ b/examples/basic-host/package.json @@ -1,7 +1,7 @@ { "homepage": "https://github.com/modelcontextprotocol/ext-apps/tree/main/examples/basic-host", "name": "@modelcontextprotocol/ext-apps-basic-host", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "scripts": { "build": "tsc --noEmit && concurrently \"cross-env INPUT=index.html vite build\" \"cross-env INPUT=sandbox.html vite build\"", @@ -11,7 +11,7 @@ "dev": "cross-env NODE_ENV=development concurrently \"npm run watch\" \"npm run serve\"" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "react": "^19.2.0", "react-dom": "^19.2.0", diff --git a/examples/basic-server-preact/package.json b/examples/basic-server-preact/package.json index 9d0b4d5..353d5f0 100644 --- a/examples/basic-server-preact/package.json +++ b/examples/basic-server-preact/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-preact", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "Basic MCP App Server example using Preact", "repository": { @@ -24,7 +24,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/basic-server-react/package.json b/examples/basic-server-react/package.json index 1be79c5..a8bdfa8 100644 --- a/examples/basic-server-react/package.json +++ b/examples/basic-server-react/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-react", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "Basic MCP App Server example using React", "repository": { @@ -34,7 +34,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/basic-server-solid/package.json b/examples/basic-server-solid/package.json index ac4c197..1925ae1 100644 --- a/examples/basic-server-solid/package.json +++ b/examples/basic-server-solid/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-solid", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "Basic MCP App Server example using Solid", "repository": { @@ -24,7 +24,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/basic-server-svelte/package.json b/examples/basic-server-svelte/package.json index 4f124f3..c7fef6b 100644 --- a/examples/basic-server-svelte/package.json +++ b/examples/basic-server-svelte/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-svelte", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "Basic MCP App Server example using Svelte", "repository": { @@ -24,7 +24,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/basic-server-vanillajs/package.json b/examples/basic-server-vanillajs/package.json index cfb7c1b..72b6ed2 100644 --- a/examples/basic-server-vanillajs/package.json +++ b/examples/basic-server-vanillajs/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-vanillajs", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "Basic MCP App Server example using vanilla JavaScript", "repository": { @@ -24,7 +24,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/basic-server-vue/package.json b/examples/basic-server-vue/package.json index 4f7d19c..cb924b4 100644 --- a/examples/basic-server-vue/package.json +++ b/examples/basic-server-vue/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-vue", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "Basic MCP App Server example using Vue", "repository": { @@ -24,7 +24,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/budget-allocator-server/package.json b/examples/budget-allocator-server/package.json index ad217c8..ded5814 100644 --- a/examples/budget-allocator-server/package.json +++ b/examples/budget-allocator-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-budget-allocator", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "Budget allocator MCP App Server with interactive visualization", "repository": { @@ -26,7 +26,7 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "chart.js": "^4.4.0", "cors": "^2.8.5", diff --git a/examples/cohort-heatmap-server/package.json b/examples/cohort-heatmap-server/package.json index 4c20844..9f82c64 100644 --- a/examples/cohort-heatmap-server/package.json +++ b/examples/cohort-heatmap-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-cohort-heatmap", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "Cohort heatmap MCP App Server for retention analysis", "repository": { @@ -26,7 +26,7 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/customer-segmentation-server/package.json b/examples/customer-segmentation-server/package.json index fada75e..aa52b35 100644 --- a/examples/customer-segmentation-server/package.json +++ b/examples/customer-segmentation-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-customer-segmentation", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "Customer segmentation MCP App Server with filtering", "repository": { @@ -26,7 +26,7 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "chart.js": "^4.4.0", "cors": "^2.8.5", diff --git a/examples/debug-server/package.json b/examples/debug-server/package.json index 5bbbad4..1c505e2 100644 --- a/examples/debug-server/package.json +++ b/examples/debug-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-debug", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "Debug MCP App Server for testing all SDK capabilities", "repository": { @@ -34,7 +34,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "zod": "^4.1.13" }, diff --git a/examples/integration-server/package.json b/examples/integration-server/package.json index 0244bad..2104382 100644 --- a/examples/integration-server/package.json +++ b/examples/integration-server/package.json @@ -1,6 +1,6 @@ { "name": "integration-server", - "version": "1.7.2", + "version": "1.7.3", "private": true, "type": "module", "scripts": { @@ -15,7 +15,7 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/lazy-auth-server/package.json b/examples/lazy-auth-server/package.json index 74f8b02..8b7cb3f 100644 --- a/examples/lazy-auth-server/package.json +++ b/examples/lazy-auth-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-lazy-auth", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "MCP App example demonstrating lazy (on-demand) OAuth: public tools work unauthenticated, protected tools return 401 + WWW-Authenticate so the host runs the OAuth flow only when needed", "repository": { @@ -22,7 +22,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/map-server/package.json b/examples/map-server/package.json index 3050e1e..7283dd2 100644 --- a/examples/map-server/package.json +++ b/examples/map-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-map", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "MCP App Server example with CesiumJS 3D globe and geocoding", "repository": { @@ -26,7 +26,7 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/pdf-server/package.json b/examples/pdf-server/package.json index fc4cdb1..619f082 100644 --- a/examples/pdf-server/package.json +++ b/examples/pdf-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-pdf", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "MCP server for loading and extracting text from PDF files with chunked pagination and interactive viewer", "repository": { @@ -26,7 +26,7 @@ }, "dependencies": { "@cantoo/pdf-lib": "^2.6.5", - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/qr-server/package.json b/examples/qr-server/package.json index 3c183d0..e86607b 100644 --- a/examples/qr-server/package.json +++ b/examples/qr-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-qr", - "version": "1.7.2", + "version": "1.7.3", "private": true, "scripts": { "start": "uv run server.py", @@ -8,7 +8,7 @@ "build": "echo 'No build step needed for Python server'" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0" } } diff --git a/examples/quickstart/package.json b/examples/quickstart/package.json index 5063a6a..81e03b7 100644 --- a/examples/quickstart/package.json +++ b/examples/quickstart/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/quickstart", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "private": true, "description": "Quickstart MCP App Server example", @@ -15,7 +15,7 @@ "start": "concurrently --raw \"cross-env NODE_ENV=development INPUT=mcp-app.html vite build --watch\" \"tsx watch main.ts\"" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0" diff --git a/examples/say-server/package.json b/examples/say-server/package.json index aca5e3d..c044d09 100644 --- a/examples/say-server/package.json +++ b/examples/say-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-say", - "version": "1.7.2", + "version": "1.7.3", "private": true, "description": "Streaming TTS MCP App Server with karaoke-style text highlighting", "repository": { @@ -15,7 +15,7 @@ "build": "echo 'No build step needed for Python server'" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0" } } diff --git a/examples/scenario-modeler-server/package.json b/examples/scenario-modeler-server/package.json index e7e1d28..a91b2f4 100644 --- a/examples/scenario-modeler-server/package.json +++ b/examples/scenario-modeler-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-scenario-modeler", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "Financial scenario modeling MCP App Server", "repository": { @@ -26,7 +26,7 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "chart.js": "^4.4.0", "cors": "^2.8.5", diff --git a/examples/shadertoy-server/package.json b/examples/shadertoy-server/package.json index 1aa1fd3..80a4c76 100644 --- a/examples/shadertoy-server/package.json +++ b/examples/shadertoy-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-shadertoy", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "MCP App Server example for rendering ShaderToy-compatible GLSL shaders", "repository": { @@ -24,7 +24,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/sheet-music-server/package.json b/examples/sheet-music-server/package.json index ffc5c8a..cfad907 100644 --- a/examples/sheet-music-server/package.json +++ b/examples/sheet-music-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-sheet-music", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "MCP App Server for rendering and playing sheet music from ABC notation", "repository": { @@ -24,7 +24,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "abcjs": "^6.4.4", "cors": "^2.8.5", diff --git a/examples/system-monitor-server/package.json b/examples/system-monitor-server/package.json index 5a55817..102e96d 100644 --- a/examples/system-monitor-server/package.json +++ b/examples/system-monitor-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-system-monitor", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "System monitor MCP App Server with real-time stats", "repository": { @@ -26,7 +26,7 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "chart.js": "^4.4.0", "cors": "^2.8.5", diff --git a/examples/threejs-server/package.json b/examples/threejs-server/package.json index be3b293..372a41b 100644 --- a/examples/threejs-server/package.json +++ b/examples/threejs-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-threejs", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "Three.js 3D visualization MCP App Server", "repository": { @@ -26,7 +26,7 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/transcript-server/package.json b/examples/transcript-server/package.json index d4e4ce9..aeb149c 100644 --- a/examples/transcript-server/package.json +++ b/examples/transcript-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-transcript", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "MCP App Server for live speech transcription", "repository": { @@ -24,7 +24,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/video-resource-server/package.json b/examples/video-resource-server/package.json index 68c890e..86f437d 100644 --- a/examples/video-resource-server/package.json +++ b/examples/video-resource-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-video-resource", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "MCP App Server demonstrating video resources served as base64 blobs", "repository": { @@ -24,7 +24,7 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/wiki-explorer-server/package.json b/examples/wiki-explorer-server/package.json index 96ce612..2d3f1f7 100644 --- a/examples/wiki-explorer-server/package.json +++ b/examples/wiki-explorer-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-wiki-explorer", - "version": "1.7.2", + "version": "1.7.3", "type": "module", "description": "Wikipedia link explorer MCP App Server with graph visualization", "repository": { @@ -26,7 +26,7 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cheerio": "^1.0.0", "cors": "^2.8.5", diff --git a/package-lock.json b/package-lock.json index be26ff8..b3f7a65 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@modelcontextprotocol/ext-apps", - "version": "1.7.2", + "version": "1.7.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@modelcontextprotocol/ext-apps", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "workspaces": [ "examples/*" @@ -66,9 +66,9 @@ }, "examples/basic-host": { "name": "@modelcontextprotocol/ext-apps-basic-host", - "version": "1.7.2", + "version": "1.7.3", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "react": "^19.2.0", "react-dom": "^19.2.0", @@ -109,10 +109,10 @@ }, "examples/basic-server-preact": { "name": "@modelcontextprotocol/server-basic-preact", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -153,10 +153,10 @@ }, "examples/basic-server-react": { "name": "@modelcontextprotocol/server-basic-react", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -200,10 +200,10 @@ }, "examples/basic-server-solid": { "name": "@modelcontextprotocol/server-basic-solid", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -244,10 +244,10 @@ }, "examples/basic-server-svelte": { "name": "@modelcontextprotocol/server-basic-svelte", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -288,10 +288,10 @@ }, "examples/basic-server-vanillajs": { "name": "@modelcontextprotocol/server-basic-vanillajs", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -330,10 +330,10 @@ }, "examples/basic-server-vue": { "name": "@modelcontextprotocol/server-basic-vue", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -374,10 +374,10 @@ }, "examples/budget-allocator-server": { "name": "@modelcontextprotocol/server-budget-allocator", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "chart.js": "^4.4.0", "cors": "^2.8.5", @@ -417,10 +417,10 @@ }, "examples/cohort-heatmap-server": { "name": "@modelcontextprotocol/server-cohort-heatmap", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -464,10 +464,10 @@ }, "examples/customer-segmentation-server": { "name": "@modelcontextprotocol/server-customer-segmentation", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "chart.js": "^4.4.0", "cors": "^2.8.5", @@ -507,10 +507,10 @@ }, "examples/debug-server": { "name": "@modelcontextprotocol/server-debug", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "zod": "^4.1.13" }, @@ -548,9 +548,9 @@ "license": "MIT" }, "examples/integration-server": { - "version": "1.7.2", + "version": "1.7.3", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -593,10 +593,10 @@ }, "examples/lazy-auth-server": { "name": "@modelcontextprotocol/server-lazy-auth", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -635,10 +635,10 @@ }, "examples/map-server": { "name": "@modelcontextprotocol/server-map", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -677,11 +677,11 @@ }, "examples/pdf-server": { "name": "@modelcontextprotocol/server-pdf", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { "@cantoo/pdf-lib": "^2.6.5", - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -721,18 +721,18 @@ }, "examples/qr-server": { "name": "@modelcontextprotocol/server-qr", - "version": "1.7.2", + "version": "1.7.3", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0" } }, "examples/quickstart": { "name": "@modelcontextprotocol/quickstart", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0" @@ -761,19 +761,19 @@ }, "examples/say-server": { "name": "@modelcontextprotocol/server-say", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0" } }, "examples/scenario-modeler-server": { "name": "@modelcontextprotocol/server-scenario-modeler", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "chart.js": "^4.4.0", "cors": "^2.8.5", @@ -818,10 +818,10 @@ }, "examples/shadertoy-server": { "name": "@modelcontextprotocol/server-shadertoy", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -860,10 +860,10 @@ }, "examples/sheet-music-server": { "name": "@modelcontextprotocol/server-sheet-music", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "abcjs": "^6.4.4", "cors": "^2.8.5", @@ -903,10 +903,10 @@ }, "examples/system-monitor-server": { "name": "@modelcontextprotocol/server-system-monitor", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "chart.js": "^4.4.0", "cors": "^2.8.5", @@ -973,10 +973,10 @@ }, "examples/threejs-server": { "name": "@modelcontextprotocol/server-threejs", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -1022,10 +1022,10 @@ }, "examples/transcript-server": { "name": "@modelcontextprotocol/server-transcript", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -1065,10 +1065,10 @@ }, "examples/video-resource-server": { "name": "@modelcontextprotocol/server-video-resource", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -1107,10 +1107,10 @@ }, "examples/wiki-explorer-server": { "name": "@modelcontextprotocol/server-wiki-explorer", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.0.0", + "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", "cheerio": "^1.0.0", "cors": "^2.8.5", diff --git a/package.json b/package.json index 2f31c24..6738b68 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "url": "https://github.com/modelcontextprotocol/ext-apps" }, "homepage": "https://github.com/modelcontextprotocol/ext-apps", - "version": "1.7.2", + "version": "1.7.3", "license": "MIT", "description": "MCP Apps SDK — Enable MCP servers to display interactive user interfaces in conversational clients.", "type": "module", From a9907802937f1da067cbc4aa48b283cd4cfa7dc8 Mon Sep 17 00:00:00 2001 From: Mel Ludowise Date: Tue, 2 Jun 2026 05:30:49 -0700 Subject: [PATCH 060/107] Require PKCE and bind redirect_uri in lazy-auth-server token exchange (#681) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Require PKCE and bind redirect_uri in lazy-auth-server token exchange Hardens the example's mock authorization server: - /authorize now requires a PKCE S256 code_challenge (the MCP auth spec mandates PKCE for clients; previously a code issued without a challenge skipped verification at the token endpoint) - /token rejects authorization-code exchanges where a provided redirect_uri does not match the authorization request (RFC 6749 §4.1.3); OAuth 2.1 clients that omit it still work, relying on the now-mandatory PKCE binding * Enforce single-use authorization codes Track redeemed code IDs (jti) in memory until the code's own 5-minute expiry; replaying a code at the token endpoint now fails with invalid_grant (RFC 6749 §4.1.2). Also documents why wildcard CORS is intentional for this demo (browser-based hosts must read WWW-Authenticate; no ambient credentials exist to protect). --- examples/lazy-auth-server/server.ts | 74 +++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 20 deletions(-) diff --git a/examples/lazy-auth-server/server.ts b/examples/lazy-auth-server/server.ts index fa46d67..1026340 100644 --- a/examples/lazy-auth-server/server.ts +++ b/examples/lazy-auth-server/server.ts @@ -273,18 +273,28 @@ async function signAuthCode( return new SignJWT({ ...payload, typ: "code" }) .setProtectedHeader({ alg: "HS256" }) .setIssuedAt() + .setJti(crypto.randomUUID()) .setIssuer(issuer) .setExpirationTime("5m") .sign(JWT_SECRET); } +// Authorization codes are single-use (RFC 6749 §4.1.2): remember redeemed code +// IDs until the code's own 5-minute expiry makes replay impossible anyway. +const redeemedCodeJtis = new Map(); // jti → unix GC time + async function verifyAuthCode( code: string, issuer: string, ): Promise { try { const { payload } = await jwtVerify(code, JWT_SECRET, { issuer }); - if (payload.typ !== "code") return undefined; + if (payload.typ !== "code" || !payload.jti) return undefined; + const now = Math.floor(Date.now() / 1000); + for (const [k, gc] of redeemedCodeJtis) + if (gc < now) redeemedCodeJtis.delete(k); + if (redeemedCodeJtis.has(payload.jti)) return undefined; // already redeemed + redeemedCodeJtis.set(payload.jti, now + 5 * 60 + 10); return payload as unknown as CodePayload; } catch { return undefined; @@ -366,6 +376,16 @@ async function handleAuthorize(req: Request, res: Response) { }); return; } + // PKCE is mandatory (the MCP auth spec requires it of clients, and this AS + // only advertises S256). Rejecting up front keeps stolen-code attacks out of + // the demo even though it has no real data to protect. + if (!code_challenge || code_challenge_method !== "S256") { + res.status(400).json({ + error: "invalid_request", + error_description: "PKCE with S256 code_challenge is required", + }); + return; + } const issuer = resolveIssuer(req); if (approved !== "1") { @@ -475,25 +495,34 @@ async function handleToken(req: Request, res: Response) { }); return; } - if (stored.code_challenge) { - if (!code_verifier) { - res.status(400).json({ - error: "invalid_grant", - error_description: "Missing code_verifier", - }); - return; - } - const hash = crypto - .createHash("sha256") - .update(code_verifier) - .digest("base64url"); - if (hash !== stored.code_challenge) { - res.status(400).json({ - error: "invalid_grant", - error_description: "PKCE verification failed", - }); - return; - } + // PKCE verification (challenges are always present — /authorize requires them). + if (!code_verifier) { + res.status(400).json({ + error: "invalid_grant", + error_description: "Missing code_verifier", + }); + return; + } + const hash = crypto + .createHash("sha256") + .update(code_verifier) + .digest("base64url"); + if (hash !== stored.code_challenge) { + res.status(400).json({ + error: "invalid_grant", + error_description: "PKCE verification failed", + }); + return; + } + // RFC 6749 §4.1.3 redirect_uri binding: if the client includes redirect_uri + // in the token request it must match the one from the authorization request. + // (OAuth 2.1 clients may omit it and rely on PKCE, which is enforced above.) + if (req.body.redirect_uri && req.body.redirect_uri !== stored.redirect_uri) { + res.status(400).json({ + error: "invalid_grant", + error_description: "redirect_uri does not match authorization request", + }); + return; } const scope = stored.scope ?? "read:secret"; const sid = crypto.randomBytes(16).toString("hex"); // new session per authorization_code grant @@ -789,6 +818,11 @@ export function createServer(authInfo?: AuthInfo, req?: Request): McpServer { */ export function createApp(): Express { const app = express(); + // Wildcard CORS is deliberate: browser-based MCP hosts connect to this demo + // from arbitrary origins and must read WWW-Authenticate to drive the lazy + // auth flow. There are no cookies or ambient credentials to protect — all + // auth is an explicit Bearer header, and /token is a credential-less PKCE + // exchange — so cross-origin reads expose nothing a direct request wouldn't. app.use(cors({ exposedHeaders: ["WWW-Authenticate"] })); app.use(express.json()); app.use(express.urlencoded({ extended: true })); From 0ffe16781ea29fc018b45ab6c1967d2abcfb2434 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Thu, 4 Jun 2026 19:47:57 +0100 Subject: [PATCH 061/107] lazy-auth-server: support mounting under a base path (#683) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lazy-auth-server: support mounting under a base path createApp() previously built every advertised URL (AS metadata endpoints, PRM resource, WWW-Authenticate resource_metadata, consent approve link, elicitation callbacks) from the bare origin, so mounting the app inside another Express app — app.use("/lazy-auth", createApp()) — advertised URLs that pointed at the host's root and collided with the host's own OAuth endpoints. Derive the public base URL from Express's req.baseUrl instead (empty when standalone, so standalone behavior is unchanged), and treat PUBLIC_URL as including any mount path. Document the mounting pattern, including the root well-known rewrite hosts must add for RFC 8414/9728 path-insertion discovery. * lazy-auth-server: derive DIST_DIR from import.meta.url import.meta.filename and import.meta.dirname are undefined in some module-VM contexts (e.g. importing this package from jest), which made createApp() throw at import time. import.meta.url is defined everywhere; derive the dist directory from it instead. --- examples/lazy-auth-server/README.md | 27 +++++++++++++ examples/lazy-auth-server/server.ts | 63 ++++++++++++++++++----------- 2 files changed, 66 insertions(+), 24 deletions(-) diff --git a/examples/lazy-auth-server/README.md b/examples/lazy-auth-server/README.md index 769ac18..f2e7545 100644 --- a/examples/lazy-auth-server/README.md +++ b/examples/lazy-auth-server/README.md @@ -51,6 +51,33 @@ https:///ttl/3600/mcp ← tokens for this connection live 1 hour This works through [RFC 8707 resource indicators](https://www.rfc-editor.org/rfc/rfc8707): MCP hosts send the MCP server URL as the `resource` parameter in OAuth authorization and token requests, and this server issues tokens for that grant with the lifetime encoded in the path (refresh tokens are extended to at least match). The TTL is a _path_ segment rather than a query param because hosts canonicalize resource indicators and strip query strings. Each TTL endpoint also enforces its value as a maximum token age, so connecting to a path with a _lower_ TTL than a token's issued lifetime forces the refresh flow. To exercise the full **re-auth** flow, call the `revoke_auth_token` tool. +## Mounting under a base path + +`createApp()` can also be mounted inside another Express app, so an existing server can host this example at a sub-path of its own origin: + +```ts +import { createApp } from "@modelcontextprotocol/server-lazy-auth"; + +hostApp.use("/lazy-auth", createApp()); +// → MCP endpoint at https:///lazy-auth/mcp +``` + +All advertised URLs (OAuth metadata, `WWW-Authenticate` `resource_metadata`, PRM `resource`, elicitation callbacks) include the mount path automatically, derived from Express's `req.baseUrl`. When `PUBLIC_URL` is set, it must include the mount path (e.g. `https://example.com/lazy-auth`). + +One thing the mounted app cannot do for itself: [RFC 8414](https://www.rfc-editor.org/rfc/rfc8414#section-3) / [RFC 9728](https://www.rfc-editor.org/rfc/rfc9728) put well-known discovery documents at the _root_ of the origin with the path inserted after the well-known prefix (`/.well-known/oauth-authorization-server/lazy-auth`), and MCP SDK clients only try that insertion form. The host app must rewrite those root paths into the mount before its other routes: + +```ts +hostApp.use((req, _res, next) => { + const m = req.url.match( + /^\/\.well-known\/(oauth-authorization-server|oauth-protected-resource)\/lazy-auth(\/.*)?$/, + ); + if (m) req.url = `/lazy-auth/.well-known/${m[1]}${m[2] ?? ""}`; + next(); +}); +``` + +Rewriting into the mount (rather than calling the sub-app directly) keeps `req.baseUrl` — and therefore every advertised URL — consistent. + ## How It Works 1. **Connect without auth** — `initialize`, `tools/list`, and public tool calls succeed with no `Authorization` header. diff --git a/examples/lazy-auth-server/server.ts b/examples/lazy-auth-server/server.ts index 1026340..fe7b1ac 100644 --- a/examples/lazy-auth-server/server.ts +++ b/examples/lazy-auth-server/server.ts @@ -34,11 +34,16 @@ import { SignJWT, jwtVerify } from "jose"; import crypto from "node:crypto"; import fs from "node:fs/promises"; import path from "node:path"; +import { fileURLToPath } from "node:url"; -// Works both from source (server.ts) and compiled (dist/server.js) -const DIST_DIR = import.meta.filename.endsWith(".ts") - ? path.join(import.meta.dirname, "dist") - : import.meta.dirname; +// Works both from source (server.ts) and compiled (dist/server.js). Derived +// from import.meta.url rather than import.meta.filename/dirname, which are +// undefined in some module-VM contexts (e.g. importing this package from +// jest). +const SERVER_FILE = fileURLToPath(import.meta.url); +const DIST_DIR = SERVER_FILE.endsWith(".ts") + ? path.join(path.dirname(SERVER_FILE), "dist") + : path.dirname(SERVER_FILE); // ─── Config ────────────────────────────────────────────────────────────────── @@ -88,25 +93,35 @@ function isLoopbackHostname(hostname: string): boolean { * explicitly. */ function resolvePublicUrl(req?: Request): URL { + // Mount path when this app is mounted inside another Express app + // (e.g. app.use("/lazy-auth", createApp())). Empty when standalone. + // PUBLIC_URL, when set, must already include any mount path. + const basePath = req?.baseUrl ?? ""; const envUrl = process.env.PUBLIC_URL; if (envUrl) return new URL(envUrl.endsWith("/") ? envUrl : envUrl + "/"); const host = req?.headers.host; if (host) { try { - const url = new URL(`http://${host}/`); + const url = new URL(`http://${host}${basePath}/`); if (isLoopbackHostname(url.hostname)) return url; } catch { // Malformed Host header → fall through to the localhost default. } } - return new URL(`http://localhost:${PORT}/`); + return new URL(`http://localhost:${PORT}${basePath}/`); +} + +/** Public base URL as a string with no trailing slash (may include a base path). */ +function publicBaseHref(req?: Request): string { + const href = resolvePublicUrl(req).href; + return href.endsWith("/") ? href.slice(0, -1) : href; } /** OAuth issuer. In REACTIVE_AUTH_ONLY mode, uses a /auth subpath so root well-known 404s. - * Otherwise uses the root origin (standard). */ + * Otherwise uses the public base URL (origin + any mount path). */ const ISSUER_SUFFIX = REACTIVE_AUTH_ONLY ? "/auth" : ""; function resolveIssuer(req?: Request): string { - return resolvePublicUrl(req).origin + ISSUER_SUFFIX; + return publicBaseHref(req) + ISSUER_SUFFIX; } // ─── Mock OAuth (HS256, stateless codes) ───────────────────────────────────── @@ -390,7 +405,7 @@ async function handleAuthorize(req: Request, res: Response) { if (approved !== "1") { // Show consent page. Keeps the OAuth popup visible so users can see the flow. - const approveUrl = new URL(resolvePublicUrl(req).origin + "/authorize"); + const approveUrl = new URL(publicBaseHref(req) + "/authorize"); for (const [k, v] of Object.entries(req.query)) if (v) approveUrl.searchParams.set(k, String(v)); approveUrl.searchParams.set("approved", "1"); @@ -695,9 +710,9 @@ export function createServer(authInfo?: AuthInfo, req?: Request): McpServer { // Public tools — no auth. Used to exercise a host's URL-elicitation flow // end-to-end over Streamable HTTP. - const base = resolvePublicUrl(req); + const base = publicBaseHref(req); const callbackUrl = (eid: string) => - `${base.origin}/elicitation-callback?id=${encodeURIComponent(eid)}`; + `${base}/elicitation-callback?id=${encodeURIComponent(eid)}`; server.registerTool( "elicit_url", @@ -850,11 +865,11 @@ export function createApp(): Express { const PRM_PATH = "/auth/prm"; function buildAsMetadata(req: Request) { - const base = resolvePublicUrl(req); + const base = publicBaseHref(req); return { issuer: resolveIssuer(req), // subpath issuer → well-known at /.well-known/.../auth - authorization_endpoint: `${base.origin}/authorize`, - token_endpoint: `${base.origin}/token`, + authorization_endpoint: `${base}/authorize`, + token_endpoint: `${base}/token`, response_types_supported: ["code"], grant_types_supported: ["authorization_code", "refresh_token"], code_challenge_methods_supported: ["S256"], @@ -888,9 +903,9 @@ export function createApp(): Express { // PRM: full version at custom path (referenced via WWW-Authenticate on 401). function buildPrm(req: Request, includeAuth: boolean, resourcePath = "/mcp") { - const base = resolvePublicUrl(req); + const base = publicBaseHref(req); return { - resource: `${base.origin}${resourcePath}`, + resource: `${base}${resourcePath}`, ...(includeAuth ? { authorization_servers: [resolveIssuer(req)], @@ -959,11 +974,11 @@ export function createApp(): Express { res: Response, pathTtl: number | undefined, ) { - const base = resolvePublicUrl(req); + const base = publicBaseHref(req); const resourceMetadataUrl = pathTtl !== undefined - ? `${base.origin}${PRM_PATH}/ttl/${pathTtl}` - : `${base.origin}${PRM_PATH}`; + ? `${base}${PRM_PATH}/ttl/${pathTtl}` + : `${base}${PRM_PATH}`; const body = req.body; const messages = Array.isArray(body) ? body : body ? [body] : []; @@ -1080,15 +1095,15 @@ export function createApp(): Express { // Simple landing page app.get("/", (req, res) => { - const base = resolvePublicUrl(req); + const base = publicBaseHref(req); res .type("text/plain") .send( `Lazy Auth Demo — MCP server\n\n` + - ` MCP endpoint: ${base.origin}/mcp\n` + - ` ${base.origin}/ttl//mcp (custom token TTL, e.g. /ttl/3600/mcp)\n` + - ` AS metadata: ${base.origin}/.well-known/oauth-authorization-server${ISSUER_SUFFIX}\n` + - ` PRM metadata: ${base.origin}${PRM_PATH}\n\n` + + ` MCP endpoint: ${base}/mcp\n` + + ` ${base}/ttl//mcp (custom token TTL, e.g. /ttl/3600/mcp)\n` + + ` AS metadata: ${base}/.well-known/oauth-authorization-server${ISSUER_SUFFIX}\n` + + ` PRM metadata: ${base}${PRM_PATH}\n\n` + `Tools:\n` + ` - show_auth_button (public)\n` + ` - get_secret (protected, requires Bearer token)\n` + From ca1d29894fabbd1558885a9ec8620dcb01d7457e Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Thu, 4 Jun 2026 22:10:06 +0100 Subject: [PATCH 062/107] chore: bump ext-apps to 1.7.4 (#685) * chore: bump ext-apps to 1.7.4 * fix: resolve all npm audit vulnerabilities - Remove unused vitest devDependency from basic-host (critical advisory, package was never referenced by any test or config) - systeminformation ^5.31.5 -> ^5.31.6 (command injection, GHSA-hvx9-hwr7-wjj9) - Lockfile-only bumps: devalue 5.8.1, fast-uri 3.1.2, hono 4.12.23, ip-address 10.2.0, express-rate-limit 8.5.2, postcss 8.5.15, qs 6.15.2, svelte 5.56.1 npm audit now reports 0 vulnerabilities. --- examples/basic-host/package.json | 5 +- examples/basic-server-preact/package.json | 2 +- examples/basic-server-react/package.json | 2 +- examples/basic-server-solid/package.json | 2 +- examples/basic-server-svelte/package.json | 2 +- examples/basic-server-vanillajs/package.json | 2 +- examples/basic-server-vue/package.json | 2 +- examples/budget-allocator-server/package.json | 2 +- examples/cohort-heatmap-server/package.json | 2 +- .../customer-segmentation-server/package.json | 2 +- examples/debug-server/package.json | 2 +- examples/integration-server/package.json | 2 +- examples/lazy-auth-server/package.json | 2 +- examples/map-server/package.json | 2 +- examples/pdf-server/package.json | 2 +- examples/qr-server/package.json | 2 +- examples/quickstart/package.json | 2 +- examples/say-server/package.json | 2 +- examples/scenario-modeler-server/package.json | 2 +- examples/shadertoy-server/package.json | 2 +- examples/sheet-music-server/package.json | 2 +- examples/system-monitor-server/package.json | 4 +- examples/threejs-server/package.json | 2 +- examples/transcript-server/package.json | 2 +- examples/video-resource-server/package.json | 2 +- examples/wiki-explorer-server/package.json | 2 +- package-lock.json | 669 +++--------------- package.json | 2 +- 28 files changed, 134 insertions(+), 594 deletions(-) diff --git a/examples/basic-host/package.json b/examples/basic-host/package.json index 117beca..1b45dcf 100644 --- a/examples/basic-host/package.json +++ b/examples/basic-host/package.json @@ -1,7 +1,7 @@ { "homepage": "https://github.com/modelcontextprotocol/ext-apps/tree/main/examples/basic-host", "name": "@modelcontextprotocol/ext-apps-basic-host", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "scripts": { "build": "tsc --noEmit && concurrently \"cross-env INPUT=index.html vite build\" \"cross-env INPUT=sandbox.html vite build\"", @@ -29,7 +29,6 @@ "prettier": "^3.6.2", "typescript": "^5.9.3", "vite": "^6.0.0", - "vite-plugin-singlefile": "^2.3.0", - "vitest": "^3.2.4" + "vite-plugin-singlefile": "^2.3.0" } } diff --git a/examples/basic-server-preact/package.json b/examples/basic-server-preact/package.json index 353d5f0..5127202 100644 --- a/examples/basic-server-preact/package.json +++ b/examples/basic-server-preact/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-preact", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "Basic MCP App Server example using Preact", "repository": { diff --git a/examples/basic-server-react/package.json b/examples/basic-server-react/package.json index a8bdfa8..e4d1233 100644 --- a/examples/basic-server-react/package.json +++ b/examples/basic-server-react/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-react", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "Basic MCP App Server example using React", "repository": { diff --git a/examples/basic-server-solid/package.json b/examples/basic-server-solid/package.json index 1925ae1..8f75ac8 100644 --- a/examples/basic-server-solid/package.json +++ b/examples/basic-server-solid/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-solid", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "Basic MCP App Server example using Solid", "repository": { diff --git a/examples/basic-server-svelte/package.json b/examples/basic-server-svelte/package.json index c7fef6b..f877bf7 100644 --- a/examples/basic-server-svelte/package.json +++ b/examples/basic-server-svelte/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-svelte", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "Basic MCP App Server example using Svelte", "repository": { diff --git a/examples/basic-server-vanillajs/package.json b/examples/basic-server-vanillajs/package.json index 72b6ed2..5d47f2c 100644 --- a/examples/basic-server-vanillajs/package.json +++ b/examples/basic-server-vanillajs/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-vanillajs", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "Basic MCP App Server example using vanilla JavaScript", "repository": { diff --git a/examples/basic-server-vue/package.json b/examples/basic-server-vue/package.json index cb924b4..d27ddc9 100644 --- a/examples/basic-server-vue/package.json +++ b/examples/basic-server-vue/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-vue", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "Basic MCP App Server example using Vue", "repository": { diff --git a/examples/budget-allocator-server/package.json b/examples/budget-allocator-server/package.json index ded5814..19a1d25 100644 --- a/examples/budget-allocator-server/package.json +++ b/examples/budget-allocator-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-budget-allocator", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "Budget allocator MCP App Server with interactive visualization", "repository": { diff --git a/examples/cohort-heatmap-server/package.json b/examples/cohort-heatmap-server/package.json index 9f82c64..8d1268b 100644 --- a/examples/cohort-heatmap-server/package.json +++ b/examples/cohort-heatmap-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-cohort-heatmap", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "Cohort heatmap MCP App Server for retention analysis", "repository": { diff --git a/examples/customer-segmentation-server/package.json b/examples/customer-segmentation-server/package.json index aa52b35..4511de9 100644 --- a/examples/customer-segmentation-server/package.json +++ b/examples/customer-segmentation-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-customer-segmentation", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "Customer segmentation MCP App Server with filtering", "repository": { diff --git a/examples/debug-server/package.json b/examples/debug-server/package.json index 1c505e2..3417a8f 100644 --- a/examples/debug-server/package.json +++ b/examples/debug-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-debug", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "Debug MCP App Server for testing all SDK capabilities", "repository": { diff --git a/examples/integration-server/package.json b/examples/integration-server/package.json index 2104382..f6715a4 100644 --- a/examples/integration-server/package.json +++ b/examples/integration-server/package.json @@ -1,6 +1,6 @@ { "name": "integration-server", - "version": "1.7.3", + "version": "1.7.4", "private": true, "type": "module", "scripts": { diff --git a/examples/lazy-auth-server/package.json b/examples/lazy-auth-server/package.json index 8b7cb3f..f3ed6cd 100644 --- a/examples/lazy-auth-server/package.json +++ b/examples/lazy-auth-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-lazy-auth", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "MCP App example demonstrating lazy (on-demand) OAuth: public tools work unauthenticated, protected tools return 401 + WWW-Authenticate so the host runs the OAuth flow only when needed", "repository": { diff --git a/examples/map-server/package.json b/examples/map-server/package.json index 7283dd2..5dc23fe 100644 --- a/examples/map-server/package.json +++ b/examples/map-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-map", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "MCP App Server example with CesiumJS 3D globe and geocoding", "repository": { diff --git a/examples/pdf-server/package.json b/examples/pdf-server/package.json index 619f082..4d960f1 100644 --- a/examples/pdf-server/package.json +++ b/examples/pdf-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-pdf", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "MCP server for loading and extracting text from PDF files with chunked pagination and interactive viewer", "repository": { diff --git a/examples/qr-server/package.json b/examples/qr-server/package.json index e86607b..a5cbf5b 100644 --- a/examples/qr-server/package.json +++ b/examples/qr-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-qr", - "version": "1.7.3", + "version": "1.7.4", "private": true, "scripts": { "start": "uv run server.py", diff --git a/examples/quickstart/package.json b/examples/quickstart/package.json index 81e03b7..99948cc 100644 --- a/examples/quickstart/package.json +++ b/examples/quickstart/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/quickstart", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "private": true, "description": "Quickstart MCP App Server example", diff --git a/examples/say-server/package.json b/examples/say-server/package.json index c044d09..a0076e6 100644 --- a/examples/say-server/package.json +++ b/examples/say-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-say", - "version": "1.7.3", + "version": "1.7.4", "private": true, "description": "Streaming TTS MCP App Server with karaoke-style text highlighting", "repository": { diff --git a/examples/scenario-modeler-server/package.json b/examples/scenario-modeler-server/package.json index a91b2f4..aa1e668 100644 --- a/examples/scenario-modeler-server/package.json +++ b/examples/scenario-modeler-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-scenario-modeler", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "Financial scenario modeling MCP App Server", "repository": { diff --git a/examples/shadertoy-server/package.json b/examples/shadertoy-server/package.json index 80a4c76..ccf15a4 100644 --- a/examples/shadertoy-server/package.json +++ b/examples/shadertoy-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-shadertoy", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "MCP App Server example for rendering ShaderToy-compatible GLSL shaders", "repository": { diff --git a/examples/sheet-music-server/package.json b/examples/sheet-music-server/package.json index cfad907..ca9fa90 100644 --- a/examples/sheet-music-server/package.json +++ b/examples/sheet-music-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-sheet-music", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "MCP App Server for rendering and playing sheet music from ABC notation", "repository": { diff --git a/examples/system-monitor-server/package.json b/examples/system-monitor-server/package.json index 102e96d..12e8cea 100644 --- a/examples/system-monitor-server/package.json +++ b/examples/system-monitor-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-system-monitor", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "System monitor MCP App Server with real-time stats", "repository": { @@ -31,7 +31,7 @@ "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", - "systeminformation": "^5.31.5", + "systeminformation": "^5.31.6", "zod": "^4.1.13" }, "devDependencies": { diff --git a/examples/threejs-server/package.json b/examples/threejs-server/package.json index 372a41b..cfb5686 100644 --- a/examples/threejs-server/package.json +++ b/examples/threejs-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-threejs", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "Three.js 3D visualization MCP App Server", "repository": { diff --git a/examples/transcript-server/package.json b/examples/transcript-server/package.json index aeb149c..dcba3d7 100644 --- a/examples/transcript-server/package.json +++ b/examples/transcript-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-transcript", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "MCP App Server for live speech transcription", "repository": { diff --git a/examples/video-resource-server/package.json b/examples/video-resource-server/package.json index 86f437d..b0d04af 100644 --- a/examples/video-resource-server/package.json +++ b/examples/video-resource-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-video-resource", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "MCP App Server demonstrating video resources served as base64 blobs", "repository": { diff --git a/examples/wiki-explorer-server/package.json b/examples/wiki-explorer-server/package.json index 2d3f1f7..fe511ad 100644 --- a/examples/wiki-explorer-server/package.json +++ b/examples/wiki-explorer-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-wiki-explorer", - "version": "1.7.3", + "version": "1.7.4", "type": "module", "description": "Wikipedia link explorer MCP App Server with graph visualization", "repository": { diff --git a/package-lock.json b/package-lock.json index b3f7a65..29e9058 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@modelcontextprotocol/ext-apps", - "version": "1.7.3", + "version": "1.7.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@modelcontextprotocol/ext-apps", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "workspaces": [ "examples/*" @@ -66,7 +66,7 @@ }, "examples/basic-host": { "name": "@modelcontextprotocol/ext-apps-basic-host", - "version": "1.7.3", + "version": "1.7.4", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", @@ -86,8 +86,7 @@ "prettier": "^3.6.2", "typescript": "^5.9.3", "vite": "^6.0.0", - "vite-plugin-singlefile": "^2.3.0", - "vitest": "^3.2.4" + "vite-plugin-singlefile": "^2.3.0" } }, "examples/basic-host/node_modules/@types/node": { @@ -109,7 +108,7 @@ }, "examples/basic-server-preact": { "name": "@modelcontextprotocol/server-basic-preact", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -153,7 +152,7 @@ }, "examples/basic-server-react": { "name": "@modelcontextprotocol/server-basic-react", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -200,7 +199,7 @@ }, "examples/basic-server-solid": { "name": "@modelcontextprotocol/server-basic-solid", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -244,7 +243,7 @@ }, "examples/basic-server-svelte": { "name": "@modelcontextprotocol/server-basic-svelte", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -288,7 +287,7 @@ }, "examples/basic-server-vanillajs": { "name": "@modelcontextprotocol/server-basic-vanillajs", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -330,7 +329,7 @@ }, "examples/basic-server-vue": { "name": "@modelcontextprotocol/server-basic-vue", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -374,7 +373,7 @@ }, "examples/budget-allocator-server": { "name": "@modelcontextprotocol/server-budget-allocator", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -417,7 +416,7 @@ }, "examples/cohort-heatmap-server": { "name": "@modelcontextprotocol/server-cohort-heatmap", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -464,7 +463,7 @@ }, "examples/customer-segmentation-server": { "name": "@modelcontextprotocol/server-customer-segmentation", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -507,7 +506,7 @@ }, "examples/debug-server": { "name": "@modelcontextprotocol/server-debug", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -548,7 +547,7 @@ "license": "MIT" }, "examples/integration-server": { - "version": "1.7.3", + "version": "1.7.4", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", @@ -593,7 +592,7 @@ }, "examples/lazy-auth-server": { "name": "@modelcontextprotocol/server-lazy-auth", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -635,7 +634,7 @@ }, "examples/map-server": { "name": "@modelcontextprotocol/server-map", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -677,7 +676,7 @@ }, "examples/pdf-server": { "name": "@modelcontextprotocol/server-pdf", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@cantoo/pdf-lib": "^2.6.5", @@ -721,7 +720,7 @@ }, "examples/qr-server": { "name": "@modelcontextprotocol/server-qr", - "version": "1.7.3", + "version": "1.7.4", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0" @@ -729,7 +728,7 @@ }, "examples/quickstart": { "name": "@modelcontextprotocol/quickstart", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -761,7 +760,7 @@ }, "examples/say-server": { "name": "@modelcontextprotocol/server-say", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -770,7 +769,7 @@ }, "examples/scenario-modeler-server": { "name": "@modelcontextprotocol/server-scenario-modeler", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -818,7 +817,7 @@ }, "examples/shadertoy-server": { "name": "@modelcontextprotocol/server-shadertoy", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -860,7 +859,7 @@ }, "examples/sheet-music-server": { "name": "@modelcontextprotocol/server-sheet-music", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -903,7 +902,7 @@ }, "examples/system-monitor-server": { "name": "@modelcontextprotocol/server-system-monitor", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -911,7 +910,7 @@ "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", - "systeminformation": "^5.31.5", + "systeminformation": "^5.31.6", "zod": "^4.1.13" }, "bin": { @@ -938,32 +937,6 @@ "undici-types": "~6.20.0" } }, - "examples/system-monitor-server/node_modules/systeminformation": { - "version": "5.31.5", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.31.5.tgz", - "integrity": "sha512-5SyLdip4/3alxD4Kh+63bUQTJmu7YMfYQTC+koZy7X73HgNqZSD2P4wOZQWtUncvPvcEmnfIjCoygN4MRoEejQ==", - "license": "MIT", - "os": [ - "darwin", - "linux", - "win32", - "freebsd", - "openbsd", - "netbsd", - "sunos", - "android" - ], - "bin": { - "systeminformation": "lib/cli.js" - }, - "engines": { - "node": ">=8.0.0" - }, - "funding": { - "type": "Buy me a coffee", - "url": "https://www.buymeacoffee.com/systeminfo" - } - }, "examples/system-monitor-server/node_modules/undici-types": { "version": "6.20.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", @@ -973,7 +946,7 @@ }, "examples/threejs-server": { "name": "@modelcontextprotocol/server-threejs", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -1022,7 +995,7 @@ }, "examples/transcript-server": { "name": "@modelcontextprotocol/server-transcript", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -1065,7 +1038,7 @@ }, "examples/video-resource-server": { "name": "@modelcontextprotocol/server-video-resource", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -1107,7 +1080,7 @@ }, "examples/wiki-explorer-server": { "name": "@modelcontextprotocol/server-wiki-explorer", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -3770,9 +3743,9 @@ "license": "MIT" }, "node_modules/@sveltejs/acorn-typescript": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.8.tgz", - "integrity": "sha512-esgN+54+q0NjB0Y/4BomT9samII7jGwNy/2a3wNZbT2A2RpmXsXwUt24LvLhx6jUq2gVk4cWEvcRO6MFQbOfNA==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@sveltejs/acorn-typescript/-/acorn-typescript-1.0.10.tgz", + "integrity": "sha512-4WfKk68eTih+MiJD4fSbxN7E8kVBmTMPWHUPYjvl2N0rMs53YLTT8/YjKU5Dtnz5LqDjl7LEw4U7lXR2W3J5WA==", "license": "MIT", "peerDependencies": { "acorn": "^8.9.0" @@ -3891,17 +3864,6 @@ "bun-types": "1.3.6" } }, - "node_modules/@types/chai": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz", - "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/deep-eql": "*", - "assertion-error": "^2.0.1" - } - }, "node_modules/@types/connect": { "version": "3.4.38", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", @@ -3922,13 +3884,6 @@ "@types/node": "*" } }, - "node_modules/@types/deep-eql": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz", - "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/dom-speech-recognition": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/@types/dom-speech-recognition/-/dom-speech-recognition-0.0.7.tgz", @@ -4092,19 +4047,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@typescript-eslint/types": { - "version": "8.58.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.58.0.tgz", - "integrity": "sha512-O9CjxypDT89fbHxRfETNoAnHj/i6IpRK0CvbVN3qibxlLdo5p5hcLmUuCCrHMpxiWSwKyI8mCP7qRNYuOJ0Uww==", - "license": "MIT", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, "node_modules/@typescript/vfs": { "version": "1.6.2", "resolved": "https://registry.npmjs.org/@typescript/vfs/-/vfs-1.6.2.tgz", @@ -4153,131 +4095,6 @@ "vue": "^3.2.25" } }, - "node_modules/@vitest/expect": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz", - "integrity": "sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/chai": "^5.2.2", - "@vitest/spy": "3.2.4", - "@vitest/utils": "3.2.4", - "chai": "^5.2.0", - "tinyrainbow": "^2.0.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/@vitest/mocker": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.4.tgz", - "integrity": "sha512-46ryTE9RZO/rfDd7pEqFl7etuyzekzEhUbTW3BvmeO/BcCMEgq59BKhek3dXDWgAj4oMK6OZi+vRr1wPW6qjEQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@vitest/spy": "3.2.4", - "estree-walker": "^3.0.3", - "magic-string": "^0.30.17" - }, - "funding": { - "url": "https://opencollective.com/vitest" - }, - "peerDependencies": { - "msw": "^2.4.9", - "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0" - }, - "peerDependenciesMeta": { - "msw": { - "optional": true - }, - "vite": { - "optional": true - } - } - }, - "node_modules/@vitest/mocker/node_modules/estree-walker": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", - "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/estree": "^1.0.0" - } - }, - "node_modules/@vitest/pretty-format": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.4.tgz", - "integrity": "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==", - "dev": true, - "license": "MIT", - "dependencies": { - "tinyrainbow": "^2.0.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/@vitest/runner": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.4.tgz", - "integrity": "sha512-oukfKT9Mk41LreEW09vt45f8wx7DordoWUZMYdY/cyAk7w5TWkTRCNZYF7sX7n2wB7jyGAl74OxgwhPgKaqDMQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@vitest/utils": "3.2.4", - "pathe": "^2.0.3", - "strip-literal": "^3.0.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/@vitest/snapshot": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.4.tgz", - "integrity": "sha512-dEYtS7qQP2CjU27QBC5oUOxLE/v5eLkGqPE0ZKEIDGMs4vKWe7IjgLOeauHsR0D5YuuycGRO5oSRXnwnmA78fQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@vitest/pretty-format": "3.2.4", - "magic-string": "^0.30.17", - "pathe": "^2.0.3" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/@vitest/spy": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.4.tgz", - "integrity": "sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==", - "dev": true, - "license": "MIT", - "dependencies": { - "tinyspy": "^4.0.3" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, - "node_modules/@vitest/utils": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.4.tgz", - "integrity": "sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@vitest/pretty-format": "3.2.4", - "loupe": "^3.1.4", - "tinyrainbow": "^2.0.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, "node_modules/@vue/compiler-core": { "version": "3.5.27", "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.27.tgz", @@ -4431,9 +4248,9 @@ } }, "node_modules/acorn": { - "version": "8.15.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", - "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", + "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -4560,16 +4377,6 @@ "node": ">= 0.4" } }, - "node_modules/assertion-error": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", - "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - } - }, "node_modules/async": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", @@ -4844,16 +4651,6 @@ "node": ">= 0.8" } }, - "node_modules/cac": { - "version": "6.7.14", - "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", - "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/call-bind-apply-helpers": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", @@ -4917,23 +4714,6 @@ "node": ">=12" } }, - "node_modules/chai": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/chai/-/chai-5.3.3.tgz", - "integrity": "sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==", - "dev": true, - "license": "MIT", - "dependencies": { - "assertion-error": "^2.0.1", - "check-error": "^2.1.1", - "deep-eql": "^5.0.1", - "loupe": "^3.1.0", - "pathval": "^2.0.0" - }, - "engines": { - "node": ">=18" - } - }, "node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -4976,16 +4756,6 @@ "pnpm": ">=8" } }, - "node_modules/check-error": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.3.tgz", - "integrity": "sha512-PAJdDJusoxnwm1VwW07VWwUN1sl7smmC3OKggvndJFadxxDRyFJBX/ggnu/KE4kQAB7a3Dp8f/YXC1FlUprWmA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 16" - } - }, "node_modules/cheerio": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.1.2.tgz", @@ -5643,16 +5413,6 @@ } } }, - "node_modules/deep-eql": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", - "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/deepmerge": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", @@ -5683,9 +5443,9 @@ } }, "node_modules/devalue": { - "version": "5.6.4", - "resolved": "https://registry.npmjs.org/devalue/-/devalue-5.6.4.tgz", - "integrity": "sha512-Gp6rDldRsFh/7XuouDbxMH3Mx8GMCcgzIb1pDTvNyn8pZGQ22u+Wa+lGV9dQCltFQ7uVw0MhRyb8XDskNFOReA==", + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/devalue/-/devalue-5.8.1.tgz", + "integrity": "sha512-4CXDYRBGqN+57wVJkuXBYmpAVUSg3L6JAQa/DFqm238G73E1wuyc/JhGQJzN7vUf/CMphYau2zXbfWzDR5aTEw==", "license": "MIT" }, "node_modules/dom-serializer": { @@ -5858,13 +5618,6 @@ "node": ">= 0.4" } }, - "node_modules/es-module-lexer": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz", - "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==", - "dev": true, - "license": "MIT" - }, "node_modules/es-object-atoms": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", @@ -5955,13 +5708,20 @@ "license": "MIT" }, "node_modules/esrap": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/esrap/-/esrap-2.2.4.tgz", - "integrity": "sha512-suICpxAmZ9A8bzJjEl/+rLJiDKC0X4gYWUxT6URAWBLvlXmtbZd5ySMu/N2ZGEtMCAmflUDPSehrP9BQcsGcSg==", + "version": "2.2.11", + "resolved": "https://registry.npmjs.org/esrap/-/esrap-2.2.11.tgz", + "integrity": "sha512-gPdx+I+BjYEinNMQaBXFjbaJVyoPMU4ZODg5mE+M4DqVG9VusAVHHjcBX+zqyITlI0DIARwDMMzZwAWj36dRoQ==", "license": "MIT", "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15", + "@jridgewell/sourcemap-codec": "^1.4.15" + }, + "peerDependencies": { "@typescript-eslint/types": "^8.2.0" + }, + "peerDependenciesMeta": { + "@typescript-eslint/types": { + "optional": true + } } }, "node_modules/estree-walker": { @@ -6007,16 +5767,6 @@ "node": ">=18.0.0" } }, - "node_modules/expect-type": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz", - "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=12.0.0" - } - }, "node_modules/express": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz", @@ -6061,12 +5811,12 @@ } }, "node_modules/express-rate-limit": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.3.2.tgz", - "integrity": "sha512-77VmFeJkO0/rvimEDuUC5H30oqUC4EyOhyGccfqoLebB0oiEYfM7nwPrsDsBL1gsTpwfzX8SFy2MT3TDyRq+bg==", + "version": "8.5.2", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.5.2.tgz", + "integrity": "sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A==", "license": "MIT", "dependencies": { - "ip-address": "10.1.0" + "ip-address": "^10.2.0" }, "engines": { "node": ">= 16" @@ -6085,9 +5835,9 @@ "license": "MIT" }, "node_modules/fast-uri": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz", - "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", + "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", "funding": [ { "type": "github", @@ -6421,9 +6171,9 @@ } }, "node_modules/hono": { - "version": "4.12.14", - "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.14.tgz", - "integrity": "sha512-am5zfg3yu6sqn5yjKBNqhnTX7Cv+m00ox+7jbaKkrLMRJ4rAdldd1xPd/JzbBWspqaQv6RSTrgFN95EsfhC+7w==", + "version": "4.12.23", + "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.23.tgz", + "integrity": "sha512-eIaZ9qDgu7XV0pxOCrg7/WhnQ6Ivm22UcxhXx/A3dcbqbbYgBEkc6e/J/s7j2tS96zoB0S9VBdLwQNCWwUo4LA==", "license": "MIT", "engines": { "node": ">=16.9.0" @@ -6562,9 +6312,9 @@ } }, "node_modules/ip-address": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz", - "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", + "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", "license": "MIT", "engines": { "node": ">= 12" @@ -7014,13 +6764,6 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/loupe": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.2.1.tgz", - "integrity": "sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==", - "dev": true, - "license": "MIT" - }, "node_modules/lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -7197,9 +6940,9 @@ "license": "MIT" }, "node_modules/nanoid": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", + "version": "3.3.12", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz", + "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==", "funding": [ { "type": "github", @@ -7465,23 +7208,6 @@ "url": "https://opencollective.com/express" } }, - "node_modules/pathe": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", - "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==", - "dev": true, - "license": "MIT" - }, - "node_modules/pathval": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.1.tgz", - "integrity": "sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 14.16" - } - }, "node_modules/pdfjs-dist": { "version": "5.4.530", "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-5.4.530.tgz", @@ -7570,9 +7296,9 @@ } }, "node_modules/postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", + "version": "8.5.15", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz", + "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==", "funding": [ { "type": "opencollective", @@ -7589,7 +7315,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.11", + "nanoid": "^3.3.12", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, @@ -7654,9 +7380,9 @@ } }, "node_modules/qs": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.0.tgz", - "integrity": "sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==", + "version": "6.15.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.2.tgz", + "integrity": "sha512-Rzq0KEyX/w/tEybncDgdkZrJgVUsUMk3xjh3t5bv3S1HTAtg+uOYt72+ZfwiQwKdysThkTBdL/rTi6HDmX9Ddw==", "license": "BSD-3-Clause", "dependencies": { "side-channel": "^1.1.0" @@ -8124,13 +7850,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/siginfo": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", - "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==", - "dev": true, - "license": "ISC" - }, "node_modules/signal-exit": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", @@ -8281,13 +8000,6 @@ "node": ">=16" } }, - "node_modules/stackback": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", - "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==", - "dev": true, - "license": "MIT" - }, "node_modules/statuses": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", @@ -8297,13 +8009,6 @@ "node": ">= 0.8" } }, - "node_modules/std-env": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.10.0.tgz", - "integrity": "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg==", - "dev": true, - "license": "MIT" - }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -8368,26 +8073,6 @@ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, - "node_modules/strip-literal": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-3.1.0.tgz", - "integrity": "sha512-8r3mkIM/2+PpjHoOtiAW8Rg3jJLHaV7xPwG+YRGrv6FP0wwk/toTpATxWYOW0BKdWwl82VT2tFYi5DlROa0Mxg==", - "dev": true, - "license": "MIT", - "dependencies": { - "js-tokens": "^9.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/antfu" - } - }, - "node_modules/strip-literal/node_modules/js-tokens": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz", - "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==", - "dev": true, - "license": "MIT" - }, "node_modules/supports-color": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", @@ -8405,23 +8090,23 @@ } }, "node_modules/svelte": { - "version": "5.55.1", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.55.1.tgz", - "integrity": "sha512-QjvU7EFemf6mRzdMGlAFttMWtAAVXrax61SZYHdkD6yoVGQ89VeyKfZD4H1JrV1WLmJBxWhFch9H6ig/87VGjw==", + "version": "5.56.1", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.56.1.tgz", + "integrity": "sha512-eArsJmvl3xZVuTYD852PzIEdg2wgDdIZ1NEsIPbzAukHwi284B18No4nK2rCO9AwsWUDza4Cjvmoa4HaojTl5g==", "license": "MIT", "dependencies": { "@jridgewell/remapping": "^2.3.4", "@jridgewell/sourcemap-codec": "^1.5.0", - "@sveltejs/acorn-typescript": "^1.0.5", + "@sveltejs/acorn-typescript": "^1.0.10", "@types/estree": "^1.0.5", "@types/trusted-types": "^2.0.7", "acorn": "^8.12.1", "aria-query": "5.3.1", "axobject-query": "^4.1.0", "clsx": "^2.1.1", - "devalue": "^5.6.4", + "devalue": "^5.8.1", "esm-env": "^1.2.1", - "esrap": "^2.2.4", + "esrap": "^2.2.9", "is-reference": "^3.0.3", "locate-character": "^3.0.0", "magic-string": "^0.30.11", @@ -8431,6 +8116,32 @@ "node": ">=18" } }, + "node_modules/systeminformation": { + "version": "5.31.7", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.31.7.tgz", + "integrity": "sha512-/8NC53e5nP9nmhn42/ncdOkyJnOoue/Vy+tJOyUGd1Yv66G069wK4rrziwhrqDETgk78CudTQupw5z19S5uoZw==", + "license": "MIT", + "os": [ + "darwin", + "linux", + "win32", + "freebsd", + "openbsd", + "netbsd", + "sunos", + "android" + ], + "bin": { + "systeminformation": "lib/cli.js" + }, + "engines": { + "node": ">=8.0.0" + }, + "funding": { + "type": "Buy me a coffee", + "url": "https://www.buymeacoffee.com/systeminfo" + } + }, "node_modules/text-camel-case": { "version": "1.2.9", "resolved": "https://registry.npmjs.org/text-camel-case/-/text-camel-case-1.2.9.tgz", @@ -8649,13 +8360,6 @@ "integrity": "sha512-k/CjiZ80bYss6Qs7/ex1TBlPD11whT9oKfT8oTGiHa34W4JRd1NiH/Tr1DbHWQ2/vMUypxksLnF2CfmlmM5XFQ==", "license": "MIT" }, - "node_modules/tinybench": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", - "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==", - "dev": true, - "license": "MIT" - }, "node_modules/tinycolor2": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz", @@ -8663,13 +8367,6 @@ "dev": true, "license": "MIT" }, - "node_modules/tinyexec": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz", - "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==", - "dev": true, - "license": "MIT" - }, "node_modules/tinyglobby": { "version": "0.2.15", "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", @@ -8718,36 +8415,6 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/tinypool": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.1.1.tgz", - "integrity": "sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.0.0 || >=20.0.0" - } - }, - "node_modules/tinyrainbow": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz", - "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/tinyspy": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-4.0.4.tgz", - "integrity": "sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -9634,29 +9301,6 @@ } } }, - "node_modules/vite-node": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.4.tgz", - "integrity": "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg==", - "dev": true, - "license": "MIT", - "dependencies": { - "cac": "^6.7.14", - "debug": "^4.4.1", - "es-module-lexer": "^1.7.0", - "pathe": "^2.0.3", - "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0" - }, - "bin": { - "vite-node": "vite-node.mjs" - }, - "engines": { - "node": "^18.0.0 || ^20.0.0 || >=22.0.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - } - }, "node_modules/vite-plugin-singlefile": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/vite-plugin-singlefile/-/vite-plugin-singlefile-2.3.0.tgz", @@ -9768,92 +9412,6 @@ } } }, - "node_modules/vitest": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.4.tgz", - "integrity": "sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/chai": "^5.2.2", - "@vitest/expect": "3.2.4", - "@vitest/mocker": "3.2.4", - "@vitest/pretty-format": "^3.2.4", - "@vitest/runner": "3.2.4", - "@vitest/snapshot": "3.2.4", - "@vitest/spy": "3.2.4", - "@vitest/utils": "3.2.4", - "chai": "^5.2.0", - "debug": "^4.4.1", - "expect-type": "^1.2.1", - "magic-string": "^0.30.17", - "pathe": "^2.0.3", - "picomatch": "^4.0.2", - "std-env": "^3.9.0", - "tinybench": "^2.9.0", - "tinyexec": "^0.3.2", - "tinyglobby": "^0.2.14", - "tinypool": "^1.1.1", - "tinyrainbow": "^2.0.0", - "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0", - "vite-node": "3.2.4", - "why-is-node-running": "^2.3.0" - }, - "bin": { - "vitest": "vitest.mjs" - }, - "engines": { - "node": "^18.0.0 || ^20.0.0 || >=22.0.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" - }, - "peerDependencies": { - "@edge-runtime/vm": "*", - "@types/debug": "^4.1.12", - "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", - "@vitest/browser": "3.2.4", - "@vitest/ui": "3.2.4", - "happy-dom": "*", - "jsdom": "*" - }, - "peerDependenciesMeta": { - "@edge-runtime/vm": { - "optional": true - }, - "@types/debug": { - "optional": true - }, - "@types/node": { - "optional": true - }, - "@vitest/browser": { - "optional": true - }, - "@vitest/ui": { - "optional": true - }, - "happy-dom": { - "optional": true - }, - "jsdom": { - "optional": true - } - } - }, - "node_modules/vitest/node_modules/picomatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", - "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, "node_modules/vue": { "version": "3.5.27", "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.27.tgz", @@ -9912,23 +9470,6 @@ "node": ">= 8" } }, - "node_modules/why-is-node-running": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", - "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==", - "dev": true, - "license": "MIT", - "dependencies": { - "siginfo": "^2.0.0", - "stackback": "0.0.2" - }, - "bin": { - "why-is-node-running": "cli.js" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/widest-line": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", diff --git a/package.json b/package.json index 6738b68..8c6ead5 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "url": "https://github.com/modelcontextprotocol/ext-apps" }, "homepage": "https://github.com/modelcontextprotocol/ext-apps", - "version": "1.7.3", + "version": "1.7.4", "license": "MIT", "description": "MCP Apps SDK — Enable MCP servers to display interactive user interfaces in conversational clients.", "type": "module", From fa1274490873f869c9a084e1abb9cf3031d288c7 Mon Sep 17 00:00:00 2001 From: Aqil Aziz Date: Wed, 17 Jun 2026 22:51:57 +0700 Subject: [PATCH 063/107] docs: fix map-server readme and code of conduct links (#657) --- CONTRIBUTING.md | 2 +- examples/map-server/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6592106..e28dcd1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -502,7 +502,7 @@ Alternatively, use the [workflow dispatch](https://github.com/modelcontextprotoc ## Code of Conduct -This project follows our [Code of Conduct](CODE_OF_CONDUCT.md). Please review it before contributing. +This project follows our [Code of Conduct](https://github.com/modelcontextprotocol/.github/blob/main/CODE_OF_CONDUCT.md). Please review it before contributing. ## Reporting Issues diff --git a/examples/map-server/README.md b/examples/map-server/README.md index 4c4de5f..e1e044a 100644 --- a/examples/map-server/README.md +++ b/examples/map-server/README.md @@ -122,7 +122,7 @@ Vanilla TypeScript app that: - [`server.ts`](server.ts) - MCP server with geocode and show-map tools - [`mcp-app.html`](mcp-app.html) / [`src/mcp-app.ts`](src/mcp-app.ts) - CesiumJS globe UI -- [`server-utils.ts`](server-utils.ts) - HTTP server utilities +- [`main.ts`](main.ts) - HTTP and stdio server utilities ## Notes From ea8775dcb5534cc8977c5137fee5572b0cd94f23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20G=C3=B6k?= <116498667+ensargx@users.noreply.github.com> Date: Tue, 7 Jul 2026 20:43:37 +0300 Subject: [PATCH 064/107] docs: API Docs link for ext-apps/server (#697) Updated API documentation link for ext-apps/server. The link `/server.html` does not exists. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7348e15..d0677ef 100644 --- a/README.md +++ b/README.md @@ -139,7 +139,7 @@ UI metadata. | `@modelcontextprotocol/ext-apps` | Build interactive Views (App class, PostMessageTransport) | [API Docs →](https://apps.extensions.modelcontextprotocol.io/api/modules/app.html) | | `@modelcontextprotocol/ext-apps/react` | React hooks for Views (useApp, useHostStyles, etc.) | [API Docs →](https://apps.extensions.modelcontextprotocol.io/api/modules/_modelcontextprotocol_ext-apps_react.html) | | `@modelcontextprotocol/ext-apps/app-bridge` | Embed and communicate with Views in your chat client | [API Docs →](https://apps.extensions.modelcontextprotocol.io/api/modules/app-bridge.html) | -| `@modelcontextprotocol/ext-apps/server` | Register tools and resources on your MCP server | [API Docs →](https://apps.extensions.modelcontextprotocol.io/api/modules/server.html) | +| `@modelcontextprotocol/ext-apps/server` | Register tools and resources on your MCP server | [API Docs →](https://apps.extensions.modelcontextprotocol.io/api/modules/server-helpers.html) | There's no _supported_ host implementation in this repo (beyond the [examples/basic-host](https://github.com/modelcontextprotocol/ext-apps/tree/main/examples/basic-host) From f0d9582eaa63faeec754c8b026ec4a9b3f626cfe Mon Sep 17 00:00:00 2001 From: Cameron Yick Date: Tue, 7 Jul 2026 14:02:07 -0400 Subject: [PATCH 065/107] spec: add missing HostCapabilities fields (#653) --- specification/draft/apps.mdx | 39 ++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/specification/draft/apps.mdx b/specification/draft/apps.mdx index 1a14d3f..96c8286 100644 --- a/specification/draft/apps.mdx +++ b/specification/draft/apps.mdx @@ -659,6 +659,22 @@ Example: They describe the features and capabilities that the Host supports. ```typescript +/** Content block modalities that the host supports for a given capability. */ +interface SupportedContentBlockModalities { + /** Host supports text content blocks. */ + text?: {}; + /** Host supports image content blocks. */ + image?: {}; + /** Host supports audio content blocks. */ + audio?: {}; + /** Host supports resource content blocks. */ + resource?: {}; + /** Host supports resource link content blocks. */ + resourceLink?: {}; + /** Host supports structured content. */ + structuredContent?: {}; +} + interface HostCapabilities { /** Experimental features (structure TBD). */ experimental?: {}; @@ -678,14 +694,6 @@ interface HostCapabilities { }; /** Host accepts log messages. */ logging?: {}; - /** - * Host supports LLM sampling (sampling/createMessage) from the view. - * Mirrors MCP ClientCapabilities.sampling so hosts can pass it through. - */ - sampling?: { - /** Host supports tool use via `tools` and `toolChoice` params (SEP-1577). */ - tools?: {}; - }; /** Sandbox configuration applied by the host. */ sandbox?: { /** Permissions granted by the host (camera, microphone, geolocation, clipboard-write). */ @@ -707,6 +715,21 @@ interface HostCapabilities { baseUriDomains?: string[]; }; }; + /** + * Host accepts context updates (ui/update-model-context) to be included in + * the model's context for future turns. + */ + updateModelContext?: SupportedContentBlockModalities; + /** Host supports receiving content messages (ui/message) from the view. */ + message?: SupportedContentBlockModalities; + /** + * Host supports LLM sampling (sampling/createMessage) from the view. + * Mirrors MCP ClientCapabilities.sampling so hosts can pass it through. + */ + sampling?: { + /** Host supports tool use via `tools` and `toolChoice` params (SEP-1577). */ + tools?: {}; + }; } ``` From cd969dbc312923a0a407ed76f8679666be45e801 Mon Sep 17 00:00:00 2001 From: Andrew Khadder <54488379+khandrew1@users.noreply.github.com> Date: Tue, 7 Jul 2026 11:05:17 -0700 Subject: [PATCH 066/107] docs: add mcp-use inspector badge to supported clients (#650) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d0677ef..506b255 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,7 @@ it will guide you through the rest. Goose Postman MCPJam + mcp-use

> [!NOTE] From cf87f2a2c2581b2bc45ff4848aac9fa7e106a576 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Tue, 7 Jul 2026 21:29:16 +0300 Subject: [PATCH 067/107] ci: fix README prettier build failure (#698) * Initial plan * fix: apply Prettier formatting to README table row --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 506b255..2fd89ff 100644 --- a/README.md +++ b/README.md @@ -140,7 +140,7 @@ UI metadata. | `@modelcontextprotocol/ext-apps` | Build interactive Views (App class, PostMessageTransport) | [API Docs →](https://apps.extensions.modelcontextprotocol.io/api/modules/app.html) | | `@modelcontextprotocol/ext-apps/react` | React hooks for Views (useApp, useHostStyles, etc.) | [API Docs →](https://apps.extensions.modelcontextprotocol.io/api/modules/_modelcontextprotocol_ext-apps_react.html) | | `@modelcontextprotocol/ext-apps/app-bridge` | Embed and communicate with Views in your chat client | [API Docs →](https://apps.extensions.modelcontextprotocol.io/api/modules/app-bridge.html) | -| `@modelcontextprotocol/ext-apps/server` | Register tools and resources on your MCP server | [API Docs →](https://apps.extensions.modelcontextprotocol.io/api/modules/server-helpers.html) | +| `@modelcontextprotocol/ext-apps/server` | Register tools and resources on your MCP server | [API Docs →](https://apps.extensions.modelcontextprotocol.io/api/modules/server-helpers.html) | There's no _supported_ host implementation in this repo (beyond the [examples/basic-host](https://github.com/modelcontextprotocol/ext-apps/tree/main/examples/basic-host) From b383847bf2c7f4f5fa37e3bd054205f71618e035 Mon Sep 17 00:00:00 2001 From: Andrew Khadder Date: Tue, 14 Jul 2026 13:35:51 -0700 Subject: [PATCH 068/107] chore: prepare SDK v2 dependencies --- examples/basic-server-preact/package.json | 2 + examples/basic-server-react/package.json | 2 + examples/basic-server-solid/package.json | 2 + examples/basic-server-svelte/package.json | 2 + examples/basic-server-vanillajs/package.json | 2 + examples/basic-server-vue/package.json | 2 + examples/budget-allocator-server/package.json | 2 + examples/cohort-heatmap-server/package.json | 2 + .../customer-segmentation-server/package.json | 2 + examples/debug-server/package.json | 2 + examples/integration-server/package.json | 2 + examples/lazy-auth-server/package.json | 1 + examples/map-server/package.json | 2 + examples/pdf-server/package.json | 2 + examples/quickstart/package.json | 2 + examples/scenario-modeler-server/package.json | 2 + examples/shadertoy-server/package.json | 2 + examples/sheet-music-server/package.json | 2 + examples/system-monitor-server/package.json | 2 + examples/threejs-server/package.json | 2 + examples/transcript-server/package.json | 2 + examples/video-resource-server/package.json | 2 + examples/wiki-explorer-server/package.json | 2 + package-lock.json | 537 +++++------------- package.json | 10 +- 25 files changed, 187 insertions(+), 405 deletions(-) diff --git a/examples/basic-server-preact/package.json b/examples/basic-server-preact/package.json index 5127202..1a63232 100644 --- a/examples/basic-server-preact/package.json +++ b/examples/basic-server-preact/package.json @@ -25,6 +25,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/basic-server-react/package.json b/examples/basic-server-react/package.json index e4d1233..821fc96 100644 --- a/examples/basic-server-react/package.json +++ b/examples/basic-server-react/package.json @@ -35,6 +35,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/basic-server-solid/package.json b/examples/basic-server-solid/package.json index 8f75ac8..997bc60 100644 --- a/examples/basic-server-solid/package.json +++ b/examples/basic-server-solid/package.json @@ -25,6 +25,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/basic-server-svelte/package.json b/examples/basic-server-svelte/package.json index f877bf7..e83772f 100644 --- a/examples/basic-server-svelte/package.json +++ b/examples/basic-server-svelte/package.json @@ -25,6 +25,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/basic-server-vanillajs/package.json b/examples/basic-server-vanillajs/package.json index 5d47f2c..64e1758 100644 --- a/examples/basic-server-vanillajs/package.json +++ b/examples/basic-server-vanillajs/package.json @@ -25,6 +25,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/basic-server-vue/package.json b/examples/basic-server-vue/package.json index d27ddc9..e4cd0b4 100644 --- a/examples/basic-server-vue/package.json +++ b/examples/basic-server-vue/package.json @@ -25,6 +25,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/budget-allocator-server/package.json b/examples/budget-allocator-server/package.json index 19a1d25..8af1a6c 100644 --- a/examples/budget-allocator-server/package.json +++ b/examples/budget-allocator-server/package.json @@ -27,6 +27,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "chart.js": "^4.4.0", "cors": "^2.8.5", diff --git a/examples/cohort-heatmap-server/package.json b/examples/cohort-heatmap-server/package.json index 8d1268b..99e9d9f 100644 --- a/examples/cohort-heatmap-server/package.json +++ b/examples/cohort-heatmap-server/package.json @@ -27,6 +27,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/customer-segmentation-server/package.json b/examples/customer-segmentation-server/package.json index 4511de9..59e3eb1 100644 --- a/examples/customer-segmentation-server/package.json +++ b/examples/customer-segmentation-server/package.json @@ -27,6 +27,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "chart.js": "^4.4.0", "cors": "^2.8.5", diff --git a/examples/debug-server/package.json b/examples/debug-server/package.json index 3417a8f..02e9fbf 100644 --- a/examples/debug-server/package.json +++ b/examples/debug-server/package.json @@ -35,6 +35,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "zod": "^4.1.13" }, diff --git a/examples/integration-server/package.json b/examples/integration-server/package.json index f6715a4..3f9d8bb 100644 --- a/examples/integration-server/package.json +++ b/examples/integration-server/package.json @@ -16,6 +16,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/lazy-auth-server/package.json b/examples/lazy-auth-server/package.json index f3ed6cd..086f20a 100644 --- a/examples/lazy-auth-server/package.json +++ b/examples/lazy-auth-server/package.json @@ -23,6 +23,7 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/map-server/package.json b/examples/map-server/package.json index 5dc23fe..b0c629a 100644 --- a/examples/map-server/package.json +++ b/examples/map-server/package.json @@ -27,6 +27,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/pdf-server/package.json b/examples/pdf-server/package.json index 4d960f1..aeb52c7 100644 --- a/examples/pdf-server/package.json +++ b/examples/pdf-server/package.json @@ -27,6 +27,8 @@ "dependencies": { "@cantoo/pdf-lib": "^2.6.5", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/quickstart/package.json b/examples/quickstart/package.json index 99948cc..1003637 100644 --- a/examples/quickstart/package.json +++ b/examples/quickstart/package.json @@ -16,6 +16,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0" diff --git a/examples/scenario-modeler-server/package.json b/examples/scenario-modeler-server/package.json index aa1e668..a7e8a9a 100644 --- a/examples/scenario-modeler-server/package.json +++ b/examples/scenario-modeler-server/package.json @@ -27,6 +27,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "chart.js": "^4.4.0", "cors": "^2.8.5", diff --git a/examples/shadertoy-server/package.json b/examples/shadertoy-server/package.json index ccf15a4..0c27501 100644 --- a/examples/shadertoy-server/package.json +++ b/examples/shadertoy-server/package.json @@ -25,6 +25,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/sheet-music-server/package.json b/examples/sheet-music-server/package.json index ca9fa90..6cf175a 100644 --- a/examples/sheet-music-server/package.json +++ b/examples/sheet-music-server/package.json @@ -25,6 +25,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "abcjs": "^6.4.4", "cors": "^2.8.5", diff --git a/examples/system-monitor-server/package.json b/examples/system-monitor-server/package.json index 12e8cea..760d07f 100644 --- a/examples/system-monitor-server/package.json +++ b/examples/system-monitor-server/package.json @@ -27,6 +27,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "chart.js": "^4.4.0", "cors": "^2.8.5", diff --git a/examples/threejs-server/package.json b/examples/threejs-server/package.json index cfb5686..9dda288 100644 --- a/examples/threejs-server/package.json +++ b/examples/threejs-server/package.json @@ -27,6 +27,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/transcript-server/package.json b/examples/transcript-server/package.json index dcba3d7..ce5b737 100644 --- a/examples/transcript-server/package.json +++ b/examples/transcript-server/package.json @@ -25,6 +25,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/video-resource-server/package.json b/examples/video-resource-server/package.json index b0d04af..605b8de 100644 --- a/examples/video-resource-server/package.json +++ b/examples/video-resource-server/package.json @@ -25,6 +25,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/wiki-explorer-server/package.json b/examples/wiki-explorer-server/package.json index fe511ad..62f1de8 100644 --- a/examples/wiki-explorer-server/package.json +++ b/examples/wiki-explorer-server/package.json @@ -27,6 +27,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cheerio": "^1.0.0", "cors": "^2.8.5", diff --git a/package-lock.json b/package-lock.json index 29e9058..5514bf1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,10 @@ }, "devDependencies": { "@boneskull/typedoc-plugin-mermaid": "^0.2.0", + "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/core": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "@playwright/test": "1.57.0", "@types/bun": "^1.3.2", "@types/node": "20.19.27", @@ -44,16 +47,19 @@ "typedoc": "^0.28.14", "typedoc-github-theme": "^0.4.0", "typescript": "^5.9.3", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "engines": { "node": ">=20" }, "peerDependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/core": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0", - "zod": "^3.25.0 || ^4.0.0" + "zod": "^4.2.0" }, "peerDependenciesMeta": { "react": { @@ -89,29 +95,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/basic-host/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/basic-host/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/basic-server-preact": { "name": "@modelcontextprotocol/server-basic-preact", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -133,29 +124,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/basic-server-preact/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/basic-server-preact/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/basic-server-react": { "name": "@modelcontextprotocol/server-basic-react", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -180,29 +156,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/basic-server-react/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/basic-server-react/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/basic-server-solid": { "name": "@modelcontextprotocol/server-basic-solid", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -224,29 +185,14 @@ "vite-plugin-solid": "^2.11.12" } }, - "examples/basic-server-solid/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/basic-server-solid/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/basic-server-svelte": { "name": "@modelcontextprotocol/server-basic-svelte", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -268,29 +214,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/basic-server-svelte/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/basic-server-svelte/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/basic-server-vanillajs": { "name": "@modelcontextprotocol/server-basic-vanillajs", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -310,29 +241,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/basic-server-vanillajs/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/basic-server-vanillajs/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/basic-server-vue": { "name": "@modelcontextprotocol/server-basic-vue", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -354,29 +270,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/basic-server-vue/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/basic-server-vue/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/budget-allocator-server": { "name": "@modelcontextprotocol/server-budget-allocator", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "chart.js": "^4.4.0", "cors": "^2.8.5", @@ -397,29 +298,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/budget-allocator-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/budget-allocator-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/cohort-heatmap-server": { "name": "@modelcontextprotocol/server-cohort-heatmap", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -444,29 +330,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/cohort-heatmap-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/cohort-heatmap-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/customer-segmentation-server": { "name": "@modelcontextprotocol/server-customer-segmentation", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "chart.js": "^4.4.0", "cors": "^2.8.5", @@ -487,29 +358,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/customer-segmentation-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/customer-segmentation-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/debug-server": { "name": "@modelcontextprotocol/server-debug", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "zod": "^4.1.13" }, @@ -529,27 +385,12 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/debug-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/debug-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/integration-server": { "version": "1.7.4", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -573,29 +414,13 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/integration-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/integration-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/lazy-auth-server": { "name": "@modelcontextprotocol/server-lazy-auth", "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -615,29 +440,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/lazy-auth-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/lazy-auth-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/map-server": { "name": "@modelcontextprotocol/server-map", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -657,30 +467,15 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/map-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/map-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/pdf-server": { "name": "@modelcontextprotocol/server-pdf", "version": "1.7.4", "license": "MIT", "dependencies": { "@cantoo/pdf-lib": "^2.6.5", + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -701,23 +496,6 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/pdf-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/pdf-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/qr-server": { "name": "@modelcontextprotocol/server-qr", "version": "1.7.4", @@ -731,7 +509,9 @@ "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0" @@ -748,16 +528,6 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/quickstart/node_modules/@types/node": { - "version": "22.19.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.5.tgz", - "integrity": "sha512-HfF8+mYcHPcPypui3w3mvzuIErlNOh2OAG+BCeBZCEwyiD5ls2SiCwEyT47OELtf7M3nHxBdu0FsmzdKxkN52Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.21.0" - } - }, "examples/say-server": { "name": "@modelcontextprotocol/server-say", "version": "1.7.4", @@ -772,7 +542,9 @@ "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "chart.js": "^4.4.0", "cors": "^2.8.5", @@ -798,29 +570,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/scenario-modeler-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/scenario-modeler-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/shadertoy-server": { "name": "@modelcontextprotocol/server-shadertoy", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -840,29 +597,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/shadertoy-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/shadertoy-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/sheet-music-server": { "name": "@modelcontextprotocol/server-sheet-music", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "abcjs": "^6.4.4", "cors": "^2.8.5", @@ -883,29 +625,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/sheet-music-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/sheet-music-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/system-monitor-server": { "name": "@modelcontextprotocol/server-system-monitor", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "chart.js": "^4.4.0", "cors": "^2.8.5", @@ -927,29 +654,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/system-monitor-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/system-monitor-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/threejs-server": { "name": "@modelcontextprotocol/server-threejs", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -976,29 +688,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/threejs-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/threejs-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/transcript-server": { "name": "@modelcontextprotocol/server-transcript", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -1019,29 +716,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/transcript-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/transcript-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/video-resource-server": { "name": "@modelcontextprotocol/server-video-resource", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -1061,29 +743,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/video-resource-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/video-resource-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/wiki-explorer-server": { "name": "@modelcontextprotocol/server-wiki-explorer", "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/node": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", "cheerio": "^1.0.0", "cors": "^2.8.5", @@ -1105,23 +772,6 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/wiki-explorer-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/wiki-explorer-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "node_modules/@babel/code-frame": { "version": "7.28.6", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.28.6.tgz", @@ -2576,6 +2226,53 @@ "integrity": "sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==", "license": "MIT" }, + "node_modules/@modelcontextprotocol/client": { + "version": "2.0.0-beta.4", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/client/-/client-2.0.0-beta.4.tgz", + "integrity": "sha512-VNHA/UXDk7mCpVl+jOg5B4WMRRD2OEl+it360Lhi6HiCbrIB2f6pZ0cqSDKXQVUtZvqnhdQHzZAM9h8EKWhq/A==", + "dev": true, + "license": "MIT", + "dependencies": { + "@modelcontextprotocol/core": "2.0.0-beta.4", + "cross-spawn": "^7.0.5", + "eventsource": "^3.0.2", + "eventsource-parser": "^3.0.0", + "jose": "^6.1.3", + "pkce-challenge": "^5.0.0", + "zod": "^4.2.0" + }, + "engines": { + "node": ">=20" + } + }, + "node_modules/@modelcontextprotocol/core": { + "version": "2.0.0-beta.4", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/core/-/core-2.0.0-beta.4.tgz", + "integrity": "sha512-nsMXd4wQBKzmph6r+WOhum+mXjDYljTAqwY/XUg3hLtvNOQ8+JVqBSJOVCMJvx9lXhTpTOPrGZ3BuNiaNPjSvg==", + "license": "MIT", + "dependencies": { + "zod": "^4.2.0" + }, + "engines": { + "node": ">=20" + } + }, + "node_modules/@modelcontextprotocol/express": { + "version": "2.0.0-beta.4", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/express/-/express-2.0.0-beta.4.tgz", + "integrity": "sha512-7hI8bEomz6rMn8sKYRVIZgQJsrWIjIS9WiPyIp3X2pMyLSCC7hB5km0kg+9SygWygTIRnPfte0tXevRB3mXEHQ==", + "license": "MIT", + "dependencies": { + "cors": "^2.8.5" + }, + "engines": { + "node": ">=20" + }, + "peerDependencies": { + "@modelcontextprotocol/server": "^2.0.0-beta.4", + "express": "^4.18.0 || ^5.0.0" + } + }, "node_modules/@modelcontextprotocol/ext-apps": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/@modelcontextprotocol/ext-apps/-/ext-apps-1.7.1.tgz", @@ -2609,6 +2306,27 @@ "resolved": "examples/basic-host", "link": true }, + "node_modules/@modelcontextprotocol/node": { + "version": "2.0.0-beta.4", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/node/-/node-2.0.0-beta.4.tgz", + "integrity": "sha512-OqbrRVNYNfLxBB2BRkP5oIHKHa0IPHluMbaLgw7YCRKcj5be9ExzyWFJY3KVMb+1F2AVn+0SRoH0XKcNzh3HYQ==", + "license": "MIT", + "dependencies": { + "@hono/node-server": "^1.19.9" + }, + "engines": { + "node": ">=20" + }, + "peerDependencies": { + "@modelcontextprotocol/server": "^2.0.0-beta.4", + "hono": "^4.11.4" + }, + "peerDependenciesMeta": { + "hono": { + "optional": true + } + } + }, "node_modules/@modelcontextprotocol/quickstart": { "resolved": "examples/quickstart", "link": true @@ -2653,6 +2371,19 @@ } } }, + "node_modules/@modelcontextprotocol/server": { + "version": "2.0.0-beta.4", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/server/-/server-2.0.0-beta.4.tgz", + "integrity": "sha512-pjMZcNEt1dOq0aJCcY3b7w1Ayh+qmQN2xlfTELcGV9yiAjEGIczBPBLWWW0k0zzo5T8kiv15jtKPsWeHGxLvLg==", + "license": "MIT", + "dependencies": { + "@modelcontextprotocol/core": "2.0.0-beta.4", + "zod": "^4.2.0" + }, + "engines": { + "node": ">=20" + } + }, "node_modules/@modelcontextprotocol/server-basic-preact": { "resolved": "examples/basic-server-preact", "link": true diff --git a/package.json b/package.json index 8c6ead5..35bcdf0 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,10 @@ "author": "Olivier Chafik", "devDependencies": { "@boneskull/typedoc-plugin-mermaid": "^0.2.0", + "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/core": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "@playwright/test": "1.57.0", "@types/bun": "^1.3.2", "@types/node": "20.19.27", @@ -105,13 +108,16 @@ "typedoc": "^0.28.14", "typedoc-github-theme": "^0.4.0", "typescript": "^5.9.3", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "peerDependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/core": "2.0.0-beta.4", "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0", - "zod": "^3.25.0 || ^4.0.0" + "zod": "^4.2.0" }, "peerDependenciesMeta": { "react": { From 209cfc62413b7eea46c127ddd756ce58bd2da095 Mon Sep 17 00:00:00 2001 From: Andrew Khadder Date: Tue, 14 Jul 2026 13:49:10 -0700 Subject: [PATCH 069/107] refactor: compose protocol-neutral event dispatch --- src/app-bridge.test.ts | 2 +- src/app-bridge.ts | 120 ++++++++++++++++--- src/app.ts | 139 +++++++++++++++++----- src/events.test.ts | 82 +++++++++++++ src/events.ts | 261 ++++++----------------------------------- typedoc.config.mjs | 2 +- 6 files changed, 335 insertions(+), 271 deletions(-) create mode 100644 src/events.test.ts diff --git a/src/app-bridge.test.ts b/src/app-bridge.test.ts index a4fe1de..7adbb16 100644 --- a/src/app-bridge.test.ts +++ b/src/app-bridge.test.ts @@ -2713,7 +2713,7 @@ describe("isToolVisibilityAppOnly", () => { expect(a).toEqual([]); }); - it("App.onEventDispatch merges hostcontext before listeners fire", async () => { + it("App merges hostcontext before listeners fire", async () => { let seen: unknown; app.addEventListener("hostcontextchanged", () => { seen = app.getHostContext(); diff --git a/src/app-bridge.ts b/src/app-bridge.ts index 23383c4..18d7671 100644 --- a/src/app-bridge.ts +++ b/src/app-bridge.ts @@ -47,7 +47,10 @@ import { ProtocolOptions, RequestOptions, } from "@modelcontextprotocol/sdk/shared/protocol.js"; -import { ProtocolWithEvents } from "./events"; +import { EventDispatcher } from "./events"; +import type { ZodLiteral, ZodObject } from "zod/v4"; + +type MethodSchema = ZodObject<{ method: ZodLiteral }>; import { type AppNotification, @@ -303,16 +306,36 @@ export type AppBridgeEventMap = { * await bridge.connect(transport); * ``` */ -export class AppBridge extends ProtocolWithEvents< - AppRequest, - AppNotification, - AppResult, - AppBridgeEventMap -> { +export class AppBridge extends Protocol { private _appCapabilities?: McpUiAppCapabilities; private _hostContext: McpUiHostContext = {}; private _appInfo?: Implementation; private _initializedReceived = false; + private readonly _registeredMethods = new Set(); + private readonly _registeredEvents = new Set(); + private readonly _events = new EventDispatcher(); + + // ProtocolWithEvents previously owned these registration guards. Keep them + // on AppBridge to preserve the existing double-registration behavior while + // event fan-out moves to protocol-independent composition. Arrow-function + // fields let Protocol's constructor run before the guards initialize. + override setRequestHandler: Protocol< + AppRequest, + AppNotification, + AppResult + >["setRequestHandler"] = (schema, handler) => { + this._assertMethodNotRegistered(schema, "setRequestHandler"); + super.setRequestHandler(schema, handler); + }; + + override setNotificationHandler: Protocol< + AppRequest, + AppNotification, + AppResult + >["setNotificationHandler"] = (schema, handler) => { + this._assertMethodNotRegistered(schema, "setNotificationHandler"); + super.setNotificationHandler(schema, handler); + }; /** * Wrap every handler registered via `replaceRequestHandler` with a check @@ -324,13 +347,14 @@ export class AppBridge extends ProtocolWithEvents< * * @see {@link https://github.com/anthropics/claude-ai-mcp/issues/149 claude-ai-mcp#149} */ - private _baseReplaceRequestHandler = this.replaceRequestHandler; - protected override replaceRequestHandler: Protocol< + protected replaceRequestHandler: Protocol< AppRequest, AppNotification, AppResult >["setRequestHandler"] = (schema, handler) => { - this._baseReplaceRequestHandler(schema, (request, extra) => { + const method = (schema as MethodSchema).shape.method.value; + this._registeredMethods.add(method); + super.setRequestHandler(schema, (request, extra) => { if (!this._initializedReceived) { console.warn( `[ext-apps] AppBridge received '${request.method}' before ` + @@ -343,7 +367,9 @@ export class AppBridge extends ProtocolWithEvents< }); }; - protected readonly eventSchemas = { + private readonly eventSchemas: { + [K in keyof AppBridgeEventMap]: MethodSchema; + } = { sizechange: McpUiSizeChangedNotificationSchema, sandboxready: McpUiSandboxProxyReadyNotificationSchema, initialized: McpUiInitializedNotificationSchema, @@ -351,6 +377,74 @@ export class AppBridge extends ProtocolWithEvents< loggingmessage: LoggingMessageNotificationSchema, }; + protected setEventHandler( + event: K, + handler: ((params: AppBridgeEventMap[K]) => void) | undefined, + ): void { + this._ensureEventSlot(event); + this._events.setHandler(event, handler); + } + + protected getEventHandler( + event: K, + ): ((params: AppBridgeEventMap[K]) => void) | undefined { + return this._events.getHandler(event); + } + + addEventListener( + event: K, + handler: (params: AppBridgeEventMap[K]) => void, + ): void { + this._ensureEventSlot(event); + this._events.addEventListener(event, handler); + } + + removeEventListener( + event: K, + handler: (params: AppBridgeEventMap[K]) => void, + ): void { + this._events.removeEventListener(event, handler); + } + + private _ensureEventSlot( + event: K, + ): void { + if (this._registeredEvents.has(event)) return; + const schema = this.eventSchemas[event]; + if (!schema) throw new Error(`Unknown event: ${String(event)}`); + this.setNotificationHandler(schema, (notification) => { + const params = (notification as { params: AppBridgeEventMap[K] }).params; + if (event === "initialized") this._initializedReceived = true; + this._events.dispatch(event, params); + }); + this._registeredEvents.add(event); + } + + protected warnIfRequestHandlerReplaced( + name: string, + previous: unknown, + next: unknown, + ): void { + if (previous && next) { + console.warn( + `[MCP Apps] ${name} handler replaced. ` + + `Previous handler will no longer be called.`, + ); + } + } + + private _assertMethodNotRegistered(schema: unknown, via: string): void { + const method = (schema as MethodSchema).shape.method.value; + if (this._registeredMethods.has(method)) { + throw new Error( + `Handler for "${method}" already registered (via ${via}). ` + + `Use addEventListener() to attach multiple listeners, ` + + `or the on* setter for replace semantics.`, + ); + } + this._registeredMethods.add(method); + } + /** * Create a new AppBridge instance. * @@ -392,9 +486,7 @@ export class AppBridge extends ProtocolWithEvents< ) { super(options); - this.addEventListener("initialized", () => { - this._initializedReceived = true; - }); + this._ensureEventSlot("initialized"); this._hostContext = options?.hostContext || {}; diff --git a/src/app.ts b/src/app.ts index adfad5c..c586c31 100644 --- a/src/app.ts +++ b/src/app.ts @@ -1,6 +1,7 @@ import { type RequestOptions, mergeCapabilities, + Protocol, ProtocolOptions, } from "@modelcontextprotocol/sdk/shared/protocol.js"; @@ -32,8 +33,8 @@ import { ToolListChangedNotification, } from "@modelcontextprotocol/sdk/types.js"; import { AppNotification, AppRequest, AppResult } from "./types"; -import { ProtocolWithEvents } from "./events"; -export { ProtocolWithEvents }; +import { EventDispatcher } from "./events"; +export { EventDispatcher } from "./events"; import { PostMessageTransport } from "./message-transport"; import { LATEST_PROTOCOL_VERSION, @@ -74,7 +75,9 @@ import { standardSchemaToJsonSchema, validateStandardSchema, } from "./standard-schema"; -import { z } from "zod/v4"; +import { z, type ZodLiteral, type ZodObject } from "zod/v4"; + +type MethodSchema = ZodObject<{ method: ZodLiteral }>; export type { StandardSchemaV1, @@ -271,9 +274,9 @@ export type RegisteredAppTool = { /** * Maps DOM-style event names to their notification `params` types. * - * Used by {@link App `App`} (which extends {@link ProtocolWithEvents `ProtocolWithEvents`}) - * to provide type-safe `addEventListener` / `removeEventListener` and - * singular `on*` handler support. + * Used by {@link App `App`} and its composed {@link EventDispatcher} to + * provide type-safe `addEventListener` / `removeEventListener` and singular + * `on*` handler support. */ export type AppEventMap = { toolinput: McpUiToolInputNotification["params"]; @@ -304,16 +307,14 @@ export type AppEventMap = { * 3. **Interactive**: Send requests, receive notifications, call tools * 4. **Teardown**: Host sends teardown request before unmounting * - * ## Inherited Methods + * ## Protocol and event methods * - * As a subclass of {@link ProtocolWithEvents `ProtocolWithEvents`}, `App` inherits: + * As a subclass of the MCP SDK's `Protocol`, `App` provides: * - `setRequestHandler()` - Register handlers for requests from host * - `setNotificationHandler()` - Register handlers for notifications from host * - `addEventListener()` - Append a listener for a notification event (multi-listener) * - `removeEventListener()` - Remove a previously added listener * - * @see {@link ProtocolWithEvents `ProtocolWithEvents`} for the DOM-model event system - * * ## Notification Setters (DOM-model `on*` handlers) * * For common notifications, the `App` class provides getter/setter properties @@ -342,17 +343,37 @@ export type AppEventMap = { * await app.connect(); * ``` */ -export class App extends ProtocolWithEvents< - AppRequest, - AppNotification, - AppResult, - AppEventMap -> { +export class App extends Protocol { private _hostCapabilities?: McpUiHostCapabilities; private _hostInfo?: Implementation; private _hostContext?: McpUiHostContext; private _registeredTools: { [name: string]: RegisteredAppTool } = {}; private _initializedSent = false; + private readonly _registeredMethods = new Set(); + private readonly _registeredEvents = new Set(); + private readonly _events = new EventDispatcher(); + + // ProtocolWithEvents previously owned these registration guards. Keep them + // on App to preserve the existing double-registration behavior while event + // fan-out moves to protocol-independent composition. Arrow-function fields + // ensure Protocol's constructor uses its own methods before the guards init. + override setRequestHandler: Protocol< + AppRequest, + AppNotification, + AppResult + >["setRequestHandler"] = (schema, handler) => { + this._assertMethodNotRegistered(schema, "setRequestHandler"); + super.setRequestHandler(schema, handler); + }; + + override setNotificationHandler: Protocol< + AppRequest, + AppNotification, + AppResult + >["setNotificationHandler"] = (schema, handler) => { + this._assertMethodNotRegistered(schema, "setNotificationHandler"); + super.setNotificationHandler(schema, handler); + }; /** * Warn if a host-bound method is called before {@link connect `connect`} has @@ -378,7 +399,9 @@ export class App extends ProtocolWithEvents< console.warn(`${msg}. This will throw in a future release.`); } - protected readonly eventSchemas = { + private readonly eventSchemas: { + [K in keyof AppEventMap]: MethodSchema; + } = { toolinput: McpUiToolInputNotificationSchema, toolinputpartial: McpUiToolInputPartialNotificationSchema, toolresult: McpUiToolResultNotificationSchema, @@ -427,31 +450,86 @@ export class App extends ProtocolWithEvents< console.warn(msg); } - protected override setEventHandler( + protected setEventHandler( event: K, handler: ((params: AppEventMap[K]) => void) | undefined, ): void { if (handler) this._assertHandlerTiming(event); - super.setEventHandler(event, handler); + this._ensureEventSlot(event); + this._events.setHandler(event, handler); } - override addEventListener( + addEventListener( event: K, handler: (params: AppEventMap[K]) => void, ): void { this._assertHandlerTiming(event); - super.addEventListener(event, handler); + this._ensureEventSlot(event); + this._events.addEventListener(event, handler); } - protected override onEventDispatch( + removeEventListener( event: K, - params: AppEventMap[K], + handler: (params: AppEventMap[K]) => void, ): void { - if (event === "hostcontextchanged") { - this._hostContext = { ...this._hostContext, ...params }; + this._events.removeEventListener(event, handler); + } + + private _ensureEventSlot(event: K): void { + if (this._registeredEvents.has(event)) return; + const schema = this.eventSchemas[event]; + if (!schema) throw new Error(`Unknown event: ${String(event)}`); + this.setNotificationHandler(schema, (notification) => { + const params = (notification as { params: AppEventMap[K] }).params; + if (event === "hostcontextchanged") { + this._hostContext = { ...this._hostContext, ...params }; + } + this._events.dispatch(event, params); + }); + this._registeredEvents.add(event); + } + + protected getEventHandler( + event: K, + ): ((params: AppEventMap[K]) => void) | undefined { + return this._events.getHandler(event); + } + + protected warnIfRequestHandlerReplaced( + name: string, + previous: unknown, + next: unknown, + ): void { + if (previous && next) { + console.warn( + `[MCP Apps] ${name} handler replaced. ` + + `Previous handler will no longer be called.`, + ); } } + protected replaceRequestHandler: Protocol< + AppRequest, + AppNotification, + AppResult + >["setRequestHandler"] = (schema, handler) => { + const method = (schema as MethodSchema).shape.method.value; + this._registeredMethods.add(method); + super.setRequestHandler(schema, handler); + }; + + private _assertMethodNotRegistered(schema: unknown, via: string): void { + const method = (schema as MethodSchema).shape.method.value; + if (this._registeredMethods.has(method)) { + throw new Error( + `Handler for "${method}" already registered (via ${via}). ` + + `Use addEventListener() to attach multiple listeners, ` + + `or the on* setter for replace semantics.`, + ); + } + this._registeredMethods.add(method); + } + /** * Create a new MCP App instance. * @@ -484,9 +562,8 @@ export class App extends ProtocolWithEvents< return {}; }); - // Eagerly register the hostcontextchanged event slot so that - // onEventDispatch (which merges into _hostContext) fires even if the - // user never assigns onhostcontextchanged or calls addEventListener. + // Eagerly register hostcontextchanged so the owner-side context merge runs + // even if the user never assigns a handler or adds a listener. this.setEventHandler("hostcontextchanged", undefined); } @@ -924,9 +1001,9 @@ export class App extends ProtocolWithEvents< * without replacing. * * Notification params are automatically merged into the internal host context - * via {@link onEventDispatch `onEventDispatch`} before any handler or listener - * fires. This means {@link getHostContext `getHostContext`} will return the - * updated values even before your callback runs. + * before any handler or listener fires. This means + * {@link getHostContext `getHostContext`} will return the updated values even + * before your callback runs. * * Register handlers before calling {@link connect `connect`} to avoid missing notifications. * diff --git a/src/events.test.ts b/src/events.test.ts new file mode 100644 index 0000000..7fd8708 --- /dev/null +++ b/src/events.test.ts @@ -0,0 +1,82 @@ +import { describe, expect, it, spyOn } from "bun:test"; + +import { EventDispatcher } from "./events"; + +type TestEventMap = { + change: { value: number }; +}; + +describe("EventDispatcher", () => { + it("replaces the singular handler", () => { + const dispatcher = new EventDispatcher(); + const calls: string[] = []; + const first = () => calls.push("first"); + const second = () => calls.push("second"); + const warn = spyOn(console, "warn").mockImplementation(() => {}); + + try { + dispatcher.setHandler("change", first); + dispatcher.setHandler("change", second); + + expect(dispatcher.getHandler("change")).toBe(second); + dispatcher.dispatch("change", { value: 1 }); + expect(calls).toEqual(["second"]); + } finally { + warn.mockRestore(); + } + }); + + it("dispatches the singular handler before listeners in insertion order", () => { + const dispatcher = new EventDispatcher(); + const calls: string[] = []; + + dispatcher.setHandler("change", () => calls.push("handler")); + dispatcher.addEventListener("change", () => calls.push("listener-1")); + dispatcher.addEventListener("change", () => calls.push("listener-2")); + + dispatcher.dispatch("change", { value: 1 }); + + expect(calls).toEqual(["handler", "listener-1", "listener-2"]); + }); + + it("uses a listener snapshot when a listener is removed during dispatch", () => { + const dispatcher = new EventDispatcher(); + const calls: string[] = []; + const second = () => calls.push("second"); + const first = () => { + calls.push("first"); + dispatcher.removeEventListener("change", second); + }; + + dispatcher.addEventListener("change", first); + dispatcher.addEventListener("change", second); + + dispatcher.dispatch("change", { value: 1 }); + dispatcher.dispatch("change", { value: 2 }); + + expect(calls).toEqual(["first", "second", "first"]); + }); + + it("warns only when one singular handler replaces another", () => { + const dispatcher = new EventDispatcher(); + const warn = spyOn(console, "warn").mockImplementation(() => {}); + const first = () => {}; + const second = () => {}; + + try { + dispatcher.setHandler("change", first); + dispatcher.setHandler("change", undefined); + dispatcher.setHandler("change", first); + expect(warn).not.toHaveBeenCalled(); + + dispatcher.setHandler("change", second); + + expect(warn).toHaveBeenCalledTimes(1); + expect(String(warn.mock.calls[0]?.[0])).toContain( + "onchange handler replaced", + ); + } finally { + warn.mockRestore(); + } + }); +}); diff --git a/src/events.ts b/src/events.ts index 4d17ca4..b891867 100644 --- a/src/events.ts +++ b/src/events.ts @@ -1,17 +1,6 @@ -import { Protocol } from "@modelcontextprotocol/sdk/shared/protocol.js"; -import { - Request, - Notification, - Result, -} from "@modelcontextprotocol/sdk/types.js"; -import { ZodLiteral, ZodObject } from "zod/v4"; - -type MethodSchema = ZodObject<{ method: ZodLiteral }>; - /** - * Per-event state: a singular `on*` handler (replace semantics) plus a - * listener array (`addEventListener` semantics), mirroring the DOM model - * where `el.onclick` and `el.addEventListener("click", …)` coexist. + * Per-event state: a singular `on*` handler (replace semantics) plus an + * ordered listener array (`addEventListener` semantics). */ interface EventSlot { onHandler?: ((params: T) => void) | undefined; @@ -19,118 +8,19 @@ interface EventSlot { } /** - * Intermediate base class that adds DOM-style event support on top of the - * MCP SDK's `Protocol`. + * Protocol-independent DOM-style event fan-out. * - * The base `Protocol` class stores one handler per method: - * `setRequestHandler()` and `setNotificationHandler()` replace any existing - * handler for the same method silently. This class introduces a two-channel - * event model inspired by the DOM: + * Owners perform event-specific state updates before calling + * {@link dispatch}. Dispatch then invokes the singular handler followed by a + * snapshot of listeners in insertion order. * - * ### Singular `on*` handler (like `el.onclick`) - * - * Subclasses expose `get`/`set` pairs that delegate to - * {@link setEventHandler `setEventHandler`} / - * {@link getEventHandler `getEventHandler`}. Assigning replaces the previous - * handler; assigning `undefined` clears it. `addEventListener` listeners are - * unaffected. - * - * ### Multi-listener (`addEventListener` / `removeEventListener`) - * - * Append to a per-event listener array. Listeners fire in insertion order - * after the singular `on*` handler. - * - * ### Dispatch order - * - * When a notification arrives for a mapped event: - * 1. {@link onEventDispatch `onEventDispatch`} (subclass side-effects) - * 2. The singular `on*` handler (if set) - * 3. All `addEventListener` listeners in insertion order - * - * ### Double-set protection - * - * Direct calls to {@link setRequestHandler `setRequestHandler`} / - * {@link setNotificationHandler `setNotificationHandler`} throw if a handler - * for the same method has already been registered (through any path), so - * accidental overwrites surface as errors instead of silent bugs. - * - * @typeParam EventMap - Maps event names to the listener's `params` type. + * @typeParam EventMap - Maps event names to their listener parameter types. */ -export abstract class ProtocolWithEvents< - SendRequestT extends Request, - SendNotificationT extends Notification, - SendResultT extends Result, - EventMap extends Record, -> extends Protocol { - private _registeredMethods = new Set(); - private _eventSlots = new Map(); +export class EventDispatcher> { + private readonly _eventSlots = new Map(); - /** - * Event name → notification schema. Subclasses populate this so that - * the event system can lazily register a dispatcher with the correct - * schema on first use. - */ - protected abstract readonly eventSchemas: { - [K in keyof EventMap]: MethodSchema; - }; - - /** - * Called once per incoming notification, before any handlers or listeners - * fire. Subclasses may override to perform side effects such as merging - * notification params into cached state. - */ - protected onEventDispatch( - _event: K, - _params: EventMap[K], - ): void {} - - // ── Event system (DOM model) ──────────────────────────────────────── - - /** - * Lazily create the event slot and register a single dispatcher with the - * base `Protocol`. The dispatcher fans out to the `on*` handler and all - * `addEventListener` listeners. - */ - private _ensureEventSlot( - event: K, - ): EventSlot { - let slot = this._eventSlots.get(event) as - | EventSlot - | undefined; - if (!slot) { - const schema = this.eventSchemas[event]; - if (!schema) { - throw new Error(`Unknown event: ${String(event)}`); - } - slot = { listeners: [] }; - this._eventSlots.set(event, slot as EventSlot); - - // Claim this method so direct setNotificationHandler calls throw. - const method = schema.shape.method.value; - this._registeredMethods.add(method); - - const s = slot; // stable reference for the closure - super.setNotificationHandler(schema, (n) => { - const params = (n as { params: EventMap[K] }).params; - this.onEventDispatch(event, params); - // 1. Singular on* handler - s.onHandler?.(params); - // 2. addEventListener listeners — snapshot to tolerate removal during - // dispatch (e.g., a listener that calls removeEventListener on itself) - for (const l of [...s.listeners]) l(params); - }); - } - return slot; - } - - /** - * Set or clear the singular `on*` handler for an event. - * - * Replace semantics — like the DOM's `el.onclick = fn`. Assigning - * `undefined` clears the handler without affecting `addEventListener` - * listeners. - */ - protected setEventHandler( + /** Set, replace, or clear the singular handler for an event. */ + setHandler( event: K, handler: ((params: EventMap[K]) => void) | undefined, ): void { @@ -144,31 +34,16 @@ export abstract class ProtocolWithEvents< slot.onHandler = handler; } - /** - * Get the singular `on*` handler for an event, or `undefined` if none is - * set. `addEventListener` listeners are not reflected here. - */ - protected getEventHandler( + /** Get the singular handler for an event, if one is set. */ + getHandler( event: K, ): ((params: EventMap[K]) => void) | undefined { - return (this._eventSlots.get(event) as EventSlot | undefined) - ?.onHandler; + return (this._eventSlots.get(event) as + | EventSlot + | undefined)?.onHandler; } - /** - * Add a listener for a notification event. - * - * Unlike the singular `on*` handler, calling this multiple times appends - * listeners rather than replacing them. All registered listeners fire in - * insertion order after the `on*` handler when the notification arrives. - * - * Registration is lazy: the first call (for a given event, from either - * this method or the `on*` setter) registers a dispatcher with the base - * `Protocol`. - * - * @param event - Event name (a key of the `EventMap` type parameter). - * @param handler - Listener invoked with the notification `params`. - */ + /** Add a listener. Listeners run in insertion order after the handler. */ addEventListener( event: K, handler: (params: EventMap[K]) => void, @@ -176,11 +51,7 @@ export abstract class ProtocolWithEvents< this._ensureEventSlot(event).listeners.push(handler); } - /** - * Remove a previously registered event listener. The dispatcher stays - * registered even if the listener array becomes empty; future - * notifications simply have no listeners to call. - */ + /** Remove the first matching listener, if present. */ removeEventListener( event: K, handler: (params: EventMap[K]) => void, @@ -193,87 +64,29 @@ export abstract class ProtocolWithEvents< if (idx !== -1) slot.listeners.splice(idx, 1); } - // ── Handler registration with double-set protection ───────────────── - - // The two overrides below are arrow-function class fields rather than - // prototype methods so that Protocol's constructor — which registers its - // own ping/cancelled/progress handlers via `this.setRequestHandler` - // before our fields initialize — hits the base implementation and skips - // tracking. Converting these to proper methods would crash with - // `_registeredMethods` undefined during super(). - /** - * Registers a request handler. Throws if a handler for the same method - * has already been registered — use the `on*` setter (replace semantics) - * or `addEventListener` (multi-listener) for notification events. - * - * @throws {Error} if a handler for this method is already registered. + * Dispatch an event to its singular handler and a listener snapshot. + * Listener mutations during dispatch take effect on the next dispatch. */ - override setRequestHandler: Protocol< - SendRequestT, - SendNotificationT, - SendResultT - >["setRequestHandler"] = (schema, handler) => { - this._assertMethodNotRegistered(schema, "setRequestHandler"); - super.setRequestHandler(schema, handler); - }; - - /** - * Registers a notification handler. Throws if a handler for the same - * method has already been registered — use the `on*` setter (replace - * semantics) or `addEventListener` (multi-listener) for mapped events. - * - * @throws {Error} if a handler for this method is already registered. - */ - override setNotificationHandler: Protocol< - SendRequestT, - SendNotificationT, - SendResultT - >["setNotificationHandler"] = (schema, handler) => { - this._assertMethodNotRegistered(schema, "setNotificationHandler"); - super.setNotificationHandler(schema, handler); - }; - - /** - * Warn if a request handler `on*` setter is replacing a previously-set - * handler. Call from each request setter before updating the backing field. - */ - protected warnIfRequestHandlerReplaced( - name: string, - previous: unknown, - next: unknown, - ): void { - if (previous && next) { - console.warn( - `[MCP Apps] ${name} handler replaced. ` + - `Previous handler will no longer be called.`, - ); - } + dispatch(event: K, params: EventMap[K]): void { + const slot = this._eventSlots.get(event) as + | EventSlot + | undefined; + if (!slot) return; + slot.onHandler?.(params); + for (const l of [...slot.listeners]) l(params); } - /** - * Replace a request handler, bypassing double-set protection. Used by - * `on*` request-handler setters that need replace semantics. - */ - protected replaceRequestHandler: Protocol< - SendRequestT, - SendNotificationT, - SendResultT - >["setRequestHandler"] = (schema, handler) => { - const method = (schema as MethodSchema).shape.method.value; - this._registeredMethods.add(method); - super.setRequestHandler(schema, handler); - }; - - private _assertMethodNotRegistered(schema: unknown, via: string): void { - const method = (schema as MethodSchema).shape.method.value; - if (this._registeredMethods.has(method)) { - throw new Error( - `Handler for "${method}" already registered (via ${via}). ` + - `Use addEventListener() to attach multiple listeners, ` + - `or the on* setter for replace semantics.`, - ); + private _ensureEventSlot( + event: K, + ): EventSlot { + let slot = this._eventSlots.get(event) as + | EventSlot + | undefined; + if (!slot) { + slot = { listeners: [] }; + this._eventSlots.set(event, slot as EventSlot); } - this._registeredMethods.add(method); + return slot; } } diff --git a/typedoc.config.mjs b/typedoc.config.mjs index 4c5baa3..00babc4 100644 --- a/typedoc.config.mjs +++ b/typedoc.config.mjs @@ -28,7 +28,7 @@ const config = { ], excludePrivate: true, excludeInternal: false, - intentionallyNotExported: ["MethodSchema", "RequestHandlerExtra"], + intentionallyNotExported: ["RequestHandlerExtra"], blockTags: [...OptionDefaults.blockTags, "@description"], jsDocCompatibility: { exampleTag: false, From 59e6ffc6d8822f5139efc4d09fae46350761ebd2 Mon Sep 17 00:00:00 2001 From: Andrew Khadder Date: Tue, 14 Jul 2026 15:02:25 -0700 Subject: [PATCH 070/107] refactor: migrate App to SDK v2 client --- src/app-bridge.test.ts | 44 +++--- src/app.test.ts | 300 +++++++++++++++++++++++++++++++++++++++++ src/app.ts | 261 ++++++++++++++++------------------- 3 files changed, 434 insertions(+), 171 deletions(-) create mode 100644 src/app.test.ts diff --git a/src/app-bridge.test.ts b/src/app-bridge.test.ts index 7adbb16..8f432b4 100644 --- a/src/app-bridge.test.ts +++ b/src/app-bridge.test.ts @@ -7,10 +7,7 @@ import { ListPromptsResultSchema, ListResourcesResultSchema, ListResourceTemplatesResultSchema, - PromptListChangedNotificationSchema, ReadResourceResultSchema, - ResourceListChangedNotificationSchema, - ToolListChangedNotificationSchema, } from "@modelcontextprotocol/sdk/types.js"; import { z } from "zod/v4"; @@ -2313,9 +2310,12 @@ describe("App <-> AppBridge integration", () => { it("sendToolListChanged sends notification to app", async () => { const receivedNotifications: unknown[] = []; - app.setNotificationHandler(ToolListChangedNotificationSchema, (n) => { - receivedNotifications.push(n.params); - }); + app.setNotificationHandler( + "notifications/tools/list_changed", + (notification) => { + receivedNotifications.push(notification.params); + }, + ); await bridge.connect(bridgeTransport); await app.connect(appTransport); @@ -2328,9 +2328,12 @@ describe("App <-> AppBridge integration", () => { it("sendResourceListChanged sends notification to app", async () => { const receivedNotifications: unknown[] = []; - app.setNotificationHandler(ResourceListChangedNotificationSchema, (n) => { - receivedNotifications.push(n.params); - }); + app.setNotificationHandler( + "notifications/resources/list_changed", + (notification) => { + receivedNotifications.push(notification.params); + }, + ); await bridge.connect(bridgeTransport); await app.connect(appTransport); @@ -2343,9 +2346,12 @@ describe("App <-> AppBridge integration", () => { it("sendPromptListChanged sends notification to app", async () => { const receivedNotifications: unknown[] = []; - app.setNotificationHandler(PromptListChangedNotificationSchema, (n) => { - receivedNotifications.push(n.params); - }); + app.setNotificationHandler( + "notifications/prompts/list_changed", + (notification) => { + receivedNotifications.push(notification.params); + }, + ); await bridge.connect(bridgeTransport); await app.connect(appTransport); @@ -2771,20 +2777,6 @@ describe("isToolVisibilityAppOnly", () => { ); }).toThrow(/already registered/); }); - - it("direct setNotificationHandler throws for event-mapped methods", () => { - const app2 = new App(testAppInfo, {}, { autoResize: false }); - app2.addEventListener("toolinput", () => {}); - expect(() => { - app2.setNotificationHandler( - // @ts-expect-error — exercising throw path with raw schema - { - shape: { method: { value: "ui/notifications/tool-input" } }, - }, - () => {}, - ); - }).toThrow(/already registered/); - }); }); }); diff --git a/src/app.test.ts b/src/app.test.ts new file mode 100644 index 0000000..dcf2d52 --- /dev/null +++ b/src/app.test.ts @@ -0,0 +1,300 @@ +import { afterEach, describe, expect, it } from "bun:test"; +import { + InMemoryTransport, + Server, + type JSONRPCMessage, +} from "@modelcontextprotocol/server"; +import { z } from "zod/v4"; + +import { App } from "./app"; +import { + LATEST_PROTOCOL_VERSION, + McpUiInitializeRequestSchema, + McpUiInitializeResultSchema, + McpUiInitializedNotificationSchema, +} from "./types"; + +const INNER_MCP_PROTOCOL_VERSION = "2025-11-25"; + +type ConnectedPair = { + app: App; + server: Server; + sentByApp: JSONRPCMessage[]; + appsInitialized: Promise; +}; + +async function connectPair( + app = new App( + { name: "view-app", version: "1.0.0" }, + { tools: { listChanged: true } }, + { autoResize: false }, + ), +): Promise { + const server = new Server( + { name: "inner-mcp-server", version: "0.0.0" }, + { + capabilities: { resources: {}, tools: {} }, + supportedProtocolVersions: [INNER_MCP_PROTOCOL_VERSION], + }, + ); + const [appTransport, serverTransport] = InMemoryTransport.createLinkedPair(); + const sentByApp: JSONRPCMessage[] = []; + const send = appTransport.send.bind(appTransport); + appTransport.send = async (message, options) => { + sentByApp.push(message); + await send(message, options); + }; + + let resolveAppsInitialized!: () => void; + const appsInitialized = new Promise((resolve) => { + resolveAppsInitialized = resolve; + }); + + server.setRequestHandler( + "ui/initialize", + { + params: McpUiInitializeRequestSchema.shape.params, + result: McpUiInitializeResultSchema, + }, + (params) => { + expect(params.protocolVersion).toBe(LATEST_PROTOCOL_VERSION); + return { + protocolVersion: LATEST_PROTOCOL_VERSION, + hostCapabilities: { openLinks: {} }, + hostInfo: { name: "apps-host", version: "2.0.0" }, + hostContext: { theme: "dark" as const, locale: "en-US" }, + }; + }, + ); + server.setNotificationHandler( + "ui/notifications/initialized", + { params: McpUiInitializedNotificationSchema.shape.params }, + () => resolveAppsInitialized(), + ); + server.setRequestHandler("tools/call", (request) => ({ + content: [{ type: "text", text: `called ${request.params.name}` }], + })); + server.setRequestHandler("resources/read", (request) => ({ + contents: [{ uri: request.params.uri, text: "resource body" }], + })); + server.setRequestHandler("resources/list", () => ({ + resources: [{ uri: "test://resource", name: "Test resource" }], + })); + server.setRequestHandler("sampling/createMessage", () => ({ + model: "test-model", + role: "assistant", + content: { type: "text", text: "sampled" }, + })); + + await server.connect(serverTransport); + await app.connect(appTransport); + await appsInitialized; + + return { app, server, sentByApp, appsInitialized }; +} + +const connected: Array> = []; + +afterEach(async () => { + await Promise.all( + connected + .splice(0) + .flatMap(({ app, server }) => [app.close(), server.close()]), + ); +}); + +describe("App base MCP SDK v2 Client migration", () => { + it("completes the legacy MCP handshake before the authoritative Apps handshake", async () => { + const pair = await connectPair(); + connected.push(pair); + + const lifecycleMethods = pair.sentByApp + .filter( + (message): message is JSONRPCMessage & { method: string } => + "method" in message, + ) + .map((message) => message.method) + .filter((method) => + [ + "initialize", + "notifications/initialized", + "ui/initialize", + "ui/notifications/initialized", + ].includes(method), + ); + + expect(lifecycleMethods).toEqual([ + "initialize", + "notifications/initialized", + "ui/initialize", + "ui/notifications/initialized", + ]); + expect(pair.app.getNegotiatedProtocolVersion()).toBe( + INNER_MCP_PROTOCOL_VERSION, + ); + }); + + it("uses ui/initialize as the authority for Apps host state", async () => { + const pair = await connectPair(); + connected.push(pair); + + expect(pair.app.getServerVersion()).toEqual({ + name: "inner-mcp-server", + version: "0.0.0", + }); + expect(pair.app.getHostVersion()).toEqual({ + name: "apps-host", + version: "2.0.0", + }); + expect(pair.app.getHostCapabilities()).toEqual({ openLinks: {} }); + expect(pair.app.getHostContext()).toEqual({ + theme: "dark", + locale: "en-US", + }); + }); + + it("preserves registered App tools with the base MCP SDK v2 Client handler context", async () => { + const pair = await connectPair(); + connected.push(pair); + let receivedSignal: AbortSignal | undefined; + + pair.app.registerTool( + "greet", + { description: "Greets a person" }, + async (extra) => { + receivedSignal = extra.mcpReq.signal; + return { content: [{ type: "text", text: "hello" }] }; + }, + ); + + const listed = await pair.server.request({ + method: "tools/list", + params: {}, + }); + const result = await pair.server.request({ + method: "tools/call", + params: { name: "greet", arguments: {} }, + }); + + expect(listed.tools.map((tool) => tool.name)).toEqual(["greet"]); + expect(result.content).toEqual([{ type: "text", text: "hello" }]); + expect(receivedSignal).toBeInstanceOf(AbortSignal); + }); + + it("uses base MCP SDK v2 method-keyed sends for standard MCP requests", async () => { + const pair = await connectPair(); + connected.push(pair); + + const toolResult = await pair.app.callServerTool({ + name: "refresh", + arguments: {}, + }); + const resource = await pair.app.readServerResource({ + uri: "test://resource", + }); + const resources = await pair.app.listServerResources(); + const sample = await pair.app.createSamplingMessage({ + messages: [{ role: "user", content: { type: "text", text: "hello" } }], + maxTokens: 20, + }); + + expect(toolResult.content).toEqual([ + { type: "text", text: "called refresh" }, + ]); + expect(resource.contents[0]).toEqual({ + uri: "test://resource", + text: "resource body", + }); + expect(resources.resources.map(({ uri }) => uri)).toEqual([ + "test://resource", + ]); + expect(sample.content).toEqual({ type: "text", text: "sampled" }); + }); + + it("preserves reconnect behavior after close", async () => { + const first = await connectPair(); + await first.app.close(); + await first.server.close(); + + const second = await connectPair(first.app); + connected.push(second); + + expect(second.app.getNegotiatedProtocolVersion()).toBe( + INNER_MCP_PROTOCOL_VERSION, + ); + expect(second.app.getHostVersion()).toEqual({ + name: "apps-host", + version: "2.0.0", + }); + }); + + it("preserves auto-resize setup after Apps initialization", async () => { + const app = new App( + { name: "view-app", version: "1.0.0" }, + {}, + { autoResize: true }, + ); + let setupCalls = 0; + app.setupSizeChangedNotifications = () => { + setupCalls += 1; + return () => {}; + }; + + const pair = await connectPair(app); + connected.push(pair); + + expect(setupCalls).toBe(1); + }); + + it("preserves strict late-handler timing errors", async () => { + const app = new App( + { name: "view-app", version: "1.0.0" }, + {}, + { autoResize: false, strict: true }, + ); + const pair = await connectPair(app); + connected.push(pair); + + expect(() => { + app.ontoolinput = () => {}; + }).toThrow(/handler registered after connect/); + }); + + it("uses base MCP SDK replacement semantics for request handlers", async () => { + const pair = await connectPair(); + connected.push(pair); + let handledBy = 0; + + pair.app.setRequestHandler("ping", () => { + handledBy = 1; + return {}; + }); + pair.app.setRequestHandler("ping", () => { + handledBy = 2; + return {}; + }); + + await pair.server.request({ method: "ping", params: {} }); + expect(handledBy).toBe(2); + }); + + it("uses base MCP SDK replacement semantics for non-event notifications", async () => { + const pair = await connectPair(); + connected.push(pair); + const calls: number[] = []; + const params = z.object({}); + + pair.app.setNotificationHandler("test/notification", { params }, () => { + calls.push(1); + }); + pair.app.setNotificationHandler("test/notification", { params }, () => { + calls.push(2); + }); + await pair.server.notification({ + method: "test/notification", + params: {}, + }); + + expect(calls).toEqual([2]); + }); +}); diff --git a/src/app.ts b/src/app.ts index c586c31..3c8f5b7 100644 --- a/src/app.ts +++ b/src/app.ts @@ -1,38 +1,27 @@ import { + Client, + type ClientContext, + type ClientOptions, type RequestOptions, - mergeCapabilities, - Protocol, - ProtocolOptions, -} from "@modelcontextprotocol/sdk/shared/protocol.js"; - -import { - CallToolRequest, - CallToolRequestSchema, - CallToolResult, - CallToolResultSchema, - CreateMessageRequest, - CreateMessageResult, - CreateMessageResultSchema, - CreateMessageResultWithTools, - CreateMessageResultWithToolsSchema, - EmptyResultSchema, - Implementation, - ListResourcesRequest, - ListResourcesResult, - ListResourcesResultSchema, - ListToolsRequest, - ListToolsRequestSchema, - ListToolsResult, - LoggingMessageNotification, - PingRequestSchema, - ReadResourceRequest, - ReadResourceResult, - ReadResourceResultSchema, - Tool, - ToolAnnotations, - ToolListChangedNotification, -} from "@modelcontextprotocol/sdk/types.js"; -import { AppNotification, AppRequest, AppResult } from "./types"; + type CallToolRequest, + type CallToolResult, + type CreateMessageRequest, + type CreateMessageResult, + type CreateMessageResultWithTools, + type Implementation, + type ListResourcesRequest, + type ListResourcesResult, + type ListToolsRequest, + type ListToolsResult, + type LoggingMessageNotification, + type ReadResourceRequest, + type ReadResourceResult, + type Tool, + type ToolAnnotations, + type ToolListChangedNotification, + type Transport, +} from "@modelcontextprotocol/client"; +import { EmptyResultSchema } from "@modelcontextprotocol/core"; import { EventDispatcher } from "./events"; export { EventDispatcher } from "./events"; import { PostMessageTransport } from "./message-transport"; @@ -56,6 +45,7 @@ import { McpUiResourceTeardownRequest, McpUiResourceTeardownRequestSchema, McpUiResourceTeardownResult, + McpUiResourceTeardownResultSchema, McpUiRequestTeardownNotification, McpUiSizeChangedNotification, McpUiToolCancelledNotification, @@ -69,15 +59,36 @@ import { McpUiRequestDisplayModeRequest, McpUiRequestDisplayModeResultSchema, } from "./types"; -import { Transport } from "@modelcontextprotocol/sdk/shared/transport.js"; import { StandardSchemaV1, standardSchemaToJsonSchema, validateStandardSchema, } from "./standard-schema"; -import { z, type ZodLiteral, type ZodObject } from "zod/v4"; +import { z, type ZodLiteral, type ZodObject, type ZodType } from "zod/v4"; -type MethodSchema = ZodObject<{ method: ZodLiteral }>; +type MethodSchema = ZodObject<{ + method: ZodLiteral; + params: ZodType; +}>; + +const INNER_MCP_PROTOCOL_VERSION = "2025-11-25"; + +function mergeAppCapabilities( + base: McpUiAppCapabilities, + additional: McpUiAppCapabilities, +): McpUiAppCapabilities { + const result = { ...base, ...additional }; + if (additional.experimental !== undefined) { + result.experimental = { + ...base.experimental, + ...additional.experimental, + }; + } + if (additional.tools !== undefined) { + result.tools = { ...base.tools, ...additional.tools }; + } + return result; +} export type { StandardSchemaV1, @@ -167,7 +178,10 @@ export const RESOURCE_MIME_TYPE = "text/html;profile=mcp-app"; * * @see `ProtocolOptions` from @modelcontextprotocol/sdk for inherited options */ -export type AppOptions = ProtocolOptions & { +export type AppOptions = Omit< + ClientOptions, + "capabilities" | "supportedProtocolVersions" | "versionNegotiation" +> & { /** * Automatically report size changes to the host using `ResizeObserver`. * @@ -207,9 +221,7 @@ export type AppOptions = ProtocolOptions & { allowUnsafeEval?: boolean; }; -type RequestHandlerExtra = Parameters< - Parameters[1] ->[1]; +type RequestHandlerExtra = ClientContext; /** * Result of an app-registered tool callback. When `Out` is provided, @@ -343,38 +355,15 @@ export type AppEventMap = { * await app.connect(); * ``` */ -export class App extends Protocol { +export class App extends Client { private _hostCapabilities?: McpUiHostCapabilities; private _hostInfo?: Implementation; private _hostContext?: McpUiHostContext; private _registeredTools: { [name: string]: RegisteredAppTool } = {}; private _initializedSent = false; - private readonly _registeredMethods = new Set(); private readonly _registeredEvents = new Set(); private readonly _events = new EventDispatcher(); - // ProtocolWithEvents previously owned these registration guards. Keep them - // on App to preserve the existing double-registration behavior while event - // fan-out moves to protocol-independent composition. Arrow-function fields - // ensure Protocol's constructor uses its own methods before the guards init. - override setRequestHandler: Protocol< - AppRequest, - AppNotification, - AppResult - >["setRequestHandler"] = (schema, handler) => { - this._assertMethodNotRegistered(schema, "setRequestHandler"); - super.setRequestHandler(schema, handler); - }; - - override setNotificationHandler: Protocol< - AppRequest, - AppNotification, - AppResult - >["setNotificationHandler"] = (schema, handler) => { - this._assertMethodNotRegistered(schema, "setNotificationHandler"); - super.setNotificationHandler(schema, handler); - }; - /** * Warn if a host-bound method is called before {@link connect `connect`} has * completed the `ui/initialize` → `ui/notifications/initialized` handshake. @@ -479,13 +468,17 @@ export class App extends Protocol { if (this._registeredEvents.has(event)) return; const schema = this.eventSchemas[event]; if (!schema) throw new Error(`Unknown event: ${String(event)}`); - this.setNotificationHandler(schema, (notification) => { - const params = (notification as { params: AppEventMap[K] }).params; - if (event === "hostcontextchanged") { - this._hostContext = { ...this._hostContext, ...params }; - } - this._events.dispatch(event, params); - }); + this.setNotificationHandler( + schema.shape.method.value, + { params: schema.shape.params }, + (params) => { + const eventParams = params as AppEventMap[K]; + if (event === "hostcontextchanged") { + this._hostContext = { ...this._hostContext, ...eventParams }; + } + this._events.dispatch(event, eventParams); + }, + ); this._registeredEvents.add(event); } @@ -508,33 +501,11 @@ export class App extends Protocol { } } - protected replaceRequestHandler: Protocol< - AppRequest, - AppNotification, - AppResult - >["setRequestHandler"] = (schema, handler) => { - const method = (schema as MethodSchema).shape.method.value; - this._registeredMethods.add(method); - super.setRequestHandler(schema, handler); - }; - - private _assertMethodNotRegistered(schema: unknown, via: string): void { - const method = (schema as MethodSchema).shape.method.value; - if (this._registeredMethods.has(method)) { - throw new Error( - `Handler for "${method}" already registered (via ${via}). ` + - `Use addEventListener() to attach multiple listeners, ` + - `or the on* setter for replace semantics.`, - ); - } - this._registeredMethods.add(method); - } - /** * Create a new MCP App instance. * * @param _appInfo - App identification (name and version) - * @param _capabilities - Features and capabilities this app provides + * @param _appCapabilities - Features and capabilities this app provides * @param options - Configuration options including `autoResize` behavior * * @example @@ -548,16 +519,29 @@ export class App extends Protocol { */ constructor( private _appInfo: Implementation, - private _capabilities: McpUiAppCapabilities = {}, + private _appCapabilities: McpUiAppCapabilities = {}, private options: AppOptions = { autoResize: true }, ) { - super(options); + // TEMPORARY INNER-CHANNEL NEGOTIATION: + // App and AppBridge use the public v2 Client/Server roles, so the iframe + // channel first completes the SDK's standard legacy MCP initialization. + // ui/initialize remains authoritative for Apps capabilities, identity, and + // host context, and ui/notifications/initialized remains the View-ready gate. + // Keep the inner MCP era pinned to 2025-11-25. Revisit this sequence only + // after the MCP Apps negotiation specification is resolved: + // https://github.com/modelcontextprotocol/ext-apps/issues/708 + super(_appInfo, { + ...options, + capabilities: {}, + versionNegotiation: { mode: "legacy" }, + supportedProtocolVersions: [INNER_MCP_PROTOCOL_VERSION], + }); if (!options.allowUnsafeEval) { z.config({ jitless: true }); } - this.setRequestHandler(PingRequestSchema, (request) => { + this.setRequestHandler("ping", (request) => { console.log("Received ping:", request.params); return {}; }); @@ -567,13 +551,16 @@ export class App extends Protocol { this.setEventHandler("hostcontextchanged", undefined); } - private registerCapabilities(capabilities: McpUiAppCapabilities): void { + private registerAppCapabilities(capabilities: McpUiAppCapabilities): void { if (this.transport) { throw new Error( "Cannot register capabilities after transport is established", ); } - this._capabilities = mergeCapabilities(this._capabilities, capabilities); + this._appCapabilities = mergeAppCapabilities( + this._appCapabilities, + capabilities, + ); } registerTool< @@ -596,7 +583,7 @@ export class App extends Protocol { } const app = this; const notify = () => { - if (app._initializedSent && app._capabilities.tools?.listChanged) { + if (app._initializedSent && app._appCapabilities.tools?.listChanged) { void app.sendToolListChanged(); } }; @@ -668,8 +655,8 @@ export class App extends Protocol { // to declare { tools: {} } in the constructor just to use registerTool. // Only do this pre-connect; post-connect the capability was already // advertised (or wasn't) and can't change. - if (!this._capabilities.tools && !this.transport) { - this.registerCapabilities({ tools: { listChanged: true } }); + if (!this._appCapabilities.tools && !this.transport) { + this.registerAppCapabilities({ tools: { listChanged: true } }); } this.ensureToolHandlersInitialized(); @@ -1081,11 +1068,15 @@ export class App extends Protocol { ) { this.warnIfRequestHandlerReplaced("onteardown", this._onteardown, callback); this._onteardown = callback; - this.replaceRequestHandler( - McpUiResourceTeardownRequestSchema, - (request, extra) => { + this.setRequestHandler( + "ui/resource-teardown", + { + params: McpUiResourceTeardownRequestSchema.shape.params, + result: McpUiResourceTeardownResultSchema, + }, + (params, extra) => { if (!this._onteardown) throw new Error("No onteardown handler set"); - return this._onteardown(request.params, extra); + return this._onteardown(params, extra); }, ); } @@ -1135,7 +1126,7 @@ export class App extends Protocol { ) { this.warnIfRequestHandlerReplaced("oncalltool", this._oncalltool, callback); this._oncalltool = callback; - this.replaceRequestHandler(CallToolRequestSchema, (request, extra) => { + this.setRequestHandler("tools/call", (request, extra) => { if (!this._oncalltool) throw new Error("No oncalltool handler set"); return this._oncalltool(request.params, extra); }); @@ -1206,7 +1197,7 @@ export class App extends Protocol { callback, ); this._onlisttools = callback; - this.replaceRequestHandler(ListToolsRequestSchema, (request, extra) => { + this.setRequestHandler("tools/list", (request, extra) => { if (!this._onlisttools) throw new Error("No onlisttools handler set"); return this._onlisttools(request.params, extra); }); @@ -1216,7 +1207,7 @@ export class App extends Protocol { * Verify that the host supports the capability required for the given request method. * @internal */ - assertCapabilityForMethod(method: AppRequest["method"]): void { + protected override assertCapabilityForMethod(method: string): void { switch (method) { case "sampling/createMessage": if (!this._hostCapabilities?.sampling) { @@ -1232,11 +1223,11 @@ export class App extends Protocol { * Verify that the app declared the capability required for the given request method. * @internal */ - assertRequestHandlerCapability(method: AppRequest["method"]): void { + protected override assertRequestHandlerCapability(method: string): void { switch (method) { case "tools/call": case "tools/list": - if (!this._capabilities.tools) { + if (!this._appCapabilities.tools) { throw new Error( `Client does not support tool capability (required for ${method})`, ); @@ -1254,26 +1245,10 @@ export class App extends Protocol { * Verify that the app supports the capability required for the given notification method. * @internal */ - assertNotificationCapability(_method: AppNotification["method"]): void { + protected override assertNotificationCapability(_method: string): void { // TODO } - /** - * Verify that task creation is supported for the given request method. - * @internal - */ - protected assertTaskCapability(_method: string): void { - throw new Error("Tasks are not supported in MCP Apps"); - } - - /** - * Verify that task handler is supported for the given method. - * @internal - */ - protected assertTaskHandlerCapability(_method: string): void { - throw new Error("Task handlers are not supported in MCP Apps"); - } - /** * Call a tool on the originating MCP server (proxied through the host). * @@ -1322,7 +1297,6 @@ export class App extends Protocol { } return await this.request( { method: "tools/call", params }, - CallToolResultSchema, { // Hosts may interpose long-running or user-interactive steps before the // tool result arrives. Opting in here lets a host heartbeat keep the @@ -1379,11 +1353,7 @@ export class App extends Protocol { options?: RequestOptions, ): Promise { this._assertInitialized("readServerResource"); - return await this.request( - { method: "resources/read", params }, - ReadResourceResultSchema, - options, - ); + return await this.request({ method: "resources/read", params }, options); } /** @@ -1427,11 +1397,7 @@ export class App extends Protocol { options?: RequestOptions, ): Promise { this._assertInitialized("listServerResources"); - return await this.request( - { method: "resources/list", params }, - ListResourcesResultSchema, - options, - ); + return await this.request({ method: "resources/list", params }, options); } /** @@ -1508,12 +1474,8 @@ export class App extends Protocol { options?: RequestOptions, ): Promise { this._assertInitialized("createSamplingMessage"); - const resultSchema = params.tools - ? CreateMessageResultWithToolsSchema - : CreateMessageResultSchema; return await this.request( { method: "sampling/createMessage", params }, - resultSchema, options, ); } @@ -2030,14 +1992,23 @@ export class App extends Protocol { ); } this._initializedSent = false; - await super.connect(transport); + // TEMPORARY INNER-CHANNEL NEGOTIATION: + // App and AppBridge use the public v2 Client/Server roles, so the iframe + // channel first completes the SDK's standard legacy MCP initialization. + // ui/initialize remains authoritative for Apps capabilities, identity, and + // host context, and ui/notifications/initialized remains the View-ready gate. + // Keep the inner MCP era pinned to 2025-11-25. Revisit this sequence only + // after the MCP Apps negotiation specification is resolved: + // https://github.com/modelcontextprotocol/ext-apps/issues/708 try { + await super.connect(transport); + const result = await this.request( { method: "ui/initialize", params: { - appCapabilities: this._capabilities, + appCapabilities: this._appCapabilities, appInfo: this._appInfo, protocolVersion: LATEST_PROTOCOL_VERSION, }, From d19a1fb83ade586d6e2eb46535e7d84a7f7468a8 Mon Sep 17 00:00:00 2001 From: Andrew Khadder Date: Tue, 14 Jul 2026 15:34:33 -0700 Subject: [PATCH 071/107] refactor: migrate AppBridge to SDK v2 server --- src/app-bridge.test.ts | 336 ++++++++++++++++++++++---- src/app-bridge.ts | 527 ++++++++++++++++++++--------------------- 2 files changed, 546 insertions(+), 317 deletions(-) diff --git a/src/app-bridge.test.ts b/src/app-bridge.test.ts index 8f432b4..81e072f 100644 --- a/src/app-bridge.test.ts +++ b/src/app-bridge.test.ts @@ -1,14 +1,6 @@ import { describe, it, expect, beforeEach, afterEach, spyOn } from "bun:test"; -import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js"; -import type { Client } from "@modelcontextprotocol/sdk/client/index.js"; -import type { ServerCapabilities } from "@modelcontextprotocol/sdk/types.js"; -import { - EmptyResultSchema, - ListPromptsResultSchema, - ListResourcesResultSchema, - ListResourceTemplatesResultSchema, - ReadResourceResultSchema, -} from "@modelcontextprotocol/sdk/types.js"; +import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; +import { Server, type ServerCapabilities } from "@modelcontextprotocol/server"; import { z } from "zod/v4"; import { App } from "./app"; @@ -19,6 +11,7 @@ import { getToolUiResourceUri, isToolVisibilityModelOnly, isToolVisibilityAppOnly, + McpUiOpenLinkResultSchema, type McpUiHostCapabilities, } from "./app-bridge"; @@ -31,11 +24,18 @@ const flush = () => new Promise((resolve) => setTimeout(resolve, 0)); */ function createMockClient( serverCapabilities: ServerCapabilities = {}, -): Pick { +): Pick< + Client, + | "getServerCapabilities" + | "request" + | "notification" + | "setNotificationHandler" +> { return { getServerCapabilities: () => serverCapabilities, request: async () => ({}) as never, notification: async () => {}, + setNotificationHandler: () => {}, }; } @@ -82,6 +82,58 @@ describe("App <-> AppBridge integration", () => { expect(initializedFired).toBe(true); }); + it("keeps standard initialization separate from the Apps-ready gate", async () => { + const methods: string[] = []; + let releaseAppsInitialized!: () => void; + let reachedAppsInitialized!: () => void; + const appsInitializedGate = new Promise((resolve) => { + releaseAppsInitialized = resolve; + }); + const reachedGate = new Promise((resolve) => { + reachedAppsInitialized = resolve; + }); + const originalSend = appTransport.send.bind(appTransport); + appTransport.send = async (message, options) => { + if ("method" in message) methods.push(message.method); + if ( + "method" in message && + message.method === "ui/notifications/initialized" + ) { + reachedAppsInitialized(); + await appsInitializedGate; + } + return originalSend(message, options); + }; + + let singularCalls = 0; + let listenerCalls = 0; + bridge.oninitialized = () => singularCalls++; + bridge.addEventListener("initialized", () => listenerCalls++); + + await bridge.connect(bridgeTransport); + const connecting = app.connect(appTransport); + await reachedGate; + + expect(methods).toEqual([ + "initialize", + "notifications/initialized", + "ui/initialize", + "ui/notifications/initialized", + ]); + expect(app.getNegotiatedProtocolVersion()).toBe("2025-11-25"); + expect(bridge.getNegotiatedProtocolVersion()).toBe("2025-11-25"); + expect(bridge.getClientVersion()).toEqual(testAppInfo); + expect(bridge.getAppVersion()).toEqual(testAppInfo); + expect(singularCalls).toBe(0); + expect(listenerCalls).toBe(0); + + releaseAppsInitialized(); + await connecting; + + expect(singularCalls).toBe(1); + expect(listenerCalls).toBe(1); + }); + it("App receives host info and capabilities after connect", async () => { await bridge.connect(bridgeTransport); await app.connect(appTransport); @@ -91,6 +143,8 @@ describe("App <-> AppBridge integration", () => { const hostCaps = app.getHostCapabilities(); expect(hostCaps).toEqual(testHostCapabilities); + expect(bridge.getHostCapabilities()).toEqual(testHostCapabilities); + expect(bridge.getCapabilities()).toEqual({}); }); it("Bridge receives app info and capabilities after initialization", async () => { @@ -611,6 +665,30 @@ describe("App <-> AppBridge integration", () => { expect(result.isError).toBe(true); }); + + it("rejects invalid params for a custom ui request", async () => { + bridge.onopenlink = async () => ({}); + await app.connect(appTransport); + + await expect( + app.request( + { + method: "ui/open-link", + params: { url: 42 }, + }, + McpUiOpenLinkResultSchema, + ), + ).rejects.toThrow(); + }); + + it("rejects invalid results from a custom ui handler", async () => { + bridge.onopenlink = async () => ({ isError: "yes" }) as never; + await app.connect(appTransport); + + await expect( + app.openLink({ url: "https://example.com" }), + ).rejects.toThrow(); + }); }); describe("deprecated method aliases", () => { @@ -680,10 +758,7 @@ describe("App <-> AppBridge integration", () => { await app.connect(appTransport); // Bridge can send ping via the protocol's request method - const result = await bridge.request( - { method: "ping", params: {} }, - EmptyResultSchema, - ); + const result = await bridge.request({ method: "ping", params: {} }); expect(result).toEqual({}); }); @@ -798,7 +873,7 @@ describe("App <-> AppBridge integration", () => { }); await bridge.callTool({ name: "noargs", arguments: {} }); expect(receivedExtra).toBeDefined(); - expect(receivedExtra.signal).toBeInstanceOf(AbortSignal); + expect(receivedExtra.mcpReq.signal).toBeInstanceOf(AbortSignal); }); it("isError result skips output schema validation", async () => { @@ -2180,10 +2255,10 @@ describe("App <-> AppBridge integration", () => { await app.connect(appTransport); // App sends resources/list request via the protocol's request method - const result = await app.request( - { method: "resources/list", params: requestParams }, - ListResourcesResultSchema, - ); + const result = await app.request({ + method: "resources/list", + params: requestParams, + }); expect(receivedRequests).toHaveLength(1); expect(receivedRequests[0]).toMatchObject(requestParams); @@ -2224,10 +2299,10 @@ describe("App <-> AppBridge integration", () => { await bridge.connect(bridgeTransport); await app.connect(appTransport); - const result = await app.request( - { method: "resources/read", params: requestParams }, - ReadResourceResultSchema, - ); + const result = await app.request({ + method: "resources/read", + params: requestParams, + }); expect(receivedRequests).toHaveLength(1); expect(receivedRequests[0]).toMatchObject(requestParams); @@ -2275,10 +2350,10 @@ describe("App <-> AppBridge integration", () => { await bridge.connect(bridgeTransport); await app.connect(appTransport); - const result = await app.request( - { method: "resources/templates/list", params: requestParams }, - ListResourceTemplatesResultSchema, - ); + const result = await app.request({ + method: "resources/templates/list", + params: requestParams, + }); expect(receivedRequests).toHaveLength(1); expect(receivedRequests[0]).toMatchObject(requestParams); @@ -2298,10 +2373,10 @@ describe("App <-> AppBridge integration", () => { await bridge.connect(bridgeTransport); await app.connect(appTransport); - const result = await app.request( - { method: "prompts/list", params: requestParams }, - ListPromptsResultSchema, - ); + const result = await app.request({ + method: "prompts/list", + params: requestParams, + }); expect(receivedRequests).toHaveLength(1); expect(receivedRequests[0]).toMatchObject(requestParams); @@ -2310,6 +2385,7 @@ describe("App <-> AppBridge integration", () => { it("sendToolListChanged sends notification to app", async () => { const receivedNotifications: unknown[] = []; + bridge.oncalltool = async () => ({ content: [] }); app.setNotificationHandler( "notifications/tools/list_changed", (notification) => { @@ -2328,6 +2404,7 @@ describe("App <-> AppBridge integration", () => { it("sendResourceListChanged sends notification to app", async () => { const receivedNotifications: unknown[] = []; + bridge.onlistresources = async () => ({ resources: [] }); app.setNotificationHandler( "notifications/resources/list_changed", (notification) => { @@ -2346,6 +2423,7 @@ describe("App <-> AppBridge integration", () => { it("sendPromptListChanged sends notification to app", async () => { const receivedNotifications: unknown[] = []; + bridge.onlistprompts = async () => ({ prompts: [] }); app.setNotificationHandler( "notifications/prompts/list_changed", (notification) => { @@ -2364,6 +2442,184 @@ describe("App <-> AppBridge integration", () => { }); }); +describe("AppBridge outer v2 Client proxy", () => { + let outerClient: Client; + let outerServer: Server; + let outerClientTransport: InMemoryTransport; + let outerServerTransport: InMemoryTransport; + let outerInitializeCount: number; + + beforeEach(async () => { + [outerClientTransport, outerServerTransport] = + InMemoryTransport.createLinkedPair(); + outerInitializeCount = 0; + const originalSend = outerClientTransport.send.bind(outerClientTransport); + outerClientTransport.send = async (message, options) => { + if ("method" in message && message.method === "initialize") { + outerInitializeCount++; + } + return originalSend(message, options); + }; + + outerServer = new Server( + { name: "ActualServer", version: "1.0.0" }, + { + capabilities: { + tools: { listChanged: true }, + resources: { listChanged: true }, + prompts: { listChanged: true }, + }, + supportedProtocolVersions: ["2025-11-25"], + }, + ); + outerServer.setRequestHandler("tools/call", async (request) => ({ + content: [ + { + type: "text", + text: `outer:${request.params.name}`, + }, + ], + })); + + outerClient = new Client( + { name: "HostOuterClient", version: "1.0.0" }, + { + capabilities: {}, + versionNegotiation: { mode: "legacy" }, + supportedProtocolVersions: ["2025-11-25"], + }, + ); + await outerServer.connect(outerServerTransport); + await outerClient.connect(outerClientTransport); + }); + + afterEach(async () => { + await outerClient.close().catch(() => {}); + await outerServer.close().catch(() => {}); + }); + + it("proxies through the outer Client without reconnecting it", async () => { + const bridge = new AppBridge( + outerClient, + testHostInfo, + testHostCapabilities, + ); + const app = new App(testAppInfo, {}, { autoResize: false }); + let [appTransport, bridgeTransport] = InMemoryTransport.createLinkedPair(); + + await bridge.connect(bridgeTransport); + await app.connect(appTransport); + expect( + await app.callServerTool({ name: "first", arguments: {} }), + ).toMatchObject({ + content: [{ type: "text", text: "outer:first" }], + }); + expect(outerInitializeCount).toBe(1); + + await app.close(); + await bridge.close(); + [appTransport, bridgeTransport] = InMemoryTransport.createLinkedPair(); + await bridge.connect(bridgeTransport); + await app.connect(appTransport); + + expect( + await app.callServerTool({ name: "second", arguments: {} }), + ).toMatchObject({ + content: [{ type: "text", text: "outer:second" }], + }); + expect(outerInitializeCount).toBe(1); + expect(outerClient.getServerVersion()).toMatchObject({ + name: "ActualServer", + version: "1.0.0", + }); + + await app.close(); + await bridge.close(); + }); + + it("propagates View cancellation to the actual outer Server", async () => { + let started!: () => void; + let aborted!: () => void; + const startedPromise = new Promise((resolve) => { + started = resolve; + }); + const abortedPromise = new Promise((resolve) => { + aborted = resolve; + }); + outerServer.setRequestHandler("tools/call", async (_request, context) => { + started(); + await new Promise((resolve) => { + context.mcpReq.signal.addEventListener( + "abort", + () => { + aborted(); + resolve(); + }, + { once: true }, + ); + }); + return { content: [] }; + }); + + const bridge = new AppBridge( + outerClient, + testHostInfo, + testHostCapabilities, + ); + const app = new App(testAppInfo, {}, { autoResize: false }); + const [appTransport, bridgeTransport] = + InMemoryTransport.createLinkedPair(); + await bridge.connect(bridgeTransport); + await app.connect(appTransport); + + const controller = new AbortController(); + const result = app.callServerTool( + { name: "cancel-me", arguments: {} }, + { signal: controller.signal }, + ); + await startedPromise; + controller.abort("test cancellation"); + await abortedPromise; + await expect(result).rejects.toThrow(); + + await app.close(); + await bridge.close(); + }); + + it("forwards outer list-changed notifications to the App", async () => { + const bridge = new AppBridge( + outerClient, + testHostInfo, + testHostCapabilities, + ); + const app = new App(testAppInfo, {}, { autoResize: false }); + const [appTransport, bridgeTransport] = + InMemoryTransport.createLinkedPair(); + const received: string[] = []; + app.setNotificationHandler("notifications/tools/list_changed", () => { + received.push("tools"); + }); + app.setNotificationHandler("notifications/resources/list_changed", () => { + received.push("resources"); + }); + app.setNotificationHandler("notifications/prompts/list_changed", () => { + received.push("prompts"); + }); + + await bridge.connect(bridgeTransport); + await app.connect(appTransport); + await outerServer.sendToolListChanged(); + await outerServer.sendResourceListChanged(); + await outerServer.sendPromptListChanged(); + await flush(); + + expect(received).toEqual(["tools", "resources", "prompts"]); + + await app.close(); + await bridge.close(); + }); +}); + describe("getToolUiResourceUri", () => { describe("new nested format (_meta.ui.resourceUri)", () => { it("extracts resourceUri from _meta.ui.resourceUri", () => { @@ -2758,24 +3014,16 @@ describe("isToolVisibilityAppOnly", () => { expect(app.onteardown).toBe(handler); }); - it("direct setRequestHandler throws when called twice", () => { + it("direct setRequestHandler uses base SDK replacement semantics", () => { const bridge2 = new AppBridge( createMockClient() as Client, testHostInfo, testHostCapabilities, ); - bridge2.setRequestHandler( - // @ts-expect-error — exercising throw path with raw schema - { shape: { method: { value: "test/method" } } }, - () => ({}), - ); + bridge2.setRequestHandler("ping", () => ({})); expect(() => { - bridge2.setRequestHandler( - // @ts-expect-error — exercising throw path with raw schema - { shape: { method: { value: "test/method" } } }, - () => ({}), - ); - }).toThrow(/already registered/); + bridge2.setRequestHandler("ping", () => ({})); + }).not.toThrow(); }); }); }); diff --git a/src/app-bridge.ts b/src/app-bridge.ts index 18d7671..c65510d 100644 --- a/src/app-bridge.ts +++ b/src/app-bridge.ts @@ -1,61 +1,51 @@ -import { Client } from "@modelcontextprotocol/sdk/client/index.js"; -import { Transport } from "@modelcontextprotocol/sdk/shared/transport.js"; +import { type Client } from "@modelcontextprotocol/client"; import { - CallToolRequest, - CallToolRequestSchema, - CallToolResult, - CallToolResultSchema, - CreateMessageRequest, - CreateMessageRequestSchema, - CreateMessageResult, - CreateMessageResultWithTools, - EmptyResult, - Implementation, - ListPromptsRequest, - ListPromptsRequestSchema, - ListPromptsResult, - ListPromptsResultSchema, - ListResourcesRequest, - ListResourcesRequestSchema, - ListResourcesResult, - ListResourcesResultSchema, - ListResourceTemplatesRequest, - ListResourceTemplatesRequestSchema, - ListResourceTemplatesResult, - ListResourceTemplatesResultSchema, - ListToolsRequest, - ListToolsRequestSchema, - ListToolsResultSchema, - LoggingMessageNotification, + Server, + type CallToolRequest, + type CallToolResult, + type CreateMessageRequest, + type CreateMessageResult, + type CreateMessageResultWithTools, + type EmptyResult, + type Implementation, + type JSONRPCRequest, + type ListPromptsRequest, + type ListPromptsResult, + type ListResourcesRequest, + type ListResourcesResult, + type ListResourceTemplatesRequest, + type ListResourceTemplatesResult, + type ListToolsRequest, + type LoggingMessageNotification, + type PingRequest, + type PromptListChangedNotification, + type ReadResourceRequest, + type ReadResourceResult, + type RequestOptions, + type ResourceListChangedNotification, + type Result, + type ServerCapabilities, + type ServerContext, + type ServerOptions, + type Tool, + type ToolListChangedNotification, + type Transport, +} from "@modelcontextprotocol/server"; +import { + EmptyResultSchema, LoggingMessageNotificationSchema, - PingRequest, - PingRequestSchema, - PromptListChangedNotification, - PromptListChangedNotificationSchema, - ReadResourceRequest, - ReadResourceRequestSchema, - ReadResourceResult, - ReadResourceResultSchema, - ResourceListChangedNotification, - ResourceListChangedNotificationSchema, - Tool, - ToolListChangedNotification, - ToolListChangedNotificationSchema, -} from "@modelcontextprotocol/sdk/types.js"; -import { - Protocol, - ProtocolOptions, - RequestOptions, -} from "@modelcontextprotocol/sdk/shared/protocol.js"; +} from "@modelcontextprotocol/core"; import { EventDispatcher } from "./events"; -import type { ZodLiteral, ZodObject } from "zod/v4"; +import type { ZodLiteral, ZodObject, ZodType } from "zod/v4"; -type MethodSchema = ZodObject<{ method: ZodLiteral }>; +type MethodSchema = ZodObject<{ + method: ZodLiteral; + params: ZodType; +}>; + +const INNER_MCP_PROTOCOL_VERSION = "2025-11-25"; import { - type AppNotification, - type AppRequest, - type AppResult, type McpUiSandboxResourceReadyNotification, type McpUiSizeChangedNotification, type McpUiToolCancelledNotification, @@ -74,15 +64,19 @@ import { McpUiInitializeRequest, McpUiInitializeRequestSchema, McpUiInitializeResult, + McpUiInitializeResultSchema, McpUiMessageRequest, McpUiMessageRequestSchema, McpUiMessageResult, + McpUiMessageResultSchema, McpUiOpenLinkRequest, McpUiOpenLinkRequestSchema, McpUiOpenLinkResult, + McpUiOpenLinkResultSchema, McpUiDownloadFileRequest, McpUiDownloadFileRequestSchema, McpUiDownloadFileResult, + McpUiDownloadFileResultSchema, McpUiResourceTeardownRequest, McpUiResourceTeardownResultSchema, McpUiRequestTeardownNotification, @@ -93,6 +87,7 @@ import { McpUiRequestDisplayModeRequest, McpUiRequestDisplayModeRequestSchema, McpUiRequestDisplayModeResult, + McpUiRequestDisplayModeResultSchema, McpUiResourcePermissions, McpUiToolMeta, } from "./types"; @@ -101,6 +96,20 @@ export { RESOURCE_URI_META_KEY, RESOURCE_MIME_TYPE } from "./app"; import { RESOURCE_URI_META_KEY } from "./app"; export { PostMessageTransport } from "./message-transport"; +function proxiedInnerCapabilities( + capabilities: ServerCapabilities, +): ServerCapabilities { + return { + ...(capabilities.tools && { tools: capabilities.tools }), + ...(capabilities.resources && { + resources: { + listChanged: capabilities.resources.listChanged, + }, + }), + ...(capabilities.prompts && { prompts: capabilities.prompts }), + }; +} + /** * Extract UI resource URI from tool metadata. * @@ -206,10 +215,13 @@ export function buildAllowAttribute( * * @property hostContext - Optional initial host context to provide to the view * - * @see `ProtocolOptions` from @modelcontextprotocol/sdk for available options + * @see `ServerOptions` from @modelcontextprotocol/server for available options * @see {@link McpUiHostContext `McpUiHostContext`} for the hostContext structure */ -export type HostOptions = ProtocolOptions & { +export type HostOptions = Omit< + ServerOptions, + "capabilities" | "supportedProtocolVersions" +> & { hostContext?: McpUiHostContext; }; @@ -224,15 +236,12 @@ export const SUPPORTED_PROTOCOL_VERSIONS = [LATEST_PROTOCOL_VERSION]; /** * Extra metadata passed to request handlers. * - * This type represents the additional context provided by the `Protocol` class - * when handling requests, including abort signals and session information. - * It is extracted from the MCP SDK's request handler signature. + * This type represents the additional context provided by the base MCP SDK + * `Server` when handling requests. * * @internal */ -type RequestHandlerExtra = Parameters< - Parameters[1] ->[1]; +type RequestHandlerExtra = ServerContext; /** * Maps DOM-style event names to their notification `params` types. @@ -306,66 +315,53 @@ export type AppBridgeEventMap = { * await bridge.connect(transport); * ``` */ -export class AppBridge extends Protocol { +export class AppBridge extends Server { private _appCapabilities?: McpUiAppCapabilities; private _hostContext: McpUiHostContext = {}; private _appInfo?: Implementation; private _initializedReceived = false; - private readonly _registeredMethods = new Set(); private readonly _registeredEvents = new Set(); private readonly _events = new EventDispatcher(); - // ProtocolWithEvents previously owned these registration guards. Keep them - // on AppBridge to preserve the existing double-registration behavior while - // event fan-out moves to protocol-independent composition. Arrow-function - // fields let Protocol's constructor run before the guards initialize. - override setRequestHandler: Protocol< - AppRequest, - AppNotification, - AppResult - >["setRequestHandler"] = (schema, handler) => { - this._assertMethodNotRegistered(schema, "setRequestHandler"); - super.setRequestHandler(schema, handler); - }; - - override setNotificationHandler: Protocol< - AppRequest, - AppNotification, - AppResult - >["setNotificationHandler"] = (schema, handler) => { - this._assertMethodNotRegistered(schema, "setNotificationHandler"); - super.setNotificationHandler(schema, handler); - }; - /** - * Wrap every handler registered via `replaceRequestHandler` with a check - * that the View has sent `ui/notifications/initialized`. Warns (never - * throws) so lenient hosts keep working while still surfacing the - * misordering that leaves strict hosts with a permanently hidden iframe. - * `ui/initialize` and `ping` use `setRequestHandler` directly and are - * intentionally exempt. + * The base MCP SDK calls this hook for every standard and custom request + * handler registration. AppBridge uses it to preserve the existing warning + * when a View calls host methods before `ui/notifications/initialized`, + * without adding overload-forwarding adapters around `setRequestHandler`. + * Chaining through `super._wrapHandler()` retains the base `Server`'s own + * role-specific behavior, including tool-result validation. The two + * initialization methods and `ping` are exempt because they are valid before + * the Apps-ready gate. This wraps registered callbacks, not JSON-RPC dispatch. * * @see {@link https://github.com/anthropics/claude-ai-mcp/issues/149 claude-ai-mcp#149} */ - protected replaceRequestHandler: Protocol< - AppRequest, - AppNotification, - AppResult - >["setRequestHandler"] = (schema, handler) => { - const method = (schema as MethodSchema).shape.method.value; - this._registeredMethods.add(method); - super.setRequestHandler(schema, (request, extra) => { + protected override _wrapHandler( + method: string, + handler: ( + request: JSONRPCRequest, + context: ServerContext, + ) => Promise, + ): (request: JSONRPCRequest, context: ServerContext) => Promise { + const wrapped = super._wrapHandler(method, handler); + if ( + method === "initialize" || + method === "ui/initialize" || + method === "ping" + ) { + return wrapped; + } + return async (request, context) => { if (!this._initializedReceived) { console.warn( - `[ext-apps] AppBridge received '${request.method}' before ` + + `[ext-apps] AppBridge received '${method}' before ` + `ui/notifications/initialized. The View is calling host ` + `methods before completing the handshake; it should await ` + `app.connect() first.`, ); } - return handler(request, extra); - }); - }; + return wrapped(request, context); + }; + } private readonly eventSchemas: { [K in keyof AppBridgeEventMap]: MethodSchema; @@ -406,17 +402,27 @@ export class AppBridge extends Protocol this._events.removeEventListener(event, handler); } - private _ensureEventSlot( - event: K, - ): void { + private _ensureEventSlot(event: K): void { if (this._registeredEvents.has(event)) return; const schema = this.eventSchemas[event]; if (!schema) throw new Error(`Unknown event: ${String(event)}`); - this.setNotificationHandler(schema, (notification) => { - const params = (notification as { params: AppBridgeEventMap[K] }).params; + + const dispatch = (params: AppBridgeEventMap[K]) => { if (event === "initialized") this._initializedReceived = true; this._events.dispatch(event, params); - }); + }; + + if (event === "loggingmessage") { + this.setNotificationHandler("notifications/message", (notification) => { + dispatch(notification.params as AppBridgeEventMap[K]); + }); + } else { + this.setNotificationHandler( + schema.shape.method.value, + { params: schema.shape.params }, + (params) => dispatch(params as AppBridgeEventMap[K]), + ); + } this._registeredEvents.add(event); } @@ -433,16 +439,12 @@ export class AppBridge extends Protocol } } - private _assertMethodNotRegistered(schema: unknown, via: string): void { - const method = (schema as MethodSchema).shape.method.value; - if (this._registeredMethods.has(method)) { - throw new Error( - `Handler for "${method}" already registered (via ${via}). ` + - `Use addEventListener() to attach multiple listeners, ` + - `or the on* setter for replace semantics.`, - ); - } - this._registeredMethods.add(method); + private ensureInnerCapabilities(capabilities: ServerCapabilities): void { + const current = super.getCapabilities(); + const missing = Object.keys(capabilities).some( + (key) => current[key as keyof ServerCapabilities] === undefined, + ); + if (missing) this.registerCapabilities(capabilities); } /** @@ -453,8 +455,8 @@ export class AppBridge extends Protocol * between the View and the server. When `null`, you must register handlers * manually using the {@link oncalltool `oncalltool`}, {@link onlistresources `onlistresources`}, etc. setters. * @param _hostInfo - Host application identification (name and version) - * @param _capabilities - Features and capabilities the host supports - * @param options - Configuration options (inherited from Protocol) + * @param _hostCapabilities - Features and capabilities the host supports + * @param options - Configuration options (inherited from Server) * * @example With MCP client (automatic forwarding) * ```ts source="./app-bridge.examples.ts#AppBridge_constructor_withMcpClient" @@ -481,29 +483,61 @@ export class AppBridge extends Protocol constructor( private _client: Client | null, private _hostInfo: Implementation, - private _capabilities: McpUiHostCapabilities, + private _hostCapabilities: McpUiHostCapabilities, options?: HostOptions, ) { - super(options); + // TEMPORARY INNER-CHANNEL NEGOTIATION: + // App and AppBridge use the public v2 Client/Server roles, so the iframe + // channel first completes the SDK's standard legacy MCP initialization. + // ui/initialize remains authoritative for Apps capabilities, identity, and + // host context, and ui/notifications/initialized remains the View-ready gate. + // Keep the inner MCP era pinned to 2025-11-25. Revisit this sequence only + // after the MCP Apps negotiation specification is resolved: + // https://github.com/modelcontextprotocol/ext-apps/issues/708 + super(_hostInfo, { + ...options, + capabilities: {}, + supportedProtocolVersions: [INNER_MCP_PROTOCOL_VERSION], + }); + + // The base Server's standard initialized callback is MCP-ready state. The + // public AppBridge callback remains exclusively the Apps View-ready gate. + super.setNotificationHandler("notifications/initialized", () => {}); + Object.defineProperty(this, "oninitialized", { + configurable: true, + enumerable: true, + get: () => this.getEventHandler("initialized"), + set: (callback: AppBridge["oninitialized"]) => + this.setEventHandler("initialized", callback), + }); this._ensureEventSlot("initialized"); this._hostContext = options?.hostContext || {}; - this.setRequestHandler(McpUiInitializeRequestSchema, (request) => - this._oninitialize(request), + this.setRequestHandler( + "ui/initialize", + { + params: McpUiInitializeRequestSchema.shape.params, + result: McpUiInitializeResultSchema, + }, + (params) => this._onAppsInitialize(params), ); - this.setRequestHandler(PingRequestSchema, (request, extra) => { + this.setRequestHandler("ping", (request, extra) => { this.onping?.(request.params, extra); return {}; }); // Default handler for requestDisplayMode - returns current mode from host context. // Hosts can override this by setting bridge.onrequestdisplaymode = ... - this.replaceRequestHandler( - McpUiRequestDisplayModeRequestSchema, - (request) => { + this.setRequestHandler( + "ui/request-display-mode", + { + params: McpUiRequestDisplayModeRequestSchema.shape.params, + result: McpUiRequestDisplayModeResultSchema, + }, + () => { const currentMode = this._hostContext.displayMode ?? "inline"; return { mode: currentMode }; }, @@ -680,18 +714,9 @@ export class AppBridge extends Protocol * @see {@link sendToolInput `sendToolInput`} for sending tool arguments to the View * @deprecated Use {@link addEventListener `addEventListener("initialized", handler)`} instead — it composes with other listeners and supports cleanup via {@link removeEventListener `removeEventListener`}. */ - get oninitialized(): - | ((params: McpUiInitializedNotification["params"]) => void) - | undefined { - return this.getEventHandler("initialized"); - } - set oninitialized( - callback: - | ((params: McpUiInitializedNotification["params"]) => void) - | undefined, - ) { - this.setEventHandler("initialized", callback); - } + override oninitialized?: ( + params?: McpUiInitializedNotification["params"], + ) => void; /** * Register a handler for message requests from the view. @@ -744,11 +769,15 @@ export class AppBridge extends Protocol ) { this.warnIfRequestHandlerReplaced("onmessage", this._onmessage, callback); this._onmessage = callback; - this.replaceRequestHandler( - McpUiMessageRequestSchema, - async (request, extra) => { + this.setRequestHandler( + "ui/message", + { + params: McpUiMessageRequestSchema.shape.params, + result: McpUiMessageResultSchema, + }, + async (params, extra) => { if (!this._onmessage) throw new Error("No onmessage handler set"); - return this._onmessage(request.params, extra); + return this._onmessage(params, extra); }, ); } @@ -813,11 +842,15 @@ export class AppBridge extends Protocol ) { this.warnIfRequestHandlerReplaced("onopenlink", this._onopenlink, callback); this._onopenlink = callback; - this.replaceRequestHandler( - McpUiOpenLinkRequestSchema, - async (request, extra) => { + this.setRequestHandler( + "ui/open-link", + { + params: McpUiOpenLinkRequestSchema.shape.params, + result: McpUiOpenLinkResultSchema, + }, + async (params, extra) => { if (!this._onopenlink) throw new Error("No onopenlink handler set"); - return this._onopenlink(request.params, extra); + return this._onopenlink(params, extra); }, ); } @@ -885,12 +918,16 @@ export class AppBridge extends Protocol callback, ); this._ondownloadfile = callback; - this.replaceRequestHandler( - McpUiDownloadFileRequestSchema, - async (request, extra) => { + this.setRequestHandler( + "ui/download-file", + { + params: McpUiDownloadFileRequestSchema.shape.params, + result: McpUiDownloadFileResultSchema, + }, + async (params, extra) => { if (!this._ondownloadfile) throw new Error("No ondownloadfile handler set"); - return this._ondownloadfile(request.params, extra); + return this._ondownloadfile(params, extra); }, ); } @@ -985,12 +1022,16 @@ export class AppBridge extends Protocol callback, ); this._onrequestdisplaymode = callback; - this.replaceRequestHandler( - McpUiRequestDisplayModeRequestSchema, - async (request, extra) => { + this.setRequestHandler( + "ui/request-display-mode", + { + params: McpUiRequestDisplayModeRequestSchema.shape.params, + result: McpUiRequestDisplayModeResultSchema, + }, + async (params, extra) => { if (!this._onrequestdisplaymode) throw new Error("No onrequestdisplaymode handler set"); - return this._onrequestdisplaymode(request.params, extra); + return this._onrequestdisplaymode(params, extra); }, ); } @@ -1082,12 +1123,16 @@ export class AppBridge extends Protocol callback, ); this._onupdatemodelcontext = callback; - this.replaceRequestHandler( - McpUiUpdateModelContextRequestSchema, - async (request, extra) => { + this.setRequestHandler( + "ui/update-model-context", + { + params: McpUiUpdateModelContextRequestSchema.shape.params, + result: EmptyResultSchema, + }, + async (params, extra) => { if (!this._onupdatemodelcontext) throw new Error("No onupdatemodelcontext handler set"); - return this._onupdatemodelcontext(request.params, extra); + return this._onupdatemodelcontext(params, extra); }, ); } @@ -1135,13 +1180,11 @@ export class AppBridge extends Protocol ) { this.warnIfRequestHandlerReplaced("oncalltool", this._oncalltool, callback); this._oncalltool = callback; - this.replaceRequestHandler( - CallToolRequestSchema, - async (request, extra) => { - if (!this._oncalltool) throw new Error("No oncalltool handler set"); - return this._oncalltool(request.params, extra); - }, - ); + this.ensureInnerCapabilities({ tools: {} }); + this.setRequestHandler("tools/call", async (request, extra) => { + if (!this._oncalltool) throw new Error("No oncalltool handler set"); + return this._oncalltool(request.params, extra); + }); } /** @@ -1179,12 +1222,9 @@ export class AppBridge extends Protocol extra: RequestHandlerExtra, ) => Promise, ) { - this.setRequestHandler( - CreateMessageRequestSchema, - async (request, extra) => { - return callback(request.params, extra); - }, - ); + this.setRequestHandler("sampling/createMessage", async (request, extra) => { + return callback(request.params, extra); + }); } /** @@ -1260,14 +1300,12 @@ export class AppBridge extends Protocol callback, ); this._onlistresources = callback; - this.replaceRequestHandler( - ListResourcesRequestSchema, - async (request, extra) => { - if (!this._onlistresources) - throw new Error("No onlistresources handler set"); - return this._onlistresources(request.params, extra); - }, - ); + this.ensureInnerCapabilities({ resources: {} }); + this.setRequestHandler("resources/list", async (request, extra) => { + if (!this._onlistresources) + throw new Error("No onlistresources handler set"); + return this._onlistresources(request.params, extra); + }); } /** @@ -1317,8 +1355,9 @@ export class AppBridge extends Protocol callback, ); this._onlistresourcetemplates = callback; - this.replaceRequestHandler( - ListResourceTemplatesRequestSchema, + this.ensureInnerCapabilities({ resources: {} }); + this.setRequestHandler( + "resources/templates/list", async (request, extra) => { if (!this._onlistresourcetemplates) throw new Error("No onlistresourcetemplates handler set"); @@ -1374,14 +1413,12 @@ export class AppBridge extends Protocol callback, ); this._onreadresource = callback; - this.replaceRequestHandler( - ReadResourceRequestSchema, - async (request, extra) => { - if (!this._onreadresource) - throw new Error("No onreadresource handler set"); - return this._onreadresource(request.params, extra); - }, - ); + this.ensureInnerCapabilities({ resources: {} }); + this.setRequestHandler("resources/read", async (request, extra) => { + if (!this._onreadresource) + throw new Error("No onreadresource handler set"); + return this._onreadresource(request.params, extra); + }); } /** @@ -1459,14 +1496,11 @@ export class AppBridge extends Protocol callback, ); this._onlistprompts = callback; - this.replaceRequestHandler( - ListPromptsRequestSchema, - async (request, extra) => { - if (!this._onlistprompts) - throw new Error("No onlistprompts handler set"); - return this._onlistprompts(request.params, extra); - }, - ); + this.ensureInnerCapabilities({ prompts: {} }); + this.setRequestHandler("prompts/list", async (request, extra) => { + if (!this._onlistprompts) throw new Error("No onlistprompts handler set"); + return this._onlistprompts(request.params, extra); + }); } /** @@ -1495,46 +1529,6 @@ export class AppBridge extends Protocol }); } - /** - * Verify that the guest supports the capability required for the given request method. - * @internal - */ - assertCapabilityForMethod(method: AppRequest["method"]): void { - // TODO - } - - /** - * Verify that a request handler is registered and supported for the given method. - * @internal - */ - assertRequestHandlerCapability(method: AppRequest["method"]): void { - // TODO - } - - /** - * Verify that the host supports the capability required for the given notification method. - * @internal - */ - assertNotificationCapability(method: AppNotification["method"]): void { - // TODO - } - - /** - * Verify that task creation is supported for the given request method. - * @internal - */ - protected assertTaskCapability(_method: string): void { - throw new Error("Tasks are not supported in MCP Apps"); - } - - /** - * Verify that task handler is supported for the given method. - * @internal - */ - protected assertTaskHandlerCapability(_method: string): void { - throw new Error("Task handlers are not supported in MCP Apps"); - } - /** * Get the host capabilities passed to the constructor. * @@ -1542,18 +1536,18 @@ export class AppBridge extends Protocol * * @see {@link McpUiHostCapabilities `McpUiHostCapabilities`} for the capabilities structure */ - getCapabilities(): McpUiHostCapabilities { - return this._capabilities; + getHostCapabilities(): McpUiHostCapabilities { + return this._hostCapabilities; } /** * Handle the ui/initialize request from the guest. * @internal */ - private async _oninitialize( - request: McpUiInitializeRequest, + private async _onAppsInitialize( + params: McpUiInitializeRequest["params"], ): Promise { - const requestedVersion = request.params.protocolVersion; + const requestedVersion = params.protocolVersion; if (this._appInfo !== undefined) { console.warn( @@ -1564,8 +1558,8 @@ export class AppBridge extends Protocol ); } - this._appCapabilities = request.params.appCapabilities; - this._appInfo = request.params.appInfo; + this._appCapabilities = params.appCapabilities; + this._appInfo = params.appInfo; const protocolVersion = SUPPORTED_PROTOCOL_VERSIONS.includes( requestedVersion, @@ -1575,7 +1569,7 @@ export class AppBridge extends Protocol return { protocolVersion, - hostCapabilities: this.getCapabilities(), + hostCapabilities: this.getHostCapabilities(), hostInfo: this._hostInfo, hostContext: this._hostContext, }; @@ -1857,11 +1851,7 @@ export class AppBridge extends Protocol * @returns Promise resolving to the tool call result */ callTool(params: CallToolRequest["params"], options?: RequestOptions) { - return this.request( - { method: "tools/call", params }, - CallToolResultSchema, - options, - ); + return this.request({ method: "tools/call", params }, options); } /** @@ -1874,11 +1864,7 @@ export class AppBridge extends Protocol * @returns Promise resolving to the list of tools */ listTools(params: ListToolsRequest["params"], options?: RequestOptions) { - return this.request( - { method: "tools/list", params }, - ListToolsResultSchema, - options, - ); + return this.request({ method: "tools/list", params }, options); } /** @@ -1949,18 +1935,18 @@ export class AppBridge extends Protocol if (!serverCapabilities) { throw new Error("Client server capabilities not available"); } + this.registerCapabilities(proxiedInnerCapabilities(serverCapabilities)); if (serverCapabilities.tools) { this.oncalltool = async (params, extra) => { return this._client!.request( { method: "tools/call", params }, - CallToolResultSchema, - { signal: extra.signal }, + { signal: extra.mcpReq.signal }, ); }; if (serverCapabilities.tools.listChanged) { this._client.setNotificationHandler( - ToolListChangedNotificationSchema, + "notifications/tools/list_changed", (n) => this.sendToolListChanged(n.params), ); } @@ -1969,27 +1955,24 @@ export class AppBridge extends Protocol this.onlistresources = async (params, extra) => { return this._client!.request( { method: "resources/list", params }, - ListResourcesResultSchema, - { signal: extra.signal }, + { signal: extra.mcpReq.signal }, ); }; this.onlistresourcetemplates = async (params, extra) => { return this._client!.request( { method: "resources/templates/list", params }, - ListResourceTemplatesResultSchema, - { signal: extra.signal }, + { signal: extra.mcpReq.signal }, ); }; this.onreadresource = async (params, extra) => { return this._client!.request( { method: "resources/read", params }, - ReadResourceResultSchema, - { signal: extra.signal }, + { signal: extra.mcpReq.signal }, ); }; if (serverCapabilities.resources.listChanged) { this._client.setNotificationHandler( - ResourceListChangedNotificationSchema, + "notifications/resources/list_changed", (n) => this.sendResourceListChanged(n.params), ); } @@ -1998,22 +1981,20 @@ export class AppBridge extends Protocol this.onlistprompts = async (params, extra) => { return this._client!.request( { method: "prompts/list", params }, - ListPromptsResultSchema, - { signal: extra.signal }, + { signal: extra.mcpReq.signal }, ); }; if (serverCapabilities.prompts.listChanged) { this._client.setNotificationHandler( - PromptListChangedNotificationSchema, + "notifications/prompts/list_changed", (n) => this.sendPromptListChanged(n.params), ); } } } - // MCP-UI specific handlers are registered by the host component - // after the proxy is created. The standard MCP initialization - // (via oninitialized callback set in constructor) handles the ready signal. + // The standard MCP handshake only establishes the temporary inner Server + // role. ui/notifications/initialized remains the public View-ready signal. return super.connect(transport); } From a76e3a76913b9482a5d00342184004ccaab44885 Mon Sep 17 00:00:00 2001 From: Andrew Khadder Date: Tue, 14 Jul 2026 15:46:56 -0700 Subject: [PATCH 072/107] refactor: migrate shared SDK surfaces to v2 --- scripts/generate-schemas.ts | 6 +- src/generated/schema.json | 182 +++++++++++++++++++++++------------- src/generated/schema.ts | 2 +- src/message-transport.ts | 8 +- src/react/useApp.tsx | 3 +- src/server/index.ts | 54 +++-------- src/spec.types.ts | 22 ++--- src/types.ts | 130 -------------------------- 8 files changed, 149 insertions(+), 258 deletions(-) diff --git a/scripts/generate-schemas.ts b/scripts/generate-schemas.ts index 109f352..85225f5 100644 --- a/scripts/generate-schemas.ts +++ b/scripts/generate-schemas.ts @@ -12,7 +12,7 @@ * * ts-to-zod generates `import { z } from "zod"`. We rewrite this to * `import { z } from "zod/v4"` because the generated schemas compose with - * schemas imported from `@modelcontextprotocol/sdk/types.js`, which the SDK + * schemas imported from `@modelcontextprotocol/core`, which the SDK * constructs via `zod/v4`. Mixing schemas from the v3 and v4 APIs at runtime * fails with errors like `keyValidator._parse is not a function` (v3 internals * calling into v4 objects, or vice versa). The `zod/v4` subpath is exported by @@ -22,7 +22,7 @@ * * **Problem**: ts-to-zod cannot resolve types imported from external packages. * When it encounters types like `ContentBlock`, `CallToolResult`, `Implementation`, - * `RequestId`, and `Tool` from `@modelcontextprotocol/sdk`, it generates `z.any()` + * `RequestId`, and `Tool` from `@modelcontextprotocol/core`, it generates `z.any()` * as a placeholder. * * **Solution**: Import the schemas from MCP SDK and remove the z.any() placeholders. @@ -193,7 +193,7 @@ function postProcess(content: string): string { `import { z } from "zod/v4"; import { ${mcpImports}, -} from "@modelcontextprotocol/sdk/types.js";`, +} from "@modelcontextprotocol/core";`, ); // 2. Remove z.any() placeholders for external types (now imported from MCP SDK) diff --git a/src/generated/schema.json b/src/generated/schema.json index 80b4ac6..5f2124a 100644 --- a/src/generated/schema.json +++ b/src/generated/schema.json @@ -596,7 +596,9 @@ "propertyNames": { "type": "string" }, - "additionalProperties": {} + "additionalProperties": { + "$ref": "#/$defs/__schema0" + } }, "required": { "type": "array", @@ -611,25 +613,10 @@ "outputSchema": { "type": "object", "properties": { - "type": { - "type": "string", - "const": "object" - }, - "properties": { - "type": "object", - "propertyNames": { - "type": "string" - }, - "additionalProperties": {} - }, - "required": { - "type": "array", - "items": { - "type": "string" - } + "$schema": { + "type": "string" } }, - "required": ["type"], "additionalProperties": {} }, "annotations": { @@ -1286,7 +1273,40 @@ } }, "required": ["method", "params"], - "additionalProperties": false + "additionalProperties": false, + "$defs": { + "__schema0": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "number" + }, + { + "type": "boolean" + }, + { + "type": "null" + }, + { + "type": "object", + "propertyNames": { + "type": "string" + }, + "additionalProperties": { + "$ref": "#/$defs/__schema0" + } + }, + { + "type": "array", + "items": { + "$ref": "#/$defs/__schema0" + } + } + ] + } + } }, "McpUiHostContext": { "$schema": "https://json-schema.org/draft/2020-12/schema", @@ -1359,7 +1379,9 @@ "propertyNames": { "type": "string" }, - "additionalProperties": {} + "additionalProperties": { + "$ref": "#/$defs/__schema0" + } }, "required": { "type": "array", @@ -1374,25 +1396,10 @@ "outputSchema": { "type": "object", "properties": { - "type": { - "type": "string", - "const": "object" - }, - "properties": { - "type": "object", - "propertyNames": { - "type": "string" - }, - "additionalProperties": {} - }, - "required": { - "type": "array", - "items": { - "type": "string" - } + "$schema": { + "type": "string" } }, - "required": ["type"], "additionalProperties": {} }, "annotations": { @@ -2044,7 +2051,40 @@ "additionalProperties": false } }, - "additionalProperties": {} + "additionalProperties": {}, + "$defs": { + "__schema0": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "number" + }, + { + "type": "boolean" + }, + { + "type": "null" + }, + { + "type": "object", + "propertyNames": { + "type": "string" + }, + "additionalProperties": { + "$ref": "#/$defs/__schema0" + } + }, + { + "type": "array", + "items": { + "$ref": "#/$defs/__schema0" + } + } + ] + } + } }, "McpUiHostCss": { "$schema": "https://json-schema.org/draft/2020-12/schema", @@ -2942,7 +2982,9 @@ "propertyNames": { "type": "string" }, - "additionalProperties": {} + "additionalProperties": { + "$ref": "#/$defs/__schema0" + } }, "required": { "type": "array", @@ -2957,25 +2999,10 @@ "outputSchema": { "type": "object", "properties": { - "type": { - "type": "string", - "const": "object" - }, - "properties": { - "type": "object", - "propertyNames": { - "type": "string" - }, - "additionalProperties": {} - }, - "required": { - "type": "array", - "items": { - "type": "string" - } + "$schema": { + "type": "string" } }, - "required": ["type"], "additionalProperties": {} }, "annotations": { @@ -3637,7 +3664,40 @@ "hostCapabilities", "hostContext" ], - "additionalProperties": {} + "additionalProperties": {}, + "$defs": { + "__schema0": { + "anyOf": [ + { + "type": "string" + }, + { + "type": "number" + }, + { + "type": "boolean" + }, + { + "type": "null" + }, + { + "type": "object", + "propertyNames": { + "type": "string" + }, + "additionalProperties": { + "$ref": "#/$defs/__schema0" + } + }, + { + "type": "array", + "items": { + "$ref": "#/$defs/__schema0" + } + } + ] + } + } }, "McpUiInitializedNotification": { "$schema": "https://json-schema.org/draft/2020-12/schema", @@ -5669,13 +5729,7 @@ ] } }, - "structuredContent": { - "type": "object", - "propertyNames": { - "type": "string" - }, - "additionalProperties": {} - }, + "structuredContent": {}, "isError": { "type": "boolean" } diff --git a/src/generated/schema.ts b/src/generated/schema.ts index 4368737..341c7b4 100644 --- a/src/generated/schema.ts +++ b/src/generated/schema.ts @@ -10,7 +10,7 @@ import { RequestIdSchema, ResourceLinkSchema, ToolSchema, -} from "@modelcontextprotocol/sdk/types.js"; +} from "@modelcontextprotocol/core"; /** * @description Color theme preference for the host environment. diff --git a/src/message-transport.ts b/src/message-transport.ts index 9d19543..9483540 100644 --- a/src/message-transport.ts +++ b/src/message-transport.ts @@ -1,12 +1,10 @@ -import { +import { JSONRPCMessageSchema } from "@modelcontextprotocol/core"; +import type { JSONRPCMessage, - JSONRPCMessageSchema, MessageExtraInfo, -} from "@modelcontextprotocol/sdk/types.js"; -import { Transport, TransportSendOptions, -} from "@modelcontextprotocol/sdk/shared/transport.js"; +} from "@modelcontextprotocol/client"; import { TOOL_INPUT_PARTIAL_METHOD } from "./spec.types"; /** diff --git a/src/react/useApp.tsx b/src/react/useApp.tsx index 6189246..0e64a74 100644 --- a/src/react/useApp.tsx +++ b/src/react/useApp.tsx @@ -1,6 +1,5 @@ import { useEffect, useState } from "react"; -import { Implementation } from "@modelcontextprotocol/sdk/types.js"; -import { Client } from "@modelcontextprotocol/sdk/client"; +import type { Implementation } from "@modelcontextprotocol/client"; import { App, AppOptions, diff --git a/src/server/index.ts b/src/server/index.ts index c90514a..b8b3ad0 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -40,24 +40,17 @@ import { McpUiClientCapabilities, } from "../app.js"; import type { - BaseToolCallback, + ClientCapabilities, McpServer, + ReadResourceResult, RegisteredTool, ResourceMetadata, + StandardSchemaWithJSON, + ToolAnnotations, ToolCallback, ReadResourceCallback as _ReadResourceCallback, RegisteredResource, -} from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { - AnySchema, - ZodRawShapeCompat, -} from "@modelcontextprotocol/sdk/server/zod-compat.js"; -import type { StandardSchemaWithJSON } from "../standard-schema"; -import type { - ClientCapabilities, - ReadResourceResult, - ToolAnnotations, -} from "@modelcontextprotocol/sdk/types.js"; +} from "@modelcontextprotocol/server"; // Re-exports for convenience export { RESOURCE_URI_META_KEY, RESOURCE_MIME_TYPE }; @@ -70,8 +63,8 @@ export type { ResourceMetadata, ToolCallback }; export interface ToolConfig { title?: string; description?: string; - inputSchema?: ZodRawShapeCompat | StandardSchemaWithJSON; - outputSchema?: ZodRawShapeCompat | StandardSchemaWithJSON; + inputSchema?: StandardSchemaWithJSON; + outputSchema?: StandardSchemaWithJSON; annotations?: ToolAnnotations; _meta?: Record; } @@ -215,9 +208,8 @@ export interface McpUiAppResourceConfig extends ResourceMetadata { * @see {@link registerAppResource `registerAppResource`} to register the HTML resource referenced by the tool */ export function registerAppTool< - OutputArgs extends ZodRawShapeCompat | StandardSchemaWithJSON, - InputArgs extends undefined | ZodRawShapeCompat | StandardSchemaWithJSON = - undefined, + OutputArgs extends StandardSchemaWithJSON, + InputArgs extends StandardSchemaWithJSON | undefined = undefined, >( server: Pick, name: string, @@ -225,15 +217,7 @@ export function registerAppTool< inputSchema?: InputArgs; outputSchema?: OutputArgs; }, - // The widened constraint signals the v2 API shape, but NOTE: McpServer in - // sdk@1.x still calls zod internals at runtime, so non-zod schemas will fail - // here until we depend on sdk v2. Zod (which all current callers use) is - // unaffected. The cast below bridges the 1.x type signature. - cb: ToolCallback< - InputArgs extends undefined | ZodRawShapeCompat | AnySchema - ? InputArgs - : AnySchema - >, + cb: ToolCallback, ): RegisteredTool { // Normalize metadata for backward compatibility: // - If _meta.ui.resourceUri is set, also set the legacy flat key @@ -251,14 +235,7 @@ export function registerAppTool< normalizedMeta = { ...meta, ui: { ...uiMeta, resourceUri: legacyUri } }; } - // Cast bridges the widened StandardSchemaWithJSON constraint to the - // sdk@1.x zod-typed signature. Drops once we depend on sdk v2. - // eslint-disable-next-line @typescript-eslint/no-explicit-any - return server.registerTool( - name, - { ...config, _meta: normalizedMeta } as any, - cb as any, - ); + return server.registerTool(name, { ...config, _meta: normalizedMeta }, cb); } export type McpUiReadResourceResult = ReadResourceResult & { @@ -418,10 +395,6 @@ export const EXTENSION_ID = "io.modelcontextprotocol/ui"; * This helper retrieves the capability object from the `extensions` field * where MCP Apps advertises its support. * - * Note: The `clientCapabilities` parameter extends the SDK's `ClientCapabilities` - * type with an `extensions` field (pending SEP-1724). Once `extensions` is added - * to the SDK, this can use `ClientCapabilities` directly. - * * @param clientCapabilities - The client capabilities from the initialize response * @returns The MCP Apps capability settings, or `undefined` if not supported * @@ -456,10 +429,7 @@ export const EXTENSION_ID = "io.modelcontextprotocol/ui"; * ``` */ export function getUiCapability( - clientCapabilities: - | (ClientCapabilities & { extensions?: Record }) - | null - | undefined, + clientCapabilities: ClientCapabilities | null | undefined, ): McpUiClientCapabilities | undefined { if (!clientCapabilities) { return undefined; diff --git a/src/spec.types.ts b/src/spec.types.ts index 7a8b337..8b03de9 100644 --- a/src/spec.types.ts +++ b/src/spec.types.ts @@ -18,7 +18,7 @@ import type { RequestId, ResourceLink, Tool, -} from "@modelcontextprotocol/sdk/types.js"; +} from "@modelcontextprotocol/client"; /** * Current protocol version supported by this SDK. @@ -163,8 +163,8 @@ export interface McpUiOpenLinkResult { /** @description True if the host failed to open the URL (e.g., due to security policy). */ isError?: boolean; /** - * Index signature required for MCP SDK `Protocol` class compatibility. - * Note: The generated schema uses passthrough() to allow additional properties. + * Additional result properties are preserved for protocol extensibility. + * The generated schema uses passthrough() to allow them. */ [key: string]: unknown; } @@ -195,8 +195,8 @@ export interface McpUiDownloadFileResult { /** @description True if the download failed (e.g., user cancelled or host denied). */ isError?: boolean; /** - * Index signature required for MCP SDK `Protocol` class compatibility. - * Note: The generated schema uses passthrough() to allow additional properties. + * Additional result properties are preserved for protocol extensibility. + * The generated schema uses passthrough() to allow them. */ [key: string]: unknown; } @@ -223,8 +223,8 @@ export interface McpUiMessageResult { /** @description True if the host rejected or failed to deliver the message. */ isError?: boolean; /** - * Index signature required for MCP SDK `Protocol` class compatibility. - * Note: The generated schema uses passthrough() to allow additional properties. + * Additional result properties are preserved for protocol extensibility. + * The generated schema uses passthrough() to allow them. */ [key: string]: unknown; } @@ -454,7 +454,7 @@ export interface McpUiResourceTeardownRequest { */ export interface McpUiResourceTeardownResult { /** - * Index signature required for MCP SDK `Protocol` class compatibility. + * Additional result properties are preserved for protocol extensibility. */ [key: string]: unknown; } @@ -577,8 +577,8 @@ export interface McpUiInitializeResult { /** @description Rich context about the host environment. */ hostContext: McpUiHostContext; /** - * Index signature required for MCP SDK `Protocol` class compatibility. - * Note: The generated schema uses passthrough() to allow additional properties. + * Additional result properties are preserved for protocol extensibility. + * The generated schema uses passthrough() to allow them. */ [key: string]: unknown; } @@ -752,7 +752,7 @@ export interface McpUiRequestDisplayModeResult { /** @description The display mode that was actually set. May differ from requested if not supported. */ mode: McpUiDisplayMode; /** - * Index signature required for MCP SDK `Protocol` class compatibility. + * Additional result properties are preserved for protocol extensibility. * Note: The generated schema uses passthrough() to allow additional properties. */ [key: string]: unknown; diff --git a/src/types.ts b/src/types.ts index 7fc6b71..655812b 100644 --- a/src/types.ts +++ b/src/types.ts @@ -69,33 +69,6 @@ export { type McpUiClientCapabilities, } from "./spec.types.js"; -// Import types needed for protocol type unions (not re-exported, just used internally) -import type { - McpUiInitializeRequest, - McpUiOpenLinkRequest, - McpUiDownloadFileRequest, - McpUiMessageRequest, - McpUiUpdateModelContextRequest, - McpUiResourceTeardownRequest, - McpUiRequestDisplayModeRequest, - McpUiHostContextChangedNotification, - McpUiToolInputNotification, - McpUiToolInputPartialNotification, - McpUiToolResultNotification, - McpUiToolCancelledNotification, - McpUiSandboxResourceReadyNotification, - McpUiInitializedNotification, - McpUiSizeChangedNotification, - McpUiSandboxProxyReadyNotification, - McpUiRequestTeardownNotification, - McpUiInitializeResult, - McpUiOpenLinkResult, - McpUiDownloadFileResult, - McpUiMessageResult, - McpUiResourceTeardownResult, - McpUiRequestDisplayModeResult, -} from "./spec.types.js"; - // Re-export all schemas from generated/schema.ts (already PascalCase) export { McpUiThemeSchema, @@ -135,106 +108,3 @@ export { McpUiToolVisibilitySchema, McpUiToolMetaSchema, } from "./generated/schema.js"; - -// Re-export SDK types used in protocol type unions -import { - CallToolRequest, - CallToolResult, - CreateMessageRequest, - CreateMessageResult, - CreateMessageResultWithTools, - EmptyResult, - ListPromptsRequest, - ListPromptsResult, - ListResourcesRequest, - ListResourcesResult, - ListResourceTemplatesRequest, - ListResourceTemplatesResult, - ListToolsRequest, - ListToolsResult, - LoggingMessageNotification, - PingRequest, - PromptListChangedNotification, - ReadResourceRequest, - ReadResourceResult, - ResourceListChangedNotification, - ToolListChangedNotification, -} from "@modelcontextprotocol/sdk/types.js"; - -/** - * All request types in the MCP Apps protocol. - * - * Includes: - * - MCP UI requests (initialize, open-link, message, resource-teardown, request-display-mode) - * - MCP server requests forwarded from the app (tools/call, tools/list, resources/list, - * resources/templates/list, resources/read, prompts/list) - * - MCP client requests forwarded to the host (sampling/createMessage) - * - Protocol requests (ping) - */ -export type AppRequest = - | McpUiInitializeRequest - | McpUiOpenLinkRequest - | McpUiDownloadFileRequest - | McpUiMessageRequest - | McpUiUpdateModelContextRequest - | McpUiResourceTeardownRequest - | McpUiRequestDisplayModeRequest - | CallToolRequest - | ListToolsRequest - | ListResourcesRequest - | ListResourceTemplatesRequest - | ReadResourceRequest - | ListPromptsRequest - | CreateMessageRequest - | PingRequest; - -/** - * All notification types in the MCP Apps protocol. - * - * Host to app: - * - Tool lifecycle (input, input-partial, result, cancelled) - * - Host context changes - * - MCP list changes (tools, resources, prompts) - * - Sandbox resource ready - * - * App to host: - * - Initialized, size-changed, sandbox-proxy-ready, request-teardown - * - Logging messages - */ -export type AppNotification = - // Sent to app - | McpUiHostContextChangedNotification - | McpUiToolInputNotification - | McpUiToolInputPartialNotification - | McpUiToolResultNotification - | McpUiToolCancelledNotification - | McpUiSandboxResourceReadyNotification - | ToolListChangedNotification - | ResourceListChangedNotification - | PromptListChangedNotification - // Received from app - | McpUiInitializedNotification - | McpUiSizeChangedNotification - | McpUiSandboxProxyReadyNotification - | McpUiRequestTeardownNotification - | LoggingMessageNotification; - -/** - * All result types in the MCP Apps protocol. - */ -export type AppResult = - | McpUiInitializeResult - | McpUiOpenLinkResult - | McpUiDownloadFileResult - | McpUiMessageResult - | McpUiResourceTeardownResult - | McpUiRequestDisplayModeResult - | CallToolResult - | ListToolsResult - | ListResourcesResult - | ListResourceTemplatesResult - | ReadResourceResult - | ListPromptsResult - | CreateMessageResult - | CreateMessageResultWithTools - | EmptyResult; From f94cb38b0b6453476cb45e3edccf606505be7708 Mon Sep 17 00:00:00 2001 From: Andrew Khadder Date: Tue, 14 Jul 2026 17:07:30 -0700 Subject: [PATCH 073/107] refactor: finish MCP SDK v2 migration --- AGENTS.md | 8 +- README.md | 10 +- build.bun.ts | 12 +- docs/authorization.md | 2 +- docs/migrate_from_openai_apps.md | 8 +- docs/overview.md | 8 +- docs/patterns.md | 11 +- docs/patterns.tsx | 17 +-- docs/quickstart.md | 19 +-- docs/testing-mcp-apps.md | 4 + examples/basic-host/package.json | 2 +- examples/basic-host/src/implementation.ts | 12 +- examples/basic-host/src/index.tsx | 2 +- examples/basic-server-preact/main.ts | 10 +- examples/basic-server-preact/package.json | 3 +- examples/basic-server-preact/server.ts | 10 +- examples/basic-server-preact/src/mcp-app.tsx | 2 +- examples/basic-server-react/main.ts | 10 +- examples/basic-server-react/package.json | 3 +- examples/basic-server-react/server.ts | 10 +- examples/basic-server-react/src/mcp-app.tsx | 2 +- examples/basic-server-solid/main.ts | 10 +- examples/basic-server-solid/package.json | 3 +- examples/basic-server-solid/server.ts | 10 +- examples/basic-server-solid/src/mcp-app.tsx | 2 +- examples/basic-server-svelte/main.ts | 10 +- examples/basic-server-svelte/package.json | 3 +- examples/basic-server-svelte/server.ts | 10 +- examples/basic-server-svelte/src/App.svelte | 2 +- examples/basic-server-vanillajs/main.ts | 10 +- examples/basic-server-vanillajs/package.json | 3 +- examples/basic-server-vanillajs/server.ts | 9 +- .../basic-server-vanillajs/src/mcp-app.ts | 2 +- examples/basic-server-vue/main.ts | 10 +- examples/basic-server-vue/package.json | 3 +- examples/basic-server-vue/server.ts | 10 +- examples/basic-server-vue/src/App.vue | 2 +- examples/budget-allocator-server/main.ts | 10 +- examples/budget-allocator-server/package.json | 2 +- examples/budget-allocator-server/server.ts | 12 +- examples/cohort-heatmap-server/main.ts | 10 +- examples/cohort-heatmap-server/package.json | 2 +- examples/cohort-heatmap-server/server.ts | 10 +- examples/customer-segmentation-server/main.ts | 10 +- .../customer-segmentation-server/package.json | 2 +- .../customer-segmentation-server/server.ts | 14 +-- examples/debug-server/main.ts | 10 +- examples/debug-server/package.json | 2 +- examples/debug-server/server.ts | 10 +- examples/integration-server/main.ts | 10 +- examples/integration-server/package.json | 3 +- examples/integration-server/server.ts | 14 +-- examples/integration-server/src/mcp-app.tsx | 2 +- examples/lazy-auth-server/package.json | 5 +- examples/lazy-auth-server/server.ts | 29 ++--- examples/map-server/main.ts | 10 +- examples/map-server/package.json | 3 +- examples/map-server/server.ts | 18 +-- examples/map-server/src/mcp-app.ts | 2 +- examples/pdf-server/main.ts | 10 +- examples/pdf-server/package.json | 3 +- examples/pdf-server/server.test.ts | 3 +- examples/pdf-server/server.ts | 57 +++++---- examples/pdf-server/src/mcp-app.ts | 6 +- examples/qr-server/package.json | 3 +- examples/quickstart/main.ts | 10 +- examples/quickstart/package.json | 5 +- examples/quickstart/server.ts | 5 +- examples/say-server/package.json | 3 +- examples/scenario-modeler-server/main.ts | 10 +- examples/scenario-modeler-server/package.json | 2 +- examples/scenario-modeler-server/server.ts | 14 +-- examples/shadertoy-server/main.ts | 10 +- examples/shadertoy-server/package.json | 2 +- examples/shadertoy-server/server.ts | 10 +- examples/sheet-music-server/main.ts | 10 +- examples/sheet-music-server/package.json | 2 +- examples/sheet-music-server/server.ts | 10 +- examples/system-monitor-server/main.ts | 10 +- examples/system-monitor-server/package.json | 2 +- examples/system-monitor-server/server.ts | 18 +-- examples/threejs-server/main.ts | 10 +- examples/threejs-server/package.json | 3 +- examples/threejs-server/server.ts | 12 +- .../threejs-server/src/mcp-app-wrapper.tsx | 2 +- examples/transcript-server/main.ts | 10 +- examples/transcript-server/package.json | 2 +- examples/transcript-server/server.ts | 13 +- examples/video-resource-server/main.ts | 10 +- examples/video-resource-server/package.json | 3 +- examples/video-resource-server/server.ts | 12 +- examples/video-resource-server/src/mcp-app.ts | 2 +- examples/wiki-explorer-server/main.ts | 10 +- examples/wiki-explorer-server/package.json | 3 +- examples/wiki-explorer-server/server.ts | 10 +- examples/wiki-explorer-server/src/mcp-app.ts | 2 +- package-lock.json | 95 +++++++++------ package.json | 2 - .../skills/add-app-to-server/SKILL.md | 111 +++++++++++------- .../mcp-apps/skills/convert-web-app/SKILL.md | 57 +++++---- .../mcp-apps/skills/create-mcp-app/SKILL.md | 5 +- scripts/typedoc-plugin-base-sdk-links.mjs | 16 +++ src/app-bridge.examples.ts | 36 +++--- src/app-bridge.ts | 62 +++++----- src/app.examples.ts | 9 +- src/app.ts | 19 ++- src/events.ts | 5 +- src/message-transport.test.ts | 2 +- src/server/index.examples.ts | 11 +- src/server/index.test.ts | 2 +- src/server/index.ts | 4 +- typedoc.config.mjs | 25 ++++ 112 files changed, 684 insertions(+), 540 deletions(-) create mode 100644 scripts/typedoc-plugin-base-sdk-links.mjs diff --git a/AGENTS.md b/AGENTS.md index 6bfc8cd..f850aa3 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -60,8 +60,8 @@ rm -fR package-lock.json node_modules && \ ### Key Source Files -- `src/app.ts` - `App` class extends MCP Protocol, handles guest initialization, tool calls, messaging -- `src/app-bridge.ts` - `AppBridge` class for hosts, proxies MCP requests, sends tool input/results to guests +- `src/app.ts` - `App` subclasses the base MCP SDK `Client`, handles View initialization, tool calls, and messaging +- `src/app-bridge.ts` - `AppBridge` subclasses the base MCP SDK `Server` for the inner iframe channel and proxies through a separate outer `Client` - `src/server/index.ts` - Helpers for MCP servers to register tools/resources with UI metadata - `src/types.ts` - Protocol types re-exported from `spec.types.ts` and Zod schemas from `generated/schema.ts` (auto-generated during build) - `src/message-transport.ts` - `PostMessageTransport` for iframe communication @@ -70,12 +70,12 @@ rm -fR package-lock.json node_modules && \ ### Protocol Flow ``` -View (App) <--PostMessageTransport--> Host (AppBridge) <--MCP Client--> MCP Server +View (App/Client) <--PostMessageTransport--> Host (AppBridge/Server) <--separate MCP Client--> MCP Server ``` 1. Host creates iframe with view HTML 2. View creates `App` instance and calls `connect()` with `PostMessageTransport` -3. View sends `ui/initialize` request, receives host capabilities and context +3. View and Host complete the temporary inner base MCP handshake, then the View sends `ui/initialize` and receives authoritative Apps capabilities and context 4. Host sends `sendToolInput()` with tool arguments after initialization 5. View can call server tools via `app.callServerTool()` or send messages via `app.sendMessage()` 6. Host sends `sendToolResult()` when tool execution completes diff --git a/README.md b/README.md index 2fd89ff..b3f68e7 100644 --- a/README.md +++ b/README.md @@ -122,9 +122,17 @@ resources: ## Getting Started ```bash -npm install -S @modelcontextprotocol/ext-apps +npm install -S @modelcontextprotocol/ext-apps \ + @modelcontextprotocol/client@2.0.0-beta.4 \ + @modelcontextprotocol/server@2.0.0-beta.4 \ + @modelcontextprotocol/core@2.0.0-beta.4 \ + zod@^4.2.0 ``` +This release uses the split base MCP SDK v2 packages. Install all three at the +exact published beta.4 version so the Apps SDK and your MCP client/server share +one compatible protocol implementation. + **New here?** Start with the [Quickstart Guide](https://apps.extensions.modelcontextprotocol.io/api/documents/Quickstart.html) to build your first MCP App. diff --git a/build.bun.ts b/build.bun.ts index a129d5d..837279f 100644 --- a/build.bun.ts +++ b/build.bun.ts @@ -31,9 +31,15 @@ function buildJs( }); } -// zod is a peerDependency — keep it external so consumers share a single -// zod instance (instanceof ZodError / schema.extend() break with duplicate copies). -const PEER_EXTERNALS = ["@modelcontextprotocol/sdk", "zod"]; +// Peer dependencies stay external in the standard entry points so consumers +// share one base MCP SDK and Zod instance. The *-with-deps entry points keep +// bundling these dependencies for standalone browser use. +const PEER_EXTERNALS = [ + "@modelcontextprotocol/client", + "@modelcontextprotocol/core", + "@modelcontextprotocol/server", + "zod", +]; await Promise.all([ buildJs("src/app.ts", { diff --git a/docs/authorization.md b/docs/authorization.md index 59fc26c..df7adc6 100644 --- a/docs/authorization.md +++ b/docs/authorization.md @@ -150,7 +150,7 @@ registerAppTool( "get_account_balance", { description: "Get account balance", - inputSchema: { accountId: z.string() }, + inputSchema: z.object({ accountId: z.string() }), }, async ({ accountId }) => { if (!authInfo) { diff --git a/docs/migrate_from_openai_apps.md b/docs/migrate_from_openai_apps.md index d91281b..22d5d9f 100644 --- a/docs/migrate_from_openai_apps.md +++ b/docs/migrate_from_openai_apps.md @@ -66,7 +66,7 @@ The server-side changes involve updating metadata structure and using helper fun #### Before (OpenAI) ```typescript -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; +import { McpServer } from "@modelcontextprotocol/server"; import { z } from "zod"; function createServer() { @@ -78,7 +78,7 @@ function createServer() { { title: "Shopping Cart", description: "Display the user's shopping cart", - inputSchema: { userId: z.string() }, + inputSchema: z.object({ userId: z.string() }), annotations: { readOnlyHint: true }, _meta: { "openai/outputTemplate": "ui://view/cart.html", @@ -126,7 +126,7 @@ function createServer() { #### After (MCP Apps) ```typescript -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; +import { McpServer } from "@modelcontextprotocol/server"; import { registerAppTool, registerAppResource, @@ -144,7 +144,7 @@ function createServer() { { title: "Shopping Cart", description: "Display the user's shopping cart", - inputSchema: { userId: z.string() }, + inputSchema: z.object({ userId: z.string() }), annotations: { readOnlyHint: true }, _meta: { ui: { resourceUri: "ui://view/cart.html" } }, }, diff --git a/docs/overview.md b/docs/overview.md index 28f5b23..317ab43 100644 --- a/docs/overview.md +++ b/docs/overview.md @@ -56,7 +56,11 @@ flowchart LR - **Host** — The chat client (e.g., Claude Desktop) that connects to servers, embeds Views in iframes, and proxies communication between them. - **View** — The UI running inside a sandboxed iframe. It receives tool data from the Host and can call server tools or send messages back to the chat. -The View acts as an MCP client, the Host acts as a proxy, and the Server is a standard MCP server. +The View's `App` subclasses the base MCP SDK `Client`. The Host's `AppBridge` +subclasses the base MCP SDK `Server` for the inner iframe channel, while a +separate outer `Client` connects the Host to the actual MCP Server. Keeping +those two connections separate prevents iframe negotiation and capabilities +from leaking into the server connection. ## Lifecycle @@ -93,7 +97,7 @@ sequenceDiagram ``` 1. **Discovery** — The Host learns about tools and their UI resources when connecting to the server. -2. **Initialization** — When a UI tool is called, the Host renders the iframe. The View sends `ui/initialize` and receives host context (theme, capabilities, container dimensions). This handshake ensures the View is ready before receiving data. +2. **Initialization** — When a UI tool is called, the Host renders the iframe. The SDK first completes its temporary inner base MCP handshake, then the View sends `ui/initialize` and receives host context (theme, capabilities, container dimensions). `ui/initialize` remains authoritative for Apps capabilities and identity, and `ui/notifications/initialized` remains the public View-ready signal. 3. **Data delivery** — The Host sends tool arguments and, once available, tool results to the View. Results include both `content` (text for the model's context) and optionally `structuredContent` (data optimized for UI rendering). This separation lets servers provide rich data to the UI without bloating the model's context. 4. **Interactive phase** — The user interacts with the View. The View can call tools, send messages, or update context. 5. **Teardown** — Before unmounting, the Host notifies the View so it can save state or release resources. diff --git a/docs/patterns.md b/docs/patterns.md index 87a6d82..884de26 100644 --- a/docs/patterns.md +++ b/docs/patterns.md @@ -19,7 +19,7 @@ registerAppTool( "update-quantity", { description: "Update item quantity in cart", - inputSchema: { itemId: z.string(), quantity: z.number() }, + inputSchema: z.object({ itemId: z.string(), quantity: z.number() }), _meta: { ui: { resourceUri: "ui://shop/cart.html", @@ -127,14 +127,14 @@ registerAppTool( { title: "Read Data Bytes", description: "Load binary data in chunks", - inputSchema: { + inputSchema: z.object({ id: z.string().describe("Resource identifier"), offset: z.number().min(0).default(0).describe("Byte offset"), byteCount: z .number() .default(MAX_CHUNK_BYTES) .describe("Bytes to read"), - }, + }), outputSchema: DataChunkSchema, // Hidden from model - only callable by the App _meta: { ui: { visibility: ["app"] } }, @@ -281,10 +281,7 @@ server.registerResource( ```ts source="./patterns.tsx#binaryBlobResourceClient" -const result = await app.request( - { method: "resources/read", params: { uri: `video://${videoId}` } }, - ReadResourceResultSchema, -); +const result = await app.readServerResource({ uri: `video://${videoId}` }); const content = result.contents[0]; if (!content || !("blob" in content)) { diff --git a/docs/patterns.tsx b/docs/patterns.tsx index 6b87692..bb9eaa4 100644 --- a/docs/patterns.tsx +++ b/docs/patterns.tsx @@ -17,16 +17,12 @@ import { randomUUID } from "node:crypto"; import type { CallToolResult, ReadResourceResult, -} from "@modelcontextprotocol/sdk/types.js"; -import { ReadResourceResultSchema } from "@modelcontextprotocol/sdk/types.js"; +} from "@modelcontextprotocol/server"; import type { McpUiHostContext } from "../src/types.js"; import { useEffect, useState } from "react"; import { useApp } from "../src/react/index.js"; import { registerAppTool } from "../src/server/index.js"; -import { - McpServer, - ResourceTemplate, -} from "@modelcontextprotocol/sdk/server/mcp.js"; +import { McpServer, ResourceTemplate } from "@modelcontextprotocol/server"; import { z } from "zod"; /** @@ -117,14 +113,14 @@ function chunkedDataServer(server: McpServer) { { title: "Read Data Bytes", description: "Load binary data in chunks", - inputSchema: { + inputSchema: z.object({ id: z.string().describe("Resource identifier"), offset: z.number().min(0).default(0).describe("Byte offset"), byteCount: z .number() .default(MAX_CHUNK_BYTES) .describe("Bytes to read"), - }, + }), outputSchema: DataChunkSchema, // Hidden from model - only callable by the App _meta: { ui: { visibility: ["app"] } }, @@ -252,10 +248,7 @@ function binaryBlobResourceServer( */ async function binaryBlobResourceClient(app: App, videoId: string) { //#region binaryBlobResourceClient - const result = await app.request( - { method: "resources/read", params: { uri: `video://${videoId}` } }, - ReadResourceResultSchema, - ); + const result = await app.readServerResource({ uri: `video://${videoId}` }); const content = result.contents[0]; if (!content || !("blob" in content)) { diff --git a/docs/quickstart.md b/docs/quickstart.md index 3e00796..eb6b096 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -21,7 +21,7 @@ This tutorial assumes you've built an MCP server before and are comfortable with We'll use the [MCP TypeScript SDK](https://github.com/modelcontextprotocol/typescript-sdk) to build the server. -You'll also need Node.js 18+. +You'll also need Node.js 20+. ## 1. Set up the project @@ -37,7 +37,7 @@ Install the dependencies you'll need: ```bash npm init -y -npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/sdk express cors +npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.4 @modelcontextprotocol/core@2.0.0-beta.4 @modelcontextprotocol/server@2.0.0-beta.4 @modelcontextprotocol/node@2.0.0-beta.4 @modelcontextprotocol/express@2.0.0-beta.4 zod@^4.2.0 express cors npm install -D typescript vite vite-plugin-singlefile @types/express @types/cors @types/node tsx concurrently cross-env ``` @@ -178,9 +178,10 @@ import { registerAppTool, RESOURCE_MIME_TYPE, } from "@modelcontextprotocol/ext-apps/server"; -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; +import { McpServer } from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; +import { z } from "zod"; const DIST_DIR = path.join(import.meta.dirname, "dist"); @@ -205,7 +206,7 @@ export function createServer(): McpServer { { title: "Get Time", description: "Returns the current server time.", - inputSchema: {}, + inputSchema: z.object({}), _meta: { ui: { resourceUri } }, // Links this tool to its UI resource }, async () => { @@ -240,10 +241,10 @@ export function createServer(): McpServer { ```ts source="../examples/quickstart/main.ts" -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -263,7 +264,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/docs/testing-mcp-apps.md b/docs/testing-mcp-apps.md index df1396c..e5d82b5 100644 --- a/docs/testing-mcp-apps.md +++ b/docs/testing-mcp-apps.md @@ -28,6 +28,10 @@ The [`basic-host`](https://github.com/modelcontextprotocol/ext-apps/tree/main/ex cd examples/basic-host ``` + The root install runs the package build, including type-checking the + documentation snippets against the exact base MCP SDK beta.4 packages. Do + not bypass a failed build before testing the host. + 2. Start basic-host, pointing it to your MCP server: ```bash diff --git a/examples/basic-host/package.json b/examples/basic-host/package.json index 1b45dcf..583d2ff 100644 --- a/examples/basic-host/package.json +++ b/examples/basic-host/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/client": "2.0.0-beta.4", "react": "^19.2.0", "react-dom": "^19.2.0", "zod": "^4.1.13" diff --git a/examples/basic-host/src/implementation.ts b/examples/basic-host/src/implementation.ts index 31e3698..5f680ff 100644 --- a/examples/basic-host/src/implementation.ts +++ b/examples/basic-host/src/implementation.ts @@ -1,8 +1,12 @@ import { RESOURCE_MIME_TYPE, getToolUiResourceUri, type McpUiSandboxProxyReadyNotification, AppBridge, PostMessageTransport, type McpUiResourceCsp, type McpUiResourcePermissions, buildAllowAttribute, type McpUiUpdateModelContextRequest, type McpUiMessageRequest } from "@modelcontextprotocol/ext-apps/app-bridge"; -import { Client } from "@modelcontextprotocol/sdk/client/index.js"; -import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js"; -import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js"; -import type { CallToolResult, Resource, Tool } from "@modelcontextprotocol/sdk/types.js"; +import { + Client, + SSEClientTransport, + StreamableHTTPClientTransport, + type CallToolResult, + type Resource, + type Tool, +} from "@modelcontextprotocol/client"; import { getTheme, onThemeChange } from "./theme"; import { HOST_STYLE_VARIABLES } from "./host-styles"; diff --git a/examples/basic-host/src/index.tsx b/examples/basic-host/src/index.tsx index 3d488a7..00c0d52 100644 --- a/examples/basic-host/src/index.tsx +++ b/examples/basic-host/src/index.tsx @@ -1,5 +1,5 @@ import { getToolUiResourceUri, McpUiToolMetaSchema } from "@modelcontextprotocol/ext-apps/app-bridge"; -import type { Tool } from "@modelcontextprotocol/sdk/types.js"; +import type { Tool } from "@modelcontextprotocol/client"; import { Component, type ErrorInfo, type ReactNode, StrictMode, Suspense, use, useEffect, useMemo, useRef, useState } from "react"; import { createRoot } from "react-dom/client"; import { callTool, connectToServer, hasAppHtml, initializeApp, loadSandboxProxy, log, newAppBridge, type ServerInfo, type ToolCallInfo, type ModelContext, type AppMessage } from "./implementation"; diff --git a/examples/basic-server-preact/main.ts b/examples/basic-server-preact/main.ts index 7642632..ffdff52 100644 --- a/examples/basic-server-preact/main.ts +++ b/examples/basic-server-preact/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/basic-server-preact/package.json b/examples/basic-server-preact/package.json index 1a63232..0187827 100644 --- a/examples/basic-server-preact/package.json +++ b/examples/basic-server-preact/package.json @@ -24,10 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "preact": "^10.0.0", diff --git a/examples/basic-server-preact/server.ts b/examples/basic-server-preact/server.ts index bf14ea5..dfec94a 100644 --- a/examples/basic-server-preact/server.ts +++ b/examples/basic-server-preact/server.ts @@ -1,8 +1,12 @@ -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; import { registerAppTool, registerAppResource, RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/server"; +import { z } from "zod"; // Works both from source (server.ts) and compiled (dist/server.js) const DIST_DIR = import.meta.filename.endsWith(".ts") ? path.join(import.meta.dirname, "dist") @@ -28,7 +32,7 @@ export function createServer(): McpServer { { title: "Get Time", description: "Returns the current server time as an ISO 8601 string.", - inputSchema: {}, + inputSchema: z.object({}), _meta: { ui: { resourceUri } }, // Links this tool to its UI resource }, async (): Promise => { diff --git a/examples/basic-server-preact/src/mcp-app.tsx b/examples/basic-server-preact/src/mcp-app.tsx index a8bdc68..351a8ec 100644 --- a/examples/basic-server-preact/src/mcp-app.tsx +++ b/examples/basic-server-preact/src/mcp-app.tsx @@ -8,7 +8,7 @@ import { applyHostStyleVariables, type McpUiHostContext, } from "@modelcontextprotocol/ext-apps"; -import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js"; +import type { CallToolResult } from "@modelcontextprotocol/client"; import { useCallback, useEffect, useState } from "preact/hooks"; import { render } from "preact"; import styles from "./mcp-app.module.css"; diff --git a/examples/basic-server-react/main.ts b/examples/basic-server-react/main.ts index ec187b6..21c5e18 100644 --- a/examples/basic-server-react/main.ts +++ b/examples/basic-server-react/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/basic-server-react/package.json b/examples/basic-server-react/package.json index 821fc96..dae7665 100644 --- a/examples/basic-server-react/package.json +++ b/examples/basic-server-react/package.json @@ -34,10 +34,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", diff --git a/examples/basic-server-react/server.ts b/examples/basic-server-react/server.ts index 23f6dda..d77c908 100644 --- a/examples/basic-server-react/server.ts +++ b/examples/basic-server-react/server.ts @@ -1,8 +1,12 @@ import { registerAppResource, registerAppTool, RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/server"; -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; +import { z } from "zod"; // Works both from source (server.ts) and compiled (dist/server.js) const DIST_DIR = import.meta.filename.endsWith(".ts") @@ -29,7 +33,7 @@ export function createServer(): McpServer { { title: "Get Time", description: "Returns the current server time as an ISO 8601 string.", - inputSchema: {}, + inputSchema: z.object({}), _meta: { ui: { resourceUri } }, // Links this tool to its UI resource }, async (): Promise => { diff --git a/examples/basic-server-react/src/mcp-app.tsx b/examples/basic-server-react/src/mcp-app.tsx index 6bb5540..2b5fbef 100644 --- a/examples/basic-server-react/src/mcp-app.tsx +++ b/examples/basic-server-react/src/mcp-app.tsx @@ -3,7 +3,7 @@ */ import type { App, McpUiHostContext } from "@modelcontextprotocol/ext-apps"; import { useApp } from "@modelcontextprotocol/ext-apps/react"; -import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js"; +import type { CallToolResult } from "@modelcontextprotocol/client"; import { StrictMode, useCallback, useEffect, useState } from "react"; import { createRoot } from "react-dom/client"; import styles from "./mcp-app.module.css"; diff --git a/examples/basic-server-solid/main.ts b/examples/basic-server-solid/main.ts index c8d9de2..095ef8d 100644 --- a/examples/basic-server-solid/main.ts +++ b/examples/basic-server-solid/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/basic-server-solid/package.json b/examples/basic-server-solid/package.json index 997bc60..5d91407 100644 --- a/examples/basic-server-solid/package.json +++ b/examples/basic-server-solid/package.json @@ -24,10 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "solid-js": "1.9.10", diff --git a/examples/basic-server-solid/server.ts b/examples/basic-server-solid/server.ts index 2ed2d93..addb522 100644 --- a/examples/basic-server-solid/server.ts +++ b/examples/basic-server-solid/server.ts @@ -1,8 +1,12 @@ -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; import { registerAppTool, registerAppResource, RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/server"; +import { z } from "zod"; // Works both from source (server.ts) and compiled (dist/server.js) const DIST_DIR = import.meta.filename.endsWith(".ts") ? path.join(import.meta.dirname, "dist") @@ -28,7 +32,7 @@ export function createServer(): McpServer { { title: "Get Time", description: "Returns the current server time as an ISO 8601 string.", - inputSchema: {}, + inputSchema: z.object({}), _meta: { ui: { resourceUri } }, // Links this tool to its UI resource }, async (): Promise => { diff --git a/examples/basic-server-solid/src/mcp-app.tsx b/examples/basic-server-solid/src/mcp-app.tsx index 66d47f3..2d78b7b 100644 --- a/examples/basic-server-solid/src/mcp-app.tsx +++ b/examples/basic-server-solid/src/mcp-app.tsx @@ -8,7 +8,7 @@ import { applyHostStyleVariables, type McpUiHostContext, } from "@modelcontextprotocol/ext-apps"; -import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js"; +import type { CallToolResult } from "@modelcontextprotocol/client"; import { createEffect, createSignal, onMount, Show } from "solid-js"; import { render } from "solid-js/web"; import styles from "./mcp-app.module.css"; diff --git a/examples/basic-server-svelte/main.ts b/examples/basic-server-svelte/main.ts index 6c50a25..734ec0c 100644 --- a/examples/basic-server-svelte/main.ts +++ b/examples/basic-server-svelte/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/basic-server-svelte/package.json b/examples/basic-server-svelte/package.json index e83772f..18bf7ab 100644 --- a/examples/basic-server-svelte/package.json +++ b/examples/basic-server-svelte/package.json @@ -24,10 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "svelte": "^5.0.0", diff --git a/examples/basic-server-svelte/server.ts b/examples/basic-server-svelte/server.ts index da603ca..9414285 100644 --- a/examples/basic-server-svelte/server.ts +++ b/examples/basic-server-svelte/server.ts @@ -1,8 +1,12 @@ -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; import { registerAppTool, registerAppResource, RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/server"; +import { z } from "zod"; // Works both from source (server.ts) and compiled (dist/server.js) const DIST_DIR = import.meta.filename.endsWith(".ts") ? path.join(import.meta.dirname, "dist") @@ -28,7 +32,7 @@ export function createServer(): McpServer { { title: "Get Time", description: "Returns the current server time as an ISO 8601 string.", - inputSchema: {}, + inputSchema: z.object({}), _meta: { ui: { resourceUri } }, // Links this tool to its UI resource }, async (): Promise => { diff --git a/examples/basic-server-svelte/src/App.svelte b/examples/basic-server-svelte/src/App.svelte index fde128d..cabcc31 100644 --- a/examples/basic-server-svelte/src/App.svelte +++ b/examples/basic-server-svelte/src/App.svelte @@ -7,7 +7,7 @@ import { applyHostStyleVariables, type McpUiHostContext, } from "@modelcontextprotocol/ext-apps"; -import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js"; +import type { CallToolResult } from "@modelcontextprotocol/client"; function extractTime(result: CallToolResult): string { const { text } = result.content?.find((c) => c.type === "text")!; diff --git a/examples/basic-server-vanillajs/main.ts b/examples/basic-server-vanillajs/main.ts index 286fa34..4de7331 100644 --- a/examples/basic-server-vanillajs/main.ts +++ b/examples/basic-server-vanillajs/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/basic-server-vanillajs/package.json b/examples/basic-server-vanillajs/package.json index 64e1758..6bb75af 100644 --- a/examples/basic-server-vanillajs/package.json +++ b/examples/basic-server-vanillajs/package.json @@ -24,10 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/basic-server-vanillajs/server.ts b/examples/basic-server-vanillajs/server.ts index 5b2daf7..693d861 100644 --- a/examples/basic-server-vanillajs/server.ts +++ b/examples/basic-server-vanillajs/server.ts @@ -1,6 +1,9 @@ import { registerAppResource, registerAppTool, RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/server"; -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; import { z } from "zod"; @@ -29,7 +32,7 @@ export function createServer(): McpServer { { title: "Get Time", description: "Returns the current server time as an ISO 8601 string.", - inputSchema: {}, + inputSchema: z.object({}), outputSchema: z.object({ time: z.string(), }), diff --git a/examples/basic-server-vanillajs/src/mcp-app.ts b/examples/basic-server-vanillajs/src/mcp-app.ts index c3168c2..6b5084a 100644 --- a/examples/basic-server-vanillajs/src/mcp-app.ts +++ b/examples/basic-server-vanillajs/src/mcp-app.ts @@ -8,7 +8,7 @@ import { applyHostStyleVariables, type McpUiHostContext, } from "@modelcontextprotocol/ext-apps"; -import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js"; +import type { CallToolResult } from "@modelcontextprotocol/client"; import "./global.css"; import "./mcp-app.css"; diff --git a/examples/basic-server-vue/main.ts b/examples/basic-server-vue/main.ts index 669a071..d774269 100644 --- a/examples/basic-server-vue/main.ts +++ b/examples/basic-server-vue/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/basic-server-vue/package.json b/examples/basic-server-vue/package.json index e4cd0b4..3b34aa6 100644 --- a/examples/basic-server-vue/package.json +++ b/examples/basic-server-vue/package.json @@ -24,10 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "vue": "^3.5.0", diff --git a/examples/basic-server-vue/server.ts b/examples/basic-server-vue/server.ts index 5aa72de..9adb911 100644 --- a/examples/basic-server-vue/server.ts +++ b/examples/basic-server-vue/server.ts @@ -1,8 +1,12 @@ -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { CallToolResult, ReadResourceResult } from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; import { registerAppTool, registerAppResource, RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/server"; +import { z } from "zod"; // Works both from source (server.ts) and compiled (dist/server.js) const DIST_DIR = import.meta.filename.endsWith(".ts") ? path.join(import.meta.dirname, "dist") @@ -28,7 +32,7 @@ export function createServer(): McpServer { { title: "Get Time", description: "Returns the current server time as an ISO 8601 string.", - inputSchema: {}, + inputSchema: z.object({}), _meta: { ui: { resourceUri } }, // Links this tool to its UI resource }, async (): Promise => { diff --git a/examples/basic-server-vue/src/App.vue b/examples/basic-server-vue/src/App.vue index 196ad64..a45c262 100644 --- a/examples/basic-server-vue/src/App.vue +++ b/examples/basic-server-vue/src/App.vue @@ -7,7 +7,7 @@ import { applyHostStyleVariables, type McpUiHostContext, } from "@modelcontextprotocol/ext-apps"; -import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js"; +import type { CallToolResult } from "@modelcontextprotocol/client"; function extractTime(result: CallToolResult): string { const { text } = result.content?.find((c) => c.type === "text")!; diff --git a/examples/budget-allocator-server/main.ts b/examples/budget-allocator-server/main.ts index cc488f0..02c03cb 100644 --- a/examples/budget-allocator-server/main.ts +++ b/examples/budget-allocator-server/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/budget-allocator-server/package.json b/examples/budget-allocator-server/package.json index 8af1a6c..5d4fe8e 100644 --- a/examples/budget-allocator-server/package.json +++ b/examples/budget-allocator-server/package.json @@ -29,7 +29,7 @@ "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/budget-allocator-server/server.ts b/examples/budget-allocator-server/server.ts index 04fba11..01f5dbf 100755 --- a/examples/budget-allocator-server/server.ts +++ b/examples/budget-allocator-server/server.ts @@ -4,11 +4,11 @@ * Provides budget configuration, 24 months of historical allocation data, * and industry benchmarks by company stage. */ -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { - CallToolResult, - ReadResourceResult, -} from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; import { z } from "zod"; @@ -270,7 +270,7 @@ export function createServer(): McpServer { title: "Get Budget Data", description: "Returns budget configuration with 24 months of historical allocations and industry benchmarks by company stage. The widget is interactive and exposes tools for reading/modifying allocations, adjusting budgets, and comparing against industry benchmarks.", - inputSchema: {}, + inputSchema: z.object({}), outputSchema: BudgetDataResponseSchema, _meta: { ui: { resourceUri } }, }, diff --git a/examples/cohort-heatmap-server/main.ts b/examples/cohort-heatmap-server/main.ts index d59903b..8b33603 100644 --- a/examples/cohort-heatmap-server/main.ts +++ b/examples/cohort-heatmap-server/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/cohort-heatmap-server/package.json b/examples/cohort-heatmap-server/package.json index 99e9d9f..c54040a 100644 --- a/examples/cohort-heatmap-server/package.json +++ b/examples/cohort-heatmap-server/package.json @@ -29,7 +29,7 @@ "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", diff --git a/examples/cohort-heatmap-server/server.ts b/examples/cohort-heatmap-server/server.ts index 6d07144..129e2dc 100644 --- a/examples/cohort-heatmap-server/server.ts +++ b/examples/cohort-heatmap-server/server.ts @@ -1,5 +1,7 @@ -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { ReadResourceResult } from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; import { z } from "zod"; @@ -178,8 +180,8 @@ export function createServer(): McpServer { title: "Get Cohort Retention Data", description: "Returns cohort retention heatmap data showing customer retention over time by signup month", - inputSchema: GetCohortDataInputSchema.shape, - outputSchema: CohortDataSchema.shape, + inputSchema: GetCohortDataInputSchema, + outputSchema: CohortDataSchema, _meta: { ui: { resourceUri } }, }, async ({ metric, periodType, cohortCount, maxPeriods }) => { diff --git a/examples/customer-segmentation-server/main.ts b/examples/customer-segmentation-server/main.ts index 130076c..c788757 100644 --- a/examples/customer-segmentation-server/main.ts +++ b/examples/customer-segmentation-server/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/customer-segmentation-server/package.json b/examples/customer-segmentation-server/package.json index 59e3eb1..ef14b32 100644 --- a/examples/customer-segmentation-server/package.json +++ b/examples/customer-segmentation-server/package.json @@ -29,7 +29,7 @@ "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/customer-segmentation-server/server.ts b/examples/customer-segmentation-server/server.ts index 244415d..7cc1c1f 100644 --- a/examples/customer-segmentation-server/server.ts +++ b/examples/customer-segmentation-server/server.ts @@ -1,8 +1,8 @@ -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { - CallToolResult, - ReadResourceResult, -} from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; import { z } from "zod"; @@ -100,8 +100,8 @@ export function createServer(): McpServer { title: "Get Customer Data", description: "Returns customer data with segment information for visualization. Optionally filter by segment.", - inputSchema: GetCustomerDataInputSchema.shape, - outputSchema: GetCustomerDataOutputSchema.shape, + inputSchema: GetCustomerDataInputSchema, + outputSchema: GetCustomerDataOutputSchema, _meta: { ui: { resourceUri } }, }, async ({ segment }): Promise => { diff --git a/examples/debug-server/main.ts b/examples/debug-server/main.ts index 3c89a97..9fb0825 100644 --- a/examples/debug-server/main.ts +++ b/examples/debug-server/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/debug-server/package.json b/examples/debug-server/package.json index 02e9fbf..0e3f508 100644 --- a/examples/debug-server/package.json +++ b/examples/debug-server/package.json @@ -37,7 +37,7 @@ "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "zod": "^4.1.13" }, "devDependencies": { diff --git a/examples/debug-server/server.ts b/examples/debug-server/server.ts index fd3452a..068f94d 100644 --- a/examples/debug-server/server.ts +++ b/examples/debug-server/server.ts @@ -3,11 +3,11 @@ import { registerAppTool, RESOURCE_MIME_TYPE, } from "@modelcontextprotocol/ext-apps/server"; -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { - CallToolResult, - ReadResourceResult, -} from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import { appendFileSync } from "node:fs"; import path from "node:path"; diff --git a/examples/integration-server/main.ts b/examples/integration-server/main.ts index c45787e..9a42842 100644 --- a/examples/integration-server/main.ts +++ b/examples/integration-server/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/integration-server/package.json b/examples/integration-server/package.json index 3f9d8bb..56fc8ed 100644 --- a/examples/integration-server/package.json +++ b/examples/integration-server/package.json @@ -15,10 +15,11 @@ "serve": "bun --watch main.ts" }, "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", diff --git a/examples/integration-server/server.ts b/examples/integration-server/server.ts index e44689d..346f4f7 100644 --- a/examples/integration-server/server.ts +++ b/examples/integration-server/server.ts @@ -3,11 +3,11 @@ import { registerAppTool, RESOURCE_MIME_TYPE, } from "@modelcontextprotocol/ext-apps/server"; -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { - CallToolResult, - ReadResourceResult, -} from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; import { z } from "zod"; @@ -33,7 +33,7 @@ export function createServer(): McpServer { { title: "Get Time", description: "Returns the current server time.", - inputSchema: {}, + inputSchema: z.object({}), outputSchema: z.object({ time: z.string(), }), @@ -72,7 +72,7 @@ export function createServer(): McpServer { ); // Sample downloadable resource — used to demo ResourceLink in ui/download-file - server.resource( + server.registerResource( SAMPLE_DOWNLOAD_URI, SAMPLE_DOWNLOAD_URI, { diff --git a/examples/integration-server/src/mcp-app.tsx b/examples/integration-server/src/mcp-app.tsx index 7f0b18c..281a356 100644 --- a/examples/integration-server/src/mcp-app.tsx +++ b/examples/integration-server/src/mcp-app.tsx @@ -3,7 +3,7 @@ */ import type { App, McpUiHostContext } from "@modelcontextprotocol/ext-apps"; import { useApp } from "@modelcontextprotocol/ext-apps/react"; -import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js"; +import type { CallToolResult } from "@modelcontextprotocol/client"; import { StrictMode, useCallback, useEffect, useState } from "react"; import { createRoot } from "react-dom/client"; import styles from "./mcp-app.module.css"; diff --git a/examples/lazy-auth-server/package.json b/examples/lazy-auth-server/package.json index 086f20a..6aef3e1 100644 --- a/examples/lazy-auth-server/package.json +++ b/examples/lazy-auth-server/package.json @@ -24,10 +24,11 @@ "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", - "jose": "^6.0.0" + "jose": "^6.0.0", + "zod": "^4.1.13" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/lazy-auth-server/server.ts b/examples/lazy-auth-server/server.ts index fe7b1ac..01535eb 100644 --- a/examples/lazy-auth-server/server.ts +++ b/examples/lazy-auth-server/server.ts @@ -21,13 +21,13 @@ import { registerAppTool, RESOURCE_MIME_TYPE, } from "@modelcontextprotocol/ext-apps/server"; -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; -import { UrlElicitationRequiredError } from "@modelcontextprotocol/sdk/types.js"; -import type { - CallToolResult, - ReadResourceResult, -} from "@modelcontextprotocol/sdk/types.js"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import { + McpServer, + UrlElicitationRequiredError, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import cors from "cors"; import express, { type Express, type Request, type Response } from "express"; import { SignJWT, jwtVerify } from "jose"; @@ -35,6 +35,7 @@ import crypto from "node:crypto"; import fs from "node:fs/promises"; import path from "node:path"; import { fileURLToPath } from "node:url"; +import { z } from "zod"; // Works both from source (server.ts) and compiled (dist/server.js). Derived // from import.meta.url rather than import.meta.filename/dirname, which are @@ -605,7 +606,7 @@ export function createServer(authInfo?: AuthInfo, req?: Request): McpServer { title: "Show Auth Button", description: "Public tool: shows a button that triggers the protected get_secret tool.", - inputSchema: {}, + inputSchema: z.object({}), _meta: { ui: { resourceUri: buttonUri } }, }, async (): Promise => ({ @@ -638,7 +639,7 @@ export function createServer(authInfo?: AuthInfo, req?: Request): McpServer { title: "Get Secret", description: "Protected tool: returns secret data. Requires authentication.", - inputSchema: {}, + inputSchema: z.object({}), _meta: { ui: { resourceUri: secretUri } }, }, async (): Promise => { @@ -682,7 +683,7 @@ export function createServer(authInfo?: AuthInfo, req?: Request): McpServer { title: "Revoke Auth Token", description: "Protected tool: revokes the caller's entire auth session (access + refresh token).", - inputSchema: {}, + inputSchema: z.object({}), }, async (): Promise => { if (!authInfo) { @@ -720,7 +721,7 @@ export function createServer(authInfo?: AuthInfo, req?: Request): McpServer { title: "Elicit URL (session-callback)", description: "URL elicitation via elicitInput. Blocks until the client accepts; sends ElicitCompleteNotification before returning.", - inputSchema: {}, + inputSchema: z.object({}), }, async (_args, extra): Promise => { const eid = crypto.randomUUID(); @@ -735,7 +736,7 @@ export function createServer(authInfo?: AuthInfo, req?: Request): McpServer { message: "Please open this URL to continue.", elicitationId: eid, }, - { relatedRequestId: extra.requestId, timeout: 300_000 }, + { relatedRequestId: extra.mcpReq.id, timeout: 300_000 }, ); // Send completion notification before returning — lands on the same SSE // stream as this tool response. For Streamable HTTP this is the ONLY @@ -767,7 +768,7 @@ export function createServer(authInfo?: AuthInfo, req?: Request): McpServer { title: "Elicit by -32042 Error", description: "Throws UrlElicitationRequiredError (-32042). Client must open the URL, then retry. On retry, if the last-issued elicitationId was completed, sends ElicitCompleteNotification and succeeds.", - inputSchema: {}, + inputSchema: z.object({}), }, async (): Promise => { // Retry path: check if the user completed the elicitation we last issued. @@ -1031,7 +1032,7 @@ export function createApp(): Express { } const server = createServer(authInfo, req); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); res.on("close", () => { diff --git a/examples/map-server/main.ts b/examples/map-server/main.ts index f91f57b..8038394 100644 --- a/examples/map-server/main.ts +++ b/examples/map-server/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/map-server/package.json b/examples/map-server/package.json index b0c629a..a3639ce 100644 --- a/examples/map-server/package.json +++ b/examples/map-server/package.json @@ -26,10 +26,11 @@ "serve": "bun --watch main.ts" }, "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/map-server/server.ts b/examples/map-server/server.ts index 10125a6..5767d46 100644 --- a/examples/map-server/server.ts +++ b/examples/map-server/server.ts @@ -5,11 +5,11 @@ * - geocode: Search for places using OpenStreetMap Nominatim * - show-map: Display an interactive 3D globe at a given location */ -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { - CallToolResult, - ReadResourceResult, -} from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; import { z } from "zod"; @@ -148,7 +148,7 @@ export function createServer(): McpServer { title: "Show Map", description: "Display an interactive world map zoomed to a specific bounding box. Use the GeoCode tool to find the bounding box of a location. The widget is interactive and exposes tools for navigation (fly to locations) and querying the current view.", - inputSchema: { + inputSchema: z.object({ west: z .number() .optional() @@ -173,7 +173,7 @@ export function createServer(): McpServer { .string() .optional() .describe("Optional label to display on the map"), - }, + }), _meta: { ui: { resourceUri } }, }, async ({ west, south, east, north, label }): Promise => ({ @@ -196,13 +196,13 @@ export function createServer(): McpServer { title: "Geocode", description: "Search for places using OpenStreetMap. Returns coordinates and bounding boxes for up to 5 matches.", - inputSchema: { + inputSchema: z.object({ query: z .string() .describe( "Place name or address to search for (e.g., 'Paris', 'Golden Gate Bridge', '1600 Pennsylvania Ave')", ), - }, + }), }, async ({ query }): Promise => { try { diff --git a/examples/map-server/src/mcp-app.ts b/examples/map-server/src/mcp-app.ts index 39d7c2a..d3090c7 100644 --- a/examples/map-server/src/mcp-app.ts +++ b/examples/map-server/src/mcp-app.ts @@ -6,7 +6,7 @@ * a navigate-to tool for the host to control navigation. */ import { App } from "@modelcontextprotocol/ext-apps"; -import type { ContentBlock } from "@modelcontextprotocol/sdk/spec.types.js"; +import type { ContentBlock } from "@modelcontextprotocol/client"; import { z } from "zod"; // TypeScript declaration for Cesium loaded from CDN diff --git a/examples/pdf-server/main.ts b/examples/pdf-server/main.ts index 1ff848a..bb7b57f 100644 --- a/examples/pdf-server/main.ts +++ b/examples/pdf-server/main.ts @@ -6,10 +6,10 @@ import fs from "node:fs"; import path from "node:path"; -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import cors from "cors"; import type { Request, Response } from "express"; import { @@ -39,7 +39,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/pdf-server/package.json b/examples/pdf-server/package.json index aeb52c7..a7eb4bb 100644 --- a/examples/pdf-server/package.json +++ b/examples/pdf-server/package.json @@ -26,10 +26,11 @@ }, "dependencies": { "@cantoo/pdf-lib": "^2.6.5", + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "pdfjs-dist": "^5.0.0", diff --git a/examples/pdf-server/server.test.ts b/examples/pdf-server/server.test.ts index 33a03f1..0b2a5eb 100644 --- a/examples/pdf-server/server.test.ts +++ b/examples/pdf-server/server.test.ts @@ -2,8 +2,7 @@ import { describe, it, expect, beforeEach, afterEach, spyOn } from "bun:test"; import fs from "node:fs"; import os from "node:os"; import path from "node:path"; -import { Client } from "@modelcontextprotocol/sdk/client/index.js"; -import { InMemoryTransport } from "@modelcontextprotocol/sdk/inMemory.js"; +import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { getDocument } from "pdfjs-dist/legacy/build/pdf.mjs"; import { PDFDocument } from "@cantoo/pdf-lib"; import { makeRandomJpeg } from "../../tests/helpers/range-counting-server"; diff --git a/examples/pdf-server/server.ts b/examples/pdf-server/server.ts index 93dedfd..e67cd47 100644 --- a/examples/pdf-server/server.ts +++ b/examples/pdf-server/server.ts @@ -13,18 +13,19 @@ import { randomUUID } from "crypto"; import fs from "node:fs"; import path from "node:path"; -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { Server } from "@modelcontextprotocol/sdk/server/index.js"; import { registerAppResource, registerAppTool, RESOURCE_MIME_TYPE, } from "@modelcontextprotocol/ext-apps/server"; import { - RootsListChangedNotificationSchema, + McpServer, type CallToolResult, + type ElicitResult, + type PrimitiveSchemaDefinition, type ReadResourceResult, -} from "@modelcontextprotocol/sdk/types.js"; + type Server, +} from "@modelcontextprotocol/server"; // Stub DOMMatrix/ImageData/Path2D before pdfjs-dist loads — its legacy // build instantiates DOMMatrix at module scope and the @napi-rs/canvas // polyfill is unreliable under npx. See ./pdfjs-polyfill.ts for details. @@ -62,10 +63,6 @@ class FetchStandardFontDataFactory { return new Uint8Array(await res.arrayBuffer()); } } -import type { - PrimitiveSchemaDefinition, - ElicitResult, -} from "@modelcontextprotocol/sdk/types.js"; import { z } from "zod"; // ============================================================================= @@ -1282,7 +1279,7 @@ export function createServer(options: CreateServerOptions = {}): McpServer { refreshRoots(server.server); }; server.server.setNotificationHandler( - RootsListChangedNotificationSchema, + "notifications/roots/list_changed", async () => { await refreshRoots(server.server); }, @@ -1292,10 +1289,12 @@ export function createServer(options: CreateServerOptions = {}): McpServer { const { readPdfRange } = sharedPdfCache; // Tool: list_pdfs - List available PDFs - server.tool( + server.registerTool( "list_pdfs", - "List available PDFs that can be displayed", - {}, + { + description: "List available PDFs that can be displayed", + inputSchema: z.object({}), + }, async (): Promise => { const seen = new Set(); const localFiles: string[] = []; @@ -1377,7 +1376,7 @@ export function createServer(options: CreateServerOptions = {}): McpServer { title: "Read PDF Bytes", description: "Read a range of bytes from a PDF (max 512KB per request). The model should NOT call this tool directly.", - inputSchema: { + inputSchema: z.object({ url: z.string().describe("PDF URL or local file path"), offset: z.number().min(0).default(0).describe("Byte offset"), byteCount: z @@ -1386,7 +1385,7 @@ export function createServer(options: CreateServerOptions = {}): McpServer { .max(MAX_CHUNK_BYTES) .default(MAX_CHUNK_BYTES) .describe("Bytes to read"), - }, + }), outputSchema: z.object({ url: z.string(), bytes: z.string().describe("Base64 encoded bytes"), @@ -1473,7 +1472,7 @@ Returns a viewUUID in structuredContent. Pass it to \`interact\`: Accepts local files (use list_pdfs), client MCP root directories, or any HTTPS URL. Set \`elicit_form_inputs\` to true to prompt the user to fill form fields before display.`, - inputSchema: { + inputSchema: z.object({ url: z .string() .default(DEFAULT_PDF) @@ -1489,7 +1488,7 @@ Set \`elicit_form_inputs\` to true to prompt the user to fill form fields before "If true and the PDF has form fields, prompt the user to fill them before displaying", ), }), - }, + }), outputSchema: z.object({ viewUUID: z .string() @@ -2426,7 +2425,7 @@ Example — add a signature image and a stamp, then screenshot to verify: **FORMS** — fill_form: fill fields with \`fields\` array of {name, value}. **SAVE** — save_as: write the annotated PDF (annotations + form values) to a file. Pass \`path\` (absolute path or file://) for a new location, or omit \`path\` to overwrite the original. Set \`overwrite: true\` to replace an existing file (always required when omitting \`path\`).`, - inputSchema: { + inputSchema: z.object({ viewUUID: z .string() .describe( @@ -2523,7 +2522,7 @@ Example — add a signature image and a stamp, then screenshot to verify: .describe( "Array of commands to execute sequentially. More efficient than separate calls. Tip: end with get_pages+getScreenshots to verify changes.", ), - }, + }), }, async ( { @@ -2600,7 +2599,7 @@ Example — add a signature image and a stamp, then screenshot to verify: const result = await processInteractCommand( uuid, commandList[i], - extra.signal, + extra.mcpReq.signal, ); if (result.isError) { const errText = result.content @@ -2657,7 +2656,7 @@ Example — add a signature image and a stamp, then screenshot to verify: title: "Submit Page Data", description: "Submit rendered page data for a get_pages request (used by viewer). The model should NOT call this tool directly.", - inputSchema: { + inputSchema: z.object({ requestId: z .string() .describe("The request ID from the get_pages command"), @@ -2670,7 +2669,7 @@ Example — add a signature image and a stamp, then screenshot to verify: }), ) .describe("Page data entries"), - }, + }), _meta: { ui: { visibility: ["app"] } }, }, async ({ requestId, pages }): Promise => { @@ -2700,7 +2699,7 @@ Example — add a signature image and a stamp, then screenshot to verify: title: "Submit Save Data", description: "Submit annotated PDF bytes for a save_as request (used by viewer). The model should NOT call this tool directly.", - inputSchema: { + inputSchema: z.object({ requestId: z .string() .describe("The request ID from the save_as command"), @@ -2709,7 +2708,7 @@ Example — add a signature image and a stamp, then screenshot to verify: .string() .optional() .describe("Error message if the viewer failed to build bytes"), - }, + }), _meta: { ui: { visibility: ["app"] } }, }, async ({ requestId, data, error }): Promise => { @@ -2739,7 +2738,7 @@ Example — add a signature image and a stamp, then screenshot to verify: title: "Submit Viewer State", description: "Submit a viewer-state snapshot for a get_viewer_state request (used by viewer). The model should NOT call this tool directly.", - inputSchema: { + inputSchema: z.object({ requestId: z .string() .describe("The request ID from the get_viewer_state command"), @@ -2751,7 +2750,7 @@ Example — add a signature image and a stamp, then screenshot to verify: .string() .optional() .describe("Error message if the viewer failed to read state"), - }, + }), _meta: { ui: { visibility: ["app"] } }, }, async ({ requestId, state, error }): Promise => { @@ -2781,9 +2780,9 @@ Example — add a signature image and a stamp, then screenshot to verify: title: "Poll PDF Commands", description: "Poll for pending commands for a PDF viewer. The model should NOT call this tool directly.", - inputSchema: { + inputSchema: z.object({ viewUUID: z.string().describe("The viewUUID of the PDF viewer"), - }, + }), _meta: { ui: { visibility: ["app"] } }, }, async ({ viewUUID: uuid }): Promise => { @@ -2828,10 +2827,10 @@ Example — add a signature image and a stamp, then screenshot to verify: title: "Save PDF", description: "Save annotated PDF bytes back to a local file. The model should NOT call this tool directly — use interact with action: save_as instead.", - inputSchema: { + inputSchema: z.object({ url: z.string().describe("Original PDF URL or local file path"), data: z.string().describe("Base64-encoded PDF bytes"), - }, + }), outputSchema: z.object({ filePath: z.string(), mtimeMs: z.number(), diff --git a/examples/pdf-server/src/mcp-app.ts b/examples/pdf-server/src/mcp-app.ts index a953e24..45e0c74 100644 --- a/examples/pdf-server/src/mcp-app.ts +++ b/examples/pdf-server/src/mcp-app.ts @@ -12,8 +12,10 @@ import { applyDocumentTheme, applyHostStyleVariables, } from "@modelcontextprotocol/ext-apps"; -import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js"; -import type { ContentBlock } from "@modelcontextprotocol/sdk/spec.types.js"; +import type { + CallToolResult, + ContentBlock, +} from "@modelcontextprotocol/client"; import { z } from "zod"; import * as pdfjsLib from "pdfjs-dist"; import { AnnotationLayer, AnnotationMode, TextLayer } from "pdfjs-dist"; diff --git a/examples/qr-server/package.json b/examples/qr-server/package.json index a5cbf5b..cb4e010 100644 --- a/examples/qr-server/package.json +++ b/examples/qr-server/package.json @@ -8,7 +8,6 @@ "build": "echo 'No build step needed for Python server'" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/sdk": "^1.29.0" + "@modelcontextprotocol/ext-apps": "^1.7.0" } } diff --git a/examples/quickstart/main.ts b/examples/quickstart/main.ts index 06895a4..7f370a8 100644 --- a/examples/quickstart/main.ts +++ b/examples/quickstart/main.ts @@ -1,7 +1,7 @@ -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -21,7 +21,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/quickstart/package.json b/examples/quickstart/package.json index 1003637..f741c6e 100644 --- a/examples/quickstart/package.json +++ b/examples/quickstart/package.json @@ -18,9 +18,10 @@ "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", - "express": "^5.1.0" + "express": "^5.1.0", + "zod": "^4.1.13" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/quickstart/server.ts b/examples/quickstart/server.ts index eb3c3b1..611d0f0 100644 --- a/examples/quickstart/server.ts +++ b/examples/quickstart/server.ts @@ -3,9 +3,10 @@ import { registerAppTool, RESOURCE_MIME_TYPE, } from "@modelcontextprotocol/ext-apps/server"; -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; +import { McpServer } from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; +import { z } from "zod"; const DIST_DIR = path.join(import.meta.dirname, "dist"); @@ -30,7 +31,7 @@ export function createServer(): McpServer { { title: "Get Time", description: "Returns the current server time.", - inputSchema: {}, + inputSchema: z.object({}), _meta: { ui: { resourceUri } }, // Links this tool to its UI resource }, async () => { diff --git a/examples/say-server/package.json b/examples/say-server/package.json index a0076e6..2ebc099 100644 --- a/examples/say-server/package.json +++ b/examples/say-server/package.json @@ -15,7 +15,6 @@ "build": "echo 'No build step needed for Python server'" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/sdk": "^1.29.0" + "@modelcontextprotocol/ext-apps": "^1.7.0" } } diff --git a/examples/scenario-modeler-server/main.ts b/examples/scenario-modeler-server/main.ts index dbd3ab6..cc20e63 100644 --- a/examples/scenario-modeler-server/main.ts +++ b/examples/scenario-modeler-server/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/scenario-modeler-server/package.json b/examples/scenario-modeler-server/package.json index a7e8a9a..63a5d48 100644 --- a/examples/scenario-modeler-server/package.json +++ b/examples/scenario-modeler-server/package.json @@ -29,7 +29,7 @@ "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/scenario-modeler-server/server.ts b/examples/scenario-modeler-server/server.ts index b59851c..c5fa05d 100644 --- a/examples/scenario-modeler-server/server.ts +++ b/examples/scenario-modeler-server/server.ts @@ -3,11 +3,11 @@ import { registerAppResource, registerAppTool, } from "@modelcontextprotocol/ext-apps/server"; -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { - CallToolResult, - ReadResourceResult, -} from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; import { z } from "zod"; @@ -305,8 +305,8 @@ export function createServer(): McpServer { title: "Get Scenario Data", description: "Returns SaaS scenario templates and optionally computes custom projections for given inputs", - inputSchema: GetScenarioDataInputSchema.shape, - outputSchema: GetScenarioDataOutputSchema.shape, + inputSchema: GetScenarioDataInputSchema, + outputSchema: GetScenarioDataOutputSchema, _meta: { ui: { resourceUri } }, }, async (args: { diff --git a/examples/shadertoy-server/main.ts b/examples/shadertoy-server/main.ts index ac8f6ad..7e388f0 100644 --- a/examples/shadertoy-server/main.ts +++ b/examples/shadertoy-server/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/shadertoy-server/package.json b/examples/shadertoy-server/package.json index 0c27501..318f017 100644 --- a/examples/shadertoy-server/package.json +++ b/examples/shadertoy-server/package.json @@ -27,7 +27,7 @@ "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/shadertoy-server/server.ts b/examples/shadertoy-server/server.ts index 5238c40..50c27bc 100644 --- a/examples/shadertoy-server/server.ts +++ b/examples/shadertoy-server/server.ts @@ -3,11 +3,11 @@ import { registerAppTool, RESOURCE_MIME_TYPE, } from "@modelcontextprotocol/ext-apps/server"; -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { - CallToolResult, - ReadResourceResult, -} from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; import { z } from "zod"; diff --git a/examples/sheet-music-server/main.ts b/examples/sheet-music-server/main.ts index 8b143a7..d7bf3a0 100644 --- a/examples/sheet-music-server/main.ts +++ b/examples/sheet-music-server/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/sheet-music-server/package.json b/examples/sheet-music-server/package.json index 6cf175a..10d7c71 100644 --- a/examples/sheet-music-server/package.json +++ b/examples/sheet-music-server/package.json @@ -27,7 +27,7 @@ "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "abcjs": "^6.4.4", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/sheet-music-server/server.ts b/examples/sheet-music-server/server.ts index cfd319b..be7214a 100644 --- a/examples/sheet-music-server/server.ts +++ b/examples/sheet-music-server/server.ts @@ -1,8 +1,8 @@ -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { - CallToolResult, - ReadResourceResult, -} from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; import { z } from "zod"; diff --git a/examples/system-monitor-server/main.ts b/examples/system-monitor-server/main.ts index 365a560..c55c799 100644 --- a/examples/system-monitor-server/main.ts +++ b/examples/system-monitor-server/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/system-monitor-server/package.json b/examples/system-monitor-server/package.json index 760d07f..5bc4a95 100644 --- a/examples/system-monitor-server/package.json +++ b/examples/system-monitor-server/package.json @@ -29,7 +29,7 @@ "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/system-monitor-server/server.ts b/examples/system-monitor-server/server.ts index 8fac5f2..a17bcf6 100644 --- a/examples/system-monitor-server/server.ts +++ b/examples/system-monitor-server/server.ts @@ -3,11 +3,11 @@ import { registerAppResource, registerAppTool, } from "@modelcontextprotocol/ext-apps/server"; -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { - CallToolResult, - ReadResourceResult, -} from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import os from "node:os"; import path from "node:path"; @@ -135,8 +135,8 @@ export function createServer(): McpServer { title: "Get System Info", description: "Returns system information, including hostname, platform, CPU info, and memory.", - inputSchema: {}, - outputSchema: SystemInfoSchema.shape, + inputSchema: z.object({}), + outputSchema: SystemInfoSchema, _meta: { ui: { resourceUri } }, }, (): CallToolResult => { @@ -156,8 +156,8 @@ export function createServer(): McpServer { title: "Poll System Stats", description: "Returns dynamic system metrics for polling: per-core CPU timing, memory usage, and uptime. App-only.", - inputSchema: {}, - outputSchema: PollStatsSchema.shape, + inputSchema: z.object({}), + outputSchema: PollStatsSchema, _meta: { ui: { visibility: ["app"] } }, }, async (): Promise => { diff --git a/examples/threejs-server/main.ts b/examples/threejs-server/main.ts index 13a2084..ef16e26 100644 --- a/examples/threejs-server/main.ts +++ b/examples/threejs-server/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/threejs-server/package.json b/examples/threejs-server/package.json index 9dda288..fb97d33 100644 --- a/examples/threejs-server/package.json +++ b/examples/threejs-server/package.json @@ -26,10 +26,11 @@ "serve": "bun --watch main.ts" }, "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", diff --git a/examples/threejs-server/server.ts b/examples/threejs-server/server.ts index ae320df..0a13c19 100644 --- a/examples/threejs-server/server.ts +++ b/examples/threejs-server/server.ts @@ -8,8 +8,10 @@ import { registerAppResource, registerAppTool, } from "@modelcontextprotocol/ext-apps/server"; -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { ReadResourceResult } from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; import { z } from "zod"; @@ -161,7 +163,7 @@ export function createServer(): McpServer { title: "Show Three.js Scene", description: "Render an interactive 3D scene with custom Three.js code. Supports transparent backgrounds (alpha: true) for seamless host UI integration. Available globals: THREE, OrbitControls, EffectComposer, RenderPass, UnrealBloomPass, canvas, width, height.", - inputSchema: { + inputSchema: z.object({ code: z .string() .default(DEFAULT_THREEJS_CODE) @@ -172,7 +174,7 @@ export function createServer(): McpServer { .positive() .default(400) .describe("Height in pixels"), - }, + }), outputSchema: z.object({ success: z.boolean(), }), @@ -192,7 +194,7 @@ export function createServer(): McpServer { { title: "Learn Three.js", description: "Get documentation and examples for using the Three.js View", - inputSchema: {}, + inputSchema: z.object({}), }, async () => { return { diff --git a/examples/threejs-server/src/mcp-app-wrapper.tsx b/examples/threejs-server/src/mcp-app-wrapper.tsx index 34194b1..44fee0c 100644 --- a/examples/threejs-server/src/mcp-app-wrapper.tsx +++ b/examples/threejs-server/src/mcp-app-wrapper.tsx @@ -6,7 +6,7 @@ */ import type { App, McpUiHostContext } from "@modelcontextprotocol/ext-apps"; import { useApp } from "@modelcontextprotocol/ext-apps/react"; -import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js"; +import type { CallToolResult } from "@modelcontextprotocol/client"; import { StrictMode, useState, useCallback, useEffect, useRef } from "react"; import { createRoot } from "react-dom/client"; import { z } from "zod"; diff --git a/examples/transcript-server/main.ts b/examples/transcript-server/main.ts index 68db8dc..e86ad7c 100644 --- a/examples/transcript-server/main.ts +++ b/examples/transcript-server/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -25,7 +25,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/transcript-server/package.json b/examples/transcript-server/package.json index ce5b737..eea4a80 100644 --- a/examples/transcript-server/package.json +++ b/examples/transcript-server/package.json @@ -27,7 +27,7 @@ "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/transcript-server/server.ts b/examples/transcript-server/server.ts index 56bf88d..863eb29 100644 --- a/examples/transcript-server/server.ts +++ b/examples/transcript-server/server.ts @@ -1,8 +1,8 @@ -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { - CallToolResult, - ReadResourceResult, -} from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; import { @@ -10,6 +10,7 @@ import { registerAppResource, RESOURCE_MIME_TYPE, } from "@modelcontextprotocol/ext-apps/server"; +import { z } from "zod"; // Works both from source (server.ts) and compiled (dist/server.js) const DIST_DIR = import.meta.filename.endsWith(".ts") ? path.join(import.meta.dirname, "dist") @@ -33,7 +34,7 @@ export function createServer(): McpServer { title: "Transcribe Speech", description: "Opens a live speech transcription interface using the Web Speech API.", - inputSchema: {}, + inputSchema: z.object({}), _meta: { ui: { resourceUri } }, }, async (): Promise => { diff --git a/examples/video-resource-server/main.ts b/examples/video-resource-server/main.ts index 082fa5a..1983373 100644 --- a/examples/video-resource-server/main.ts +++ b/examples/video-resource-server/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/video-resource-server/package.json b/examples/video-resource-server/package.json index 605b8de..ea816b9 100644 --- a/examples/video-resource-server/package.json +++ b/examples/video-resource-server/package.json @@ -24,10 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/video-resource-server/server.ts b/examples/video-resource-server/server.ts index 2cb317e..8ae6240 100644 --- a/examples/video-resource-server/server.ts +++ b/examples/video-resource-server/server.ts @@ -12,11 +12,9 @@ import { import { McpServer, ResourceTemplate, -} from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { - CallToolResult, - ReadResourceResult, -} from "@modelcontextprotocol/sdk/types.js"; + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import fs from "node:fs/promises"; import path from "node:path"; import { z } from "zod"; @@ -135,14 +133,14 @@ Available videos: ${Object.entries(VIDEO_LIBRARY) .map(([id, v]) => `- ${id}: ${v.description}`) .join("\n")}`, - inputSchema: { + inputSchema: z.object({ videoId: z .enum(Object.keys(VIDEO_LIBRARY) as [string, ...string[]]) .default("bunny-1mb") .describe( `Video ID to play. Available: ${Object.keys(VIDEO_LIBRARY).join(", ")}`, ), - }, + }), outputSchema: z.object({ videoUri: z.string(), description: z.string(), diff --git a/examples/video-resource-server/src/mcp-app.ts b/examples/video-resource-server/src/mcp-app.ts index 88ed913..2a3f8f9 100644 --- a/examples/video-resource-server/src/mcp-app.ts +++ b/examples/video-resource-server/src/mcp-app.ts @@ -5,7 +5,7 @@ * The video is served as a base64 blob and converted to a data URI for playback. */ import { App, type McpUiHostContext } from "@modelcontextprotocol/ext-apps"; -import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js"; +import type { CallToolResult } from "@modelcontextprotocol/client"; import "./global.css"; import "./mcp-app.css"; diff --git a/examples/wiki-explorer-server/main.ts b/examples/wiki-explorer-server/main.ts index cc7b3a2..bfeeffb 100644 --- a/examples/wiki-explorer-server/main.ts +++ b/examples/wiki-explorer-server/main.ts @@ -4,10 +4,10 @@ * Or: node dist/index.js [--stdio] */ -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; -import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; +import { createMcpExpressApp } from "@modelcontextprotocol/express"; +import type { McpServer } from "@modelcontextprotocol/server"; +import { NodeStreamableHTTPServerTransport } from "@modelcontextprotocol/node"; import cors from "cors"; import type { Request, Response } from "express"; import { createServer } from "./server.js"; @@ -27,7 +27,7 @@ export async function startStreamableHTTPServer( app.all("/mcp", async (req: Request, res: Response) => { const server = createServer(); - const transport = new StreamableHTTPServerTransport({ + const transport = new NodeStreamableHTTPServerTransport({ sessionIdGenerator: undefined, }); diff --git a/examples/wiki-explorer-server/package.json b/examples/wiki-explorer-server/package.json index 62f1de8..bd31d6f 100644 --- a/examples/wiki-explorer-server/package.json +++ b/examples/wiki-explorer-server/package.json @@ -26,10 +26,11 @@ "serve": "bun --watch main.ts" }, "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cheerio": "^1.0.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/wiki-explorer-server/server.ts b/examples/wiki-explorer-server/server.ts index 59d5e18..8bc4eb7 100644 --- a/examples/wiki-explorer-server/server.ts +++ b/examples/wiki-explorer-server/server.ts @@ -3,11 +3,11 @@ import { registerAppResource, registerAppTool, } from "@modelcontextprotocol/ext-apps/server"; -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import type { - CallToolResult, - ReadResourceResult, -} from "@modelcontextprotocol/sdk/types.js"; +import { + McpServer, + type CallToolResult, + type ReadResourceResult, +} from "@modelcontextprotocol/server"; import * as cheerio from "cheerio"; import fs from "node:fs/promises"; import path from "node:path"; diff --git a/examples/wiki-explorer-server/src/mcp-app.ts b/examples/wiki-explorer-server/src/mcp-app.ts index 291292d..9833d9c 100644 --- a/examples/wiki-explorer-server/src/mcp-app.ts +++ b/examples/wiki-explorer-server/src/mcp-app.ts @@ -2,7 +2,7 @@ * Wiki Explorer - Force-directed graph visualization of Wikipedia link networks */ import { App, type McpUiHostContext } from "@modelcontextprotocol/ext-apps"; -import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js"; +import type { CallToolResult } from "@modelcontextprotocol/client"; import { z } from "zod"; import { forceCenter, diff --git a/package-lock.json b/package-lock.json index 5514bf1..c1ae34d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,6 @@ "@boneskull/typedoc-plugin-mermaid": "^0.2.0", "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/core": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", "@modelcontextprotocol/server": "2.0.0-beta.4", "@playwright/test": "1.57.0", "@types/bun": "^1.3.2", @@ -55,7 +54,6 @@ "peerDependencies": { "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/core": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", "@modelcontextprotocol/server": "2.0.0-beta.4", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0", @@ -74,8 +72,8 @@ "name": "@modelcontextprotocol/ext-apps-basic-host", "version": "1.7.4", "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/sdk": "^1.29.0", "react": "^19.2.0", "react-dom": "^19.2.0", "zod": "^4.1.13" @@ -100,10 +98,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "preact": "^10.0.0", @@ -129,10 +128,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", @@ -161,10 +161,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "solid-js": "1.9.10", @@ -190,10 +191,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "svelte": "^5.0.0", @@ -219,10 +221,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -246,10 +249,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "vue": "^3.5.0", @@ -278,7 +282,7 @@ "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -306,7 +310,7 @@ "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", @@ -338,7 +342,7 @@ "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -366,7 +370,7 @@ "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "zod": "^4.1.13" }, "bin": { @@ -388,10 +392,11 @@ "examples/integration-server": { "version": "1.7.4", "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", @@ -421,10 +426,11 @@ "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", - "jose": "^6.0.0" + "jose": "^6.0.0", + "zod": "^4.1.13" }, "bin": { "mcp-server-lazy-auth": "dist/index.js" @@ -445,10 +451,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -473,10 +480,11 @@ "license": "MIT", "dependencies": { "@cantoo/pdf-lib": "^2.6.5", + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "pdfjs-dist": "^5.0.0", @@ -500,8 +508,7 @@ "name": "@modelcontextprotocol/server-qr", "version": "1.7.4", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/sdk": "^1.29.0" + "@modelcontextprotocol/ext-apps": "^1.7.0" } }, "examples/quickstart": { @@ -512,9 +519,10 @@ "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", - "express": "^5.1.0" + "express": "^5.1.0", + "zod": "^4.1.13" }, "devDependencies": { "@types/cors": "^2.8.19", @@ -533,8 +541,7 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/sdk": "^1.29.0" + "@modelcontextprotocol/ext-apps": "^1.7.0" } }, "examples/scenario-modeler-server": { @@ -545,7 +552,7 @@ "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -578,7 +585,7 @@ "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -605,7 +612,7 @@ "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "abcjs": "^6.4.4", "cors": "^2.8.5", "express": "^5.1.0", @@ -633,7 +640,7 @@ "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -659,10 +666,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", @@ -696,7 +704,7 @@ "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -721,10 +729,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -748,10 +757,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { + "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/express": "2.0.0-beta.4", "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", + "@modelcontextprotocol/server": "2.0.0-beta.4", "cheerio": "^1.0.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -2230,7 +2240,6 @@ "version": "2.0.0-beta.4", "resolved": "https://registry.npmjs.org/@modelcontextprotocol/client/-/client-2.0.0-beta.4.tgz", "integrity": "sha512-VNHA/UXDk7mCpVl+jOg5B4WMRRD2OEl+it360Lhi6HiCbrIB2f6pZ0cqSDKXQVUtZvqnhdQHzZAM9h8EKWhq/A==", - "dev": true, "license": "MIT", "dependencies": { "@modelcontextprotocol/core": "2.0.0-beta.4", @@ -2336,6 +2345,7 @@ "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.29.0.tgz", "integrity": "sha512-zo37mZA9hJWpULgkRpowewez1y6ML5GsXJPY8FI0tBBCd77HEvza4jDqRKOXgHNn867PVGCyTdzqpz0izu5ZjQ==", "license": "MIT", + "peer": true, "dependencies": { "@hono/node-server": "^1.19.9", "ajv": "^8.17.1", @@ -3995,6 +4005,7 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "license": "MIT", + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -4011,6 +4022,7 @@ "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", "license": "MIT", + "peer": true, "dependencies": { "ajv": "^8.0.0" }, @@ -5546,6 +5558,7 @@ "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.5.2.tgz", "integrity": "sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A==", "license": "MIT", + "peer": true, "dependencies": { "ip-address": "^10.2.0" }, @@ -5563,7 +5576,8 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/fast-uri": { "version": "3.1.2", @@ -5579,7 +5593,8 @@ "url": "https://opencollective.com/fastify" } ], - "license": "BSD-3-Clause" + "license": "BSD-3-Clause", + "peer": true }, "node_modules/fflate": { "version": "0.8.2", @@ -5906,6 +5921,7 @@ "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.23.tgz", "integrity": "sha512-eIaZ9qDgu7XV0pxOCrg7/WhnQ6Ivm22UcxhXx/A3dcbqbbYgBEkc6e/J/s7j2tS96zoB0S9VBdLwQNCWwUo4LA==", "license": "MIT", + "peer": true, "engines": { "node": ">=16.9.0" } @@ -6047,6 +6063,7 @@ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", "license": "MIT", + "peer": true, "engines": { "node": ">= 12" } @@ -6242,13 +6259,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/json-schema-typed": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.2.tgz", "integrity": "sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==", - "license": "BSD-2-Clause" + "license": "BSD-2-Clause", + "peer": true }, "node_modules/json5": { "version": "2.2.3", @@ -7224,6 +7243,7 @@ "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "license": "MIT", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -9350,6 +9370,7 @@ "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.1.tgz", "integrity": "sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA==", "license": "ISC", + "peer": true, "peerDependencies": { "zod": "^3.25 || ^4" } diff --git a/package.json b/package.json index 35bcdf0..ecbf386 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,6 @@ "@boneskull/typedoc-plugin-mermaid": "^0.2.0", "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/core": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", "@modelcontextprotocol/server": "2.0.0-beta.4", "@playwright/test": "1.57.0", "@types/bun": "^1.3.2", @@ -113,7 +112,6 @@ "peerDependencies": { "@modelcontextprotocol/client": "2.0.0-beta.4", "@modelcontextprotocol/core": "2.0.0-beta.4", - "@modelcontextprotocol/sdk": "^1.29.0", "@modelcontextprotocol/server": "2.0.0-beta.4", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0", diff --git a/plugins/mcp-apps/skills/add-app-to-server/SKILL.md b/plugins/mcp-apps/skills/add-app-to-server/SKILL.md index 02d09a4..69e41f8 100644 --- a/plugins/mcp-apps/skills/add-app-to-server/SKILL.md +++ b/plugins/mcp-apps/skills/add-app-to-server/SKILL.md @@ -77,13 +77,15 @@ Before writing any code, analyze the server's existing tools and determine which ## Step 2: Add Dependencies ```bash -npm install @modelcontextprotocol/ext-apps +npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.4 @modelcontextprotocol/core@2.0.0-beta.4 @modelcontextprotocol/server@2.0.0-beta.4 zod@^4.2.0 npm install -D vite vite-plugin-singlefile ``` Plus framework-specific dependencies if needed (e.g., `react`, `react-dom`, `@vitejs/plugin-react` for React). -Use `npm install` to add dependencies rather than manually writing version numbers. This lets npm resolve the latest compatible versions. Never specify version numbers from memory. +Use the exact base MCP SDK prerelease required by ext-apps. Existing servers +that still import `@modelcontextprotocol/sdk` v1 must migrate those imports and +handler schemas before adding the App integration. ## Step 3: Set Up the Build Pipeline @@ -146,10 +148,14 @@ Transform plain MCP tools into App tools with UI. **Before** (plain MCP tool): ```typescript -server.tool("my-tool", { param: z.string() }, async (args) => { - const data = await fetchData(args.param); - return { content: [{ type: "text", text: JSON.stringify(data) }] }; -}); +server.registerTool( + "my-tool", + { inputSchema: z.object({ param: z.string() }) }, + async ({ param }) => { + const data = await fetchData(param); + return { content: [{ type: "text", text: JSON.stringify(data) }] }; + }, +); ``` **After** (App tool with UI): @@ -158,17 +164,22 @@ import { registerAppTool, registerAppResource, RESOURCE_MIME_TYPE } from "@model const resourceUri = "ui://my-tool/mcp-app.html"; -registerAppTool(server, "my-tool", { - description: "Shows data with an interactive UI", - inputSchema: { param: z.string() }, - _meta: { ui: { resourceUri } }, -}, async (args) => { - const data = await fetchData(args.param); - return { - content: [{ type: "text", text: JSON.stringify(data) }], // text fallback for non-UI hosts - structuredContent: { data }, // structured data for the UI - }; -}); +registerAppTool( + server, + "my-tool", + { + description: "Shows data with an interactive UI", + inputSchema: z.object({ param: z.string() }), + _meta: { ui: { resourceUri } }, + }, + async ({ param }) => { + const data = await fetchData(param); + return { + content: [{ type: "text", text: JSON.stringify(data) }], // text fallback for non-UI hosts + structuredContent: { data }, // structured data for the UI + }; + }, +); ``` Key guidance: @@ -187,17 +198,21 @@ import path from "node:path"; const resourceUri = "ui://my-tool/mcp-app.html"; -registerAppResource(server, { - uri: resourceUri, - name: "My Tool UI", - mimeType: RESOURCE_MIME_TYPE, -}, async () => { - const html = await fs.readFile( - path.resolve(import.meta.dirname, "dist", "mcp-app.html"), - "utf-8", - ); - return { contents: [{ uri: resourceUri, mimeType: RESOURCE_MIME_TYPE, text: html }] }; -}); +registerAppResource( + server, + "My Tool UI", + resourceUri, + {}, + async () => { + const html = await fs.readFile( + path.resolve(import.meta.dirname, "dist", "mcp-app.html"), + "utf-8", + ); + return { + contents: [{ uri: resourceUri, mimeType: RESOURCE_MIME_TYPE, text: html }], + }; + }, +); ``` If multiple tools share the same UI, they can reference the same `resourceUri` and the same resource registration. @@ -271,25 +286,32 @@ registerAppTool(server, "poll-data", { }); ``` -The UI calls these via `app.callServerTool("poll-data", {})`. +The UI calls these via +`app.callServerTool({ name: "poll-data", arguments: {} })`. ### CSP Configuration If the UI needs to load external resources (fonts, APIs, CDNs), declare the domains: ```typescript -registerAppResource(server, { - uri: resourceUri, - name: "My Tool UI", - mimeType: RESOURCE_MIME_TYPE, - _meta: { - ui: { - connectDomains: ["api.example.com"], // fetch/XHR targets - resourceDomains: ["cdn.example.com"], // scripts, styles, images - frameDomains: ["embed.example.com"], // nested iframes +registerAppResource(server, "My Tool UI", resourceUri, {}, async () => ({ + contents: [ + { + uri: resourceUri, + mimeType: RESOURCE_MIME_TYPE, + text: html, + _meta: { + ui: { + csp: { + connectDomains: ["https://api.example.com"], // fetch/XHR targets + resourceDomains: ["https://cdn.example.com"], // scripts, styles, images + frameDomains: ["https://embed.example.com"], // nested iframes + }, + }, + }, }, - }, -}, async () => { /* ... */ }); + ], +})); ``` ### Streaming Partial Input @@ -326,7 +348,14 @@ server.server.oninitialized = () => { }, appToolHandler); } else { // Text-only client — register plain tool - server.tool("my-tool", "Shows data", { param: z.string() }, plainToolHandler); + server.registerTool( + "my-tool", + { + description: "Shows data", + inputSchema: z.object({ param: z.string() }), + }, + plainToolHandler, + ); } }; ``` diff --git a/plugins/mcp-apps/skills/convert-web-app/SKILL.md b/plugins/mcp-apps/skills/convert-web-app/SKILL.md index 5db2d94..22686ef 100644 --- a/plugins/mcp-apps/skills/convert-web-app/SKILL.md +++ b/plugins/mcp-apps/skills/convert-web-app/SKILL.md @@ -115,19 +115,20 @@ Create a new MCP server with tool and resource registration. This wraps the exis ### Dependencies ```bash -npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/sdk zod +npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.4 @modelcontextprotocol/core@2.0.0-beta.4 @modelcontextprotocol/server@2.0.0-beta.4 zod@^4.2.0 npm install -D tsx vite vite-plugin-singlefile ``` -Use `npm install` to add dependencies rather than manually writing version numbers. This lets npm resolve the latest compatible versions. Never specify version numbers from memory. +Use `npm install` with the exact base MCP SDK prerelease required by ext-apps. +Do not substitute unpublished local packages or guess a different prerelease. ### Server Code Create `server.ts`: ```typescript -import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; -import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"; +import { McpServer } from "@modelcontextprotocol/server"; +import { StdioServerTransport } from "@modelcontextprotocol/server/stdio"; import { registerAppTool, registerAppResource, RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/server"; import fs from "node:fs/promises"; import path from "node:path"; @@ -140,7 +141,9 @@ const resourceUri = "ui://my-app/mcp-app.html"; // Register the tool — inputSchema maps to the app's data sources registerAppTool(server, "show-app", { description: "Displays the app with the given parameters", - inputSchema: { query: z.string().describe("The search query") }, + inputSchema: z.object({ + query: z.string().describe("The search query"), + }), _meta: { ui: { resourceUri } }, }, async (args) => { // Process args server-side if needed @@ -151,19 +154,29 @@ registerAppTool(server, "show-app", { }); // Register the HTML resource -registerAppResource(server, { - uri: resourceUri, - name: "My App UI", - mimeType: RESOURCE_MIME_TYPE, - // Add CSP domains from Step 2 if needed: - // _meta: { ui: { connectDomains: ["api.example.com"], resourceDomains: ["cdn.example.com"] } }, -}, async () => { - const html = await fs.readFile( - path.resolve(import.meta.dirname, "dist", "mcp-app.html"), - "utf-8", - ); - return { contents: [{ uri: resourceUri, mimeType: RESOURCE_MIME_TYPE, text: html }] }; -}); +registerAppResource( + server, + "My App UI", + resourceUri, + {}, + async () => { + const html = await fs.readFile( + path.resolve(import.meta.dirname, "dist", "mcp-app.html"), + "utf-8", + ); + return { + contents: [ + { + uri: resourceUri, + mimeType: RESOURCE_MIME_TYPE, + text: html, + // Add CSP domains from Step 2 if needed: + // _meta: { ui: { csp: { connectDomains: ["https://api.example.com"], resourceDomains: ["https://cdn.example.com"] } } }, + }, + ], + }; + }, +); // Start the server const transport = new StdioServerTransport(); @@ -310,7 +323,10 @@ const data = await fetch("/api/data").then(r => r.json()); // After (hybrid): async function fetchData(): Promise { if (isMcpApp) { - const result = await app.callServerTool("fetch-data", {}); + const result = await app.callServerTool({ + name: "fetch-data", + arguments: {}, + }); return result.structuredContent; } return fetch("/api/data").then(r => r.json()); @@ -437,7 +453,8 @@ registerAppTool(server, "refresh-data", { }); ``` -The UI calls these via `app.callServerTool("refresh-data", {})`. +The UI calls these via +`app.callServerTool({ name: "refresh-data", arguments: {} })`. ### Streaming Partial Input diff --git a/plugins/mcp-apps/skills/create-mcp-app/SKILL.md b/plugins/mcp-apps/skills/create-mcp-app/SKILL.md index 5bd1219..fc41e70 100644 --- a/plugins/mcp-apps/skills/create-mcp-app/SKILL.md +++ b/plugins/mcp-apps/skills/create-mcp-app/SKILL.md @@ -110,11 +110,12 @@ See `/tmp/mcp-ext-apps/docs/patterns.md` for detailed recipes: **Always** use `npm install` to add dependencies rather than manually writing version numbers: ```bash -npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/sdk zod express cors +npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.4 @modelcontextprotocol/core@2.0.0-beta.4 @modelcontextprotocol/server@2.0.0-beta.4 @modelcontextprotocol/node@2.0.0-beta.4 @modelcontextprotocol/express@2.0.0-beta.4 zod@^4.2.0 express cors npm install -D typescript vite vite-plugin-singlefile concurrently cross-env @types/node @types/express @types/cors ``` -This lets npm resolve the latest compatible versions. **Never** specify version numbers from memory. +Use the exact base MCP SDK prerelease required by ext-apps. Do not substitute +unpublished local packages or guess a different prerelease. ### TypeScript Server Execution diff --git a/scripts/typedoc-plugin-base-sdk-links.mjs b/scripts/typedoc-plugin-base-sdk-links.mjs new file mode 100644 index 0000000..6098918 --- /dev/null +++ b/scripts/typedoc-plugin-base-sdk-links.mjs @@ -0,0 +1,16 @@ +/** + * Resolve module-local links inherited from the base MCP SDK declarations. + * + * TypeDoc's externalSymbolLinkMappings handles package-qualified symbols, but + * the base SDK writes this particular reference as `index.inputRequired`. + */ + +const BASE_SDK_DOCS = "https://ts.sdk.modelcontextprotocol.io/v2/"; + +/** @param {import("typedoc").Application} app */ +export function load(app) { + app.converter.addUnknownSymbolResolver((ref) => { + const name = ref.symbolReference?.path?.map((part) => part.path).join("."); + if (name === "index.inputRequired") return BASE_SDK_DOCS; + }); +} diff --git a/src/app-bridge.examples.ts b/src/app-bridge.examples.ts index d5dc5bc..47ad623 100644 --- a/src/app-bridge.examples.ts +++ b/src/app-bridge.examples.ts @@ -7,17 +7,11 @@ * @module */ -import { Client } from "@modelcontextprotocol/sdk/client/index.js"; -import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js"; -import { - CallToolResult, - CallToolResultSchema, +import { Client, type Transport } from "@modelcontextprotocol/client"; +import type { CreateMessageRequest, CreateMessageResult, - ListResourcesResultSchema, - ReadResourceResultSchema, - ListPromptsResultSchema, -} from "@modelcontextprotocol/sdk/types.js"; +} from "@modelcontextprotocol/server"; import { AppBridge, PostMessageTransport } from "./app-bridge.js"; import type { McpUiDisplayMode } from "./types.js"; @@ -223,8 +217,7 @@ function AppBridge_oncalltool_forwardToServer( bridge.oncalltool = async (params, extra) => { return mcpClient.request( { method: "tools/call", params }, - CallToolResultSchema, - { signal: extra.signal }, + { signal: extra.mcpReq.signal }, ); }; //#endregion AppBridge_oncalltool_forwardToServer @@ -245,7 +238,9 @@ function AppBridge_oncreatesamplingmessage_forwardToLlm( //#region AppBridge_oncreatesamplingmessage_forwardToLlm bridge.oncreatesamplingmessage = async (params, extra) => { // Apply rate limiting, user approval, cost controls here - return await myLlmProvider.complete(params, { signal: extra.signal }); + return await myLlmProvider.complete(params, { + signal: extra.mcpReq.signal, + }); }; //#endregion AppBridge_oncreatesamplingmessage_forwardToLlm } @@ -261,8 +256,7 @@ function AppBridge_onlistresources_returnResources( bridge.onlistresources = async (params, extra) => { return mcpClient.request( { method: "resources/list", params }, - ListResourcesResultSchema, - { signal: extra.signal }, + { signal: extra.mcpReq.signal }, ); }; //#endregion AppBridge_onlistresources_returnResources @@ -279,8 +273,7 @@ function AppBridge_onreadresource_returnResource( bridge.onreadresource = async (params, extra) => { return mcpClient.request( { method: "resources/read", params }, - ReadResourceResultSchema, - { signal: extra.signal }, + { signal: extra.mcpReq.signal }, ); }; //#endregion AppBridge_onreadresource_returnResource @@ -297,8 +290,7 @@ function AppBridge_onlistprompts_returnPrompts( bridge.onlistprompts = async (params, extra) => { return mcpClient.request( { method: "prompts/list", params }, - ListPromptsResultSchema, - { signal: extra.signal }, + { signal: extra.mcpReq.signal }, ); }; //#endregion AppBridge_onlistprompts_returnPrompts @@ -444,10 +436,10 @@ async function AppBridge_sendToolResult_afterExecution( args: Record, ) { //#region AppBridge_sendToolResult_afterExecution - const result = await mcpClient.request( - { method: "tools/call", params: { name: "get_weather", arguments: args } }, - CallToolResultSchema, - ); + const result = await mcpClient.request({ + method: "tools/call", + params: { name: "get_weather", arguments: args }, + }); bridge.sendToolResult(result); //#endregion AppBridge_sendToolResult_afterExecution } diff --git a/src/app-bridge.ts b/src/app-bridge.ts index c65510d..d353cf7 100644 --- a/src/app-bridge.ts +++ b/src/app-bridge.ts @@ -261,7 +261,7 @@ export type AppBridgeEventMap = { /** * Host-side bridge for communicating with a single View ({@link app!App `App`}). * - * `AppBridge` extends the MCP SDK's `Protocol` class and acts as a proxy between + * `AppBridge` extends the base MCP SDK's public `Server` class and acts as a proxy between * the host application and a view running in an iframe. When an MCP client * is provided to the constructor, it automatically forwards MCP server capabilities * (tools, resources, prompts) to the view. It also handles the initialization @@ -667,8 +667,7 @@ export class AppBridge extends Server { * ```typescript * bridge.onsandboxready = async () => { * const resource = await mcpClient.request( - * { method: "resources/read", params: { uri: "ui://my-app" } }, - * ReadResourceResultSchema + * { method: "resources/read", params: { uri: "ui://my-app" } } * ); * * bridge.sendSandboxResourceReady({ @@ -1154,14 +1153,13 @@ export class AppBridge extends Server { * bridge.oncalltool = async (params, extra) => { * return mcpClient.request( * { method: "tools/call", params }, - * CallToolResultSchema, - * { signal: extra.signal }, + * { signal: extra.mcpReq.signal }, * ); * }; * ``` * - * @see `CallToolRequest` from @modelcontextprotocol/sdk for the request type - * @see `CallToolResult` from @modelcontextprotocol/sdk for the result type + * @see `CallToolRequest` from @modelcontextprotocol/server for the request type + * @see `CallToolResult` from @modelcontextprotocol/server for the result type */ private _oncalltool?: ( params: CallToolRequest["params"], @@ -1209,12 +1207,14 @@ export class AppBridge extends Server { * ```ts source="./app-bridge.examples.ts#AppBridge_oncreatesamplingmessage_forwardToLlm" * bridge.oncreatesamplingmessage = async (params, extra) => { * // Apply rate limiting, user approval, cost controls here - * return await myLlmProvider.complete(params, { signal: extra.signal }); + * return await myLlmProvider.complete(params, { + * signal: extra.mcpReq.signal, + * }); * }; * ``` * - * @see `CreateMessageRequest` from @modelcontextprotocol/sdk for the request type - * @see `CreateMessageResult` / `CreateMessageResultWithTools` from @modelcontextprotocol/sdk for result types + * @see `CreateMessageRequest` from @modelcontextprotocol/server for the request type + * @see `CreateMessageResult` / `CreateMessageResultWithTools` from @modelcontextprotocol/server for result types */ set oncreatesamplingmessage( callback: ( @@ -1244,7 +1244,7 @@ export class AppBridge extends Server { * }); * ``` * - * @see `ToolListChangedNotification` from @modelcontextprotocol/sdk for the notification type + * @see `ToolListChangedNotification` from @modelcontextprotocol/server for the notification type */ sendToolListChanged(params: ToolListChangedNotification["params"] = {}) { return this.notification({ @@ -1270,14 +1270,13 @@ export class AppBridge extends Server { * bridge.onlistresources = async (params, extra) => { * return mcpClient.request( * { method: "resources/list", params }, - * ListResourcesResultSchema, - * { signal: extra.signal }, + * { signal: extra.mcpReq.signal }, * ); * }; * ``` * - * @see `ListResourcesRequest` from @modelcontextprotocol/sdk for the request type - * @see `ListResourcesResult` from @modelcontextprotocol/sdk for the result type + * @see `ListResourcesRequest` from @modelcontextprotocol/server for the request type + * @see `ListResourcesResult` from @modelcontextprotocol/server for the result type */ private _onlistresources?: ( params: ListResourcesRequest["params"], @@ -1325,14 +1324,13 @@ export class AppBridge extends Server { * bridge.onlistresourcetemplates = async (params, extra) => { * return mcpClient.request( * { method: "resources/templates/list", params }, - * ListResourceTemplatesResultSchema, - * { signal: extra.signal } + * { signal: extra.mcpReq.signal } * ); * }; * ``` * - * @see `ListResourceTemplatesRequest` from @modelcontextprotocol/sdk for the request type - * @see `ListResourceTemplatesResult` from @modelcontextprotocol/sdk for the result type + * @see `ListResourceTemplatesRequest` from @modelcontextprotocol/server for the request type + * @see `ListResourceTemplatesResult` from @modelcontextprotocol/server for the result type */ private _onlistresourcetemplates?: ( params: ListResourceTemplatesRequest["params"], @@ -1383,14 +1381,13 @@ export class AppBridge extends Server { * bridge.onreadresource = async (params, extra) => { * return mcpClient.request( * { method: "resources/read", params }, - * ReadResourceResultSchema, - * { signal: extra.signal }, + * { signal: extra.mcpReq.signal }, * ); * }; * ``` * - * @see `ReadResourceRequest` from @modelcontextprotocol/sdk for the request type - * @see `ReadResourceResult` from @modelcontextprotocol/sdk for the result type + * @see `ReadResourceRequest` from @modelcontextprotocol/server for the request type + * @see `ReadResourceResult` from @modelcontextprotocol/server for the result type */ private _onreadresource?: ( params: ReadResourceRequest["params"], @@ -1438,7 +1435,7 @@ export class AppBridge extends Server { * }); * ``` * - * @see `ResourceListChangedNotification` from @modelcontextprotocol/sdk for the notification type + * @see `ResourceListChangedNotification` from @modelcontextprotocol/server for the notification type */ sendResourceListChanged( params: ResourceListChangedNotification["params"] = {}, @@ -1466,14 +1463,13 @@ export class AppBridge extends Server { * bridge.onlistprompts = async (params, extra) => { * return mcpClient.request( * { method: "prompts/list", params }, - * ListPromptsResultSchema, - * { signal: extra.signal }, + * { signal: extra.mcpReq.signal }, * ); * }; * ``` * - * @see `ListPromptsRequest` from @modelcontextprotocol/sdk for the request type - * @see `ListPromptsResult` from @modelcontextprotocol/sdk for the result type + * @see `ListPromptsRequest` from @modelcontextprotocol/server for the request type + * @see `ListPromptsResult` from @modelcontextprotocol/server for the result type */ private _onlistprompts?: ( params: ListPromptsRequest["params"], @@ -1520,7 +1516,7 @@ export class AppBridge extends Server { * }); * ``` * - * @see `PromptListChangedNotification` from @modelcontextprotocol/sdk for the notification type + * @see `PromptListChangedNotification` from @modelcontextprotocol/server for the notification type */ sendPromptListChanged(params: PromptListChangedNotification["params"] = {}) { return this.notification({ @@ -1722,10 +1718,10 @@ export class AppBridge extends Server { * * @example * ```ts source="./app-bridge.examples.ts#AppBridge_sendToolResult_afterExecution" - * const result = await mcpClient.request( - * { method: "tools/call", params: { name: "get_weather", arguments: args } }, - * CallToolResultSchema, - * ); + * const result = await mcpClient.request({ + * method: "tools/call", + * params: { name: "get_weather", arguments: args }, + * }); * bridge.sendToolResult(result); * ``` * diff --git a/src/app.examples.ts b/src/app.examples.ts index 81bdd44..7d475ef 100644 --- a/src/app.examples.ts +++ b/src/app.examples.ts @@ -7,11 +7,8 @@ * @module */ -import type { Tool } from "@modelcontextprotocol/sdk/types.js"; -import type { - McpServer, - ToolCallback, -} from "@modelcontextprotocol/sdk/server/mcp.js"; +import type { SamplingMessage, Tool } from "@modelcontextprotocol/client"; +import type { McpServer, ToolCallback } from "@modelcontextprotocol/server"; import { App, PostMessageTransport, @@ -369,7 +366,7 @@ async function App_createSamplingMessage_simple(app: App) { */ async function App_createSamplingMessage_withTools( app: App, - messages: import("@modelcontextprotocol/sdk/types.js").SamplingMessage[], + messages: SamplingMessage[], ) { //#region App_createSamplingMessage_withTools if (!app.getHostCapabilities()?.sampling?.tools) return; diff --git a/src/app.ts b/src/app.ts index 3c8f5b7..7e752ce 100644 --- a/src/app.ts +++ b/src/app.ts @@ -174,9 +174,9 @@ export const RESOURCE_MIME_TYPE = "text/html;profile=mcp-app"; /** * Options for configuring {@link App `App`} behavior. * - * Extends `ProtocolOptions` from the MCP SDK with `App`-specific configuration. + * Extends `ClientOptions` from the base MCP SDK with `App`-specific configuration. * - * @see `ProtocolOptions` from @modelcontextprotocol/sdk for inherited options + * @see `ClientOptions` from @modelcontextprotocol/client for inherited options */ export type AppOptions = Omit< ClientOptions, @@ -243,7 +243,7 @@ export type AppToolResult< * validated/parsed input; when `In` is `undefined`, the callback receives only * `extra`. When `Out` is provided, the return's `structuredContent` is typed. * - * Mirrors `ToolCallback` from `@modelcontextprotocol/sdk/server/mcp.js` but is + * Mirrors `ToolCallback` from `@modelcontextprotocol/server` but is * parameterized over {@link StandardSchemaV1} instead of zod, so any * Standard-Schema-compatible library (Zod, ArkType, Valibot, …) can be used. */ @@ -261,7 +261,7 @@ export type AppToolCallback< /** * Handle returned by {@link App.registerTool}. Mirrors `RegisteredTool` from - * `@modelcontextprotocol/sdk/server/mcp.js` but stores + * `@modelcontextprotocol/server` but stores * {@link StandardSchemaV1} schemas. */ export type RegisteredAppTool = { @@ -302,9 +302,8 @@ export type AppEventMap = { * Main class for MCP Apps to communicate with their host. * * The `App` class provides a framework-agnostic way to build interactive MCP Apps - * that run inside host applications. It extends the MCP SDK's `Protocol` class and - * handles the connection lifecycle, initialization handshake, and bidirectional - * communication with the host. + * that run inside host applications. It extends the base MCP SDK's public + * `Client` class and adds the Apps handshake, lifecycle, and high-level APIs. * * ## Architecture * @@ -321,7 +320,7 @@ export type AppEventMap = { * * ## Protocol and event methods * - * As a subclass of the MCP SDK's `Protocol`, `App` provides: + * As a subclass of the base MCP SDK's `Client`, `App` provides: * - `setRequestHandler()` - Register handlers for requests from host * - `setNotificationHandler()` - Register handlers for notifications from host * - `addEventListener()` - Append a listener for a notification event (multi-listener) @@ -1458,8 +1457,8 @@ export class App extends Client { * } * ``` * - * @see `CreateMessageRequest` from @modelcontextprotocol/sdk for the request type - * @see `CreateMessageResult` / `CreateMessageResultWithTools` from @modelcontextprotocol/sdk for result types + * @see `CreateMessageRequest` from @modelcontextprotocol/client for the request type + * @see `CreateMessageResult` / `CreateMessageResultWithTools` from @modelcontextprotocol/client for result types */ async createSamplingMessage( params: CreateMessageRequest["params"] & { tools?: undefined }, diff --git a/src/events.ts b/src/events.ts index b891867..aff1446 100644 --- a/src/events.ts +++ b/src/events.ts @@ -38,9 +38,8 @@ export class EventDispatcher> { getHandler( event: K, ): ((params: EventMap[K]) => void) | undefined { - return (this._eventSlots.get(event) as - | EventSlot - | undefined)?.onHandler; + return (this._eventSlots.get(event) as EventSlot | undefined) + ?.onHandler; } /** Add a listener. Listeners run in insertion order after the handler. */ diff --git a/src/message-transport.test.ts b/src/message-transport.test.ts index d5f5092..2a115f3 100644 --- a/src/message-transport.test.ts +++ b/src/message-transport.test.ts @@ -1,5 +1,5 @@ import { describe, it, expect, beforeEach, afterEach, mock } from "bun:test"; -import type { JSONRPCMessage } from "@modelcontextprotocol/sdk/types.js"; +import type { JSONRPCMessage } from "@modelcontextprotocol/client"; import { PostMessageTransport } from "./message-transport"; diff --git a/src/server/index.examples.ts b/src/server/index.examples.ts index d583ae8..9ceebce 100644 --- a/src/server/index.examples.ts +++ b/src/server/index.examples.ts @@ -9,17 +9,14 @@ import * as crypto from "node:crypto"; import * as fs from "node:fs/promises"; -import type { - McpServer, - ToolCallback, - ReadResourceCallback, -} from "@modelcontextprotocol/sdk/server/mcp.js"; +import type { McpServer, ToolCallback } from "@modelcontextprotocol/server"; import { z } from "zod"; import { registerAppTool, registerAppResource, getUiCapability, RESOURCE_MIME_TYPE, + type ReadResourceCallback, } from "./index.js"; // Stubs for external functions used in examples @@ -74,7 +71,7 @@ function registerAppTool_basicUsage(server: McpServer) { { title: "Get Weather", description: "Get current weather for a location", - inputSchema: { location: z.string() }, + inputSchema: z.object({ location: z.string() }), _meta: { ui: { resourceUri: "ui://weather/view.html" }, }, @@ -122,7 +119,7 @@ function registerAppTool_appOnlyVisibility(server: McpServer) { "update-quantity", { description: "Update item quantity in cart", - inputSchema: { itemId: z.string(), quantity: z.number() }, + inputSchema: z.object({ itemId: z.string(), quantity: z.number() }), _meta: { ui: { resourceUri: "ui://shop/cart.html", diff --git a/src/server/index.test.ts b/src/server/index.test.ts index 1853cc0..5de341f 100644 --- a/src/server/index.test.ts +++ b/src/server/index.test.ts @@ -7,7 +7,7 @@ import { getUiCapability, EXTENSION_ID, } from "./index"; -import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js"; +import type { McpServer } from "@modelcontextprotocol/server"; describe("registerAppTool", () => { it("should pass through config to server.registerTool", () => { diff --git a/src/server/index.ts b/src/server/index.ts index b8b3ad0..61e7438 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -150,7 +150,7 @@ export interface McpUiAppResourceConfig extends ResourceMetadata { * { * title: "Get Weather", * description: "Get current weather for a location", - * inputSchema: { location: z.string() }, + * inputSchema: z.object({ location: z.string() }), * _meta: { * ui: { resourceUri: "ui://weather/view.html" }, * }, @@ -190,7 +190,7 @@ export interface McpUiAppResourceConfig extends ResourceMetadata { * "update-quantity", * { * description: "Update item quantity in cart", - * inputSchema: { itemId: z.string(), quantity: z.number() }, + * inputSchema: z.object({ itemId: z.string(), quantity: z.number() }), * _meta: { * ui: { * resourceUri: "ui://shop/cart.html", diff --git a/typedoc.config.mjs b/typedoc.config.mjs index 00babc4..041bf5e 100644 --- a/typedoc.config.mjs +++ b/typedoc.config.mjs @@ -1,5 +1,7 @@ import { OptionDefaults } from "typedoc"; +const BASE_SDK_DOCS = "https://ts.sdk.modelcontextprotocol.io/v2/"; + /** @type {Partial} */ const config = { name: "MCP Apps", @@ -29,6 +31,28 @@ const config = { excludePrivate: true, excludeInternal: false, intentionallyNotExported: ["RequestHandlerExtra"], + externalSymbolLinkMappings: { + "@modelcontextprotocol/client": { + ClientOptions: BASE_SDK_DOCS, + ConnectOptions: BASE_SDK_DOCS, + DiscoverResult: BASE_SDK_DOCS, + ProtocolError: BASE_SDK_DOCS, + "Protocol.close": BASE_SDK_DOCS, + "Protocol.notification": BASE_SDK_DOCS, + ResponseCacheStore: BASE_SDK_DOCS, + SdkError: BASE_SDK_DOCS, + "SdkErrorCode.MethodNotSupportedByProtocolVersion": BASE_SDK_DOCS, + "__type.enforceStrictCapabilities": BASE_SDK_DOCS, + }, + "@modelcontextprotocol/server": { + LoggingMessageNotification: BASE_SDK_DOCS, + "McpServer.registerTool": BASE_SDK_DOCS, + "MessageExtraInfo.classification": BASE_SDK_DOCS, + "Protocol.close": BASE_SDK_DOCS, + "Protocol.notification": BASE_SDK_DOCS, + "SdkErrorCode.UnsupportedResultType": BASE_SDK_DOCS, + }, + }, blockTags: [...OptionDefaults.blockTags, "@description"], jsDocCompatibility: { exampleTag: false, @@ -49,6 +73,7 @@ const config = { out: "docs/api", plugin: [ "typedoc-github-theme", + "./scripts/typedoc-plugin-base-sdk-links.mjs", "./scripts/typedoc-plugin-fix-mermaid-entities.mjs", "./scripts/typedoc-plugin-seo.mjs", "./scripts/typedoc-plugin-mcpstyle.mjs", From f50ec6ebfbca14bf3d3070b6d01b90f12ba93359 Mon Sep 17 00:00:00 2001 From: Andrew Khadder Date: Tue, 14 Jul 2026 17:16:27 -0700 Subject: [PATCH 074/107] fix: regenerate lockfile for npm 10 --- package-lock.json | 401 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 401 insertions(+) diff --git a/package-lock.json b/package-lock.json index c1ae34d..9e0a71b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -93,6 +93,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/basic-host/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/basic-host/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/basic-server-preact": { "name": "@modelcontextprotocol/server-basic-preact", "version": "1.7.4", @@ -123,6 +140,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/basic-server-preact/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/basic-server-preact/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/basic-server-react": { "name": "@modelcontextprotocol/server-basic-react", "version": "1.7.4", @@ -156,6 +190,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/basic-server-react/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/basic-server-react/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/basic-server-solid": { "name": "@modelcontextprotocol/server-basic-solid", "version": "1.7.4", @@ -186,6 +237,23 @@ "vite-plugin-solid": "^2.11.12" } }, + "examples/basic-server-solid/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/basic-server-solid/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/basic-server-svelte": { "name": "@modelcontextprotocol/server-basic-svelte", "version": "1.7.4", @@ -216,6 +284,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/basic-server-svelte/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/basic-server-svelte/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/basic-server-vanillajs": { "name": "@modelcontextprotocol/server-basic-vanillajs", "version": "1.7.4", @@ -244,6 +329,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/basic-server-vanillajs/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/basic-server-vanillajs/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/basic-server-vue": { "name": "@modelcontextprotocol/server-basic-vue", "version": "1.7.4", @@ -274,6 +376,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/basic-server-vue/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/basic-server-vue/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/budget-allocator-server": { "name": "@modelcontextprotocol/server-budget-allocator", "version": "1.7.4", @@ -302,6 +421,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/budget-allocator-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/budget-allocator-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/cohort-heatmap-server": { "name": "@modelcontextprotocol/server-cohort-heatmap", "version": "1.7.4", @@ -334,6 +470,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/cohort-heatmap-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/cohort-heatmap-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/customer-segmentation-server": { "name": "@modelcontextprotocol/server-customer-segmentation", "version": "1.7.4", @@ -362,6 +515,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/customer-segmentation-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/customer-segmentation-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/debug-server": { "name": "@modelcontextprotocol/server-debug", "version": "1.7.4", @@ -389,6 +559,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/debug-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/debug-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/integration-server": { "version": "1.7.4", "dependencies": { @@ -419,6 +606,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/integration-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/integration-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/lazy-auth-server": { "name": "@modelcontextprotocol/server-lazy-auth", "version": "1.7.4", @@ -446,6 +650,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/lazy-auth-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/lazy-auth-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/map-server": { "name": "@modelcontextprotocol/server-map", "version": "1.7.4", @@ -474,6 +695,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/map-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/map-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/pdf-server": { "name": "@modelcontextprotocol/server-pdf", "version": "1.7.4", @@ -504,6 +742,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/pdf-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/pdf-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/qr-server": { "name": "@modelcontextprotocol/server-qr", "version": "1.7.4", @@ -536,6 +791,16 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/quickstart/node_modules/@types/node": { + "version": "22.19.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.5.tgz", + "integrity": "sha512-HfF8+mYcHPcPypui3w3mvzuIErlNOh2OAG+BCeBZCEwyiD5ls2SiCwEyT47OELtf7M3nHxBdu0FsmzdKxkN52Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.21.0" + } + }, "examples/say-server": { "name": "@modelcontextprotocol/server-say", "version": "1.7.4", @@ -577,6 +842,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/scenario-modeler-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/scenario-modeler-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/shadertoy-server": { "name": "@modelcontextprotocol/server-shadertoy", "version": "1.7.4", @@ -604,6 +886,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/shadertoy-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/shadertoy-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/sheet-music-server": { "name": "@modelcontextprotocol/server-sheet-music", "version": "1.7.4", @@ -632,6 +931,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/sheet-music-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/sheet-music-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/system-monitor-server": { "name": "@modelcontextprotocol/server-system-monitor", "version": "1.7.4", @@ -661,6 +977,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/system-monitor-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/system-monitor-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/threejs-server": { "name": "@modelcontextprotocol/server-threejs", "version": "1.7.4", @@ -696,6 +1029,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/threejs-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/threejs-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/transcript-server": { "name": "@modelcontextprotocol/server-transcript", "version": "1.7.4", @@ -724,6 +1074,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/transcript-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/transcript-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/video-resource-server": { "name": "@modelcontextprotocol/server-video-resource", "version": "1.7.4", @@ -752,6 +1119,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/video-resource-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/video-resource-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/wiki-explorer-server": { "name": "@modelcontextprotocol/server-wiki-explorer", "version": "1.7.4", @@ -782,6 +1166,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/wiki-explorer-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/wiki-explorer-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "node_modules/@babel/code-frame": { "version": "7.28.6", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.28.6.tgz", From 9778cf97a2643e58d43d3e5cdc86fe6a43773fbc Mon Sep 17 00:00:00 2001 From: Mel Ludowise Date: Thu, 16 Jul 2026 09:00:17 -0700 Subject: [PATCH 075/107] Make lazy-auth-server usable on mobile (#714) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The consent page shipped without a viewport meta tag, so mobile browsers laid it out at a desktop width. Its Approve/Deny buttons were 37px tall and nested a - -
`); +
+Approve +Deny +
+ + +`); return; } diff --git a/examples/lazy-auth-server/src/mcp-app.css b/examples/lazy-auth-server/src/mcp-app.css index ba4f323..800b224 100644 --- a/examples/lazy-auth-server/src/mcp-app.css +++ b/examples/lazy-auth-server/src/mcp-app.css @@ -17,9 +17,17 @@ display: flex; flex-wrap: wrap; gap: var(--spacing-sm); + /* Keep a long press on or near the buttons from starting text selection + or raising the iOS callout menu instead of a click. */ + -webkit-user-select: none; + user-select: none; + -webkit-touch-callout: none; } button { + /* Match the consent page's 56px tap targets (server.ts .btn). */ + min-height: 56px; + min-width: 56px; padding: var(--spacing-sm) var(--spacing-md); border: none; border-radius: var(--border-radius-md); @@ -27,12 +35,20 @@ button { font-weight: var(--font-weight-bold); background-color: var(--color-accent); cursor: pointer; + /* Suppress the double-tap-to-zoom gesture so a tap resolves to a click + immediately instead of waiting to see if a second tap follows. */ + touch-action: manipulation; + -webkit-tap-highlight-color: transparent; &:disabled { opacity: 0.5; cursor: not-allowed; } + &:active:not(:disabled) { + filter: brightness(0.85); + } + &:hover:not(:disabled) { background-color: color-mix( in srgb, From 2ca6a59d2f493b227a83a2e3ce0396db4705621a Mon Sep 17 00:00:00 2001 From: Dominic Farolino Date: Thu, 16 Jul 2026 20:15:10 -0400 Subject: [PATCH 076/107] spec: sync object-src with default-src (#715) --- specification/draft/apps.mdx | 1 + 1 file changed, 1 insertion(+) diff --git a/specification/draft/apps.mdx b/specification/draft/apps.mdx index 96c8286..369ef64 100644 --- a/specification/draft/apps.mdx +++ b/specification/draft/apps.mdx @@ -289,6 +289,7 @@ When `_meta.ui` is present on **both**, the content-item value takes precedence. style-src 'self' 'unsafe-inline'; img-src 'self' data:; media-src 'self' data:; + object-src 'none'; connect-src 'none'; ``` From ccae093d1ab04b182e17817a3e457f7b6b1c8aea Mon Sep 17 00:00:00 2001 From: Felix Weinberger Date: Wed, 15 Jul 2026 08:30:45 +0000 Subject: [PATCH 077/107] Port App and AppBridge to the public v2 Protocol base class Replaces the Client/Server subclassing from the v2 migration with direct Protocol extension, now that the SDK exports Protocol from the client package root. This restores the v1 wire contract on the iframe channel: ui/initialize is the first and only handshake, so deployed hosts keep working unchanged. Deleted with the double handshake: the inner MCP initialize round-trip and its pinned protocol version, the contentless inner capabilities and their retro-registration plumbing, the oninitialized defineProperty shadow, and the getCapabilities/getHostCapabilities split (v1 getCapabilities restored). Tests pin the wire order and assert no MCP initialize is sent in either direction. Note: package.json overrides point the SDK packages at locally built tarballs carrying the Protocol export; replace with published versions before any upstream PR. --- AGENTS.md | 8 +-- docs/overview.md | 2 +- package-lock.json | 16 ++--- package.json | 11 +-- src/app-bridge.test.ts | 10 +-- src/app-bridge.ts | 150 +++++++++++++++++------------------------ src/app.test.ts | 22 ++---- src/app.ts | 52 +++++--------- 8 files changed, 105 insertions(+), 166 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index f850aa3..4b0faa0 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -60,8 +60,8 @@ rm -fR package-lock.json node_modules && \ ### Key Source Files -- `src/app.ts` - `App` subclasses the base MCP SDK `Client`, handles View initialization, tool calls, and messaging -- `src/app-bridge.ts` - `AppBridge` subclasses the base MCP SDK `Server` for the inner iframe channel and proxies through a separate outer `Client` +- `src/app.ts` - `App` subclasses the base MCP SDK `Protocol`, handles View initialization, tool calls, and messaging +- `src/app-bridge.ts` - `AppBridge` subclasses the base MCP SDK `Protocol` for the iframe channel and proxies through a separate outer `Client` - `src/server/index.ts` - Helpers for MCP servers to register tools/resources with UI metadata - `src/types.ts` - Protocol types re-exported from `spec.types.ts` and Zod schemas from `generated/schema.ts` (auto-generated during build) - `src/message-transport.ts` - `PostMessageTransport` for iframe communication @@ -70,12 +70,12 @@ rm -fR package-lock.json node_modules && \ ### Protocol Flow ``` -View (App/Client) <--PostMessageTransport--> Host (AppBridge/Server) <--separate MCP Client--> MCP Server +View (App/Protocol) <--PostMessageTransport--> Host (AppBridge/Protocol) <--separate MCP Client--> MCP Server ``` 1. Host creates iframe with view HTML 2. View creates `App` instance and calls `connect()` with `PostMessageTransport` -3. View and Host complete the temporary inner base MCP handshake, then the View sends `ui/initialize` and receives authoritative Apps capabilities and context +3. View sends `ui/initialize` (the only handshake on the iframe channel) and receives authoritative Apps capabilities and context 4. Host sends `sendToolInput()` with tool arguments after initialization 5. View can call server tools via `app.callServerTool()` or send messages via `app.sendMessage()` 6. Host sends `sendToolResult()` when tool execution completes diff --git a/docs/overview.md b/docs/overview.md index 317ab43..63156ec 100644 --- a/docs/overview.md +++ b/docs/overview.md @@ -97,7 +97,7 @@ sequenceDiagram ``` 1. **Discovery** — The Host learns about tools and their UI resources when connecting to the server. -2. **Initialization** — When a UI tool is called, the Host renders the iframe. The SDK first completes its temporary inner base MCP handshake, then the View sends `ui/initialize` and receives host context (theme, capabilities, container dimensions). `ui/initialize` remains authoritative for Apps capabilities and identity, and `ui/notifications/initialized` remains the public View-ready signal. +2. **Initialization** — When a UI tool is called, the Host renders the iframe. The View sends `ui/initialize` (the only handshake on the iframe channel) and receives host context (theme, capabilities, container dimensions). `ui/initialize` is authoritative for Apps capabilities and identity, and `ui/notifications/initialized` is the public View-ready signal. 3. **Data delivery** — The Host sends tool arguments and, once available, tool results to the View. Results include both `content` (text for the model's context) and optionally `structuredContent` (data optimized for UI rendering). This separation lets servers provide rich data to the UI without bloating the model's context. 4. **Interactive phase** — The user interacts with the View. The View can call tools, send messages, or update context. 5. **Teardown** — Before unmounting, the Host notifies the View so it can save state or release resources. diff --git a/package-lock.json b/package-lock.json index 9e0a71b..04b0d2e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,9 +16,9 @@ }, "devDependencies": { "@boneskull/typedoc-plugin-mermaid": "^0.2.0", - "@modelcontextprotocol/client": "2.0.0-beta.4", - "@modelcontextprotocol/core": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/client": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-client.tgz", + "@modelcontextprotocol/core": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-core.tgz", + "@modelcontextprotocol/server": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-server.tgz", "@playwright/test": "1.57.0", "@types/bun": "^1.3.2", "@types/node": "20.19.27", @@ -2639,8 +2639,8 @@ }, "node_modules/@modelcontextprotocol/client": { "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/client/-/client-2.0.0-beta.4.tgz", - "integrity": "sha512-VNHA/UXDk7mCpVl+jOg5B4WMRRD2OEl+it360Lhi6HiCbrIB2f6pZ0cqSDKXQVUtZvqnhdQHzZAM9h8EKWhq/A==", + "resolved": "file:../tarballs/mcp-client.tgz", + "integrity": "sha512-aCTBtOjOSOj+SOLsoUfDjhD3Ngs4pMXzAczBmKRTesiz0N/3wUEXEmKgxhfbhF6Wtgk4tatWBUG9LDaj919K2Q==", "license": "MIT", "dependencies": { "@modelcontextprotocol/core": "2.0.0-beta.4", @@ -2657,7 +2657,7 @@ }, "node_modules/@modelcontextprotocol/core": { "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/core/-/core-2.0.0-beta.4.tgz", + "resolved": "file:../tarballs/mcp-core.tgz", "integrity": "sha512-nsMXd4wQBKzmph6r+WOhum+mXjDYljTAqwY/XUg3hLtvNOQ8+JVqBSJOVCMJvx9lXhTpTOPrGZ3BuNiaNPjSvg==", "license": "MIT", "dependencies": { @@ -2784,8 +2784,8 @@ }, "node_modules/@modelcontextprotocol/server": { "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/server/-/server-2.0.0-beta.4.tgz", - "integrity": "sha512-pjMZcNEt1dOq0aJCcY3b7w1Ayh+qmQN2xlfTELcGV9yiAjEGIczBPBLWWW0k0zzo5T8kiv15jtKPsWeHGxLvLg==", + "resolved": "file:../tarballs/mcp-server.tgz", + "integrity": "sha512-/UJubByzGV+mlU8fN8yyuMI9zgoq4Ic5b1V/6yhzxrKjmXpTbNkY5rD2jRsWBk+At0AVcXLkcDzmLF91oOJtKw==", "license": "MIT", "dependencies": { "@modelcontextprotocol/core": "2.0.0-beta.4", diff --git a/package.json b/package.json index ecbf386..59e1802 100644 --- a/package.json +++ b/package.json @@ -77,9 +77,9 @@ "author": "Olivier Chafik", "devDependencies": { "@boneskull/typedoc-plugin-mermaid": "^0.2.0", - "@modelcontextprotocol/client": "2.0.0-beta.4", - "@modelcontextprotocol/core": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/client": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-client.tgz", + "@modelcontextprotocol/core": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-core.tgz", + "@modelcontextprotocol/server": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-server.tgz", "@playwright/test": "1.57.0", "@types/bun": "^1.3.2", "@types/node": "20.19.27", @@ -129,7 +129,10 @@ "seroval": "1.4.1", "seroval-plugins": "1.4.2", "solid-js": "1.9.10", - "@types/node": "20.19.27" + "@types/node": "20.19.27", + "@modelcontextprotocol/core": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-core.tgz", + "@modelcontextprotocol/client": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-client.tgz", + "@modelcontextprotocol/server": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-server.tgz" }, "dependencies": { "@standard-schema/spec": "^1.1.0" diff --git a/src/app-bridge.test.ts b/src/app-bridge.test.ts index 81e072f..a80a961 100644 --- a/src/app-bridge.test.ts +++ b/src/app-bridge.test.ts @@ -82,7 +82,7 @@ describe("App <-> AppBridge integration", () => { expect(initializedFired).toBe(true); }); - it("keeps standard initialization separate from the Apps-ready gate", async () => { + it("sends only the Apps handshake on the wire and gates the Apps-ready callback", async () => { const methods: string[] = []; let releaseAppsInitialized!: () => void; let reachedAppsInitialized!: () => void; @@ -115,14 +115,9 @@ describe("App <-> AppBridge integration", () => { await reachedGate; expect(methods).toEqual([ - "initialize", - "notifications/initialized", "ui/initialize", "ui/notifications/initialized", ]); - expect(app.getNegotiatedProtocolVersion()).toBe("2025-11-25"); - expect(bridge.getNegotiatedProtocolVersion()).toBe("2025-11-25"); - expect(bridge.getClientVersion()).toEqual(testAppInfo); expect(bridge.getAppVersion()).toEqual(testAppInfo); expect(singularCalls).toBe(0); expect(listenerCalls).toBe(0); @@ -143,8 +138,7 @@ describe("App <-> AppBridge integration", () => { const hostCaps = app.getHostCapabilities(); expect(hostCaps).toEqual(testHostCapabilities); - expect(bridge.getHostCapabilities()).toEqual(testHostCapabilities); - expect(bridge.getCapabilities()).toEqual({}); + expect(bridge.getCapabilities()).toEqual(testHostCapabilities); }); it("Bridge receives app info and capabilities after initialization", async () => { diff --git a/src/app-bridge.ts b/src/app-bridge.ts index d353cf7..467c33d 100644 --- a/src/app-bridge.ts +++ b/src/app-bridge.ts @@ -1,6 +1,8 @@ -import { type Client } from "@modelcontextprotocol/client"; import { - Server, + Protocol, + type BaseContext, + type Client, + type ProtocolOptions, type CallToolRequest, type CallToolResult, type CreateMessageRequest, @@ -24,13 +26,10 @@ import { type RequestOptions, type ResourceListChangedNotification, type Result, - type ServerCapabilities, - type ServerContext, - type ServerOptions, type Tool, type ToolListChangedNotification, type Transport, -} from "@modelcontextprotocol/server"; +} from "@modelcontextprotocol/client"; import { EmptyResultSchema, LoggingMessageNotificationSchema, @@ -43,8 +42,6 @@ type MethodSchema = ZodObject<{ params: ZodType; }>; -const INNER_MCP_PROTOCOL_VERSION = "2025-11-25"; - import { type McpUiSandboxResourceReadyNotification, type McpUiSizeChangedNotification, @@ -96,20 +93,6 @@ export { RESOURCE_URI_META_KEY, RESOURCE_MIME_TYPE } from "./app"; import { RESOURCE_URI_META_KEY } from "./app"; export { PostMessageTransport } from "./message-transport"; -function proxiedInnerCapabilities( - capabilities: ServerCapabilities, -): ServerCapabilities { - return { - ...(capabilities.tools && { tools: capabilities.tools }), - ...(capabilities.resources && { - resources: { - listChanged: capabilities.resources.listChanged, - }, - }), - ...(capabilities.prompts && { prompts: capabilities.prompts }), - }; -} - /** * Extract UI resource URI from tool metadata. * @@ -215,13 +198,10 @@ export function buildAllowAttribute( * * @property hostContext - Optional initial host context to provide to the view * - * @see `ServerOptions` from @modelcontextprotocol/server for available options + * @see `ProtocolOptions` from @modelcontextprotocol/client for available options * @see {@link McpUiHostContext `McpUiHostContext`} for the hostContext structure */ -export type HostOptions = Omit< - ServerOptions, - "capabilities" | "supportedProtocolVersions" -> & { +export type HostOptions = Omit & { hostContext?: McpUiHostContext; }; @@ -241,7 +221,7 @@ export const SUPPORTED_PROTOCOL_VERSIONS = [LATEST_PROTOCOL_VERSION]; * * @internal */ -type RequestHandlerExtra = ServerContext; +type RequestHandlerExtra = BaseContext; /** * Maps DOM-style event names to their notification `params` types. @@ -315,7 +295,7 @@ export type AppBridgeEventMap = { * await bridge.connect(transport); * ``` */ -export class AppBridge extends Server { +export class AppBridge extends Protocol { private _appCapabilities?: McpUiAppCapabilities; private _hostContext: McpUiHostContext = {}; private _appInfo?: Implementation; @@ -328,26 +308,17 @@ export class AppBridge extends Server { * handler registration. AppBridge uses it to preserve the existing warning * when a View calls host methods before `ui/notifications/initialized`, * without adding overload-forwarding adapters around `setRequestHandler`. - * Chaining through `super._wrapHandler()` retains the base `Server`'s own - * role-specific behavior, including tool-result validation. The two - * initialization methods and `ping` are exempt because they are valid before - * the Apps-ready gate. This wraps registered callbacks, not JSON-RPC dispatch. + * `ui/initialize` and `ping` are exempt because they are valid before the + * Apps-ready gate. This wraps registered callbacks, not JSON-RPC dispatch. * * @see {@link https://github.com/anthropics/claude-ai-mcp/issues/149 claude-ai-mcp#149} */ protected override _wrapHandler( method: string, - handler: ( - request: JSONRPCRequest, - context: ServerContext, - ) => Promise, - ): (request: JSONRPCRequest, context: ServerContext) => Promise { + handler: (request: JSONRPCRequest, context: BaseContext) => Promise, + ): (request: JSONRPCRequest, context: BaseContext) => Promise { const wrapped = super._wrapHandler(method, handler); - if ( - method === "initialize" || - method === "ui/initialize" || - method === "ping" - ) { + if (method === "ui/initialize" || method === "ping") { return wrapped; } return async (request, context) => { @@ -439,14 +410,6 @@ export class AppBridge extends Server { } } - private ensureInnerCapabilities(capabilities: ServerCapabilities): void { - const current = super.getCapabilities(); - const missing = Object.keys(capabilities).some( - (key) => current[key as keyof ServerCapabilities] === undefined, - ); - if (missing) this.registerCapabilities(capabilities); - } - /** * Create a new AppBridge instance. * @@ -486,30 +449,7 @@ export class AppBridge extends Server { private _hostCapabilities: McpUiHostCapabilities, options?: HostOptions, ) { - // TEMPORARY INNER-CHANNEL NEGOTIATION: - // App and AppBridge use the public v2 Client/Server roles, so the iframe - // channel first completes the SDK's standard legacy MCP initialization. - // ui/initialize remains authoritative for Apps capabilities, identity, and - // host context, and ui/notifications/initialized remains the View-ready gate. - // Keep the inner MCP era pinned to 2025-11-25. Revisit this sequence only - // after the MCP Apps negotiation specification is resolved: - // https://github.com/modelcontextprotocol/ext-apps/issues/708 - super(_hostInfo, { - ...options, - capabilities: {}, - supportedProtocolVersions: [INNER_MCP_PROTOCOL_VERSION], - }); - - // The base Server's standard initialized callback is MCP-ready state. The - // public AppBridge callback remains exclusively the Apps View-ready gate. - super.setNotificationHandler("notifications/initialized", () => {}); - Object.defineProperty(this, "oninitialized", { - configurable: true, - enumerable: true, - get: () => this.getEventHandler("initialized"), - set: (callback: AppBridge["oninitialized"]) => - this.setEventHandler("initialized", callback), - }); + super(options); this._ensureEventSlot("initialized"); @@ -544,6 +484,35 @@ export class AppBridge extends Server { ); } + /** @internal */ + protected buildContext(ctx: BaseContext): BaseContext { + return ctx; + } + + /** + * Verify that the view supports the capability required for the given request method. + * @internal + */ + protected assertCapabilityForMethod(_method: string): void { + // Host-to-view requests are not capability-gated. + } + + /** + * Verify that a request handler is registered and supported for the given method. + * @internal + */ + protected assertRequestHandlerCapability(_method: string): void { + // Host handler registration is not capability-gated. + } + + /** + * Verify that the host supports the capability required for the given notification method. + * @internal + */ + protected assertNotificationCapability(_method: string): void { + // Host notifications are not capability-gated. + } + /** * Get the view's capabilities discovered during initialization. * @@ -713,9 +682,18 @@ export class AppBridge extends Server { * @see {@link sendToolInput `sendToolInput`} for sending tool arguments to the View * @deprecated Use {@link addEventListener `addEventListener("initialized", handler)`} instead — it composes with other listeners and supports cleanup via {@link removeEventListener `removeEventListener`}. */ - override oninitialized?: ( - params?: McpUiInitializedNotification["params"], - ) => void; + get oninitialized(): + | ((params?: McpUiInitializedNotification["params"]) => void) + | undefined { + return this.getEventHandler("initialized"); + } + set oninitialized( + callback: + | ((params?: McpUiInitializedNotification["params"]) => void) + | undefined, + ) { + this.setEventHandler("initialized", callback); + } /** * Register a handler for message requests from the view. @@ -1178,7 +1156,6 @@ export class AppBridge extends Server { ) { this.warnIfRequestHandlerReplaced("oncalltool", this._oncalltool, callback); this._oncalltool = callback; - this.ensureInnerCapabilities({ tools: {} }); this.setRequestHandler("tools/call", async (request, extra) => { if (!this._oncalltool) throw new Error("No oncalltool handler set"); return this._oncalltool(request.params, extra); @@ -1299,7 +1276,6 @@ export class AppBridge extends Server { callback, ); this._onlistresources = callback; - this.ensureInnerCapabilities({ resources: {} }); this.setRequestHandler("resources/list", async (request, extra) => { if (!this._onlistresources) throw new Error("No onlistresources handler set"); @@ -1353,7 +1329,6 @@ export class AppBridge extends Server { callback, ); this._onlistresourcetemplates = callback; - this.ensureInnerCapabilities({ resources: {} }); this.setRequestHandler( "resources/templates/list", async (request, extra) => { @@ -1410,7 +1385,6 @@ export class AppBridge extends Server { callback, ); this._onreadresource = callback; - this.ensureInnerCapabilities({ resources: {} }); this.setRequestHandler("resources/read", async (request, extra) => { if (!this._onreadresource) throw new Error("No onreadresource handler set"); @@ -1492,7 +1466,6 @@ export class AppBridge extends Server { callback, ); this._onlistprompts = callback; - this.ensureInnerCapabilities({ prompts: {} }); this.setRequestHandler("prompts/list", async (request, extra) => { if (!this._onlistprompts) throw new Error("No onlistprompts handler set"); return this._onlistprompts(request.params, extra); @@ -1532,7 +1505,7 @@ export class AppBridge extends Server { * * @see {@link McpUiHostCapabilities `McpUiHostCapabilities`} for the capabilities structure */ - getHostCapabilities(): McpUiHostCapabilities { + getCapabilities(): McpUiHostCapabilities { return this._hostCapabilities; } @@ -1565,7 +1538,7 @@ export class AppBridge extends Server { return { protocolVersion, - hostCapabilities: this.getHostCapabilities(), + hostCapabilities: this.getCapabilities(), hostInfo: this._hostInfo, hostContext: this._hostContext, }; @@ -1931,7 +1904,6 @@ export class AppBridge extends Server { if (!serverCapabilities) { throw new Error("Client server capabilities not available"); } - this.registerCapabilities(proxiedInnerCapabilities(serverCapabilities)); if (serverCapabilities.tools) { this.oncalltool = async (params, extra) => { @@ -1989,9 +1961,9 @@ export class AppBridge extends Server { } } - // The standard MCP handshake only establishes the temporary inner Server - // role. ui/notifications/initialized remains the public View-ready signal. - + // Protocol.connect only wires the transport — no MCP handshake happens on + // the iframe channel. The View drives ui/initialize; + // ui/notifications/initialized remains the public View-ready signal. return super.connect(transport); } } diff --git a/src/app.test.ts b/src/app.test.ts index dcf2d52..9057710 100644 --- a/src/app.test.ts +++ b/src/app.test.ts @@ -14,8 +14,6 @@ import { McpUiInitializedNotificationSchema, } from "./types"; -const INNER_MCP_PROTOCOL_VERSION = "2025-11-25"; - type ConnectedPair = { app: App; server: Server; @@ -34,7 +32,6 @@ async function connectPair( { name: "inner-mcp-server", version: "0.0.0" }, { capabilities: { resources: {}, tools: {} }, - supportedProtocolVersions: [INNER_MCP_PROTOCOL_VERSION], }, ); const [appTransport, serverTransport] = InMemoryTransport.createLinkedPair(); @@ -103,8 +100,8 @@ afterEach(async () => { ); }); -describe("App base MCP SDK v2 Client migration", () => { - it("completes the legacy MCP handshake before the authoritative Apps handshake", async () => { +describe("App base MCP SDK v2 Protocol migration", () => { + it("performs only the Apps handshake — no MCP initialize on the wire", async () => { const pair = await connectPair(); connected.push(pair); @@ -123,25 +120,19 @@ describe("App base MCP SDK v2 Client migration", () => { ].includes(method), ); + // The filter above includes the core MCP lifecycle methods, so this + // equality also proves no `initialize`/`notifications/initialized` was sent + // — the wire contract deployed v1 hosts depend on. expect(lifecycleMethods).toEqual([ - "initialize", - "notifications/initialized", "ui/initialize", "ui/notifications/initialized", ]); - expect(pair.app.getNegotiatedProtocolVersion()).toBe( - INNER_MCP_PROTOCOL_VERSION, - ); }); it("uses ui/initialize as the authority for Apps host state", async () => { const pair = await connectPair(); connected.push(pair); - expect(pair.app.getServerVersion()).toEqual({ - name: "inner-mcp-server", - version: "0.0.0", - }); expect(pair.app.getHostVersion()).toEqual({ name: "apps-host", version: "2.0.0", @@ -219,9 +210,6 @@ describe("App base MCP SDK v2 Client migration", () => { const second = await connectPair(first.app); connected.push(second); - expect(second.app.getNegotiatedProtocolVersion()).toBe( - INNER_MCP_PROTOCOL_VERSION, - ); expect(second.app.getHostVersion()).toEqual({ name: "apps-host", version: "2.0.0", diff --git a/src/app.ts b/src/app.ts index 7e752ce..c639784 100644 --- a/src/app.ts +++ b/src/app.ts @@ -1,7 +1,7 @@ import { - Client, - type ClientContext, - type ClientOptions, + Protocol, + type BaseContext, + type ProtocolOptions, type RequestOptions, type CallToolRequest, type CallToolResult, @@ -71,8 +71,6 @@ type MethodSchema = ZodObject<{ params: ZodType; }>; -const INNER_MCP_PROTOCOL_VERSION = "2025-11-25"; - function mergeAppCapabilities( base: McpUiAppCapabilities, additional: McpUiAppCapabilities, @@ -174,14 +172,11 @@ export const RESOURCE_MIME_TYPE = "text/html;profile=mcp-app"; /** * Options for configuring {@link App `App`} behavior. * - * Extends `ClientOptions` from the base MCP SDK with `App`-specific configuration. + * Extends `ProtocolOptions` from the base MCP SDK with `App`-specific configuration. * - * @see `ClientOptions` from @modelcontextprotocol/client for inherited options + * @see `ProtocolOptions` from @modelcontextprotocol/client for inherited options */ -export type AppOptions = Omit< - ClientOptions, - "capabilities" | "supportedProtocolVersions" | "versionNegotiation" -> & { +export type AppOptions = Omit & { /** * Automatically report size changes to the host using `ResizeObserver`. * @@ -221,7 +216,7 @@ export type AppOptions = Omit< allowUnsafeEval?: boolean; }; -type RequestHandlerExtra = ClientContext; +type RequestHandlerExtra = BaseContext; /** * Result of an app-registered tool callback. When `Out` is provided, @@ -354,7 +349,7 @@ export type AppEventMap = { * await app.connect(); * ``` */ -export class App extends Client { +export class App extends Protocol { private _hostCapabilities?: McpUiHostCapabilities; private _hostInfo?: Implementation; private _hostContext?: McpUiHostContext; @@ -521,20 +516,7 @@ export class App extends Client { private _appCapabilities: McpUiAppCapabilities = {}, private options: AppOptions = { autoResize: true }, ) { - // TEMPORARY INNER-CHANNEL NEGOTIATION: - // App and AppBridge use the public v2 Client/Server roles, so the iframe - // channel first completes the SDK's standard legacy MCP initialization. - // ui/initialize remains authoritative for Apps capabilities, identity, and - // host context, and ui/notifications/initialized remains the View-ready gate. - // Keep the inner MCP era pinned to 2025-11-25. Revisit this sequence only - // after the MCP Apps negotiation specification is resolved: - // https://github.com/modelcontextprotocol/ext-apps/issues/708 - super(_appInfo, { - ...options, - capabilities: {}, - versionNegotiation: { mode: "legacy" }, - supportedProtocolVersions: [INNER_MCP_PROTOCOL_VERSION], - }); + super(options); if (!options.allowUnsafeEval) { z.config({ jitless: true }); @@ -550,6 +532,11 @@ export class App extends Client { this.setEventHandler("hostcontextchanged", undefined); } + /** @internal */ + protected buildContext(ctx: BaseContext): BaseContext { + return ctx; + } + private registerAppCapabilities(capabilities: McpUiAppCapabilities): void { if (this.transport) { throw new Error( @@ -1992,15 +1979,10 @@ export class App extends Client { } this._initializedSent = false; - // TEMPORARY INNER-CHANNEL NEGOTIATION: - // App and AppBridge use the public v2 Client/Server roles, so the iframe - // channel first completes the SDK's standard legacy MCP initialization. - // ui/initialize remains authoritative for Apps capabilities, identity, and - // host context, and ui/notifications/initialized remains the View-ready gate. - // Keep the inner MCP era pinned to 2025-11-25. Revisit this sequence only - // after the MCP Apps negotiation specification is resolved: - // https://github.com/modelcontextprotocol/ext-apps/issues/708 try { + // Protocol.connect only wires the transport — no MCP handshake. The + // ui/initialize request below is the sole negotiation on this channel, + // matching the v1 wire behavior deployed hosts expect. await super.connect(transport); const result = await this.request( From 43eed45404d085b63815acd971d7ab097817ec99 Mon Sep 17 00:00:00 2001 From: Felix Weinberger Date: Wed, 15 Jul 2026 08:34:35 +0000 Subject: [PATCH 078/107] Point SDK packages at the pkg.pr.new preview of typescript-sdk#2501 The Protocol-based migration needs the Protocol class exported from the package roots, which lands in modelcontextprotocol/typescript-sdk#2501. Pin the preview builds so the branch is installable; swap to the next published beta once that PR is released. --- package-lock.json | 20 ++++++++++---------- package.json | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 04b0d2e..e82271b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,9 +16,9 @@ }, "devDependencies": { "@boneskull/typedoc-plugin-mermaid": "^0.2.0", - "@modelcontextprotocol/client": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-client.tgz", - "@modelcontextprotocol/core": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-core.tgz", - "@modelcontextprotocol/server": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-server.tgz", + "@modelcontextprotocol/client": "https://pkg.pr.new/@modelcontextprotocol/client@2501", + "@modelcontextprotocol/core": "https://pkg.pr.new/@modelcontextprotocol/core@2501", + "@modelcontextprotocol/server": "https://pkg.pr.new/@modelcontextprotocol/server@2501", "@playwright/test": "1.57.0", "@types/bun": "^1.3.2", "@types/node": "20.19.27", @@ -2639,11 +2639,11 @@ }, "node_modules/@modelcontextprotocol/client": { "version": "2.0.0-beta.4", - "resolved": "file:../tarballs/mcp-client.tgz", - "integrity": "sha512-aCTBtOjOSOj+SOLsoUfDjhD3Ngs4pMXzAczBmKRTesiz0N/3wUEXEmKgxhfbhF6Wtgk4tatWBUG9LDaj919K2Q==", + "resolved": "https://pkg.pr.new/@modelcontextprotocol/client@2501", + "integrity": "sha512-5FvmSf2qWlJXlI9ydf8230f1rsDHMEw9Jgcq2ZUGmA3DJShaYV6t49zKJBuawetMcLOzWBGs8+qDzhZOZTk6Fw==", "license": "MIT", "dependencies": { - "@modelcontextprotocol/core": "2.0.0-beta.4", + "@modelcontextprotocol/core": "https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/core@f60b401", "cross-spawn": "^7.0.5", "eventsource": "^3.0.2", "eventsource-parser": "^3.0.0", @@ -2657,7 +2657,7 @@ }, "node_modules/@modelcontextprotocol/core": { "version": "2.0.0-beta.4", - "resolved": "file:../tarballs/mcp-core.tgz", + "resolved": "https://pkg.pr.new/@modelcontextprotocol/core@2501", "integrity": "sha512-nsMXd4wQBKzmph6r+WOhum+mXjDYljTAqwY/XUg3hLtvNOQ8+JVqBSJOVCMJvx9lXhTpTOPrGZ3BuNiaNPjSvg==", "license": "MIT", "dependencies": { @@ -2784,11 +2784,11 @@ }, "node_modules/@modelcontextprotocol/server": { "version": "2.0.0-beta.4", - "resolved": "file:../tarballs/mcp-server.tgz", - "integrity": "sha512-/UJubByzGV+mlU8fN8yyuMI9zgoq4Ic5b1V/6yhzxrKjmXpTbNkY5rD2jRsWBk+At0AVcXLkcDzmLF91oOJtKw==", + "resolved": "https://pkg.pr.new/@modelcontextprotocol/server@2501", + "integrity": "sha512-mI+V52bTdSCHDrsrVG3TeOzgy+apDQXz6l1B4KuwKV/8xbRAsV9LZ2Nf67SEoLszuYYH0as4pZQUG4cCMYP5/g==", "license": "MIT", "dependencies": { - "@modelcontextprotocol/core": "2.0.0-beta.4", + "@modelcontextprotocol/core": "https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/core@f60b401", "zod": "^4.2.0" }, "engines": { diff --git a/package.json b/package.json index 59e1802..e95e0be 100644 --- a/package.json +++ b/package.json @@ -77,9 +77,9 @@ "author": "Olivier Chafik", "devDependencies": { "@boneskull/typedoc-plugin-mermaid": "^0.2.0", - "@modelcontextprotocol/client": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-client.tgz", - "@modelcontextprotocol/core": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-core.tgz", - "@modelcontextprotocol/server": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-server.tgz", + "@modelcontextprotocol/client": "https://pkg.pr.new/@modelcontextprotocol/client@2501", + "@modelcontextprotocol/core": "https://pkg.pr.new/@modelcontextprotocol/core@2501", + "@modelcontextprotocol/server": "https://pkg.pr.new/@modelcontextprotocol/server@2501", "@playwright/test": "1.57.0", "@types/bun": "^1.3.2", "@types/node": "20.19.27", @@ -130,9 +130,9 @@ "seroval-plugins": "1.4.2", "solid-js": "1.9.10", "@types/node": "20.19.27", - "@modelcontextprotocol/core": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-core.tgz", - "@modelcontextprotocol/client": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-client.tgz", - "@modelcontextprotocol/server": "file:/root/src/mcp/projects/v2-2026-ext-apps/tarballs/mcp-server.tgz" + "@modelcontextprotocol/core": "https://pkg.pr.new/@modelcontextprotocol/core@2501", + "@modelcontextprotocol/client": "https://pkg.pr.new/@modelcontextprotocol/client@2501", + "@modelcontextprotocol/server": "https://pkg.pr.new/@modelcontextprotocol/server@2501" }, "dependencies": { "@standard-schema/spec": "^1.1.0" From 7664bb1010aa364e84c76f8260bf1701d38b0a10 Mon Sep 17 00:00:00 2001 From: Enrico <2827496+tonxxd@users.noreply.github.com> Date: Mon, 20 Jul 2026 11:29:43 -0700 Subject: [PATCH 079/107] test: isolate optional SDK role dependencies --- build.bun.ts | 5 +- package-lock.json | 6 + package.json | 7 ++ scripts/check-dependency-isolation.mjs | 159 +++++++++++++++++++++++++ src/app-bridge.ts | 4 +- src/app.ts | 3 +- src/constants.ts | 5 + src/core-types.ts | 20 ++++ src/server/index.ts | 5 +- src/spec.types.ts | 2 +- typedoc.config.mjs | 2 + 11 files changed, 209 insertions(+), 9 deletions(-) create mode 100644 scripts/check-dependency-isolation.mjs create mode 100644 src/constants.ts create mode 100644 src/core-types.ts diff --git a/build.bun.ts b/build.bun.ts index 837279f..61361e6 100644 --- a/build.bun.ts +++ b/build.bun.ts @@ -1,6 +1,9 @@ #!/usr/bin/env bun import { $ } from "bun"; -import { cpSync, mkdirSync } from "node:fs"; +import { cpSync, mkdirSync, rmSync } from "node:fs"; + +// Avoid publishing artifacts left behind by an earlier build or branch. +rmSync("dist", { recursive: true, force: true }); // Run TypeScript compiler for type declarations await $`tsc`; diff --git a/package-lock.json b/package-lock.json index e82271b..c7d677e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -60,6 +60,12 @@ "zod": "^4.2.0" }, "peerDependenciesMeta": { + "@modelcontextprotocol/client": { + "optional": true + }, + "@modelcontextprotocol/server": { + "optional": true + }, "react": { "optional": true }, diff --git a/package.json b/package.json index e95e0be..4f88483 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "prepack": "npm run build", "build:all": "npm run examples:build", "test": "bun test src examples", + "test:dependency-isolation": "npm run build && node scripts/check-dependency-isolation.mjs", "test:e2e": "playwright test", "test:e2e:update": "playwright test --update-snapshots", "test:e2e:ui": "playwright test --ui", @@ -118,6 +119,12 @@ "zod": "^4.2.0" }, "peerDependenciesMeta": { + "@modelcontextprotocol/client": { + "optional": true + }, + "@modelcontextprotocol/server": { + "optional": true + }, "react": { "optional": true }, diff --git a/scripts/check-dependency-isolation.mjs b/scripts/check-dependency-isolation.mjs new file mode 100644 index 0000000..2ec28ce --- /dev/null +++ b/scripts/check-dependency-isolation.mjs @@ -0,0 +1,159 @@ +import { execFileSync } from "node:child_process"; +import { + mkdtempSync, + mkdirSync, + readFileSync, + rmSync, + writeFileSync, +} from "node:fs"; +import { tmpdir } from "node:os"; +import { join, resolve } from "node:path"; + +const root = resolve(import.meta.dirname, ".."); +const packageJson = JSON.parse( + readFileSync(join(root, "package.json"), "utf8"), +); +const client = "@modelcontextprotocol/client"; +const server = "@modelcontextprotocol/server"; + +for (const role of [client, server]) { + if (!packageJson.peerDependencies?.[role]) { + throw new Error(`${role} must remain a peer dependency`); + } + if (packageJson.peerDependenciesMeta?.[role]?.optional !== true) { + throw new Error(`${role} must be an optional peer dependency`); + } +} + +const temporaryRoot = mkdtempSync(join(tmpdir(), "ext-apps-role-peers-")); +try { + const npmEnvironment = { + ...process.env, + npm_config_cache: join(temporaryRoot, "npm-cache"), + }; + const packOutput = JSON.parse( + execFileSync( + "npm", + [ + "pack", + "--ignore-scripts", + "--json", + "--pack-destination", + temporaryRoot, + ], + { cwd: root, encoding: "utf8", env: npmEnvironment }, + ), + ); + const tarball = join(temporaryRoot, packOutput[0].filename); + + const consumers = [ + { + name: "app-only", + dependencies: { + "@types/node": packageJson.devDependencies["@types/node"], + [client]: packageJson.devDependencies[client], + "@modelcontextprotocol/ext-apps": `file:${tarball}`, + }, + absent: server, + entry: + 'import { App } from "@modelcontextprotocol/ext-apps"; import { AppBridge } from "@modelcontextprotocol/ext-apps/app-bridge"; console.log(App, AppBridge);', + }, + { + name: "server-only", + dependencies: { + "@types/node": packageJson.devDependencies["@types/node"], + "@modelcontextprotocol/ext-apps": `file:${tarball}`, + [server]: packageJson.devDependencies[server], + }, + absent: client, + entry: + 'import { registerAppTool } from "@modelcontextprotocol/ext-apps/server"; console.log(registerAppTool);', + }, + ]; + + for (const consumer of consumers) { + const directory = join(temporaryRoot, consumer.name); + mkdirSync(directory); + writeFileSync( + join(directory, "package.json"), + JSON.stringify({ + private: true, + type: "module", + dependencies: consumer.dependencies, + }), + ); + execFileSync( + "npm", + [ + "install", + "--ignore-scripts", + "--package-lock=false", + "--no-audit", + "--no-fund", + ], + { cwd: directory, stdio: "pipe", env: npmEnvironment }, + ); + + const absentPath = join( + directory, + "node_modules", + ...consumer.absent.split("/"), + "package.json", + ); + try { + readFileSync(absentPath); + throw new Error( + `${consumer.name} unexpectedly installed ${consumer.absent}`, + ); + } catch (error) { + if (error?.code !== "ENOENT") throw error; + } + + writeFileSync(join(directory, "entry.ts"), consumer.entry); + writeFileSync( + join(directory, "tsconfig.json"), + JSON.stringify({ + compilerOptions: { + lib: ["ES2020", "DOM"], + module: "ESNext", + moduleResolution: "bundler", + noEmit: true, + skipLibCheck: false, + strict: true, + target: "ES2020", + }, + include: ["entry.ts"], + }), + ); + execFileSync( + process.execPath, + [join(root, "node_modules", "typescript", "bin", "tsc")], + { cwd: directory, stdio: "inherit" }, + ); + + const metafile = join(directory, "bundle-meta.json"); + execFileSync( + join(root, "node_modules", ".bin", "esbuild"), + [ + "entry.ts", + "--bundle", + "--platform=browser", + "--outfile=bundle.js", + `--metafile=${metafile}`, + ], + { cwd: directory, stdio: "pipe" }, + ); + const bundleInputs = Object.keys( + JSON.parse(readFileSync(metafile, "utf8")).inputs, + ).join("\n"); + if (bundleInputs.includes(`/node_modules/${consumer.absent}/`)) { + throw new Error( + `${consumer.name} unexpectedly bundled ${consumer.absent}`, + ); + } + } +} finally { + rmSync(temporaryRoot, { recursive: true, force: true }); +} + +console.log("Role peer dependency isolation checks passed."); diff --git a/src/app-bridge.ts b/src/app-bridge.ts index 467c33d..d6a2368 100644 --- a/src/app-bridge.ts +++ b/src/app-bridge.ts @@ -89,8 +89,8 @@ import { McpUiToolMeta, } from "./types"; export * from "./types"; -export { RESOURCE_URI_META_KEY, RESOURCE_MIME_TYPE } from "./app"; -import { RESOURCE_URI_META_KEY } from "./app"; +export { RESOURCE_URI_META_KEY, RESOURCE_MIME_TYPE } from "./constants"; +import { RESOURCE_URI_META_KEY } from "./constants"; export { PostMessageTransport } from "./message-transport"; /** diff --git a/src/app.ts b/src/app.ts index c639784..0ff369e 100644 --- a/src/app.ts +++ b/src/app.ts @@ -22,6 +22,7 @@ import { type Transport, } from "@modelcontextprotocol/client"; import { EmptyResultSchema } from "@modelcontextprotocol/core"; +export { RESOURCE_MIME_TYPE, RESOURCE_URI_META_KEY } from "./constants"; import { EventDispatcher } from "./events"; export { EventDispatcher } from "./events"; import { PostMessageTransport } from "./message-transport"; @@ -158,7 +159,6 @@ export { * } * ``` */ -export const RESOURCE_URI_META_KEY = "ui/resourceUri"; /** * MIME type for MCP UI resources. @@ -167,7 +167,6 @@ export const RESOURCE_URI_META_KEY = "ui/resourceUri"; * * Used by {@link server-helpers!registerAppResource `registerAppResource`} as the default MIME type for app resources. */ -export const RESOURCE_MIME_TYPE = "text/html;profile=mcp-app"; /** * Options for configuring {@link App `App`} behavior. diff --git a/src/constants.ts b/src/constants.ts new file mode 100644 index 0000000..f69cfa5 --- /dev/null +++ b/src/constants.ts @@ -0,0 +1,5 @@ +/** Legacy metadata key associating an MCP tool with its App resource. */ +export const RESOURCE_URI_META_KEY = "ui/resourceUri"; + +/** MIME type for MCP App HTML resources. */ +export const RESOURCE_MIME_TYPE = "text/html;profile=mcp-app"; diff --git a/src/core-types.ts b/src/core-types.ts new file mode 100644 index 0000000..19392d2 --- /dev/null +++ b/src/core-types.ts @@ -0,0 +1,20 @@ +import { + CallToolResultSchema, + ContentBlockSchema, + EmbeddedResourceSchema, + ImplementationSchema, + RequestIdSchema, + ResourceLinkSchema, + ToolSchema, +} from "@modelcontextprotocol/core"; +import type { z } from "zod/v4"; + +// Infer shared wire types from the public role-neutral schemas so declarations +// used by every entrypoint do not acquire a client or server package edge. +export type CallToolResult = z.infer; +export type ContentBlock = z.infer; +export type EmbeddedResource = z.infer; +export type Implementation = z.infer; +export type RequestId = z.infer; +export type ResourceLink = z.infer; +export type Tool = z.infer; diff --git a/src/server/index.ts b/src/server/index.ts index 61e7438..dc9a1f3 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -32,13 +32,12 @@ */ import { - RESOURCE_URI_META_KEY, - RESOURCE_MIME_TYPE, McpUiResourceCsp, McpUiResourceMeta, McpUiToolMeta, McpUiClientCapabilities, -} from "../app.js"; +} from "../spec.types.js"; +import { RESOURCE_URI_META_KEY, RESOURCE_MIME_TYPE } from "../constants.js"; import type { ClientCapabilities, McpServer, diff --git a/src/spec.types.ts b/src/spec.types.ts index 8b03de9..6c158d1 100644 --- a/src/spec.types.ts +++ b/src/spec.types.ts @@ -18,7 +18,7 @@ import type { RequestId, ResourceLink, Tool, -} from "@modelcontextprotocol/client"; +} from "./core-types"; /** * Current protocol version supported by this SDK. diff --git a/typedoc.config.mjs b/typedoc.config.mjs index 041bf5e..1531bdc 100644 --- a/typedoc.config.mjs +++ b/typedoc.config.mjs @@ -36,12 +36,14 @@ const config = { ClientOptions: BASE_SDK_DOCS, ConnectOptions: BASE_SDK_DOCS, DiscoverResult: BASE_SDK_DOCS, + "MessageExtraInfo.classification": BASE_SDK_DOCS, ProtocolError: BASE_SDK_DOCS, "Protocol.close": BASE_SDK_DOCS, "Protocol.notification": BASE_SDK_DOCS, ResponseCacheStore: BASE_SDK_DOCS, SdkError: BASE_SDK_DOCS, "SdkErrorCode.MethodNotSupportedByProtocolVersion": BASE_SDK_DOCS, + "SdkErrorCode.UnsupportedResultType": BASE_SDK_DOCS, "__type.enforceStrictCapabilities": BASE_SDK_DOCS, }, "@modelcontextprotocol/server": { From c55a3a231fb76303376e059aef9a13367e72731c Mon Sep 17 00:00:00 2001 From: victor-openai Date: Wed, 22 Jul 2026 09:28:57 -0700 Subject: [PATCH 080/107] fix: preserve experimental capability settings (#721) --- specification/draft/apps.mdx | 8 ++--- src/app-bridge.test.ts | 10 +++++- src/generated/schema.json | 60 ++++++++++++++++++++++++++++-------- src/generated/schema.ts | 22 +++++++++---- src/spec.types.ts | 8 ++--- 5 files changed, 81 insertions(+), 27 deletions(-) diff --git a/specification/draft/apps.mdx b/specification/draft/apps.mdx index 369ef64..f2523f2 100644 --- a/specification/draft/apps.mdx +++ b/specification/draft/apps.mdx @@ -548,8 +548,8 @@ When the View sends an `ui/initialize` request to the Host, it MUST include its ```typescript interface McpUiAppCapabilities { - /** Experimental features (structure TBD). */ - experimental?: {}; + /** Experimental features keyed by identifier. */ + experimental?: Record; /** App exposes MCP-style tools that the host can call. */ tools?: { /** App supports tools/list_changed notifications. */ @@ -677,8 +677,8 @@ interface SupportedContentBlockModalities { } interface HostCapabilities { - /** Experimental features (structure TBD). */ - experimental?: {}; + /** Experimental features keyed by identifier. */ + experimental?: Record; /** Host supports opening external URLs. */ openLinks?: {}; /** Host supports file downloads via ui/download-file. */ diff --git a/src/app-bridge.test.ts b/src/app-bridge.test.ts index a4fe1de..d327c95 100644 --- a/src/app-bridge.test.ts +++ b/src/app-bridge.test.ts @@ -45,6 +45,9 @@ function createMockClient( const testHostInfo = { name: "TestHost", version: "1.0.0" }; const testAppInfo = { name: "TestApp", version: "1.0.0" }; const testHostCapabilities: McpUiHostCapabilities = { + experimental: { + "com.example/host-extension": { version: 1 }, + }, openLinks: {}, serverTools: {}, logging: {}, @@ -97,7 +100,12 @@ describe("App <-> AppBridge integration", () => { }); it("Bridge receives app info and capabilities after initialization", async () => { - const appCapabilities = { tools: { listChanged: true } }; + const appCapabilities = { + experimental: { + "com.example/app-extension": { version: 1 }, + }, + tools: { listChanged: true }, + }; app = new App(testAppInfo, appCapabilities, { autoResize: false }); await bridge.connect(bridgeTransport); diff --git a/src/generated/schema.json b/src/generated/schema.json index 80b4ac6..6b66482 100644 --- a/src/generated/schema.json +++ b/src/generated/schema.json @@ -9,10 +9,19 @@ "type": "object", "properties": { "experimental": { - "description": "Experimental features (structure TBD).", + "description": "Experimental features keyed by identifier.", "type": "object", - "properties": {}, - "additionalProperties": false + "propertyNames": { + "type": "string" + }, + "additionalProperties": { + "type": "object", + "propertyNames": { + "type": "string" + }, + "additionalProperties": {}, + "description": "Experimental features keyed by identifier." + } }, "tools": { "description": "App exposes MCP-style tools that the host can call.", @@ -298,10 +307,19 @@ "type": "object", "properties": { "experimental": { - "description": "Experimental features (structure TBD).", + "description": "Experimental features keyed by identifier.", "type": "object", - "properties": {}, - "additionalProperties": false + "propertyNames": { + "type": "string" + }, + "additionalProperties": { + "type": "object", + "propertyNames": { + "type": "string" + }, + "additionalProperties": {}, + "description": "Experimental features keyed by identifier." + } }, "openLinks": { "description": "Host supports opening external URLs.", @@ -2537,10 +2555,19 @@ "type": "object", "properties": { "experimental": { - "description": "Experimental features (structure TBD).", + "description": "Experimental features keyed by identifier.", "type": "object", - "properties": {}, - "additionalProperties": false + "propertyNames": { + "type": "string" + }, + "additionalProperties": { + "type": "object", + "propertyNames": { + "type": "string" + }, + "additionalProperties": {}, + "description": "Experimental features keyed by identifier." + } }, "tools": { "description": "App exposes MCP-style tools that the host can call.", @@ -2651,10 +2678,19 @@ "type": "object", "properties": { "experimental": { - "description": "Experimental features (structure TBD).", + "description": "Experimental features keyed by identifier.", "type": "object", - "properties": {}, - "additionalProperties": false + "propertyNames": { + "type": "string" + }, + "additionalProperties": { + "type": "object", + "propertyNames": { + "type": "string" + }, + "additionalProperties": {}, + "description": "Experimental features keyed by identifier." + } }, "openLinks": { "description": "Host supports opening external URLs.", diff --git a/src/generated/schema.ts b/src/generated/schema.ts index 4368737..a8bc1b6 100644 --- a/src/generated/schema.ts +++ b/src/generated/schema.ts @@ -496,11 +496,16 @@ export const McpUiRequestTeardownNotificationSchema = z.object({ * @see {@link McpUiInitializeResult `McpUiInitializeResult`} for the initialization result that includes these capabilities */ export const McpUiHostCapabilitiesSchema = z.object({ - /** @description Experimental features (structure TBD). */ + /** @description Experimental features keyed by identifier. */ experimental: z - .object({}) + .record( + z.string(), + z + .record(z.string(), z.any()) + .describe("Experimental features keyed by identifier."), + ) .optional() - .describe("Experimental features (structure TBD)."), + .describe("Experimental features keyed by identifier."), /** @description Host supports opening external URLs. */ openLinks: z .object({}) @@ -583,11 +588,16 @@ export const McpUiHostCapabilitiesSchema = z.object({ * @see {@link McpUiInitializeRequest `McpUiInitializeRequest`} for the initialization request that includes these capabilities */ export const McpUiAppCapabilitiesSchema = z.object({ - /** @description Experimental features (structure TBD). */ + /** @description Experimental features keyed by identifier. */ experimental: z - .object({}) + .record( + z.string(), + z + .record(z.string(), z.any()) + .describe("Experimental features keyed by identifier."), + ) .optional() - .describe("Experimental features (structure TBD)."), + .describe("Experimental features keyed by identifier."), /** @description App exposes MCP-style tools that the host can call. */ tools: z .object({ diff --git a/src/spec.types.ts b/src/spec.types.ts index 7a8b337..bedc1f5 100644 --- a/src/spec.types.ts +++ b/src/spec.types.ts @@ -492,8 +492,8 @@ export interface McpUiRequestTeardownNotification { * @see {@link McpUiInitializeResult `McpUiInitializeResult`} for the initialization result that includes these capabilities */ export interface McpUiHostCapabilities { - /** @description Experimental features (structure TBD). */ - experimental?: {}; + /** @description Experimental features keyed by identifier. */ + experimental?: Record; /** @description Host supports opening external URLs. */ openLinks?: {}; /** @description Host supports file downloads via ui/download-file. */ @@ -536,8 +536,8 @@ export interface McpUiHostCapabilities { * @see {@link McpUiInitializeRequest `McpUiInitializeRequest`} for the initialization request that includes these capabilities */ export interface McpUiAppCapabilities { - /** @description Experimental features (structure TBD). */ - experimental?: {}; + /** @description Experimental features keyed by identifier. */ + experimental?: Record; /** @description App exposes MCP-style tools that the host can call. */ tools?: { /** @description App supports tools/list_changed notifications. */ From 7d498079e8f2d0d385ac2ec88a72e031378e6702 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Wed, 22 Jul 2026 19:34:30 +0100 Subject: [PATCH 081/107] chore: clear npm audit findings (15 -> 3) (#725) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Non-breaking transitive updates via `npm audit fix`, plus a `sharp` major bump. Takes `npm audit` from 15 findings (2 critical, 7 high, 4 moderate, 2 low) to 3 moderate. Critical / high: - shell-quote 1.8.3 -> 1.9.0 (GHSA-w7jw-789q-3m8p, GHSA-395f-4hp3-45gv) - @babel/core 7.28.6 -> 7.29.7 (GHSA-4x5r-pxfx-6jf8) - sharp ^0.34.5 -> ^0.35.3 (GHSA-f88m-g3jw-g9cj; libvips CVE-2026-33327, CVE-2026-33328, CVE-2026-35590, CVE-2026-35591) - brace-expansion 1.1.16 / 2.1.2 (GHSA-3jxr-9vmj-r5cp) - fast-uri 3.1.4 (GHSA-v2hh-gcrm-f6hx, GHSA-4c8g-83qw-93j6) - hono 4.12.31 (8 advisories, incl. GHSA-88fw-hqm2-52qc, GHSA-hvrm-45r6-mjfj) - linkify-it 5.0.2 (GHSA-22p9-wv53-3rq4, GHSA-v245-v573-v5vm) Plus markdown-it 14.3.0, body-parser 2.3.0, type-is 2.1.0, undici 7.28.0 and vite 6.4.3. sharp is a devDependency used only by tests/e2e/generate-grid-screenshots, which is testIgnore'd unless GENERATE_SCREENSHOTS=1. The only breaking change in 0.35 is the Node floor moving to >=20.9.0, and CI runs Node 22; the API used (png / resize / toFile) is unchanged. The 3 remaining findings are all the same advisory (GHSA-frvp-7c67-39w9, path traversal in @hono/node-server's serve-static on Windows), reported once each for @hono/node-server, @modelcontextprotocol/sdk and @modelcontextprotocol/ext-apps. The fix is in @hono/node-server 2.0.5 but sdk 1.29.0 pins ^1.19.9, so the range cannot reach it; that needs an upstream bump. It is not reachable here either way — the SDK imports only getRequestListener and serve from that package, never serve-static. --- package-lock.json | 708 +++++++++++++++++++++++++++------------------- package.json | 2 +- 2 files changed, 418 insertions(+), 292 deletions(-) diff --git a/package-lock.json b/package-lock.json index 29e9058..26be03f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,7 @@ "prettier": "^3.6.2", "react": "^19.2.0", "react-dom": "^19.2.0", - "sharp": "^0.34.5", + "sharp": "^0.35.3", "ts-to-zod": "^5.1.0", "tsx": "^4.21.0", "typedoc": "^0.28.14", @@ -1123,13 +1123,13 @@ "license": "MIT" }, "node_modules/@babel/code-frame": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.28.6.tgz", - "integrity": "sha512-JYgintcMjRiCvS8mMECzaEn+m3PfoQiyqukOMCCVQtoJGYJw8j/8LBJEiqkHLkfwCcs74E3pbAUFNg7d9VNJ+Q==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz", + "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.28.5", + "@babel/helper-validator-identifier": "^7.29.7", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" }, @@ -1138,9 +1138,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.6.tgz", - "integrity": "sha512-2lfu57JtzctfIrcGMz992hyLlByuzgIk58+hhGCxjKZ3rWI82NnVLjXcaTqkI2NvlcvOskZaiZ5kjUALo3Lpxg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz", + "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==", "dev": true, "license": "MIT", "engines": { @@ -1148,21 +1148,21 @@ } }, "node_modules/@babel/core": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.6.tgz", - "integrity": "sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz", + "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.28.6", - "@babel/generator": "^7.28.6", - "@babel/helper-compilation-targets": "^7.28.6", - "@babel/helper-module-transforms": "^7.28.6", - "@babel/helpers": "^7.28.6", - "@babel/parser": "^7.28.6", - "@babel/template": "^7.28.6", - "@babel/traverse": "^7.28.6", - "@babel/types": "^7.28.6", + "@babel/code-frame": "^7.29.7", + "@babel/generator": "^7.29.7", + "@babel/helper-compilation-targets": "^7.29.7", + "@babel/helper-module-transforms": "^7.29.7", + "@babel/helpers": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/template": "^7.29.7", + "@babel/traverse": "^7.29.7", + "@babel/types": "^7.29.7", "@jridgewell/remapping": "^2.3.5", "convert-source-map": "^2.0.0", "debug": "^4.1.0", @@ -1189,14 +1189,14 @@ } }, "node_modules/@babel/generator": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.6.tgz", - "integrity": "sha512-lOoVRwADj8hjf7al89tvQ2a1lf53Z+7tiXMgpZJL3maQPDxh0DgLMN62B2MKUOFcoodBHLMbDM6WAbKgNy5Suw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.7.tgz", + "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==", "dev": true, "license": "MIT", "dependencies": { - "@babel/parser": "^7.28.6", - "@babel/types": "^7.28.6", + "@babel/parser": "^7.29.7", + "@babel/types": "^7.29.7", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -1219,14 +1219,14 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz", - "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz", + "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.28.6", - "@babel/helper-validator-option": "^7.27.1", + "@babel/compat-data": "^7.29.7", + "@babel/helper-validator-option": "^7.29.7", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" @@ -1246,9 +1246,9 @@ } }, "node_modules/@babel/helper-globals": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", - "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz", + "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==", "dev": true, "license": "MIT", "engines": { @@ -1256,29 +1256,29 @@ } }, "node_modules/@babel/helper-module-imports": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz", - "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz", + "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==", "dev": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.28.6", - "@babel/types": "^7.28.6" + "@babel/traverse": "^7.29.7", + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz", - "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz", + "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.28.6", - "@babel/helper-validator-identifier": "^7.28.5", - "@babel/traverse": "^7.28.6" + "@babel/helper-module-imports": "^7.29.7", + "@babel/helper-validator-identifier": "^7.29.7", + "@babel/traverse": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1298,27 +1298,27 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", - "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", + "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", - "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", + "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz", - "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz", + "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==", "dev": true, "license": "MIT", "engines": { @@ -1326,26 +1326,26 @@ } }, "node_modules/@babel/helpers": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.6.tgz", - "integrity": "sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.7.tgz", + "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.28.6", - "@babel/types": "^7.28.6" + "@babel/template": "^7.29.7", + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.6.tgz", - "integrity": "sha512-TeR9zWR18BvbfPmGbLampPMW+uW1NZnJlRuuHso8i87QZNq2JRF9i6RgxRqtEq+wQGsS19NNTWr2duhnE49mfQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz", + "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==", "license": "MIT", "dependencies": { - "@babel/types": "^7.28.6" + "@babel/types": "^7.29.7" }, "bin": { "parser": "bin/babel-parser.js" @@ -1439,33 +1439,33 @@ } }, "node_modules/@babel/template": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz", - "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz", + "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.28.6", - "@babel/parser": "^7.28.6", - "@babel/types": "^7.28.6" + "@babel/code-frame": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.6.tgz", - "integrity": "sha512-fgWX62k02qtjqdSNTAGxmKYY/7FSL9WAS1o2Hu5+I5m9T0yxZzr4cnrfXQ/MX0rIifthCSs6FKTlzYbJcPtMNg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.7.tgz", + "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==", "dev": true, "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.28.6", - "@babel/generator": "^7.28.6", - "@babel/helper-globals": "^7.28.0", - "@babel/parser": "^7.28.6", - "@babel/template": "^7.28.6", - "@babel/types": "^7.28.6", + "@babel/code-frame": "^7.29.7", + "@babel/generator": "^7.29.7", + "@babel/helper-globals": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/template": "^7.29.7", + "@babel/types": "^7.29.7", "debug": "^4.3.1" }, "engines": { @@ -1473,13 +1473,13 @@ } }, "node_modules/@babel/types": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.6.tgz", - "integrity": "sha512-0ZrskXVEHSWIqZM/sQZ4EV3jZJXRkio/WCxaqKZP1g//CEWEPSfeZFcms4XeKBCHU0ZKnIkdJeU/kF+eRp5lBg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz", + "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==", "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.27.1", - "@babel/helper-validator-identifier": "^7.28.5" + "@babel/helper-string-parser": "^7.29.7", + "@babel/helper-validator-identifier": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -1550,9 +1550,9 @@ "license": "Apache-2.0" }, "node_modules/@emnapi/runtime": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.8.1.tgz", - "integrity": "sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==", + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.2.tgz", + "integrity": "sha512-kyOl3X0DuTiT1h2ft8r2fYO8JYtU9a9Xis/zBSiGArNaagCOWx90N1k2wxp18czFDH+OgcWGb5ZP/XMt3dcyPA==", "dev": true, "license": "MIT", "optional": true, @@ -2036,9 +2036,9 @@ } }, "node_modules/@img/colour": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.0.0.tgz", - "integrity": "sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.1.0.tgz", + "integrity": "sha512-Td76q7j57o/tLVdgS746cYARfSyxk8iEfRxewL9h4OMzYhbW4TAcppl0mT4eyqXddh6L/jwoM75mo7ixa/pCeQ==", "dev": true, "license": "MIT", "engines": { @@ -2046,9 +2046,9 @@ } }, "node_modules/@img/sharp-darwin-arm64": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.5.tgz", - "integrity": "sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==", + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.35.3.tgz", + "integrity": "sha512-RMnFX7YQsMoh7lWfcM4NEHHymBX/rLuKNPVM84XE9ONPcaSCDgE7CHIHpSgPcO2xcRthgBy1HfNO319mwhIAkg==", "cpu": [ "arm64" ], @@ -2059,19 +2059,19 @@ "darwin" ], "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + "node": ">=20.9.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-darwin-arm64": "1.2.4" + "@img/sharp-libvips-darwin-arm64": "1.3.2" } }, "node_modules/@img/sharp-darwin-x64": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.5.tgz", - "integrity": "sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==", + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.35.3.tgz", + "integrity": "sha512-Xo+5uFBtLN0BKqieTxiFzFPQAUlBbbH5iBKyRX/z1JrbnYsHTfKJnUfL8+p2TPXr1pXqao4eeL4Rl144uDpK9w==", "cpu": [ "x64" ], @@ -2082,19 +2082,39 @@ "darwin" ], "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + "node": ">=20.9.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-darwin-x64": "1.2.4" + "@img/sharp-libvips-darwin-x64": "1.3.2" + } + }, + "node_modules/@img/sharp-freebsd-wasm32": { + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/@img/sharp-freebsd-wasm32/-/sharp-freebsd-wasm32-0.35.3.tgz", + "integrity": "sha512-lUxcqWIj2wMQ9BrwNjngcr1gWUr5xgaGThBRqPPalIC2n67Cqj1uPh8NnA/ZhAg8hUbKl+kVHKwgUIwe6ZYPrg==", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "os": [ + "freebsd" + ], + "dependencies": { + "@img/sharp-wasm32": "0.35.3" + }, + "engines": { + "node": ">=20.9.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" } }, "node_modules/@img/sharp-libvips-darwin-arm64": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.4.tgz", - "integrity": "sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.3.2.tgz", + "integrity": "sha512-9J6ypZFpQBj4YnePGoq/S38w6nz+vqg5WZLrLGY4YuSemdMq47GMLBPO42MzwdGwpg/agZ7xzZcFHa48xlywfg==", "cpu": [ "arm64" ], @@ -2109,9 +2129,9 @@ } }, "node_modules/@img/sharp-libvips-darwin-x64": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.4.tgz", - "integrity": "sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.3.2.tgz", + "integrity": "sha512-m2pW1n6cns9VaubNwsZ+c3CRYjxNQWgJ5gPlnL1nbBcpkBvFm6SCFN5o0psFHI8w9n11NKhFkeEDns98tiqbEw==", "cpu": [ "x64" ], @@ -2126,9 +2146,9 @@ } }, "node_modules/@img/sharp-libvips-linux-arm": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.4.tgz", - "integrity": "sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.3.2.tgz", + "integrity": "sha512-1eMLzy92I4J6rmi4mAT8yC3HxOtniyGELlzGbNMLLeqe052ahFQ0h6LFq+lh5DsDIdYViIDst08abvSbcEdLXQ==", "cpu": [ "arm" ], @@ -2143,9 +2163,9 @@ } }, "node_modules/@img/sharp-libvips-linux-arm64": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.4.tgz", - "integrity": "sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.3.2.tgz", + "integrity": "sha512-dqVSFynCox4C/J8kT16V7SIFAns0IjgLwkvYT7p8LQVmJ5OS5b6tI9IGflxTeuBS//zXeFIUbwt5dwxyZ17cnA==", "cpu": [ "arm64" ], @@ -2160,9 +2180,9 @@ } }, "node_modules/@img/sharp-libvips-linux-ppc64": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.4.tgz", - "integrity": "sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.3.2.tgz", + "integrity": "sha512-3z0NHDxD6n5I9gc05U1eW1AyRm+Gznzq3naMrthPNqE6oYykcogW0l/jfpJdjYnuNl8R7yI9pNbE1XiUeyq0Aw==", "cpu": [ "ppc64" ], @@ -2177,9 +2197,9 @@ } }, "node_modules/@img/sharp-libvips-linux-riscv64": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.2.4.tgz", - "integrity": "sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.3.2.tgz", + "integrity": "sha512-bsb4rI+NldGOsXuej2r8OdSS8+zXDVaCWxyWrcv6kneTOlgAHtZABRzBBCwdsPiD90J4myNJuHpg6kA20ImW/w==", "cpu": [ "riscv64" ], @@ -2194,9 +2214,9 @@ } }, "node_modules/@img/sharp-libvips-linux-s390x": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.4.tgz", - "integrity": "sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.3.2.tgz", + "integrity": "sha512-/ABshyj8gCpyIrNXnHn4LorDJ0HHm1VhXPBlxZ8zAtfVPAaSafXPGn+sUSIRiwaSBy0mmFjSjiXI5mkcwdChKQ==", "cpu": [ "s390x" ], @@ -2211,9 +2231,9 @@ } }, "node_modules/@img/sharp-libvips-linux-x64": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.4.tgz", - "integrity": "sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.3.2.tgz", + "integrity": "sha512-ITPEtgffGJ0S6G9dRyw/366tJQqFRcHWPHhC+Stpg3Z8AEMrDrTr2lhdz4f/Y/HMbRh//7Z5mBzEpVdi62Oc3w==", "cpu": [ "x64" ], @@ -2228,9 +2248,9 @@ } }, "node_modules/@img/sharp-libvips-linuxmusl-arm64": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.4.tgz", - "integrity": "sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.3.2.tgz", + "integrity": "sha512-zE9EdiUzUmg5mDT5a1rk5fYJ6GWPloTwWBYDS14naqHsL+EaMpDj1AWnpLgh3u0YCORv2Tt50wrcrpYqkP97Kw==", "cpu": [ "arm64" ], @@ -2245,9 +2265,9 @@ } }, "node_modules/@img/sharp-libvips-linuxmusl-x64": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.4.tgz", - "integrity": "sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.3.2.tgz", + "integrity": "sha512-m0lrLiUt+lBYnCFr8qV/65yMR4E/c7/wf78I5eKTdkEakFAlZ9QlzEM3QIhhAwVeUhLAHLcCq7a7Vszq/oFNZQ==", "cpu": [ "x64" ], @@ -2262,9 +2282,9 @@ } }, "node_modules/@img/sharp-linux-arm": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.5.tgz", - "integrity": "sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==", + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.35.3.tgz", + "integrity": "sha512-affVWCTLooy8TSxbDx2qkzuDeaWLNVBA+P//FNBirHsXpP2fuBhk5AuboYUnrDnzoXes8GFjpTx0SBFOCRg+FA==", "cpu": [ "arm" ], @@ -2275,19 +2295,19 @@ "linux" ], "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + "node": ">=20.9.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-arm": "1.2.4" + "@img/sharp-libvips-linux-arm": "1.3.2" } }, "node_modules/@img/sharp-linux-arm64": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.5.tgz", - "integrity": "sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==", + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.35.3.tgz", + "integrity": "sha512-QgKDspHPnrU+GQ55XPhGwyhC8acLVOOSyAvo1oVfFmrIXLkDNmGWzAfDZ4xK8oSA1qBQrALcHX0G5UZni/SuFQ==", "cpu": [ "arm64" ], @@ -2298,19 +2318,19 @@ "linux" ], "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + "node": ">=20.9.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-arm64": "1.2.4" + "@img/sharp-libvips-linux-arm64": "1.3.2" } }, "node_modules/@img/sharp-linux-ppc64": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.5.tgz", - "integrity": "sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==", + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.35.3.tgz", + "integrity": "sha512-sMd8rDxmpLOwv/7N44klFjOD5DUO7FLdjiXDI0hoxYaf7Ar262dQIEkosE98bps+5HPLtp/EvNqeqQtOycP/IA==", "cpu": [ "ppc64" ], @@ -2321,19 +2341,19 @@ "linux" ], "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + "node": ">=20.9.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-ppc64": "1.2.4" + "@img/sharp-libvips-linux-ppc64": "1.3.2" } }, "node_modules/@img/sharp-linux-riscv64": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.34.5.tgz", - "integrity": "sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==", + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.35.3.tgz", + "integrity": "sha512-0Eob78yjlYPfL5vMNWAW55l3R9Y6BQS/gOfe0ZcP9mEz9ohhKSt4im1hayiknXgf8AWrFqMvJcKIdmLmEe7yeQ==", "cpu": [ "riscv64" ], @@ -2344,19 +2364,19 @@ "linux" ], "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + "node": ">=20.9.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-riscv64": "1.2.4" + "@img/sharp-libvips-linux-riscv64": "1.3.2" } }, "node_modules/@img/sharp-linux-s390x": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.5.tgz", - "integrity": "sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==", + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.35.3.tgz", + "integrity": "sha512-KgAxQ0DxpNOq1rG2t5cgTgShJFGSuU7XO45cqC+1NVOuZnP6tlgZRuSYOfNupGkHID0o3cJOsw4DVeJpMovcGw==", "cpu": [ "s390x" ], @@ -2367,19 +2387,19 @@ "linux" ], "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + "node": ">=20.9.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-s390x": "1.2.4" + "@img/sharp-libvips-linux-s390x": "1.3.2" } }, "node_modules/@img/sharp-linux-x64": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.5.tgz", - "integrity": "sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==", + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.35.3.tgz", + "integrity": "sha512-8pqvxubL2PGdhlPy6GLqzDYMUjyRmKAwKHYKixpdJYBUK7PJ0C029XdsnpFIdgRZG68fZiGdHVWcKPvtiPB4cA==", "cpu": [ "x64" ], @@ -2390,19 +2410,19 @@ "linux" ], "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + "node": ">=20.9.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linux-x64": "1.2.4" + "@img/sharp-libvips-linux-x64": "1.3.2" } }, "node_modules/@img/sharp-linuxmusl-arm64": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.5.tgz", - "integrity": "sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==", + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.35.3.tgz", + "integrity": "sha512-Vz0iQjzzcSX3HCbfwFfCSG/9SCIqyO0mH2sXyiHaAYfBk0cRsCWXRyQYX0ovCK/PAQBbTzQ0dsPQHh5MAFL59w==", "cpu": [ "arm64" ], @@ -2413,19 +2433,19 @@ "linux" ], "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + "node": ">=20.9.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linuxmusl-arm64": "1.2.4" + "@img/sharp-libvips-linuxmusl-arm64": "1.3.2" } }, "node_modules/@img/sharp-linuxmusl-x64": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.5.tgz", - "integrity": "sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==", + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.35.3.tgz", + "integrity": "sha512-6O1NPKcDVj9QEdg7Hx549EX8U0rp6yXQERqru6yRN7fGBn32UvIRJUlWnk+8xDCiG76hXVBbX82NZ/ZKr0euIg==", "cpu": [ "x64" ], @@ -2436,39 +2456,56 @@ "linux" ], "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + "node": ">=20.9.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-libvips-linuxmusl-x64": "1.2.4" + "@img/sharp-libvips-linuxmusl-x64": "1.3.2" } }, "node_modules/@img/sharp-wasm32": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.5.tgz", - "integrity": "sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==", - "cpu": [ - "wasm32" - ], + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.35.3.tgz", + "integrity": "sha512-cZ0XkcYGpHZkqW6iCkqTcmUC0CD9DhD5d/qeZlZkfRBn6GnHniZXLUo5+9xw8Iv76YE6LQFN9YNBlKREcCG76w==", "dev": true, "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT", "optional": true, "dependencies": { - "@emnapi/runtime": "^1.7.0" + "@emnapi/runtime": "^1.11.1" }, "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + "node": ">=20.9.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-webcontainers-wasm32": { + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/@img/sharp-webcontainers-wasm32/-/sharp-webcontainers-wasm32-0.35.3.tgz", + "integrity": "sha512-2rnq7bX3NzeR2T4YWgz8qiG4h3TSdMe+vN1iQXpJleSJ3SM5zQ8Fy2SyyXAWlbxpEZ2Y+Z4u1BePgJEYbSy80Q==", + "cpu": [ + "wasm32" + ], + "dev": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "@img/sharp-wasm32": "0.35.3" + }, + "engines": { + "node": ">=20.9.0" }, "funding": { "url": "https://opencollective.com/libvips" } }, "node_modules/@img/sharp-win32-arm64": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.5.tgz", - "integrity": "sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==", + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.35.3.tgz", + "integrity": "sha512-4bPwFdMbeC4JQ8L8LOyWp6nsHcboP5fxkp6iPOXz2Vg49R42TuMs2whkJ5OAP4/Ul035qOzy0AecOF9VOscn4w==", "cpu": [ "arm64" ], @@ -2479,16 +2516,16 @@ "win32" ], "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + "node": ">=20.9.0" }, "funding": { "url": "https://opencollective.com/libvips" } }, "node_modules/@img/sharp-win32-ia32": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.5.tgz", - "integrity": "sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==", + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.35.3.tgz", + "integrity": "sha512-r53mXsBN6lFUDiST764SvgwUdHAqM4rPAiDzAmf4fLoB6X/rkfyTrLCg6+g17wJJiCmB3JYgHuUldCWUIRFSXw==", "cpu": [ "ia32" ], @@ -2499,16 +2536,16 @@ "win32" ], "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + "node": "^20.9.0" }, "funding": { "url": "https://opencollective.com/libvips" } }, "node_modules/@img/sharp-win32-x64": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.5.tgz", - "integrity": "sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==", + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.35.3.tgz", + "integrity": "sha512-D4y1vNeZrIIJCN+uHaWVtH86B+aCrdMYYjicy9pXHvbGZeGYLLSd3wdVuC37FxVXlU1ARsk84eKWfWMXGYEqvA==", "cpu": [ "x64" ], @@ -2519,7 +2556,7 @@ "win32" ], "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + "node": ">=20.9.0" }, "funding": { "url": "https://opencollective.com/libvips" @@ -3026,9 +3063,9 @@ } }, "node_modules/@oclif/core/node_modules/brace-expansion": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz", - "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.2.tgz", + "integrity": "sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA==", "dev": true, "license": "MIT", "dependencies": { @@ -4460,13 +4497,16 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.9.18", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.18.tgz", - "integrity": "sha512-e23vBV1ZLfjb9apvfPk4rHVu2ry6RIr2Wfs+O324okSidrX7pTAnEJPCh/O5BtRlr7QtZI7ktOP3vsqr7Z5XoA==", + "version": "2.11.1", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.1.tgz", + "integrity": "sha512-HYXq73DDpCtNzOmrFsm9eSwCvWCql0RzqjpDzXN9EadiLJ4DNat0nsZ/Bzmy+Ud12mb4/zKDY0cQ805ZzN+i0A==", "dev": true, "license": "Apache-2.0", "bin": { - "baseline-browser-mapping": "dist/cli.js" + "baseline-browser-mapping": "dist/cli.cjs" + }, + "engines": { + "node": ">=6.0.0" } }, "node_modules/bezier-js": { @@ -4494,20 +4534,20 @@ } }, "node_modules/body-parser": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.2.2.tgz", - "integrity": "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.3.0.tgz", + "integrity": "sha512-2cGmJupaNgg+QUwVLAucDuWuoMZ6EX9iHDRswZ5lsNYEmwPaRknMPCLZz07yTzVq/83p4o/wzbDZbBrTvGGTIw==", "license": "MIT", "dependencies": { "bytes": "^3.1.2", - "content-type": "^1.0.5", + "content-type": "^2.0.0", "debug": "^4.4.3", - "http-errors": "^2.0.0", - "iconv-lite": "^0.7.0", + "http-errors": "^2.0.1", + "iconv-lite": "^0.7.2", "on-finished": "^2.4.1", - "qs": "^6.14.1", - "raw-body": "^3.0.1", - "type-is": "^2.0.1" + "qs": "^6.15.2", + "raw-body": "^3.0.2", + "type-is": "^2.1.0" }, "engines": { "node": ">=18" @@ -4517,6 +4557,19 @@ "url": "https://opencollective.com/express" } }, + "node_modules/body-parser/node_modules/content-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.0.0.tgz", + "integrity": "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/body-parser/node_modules/iconv-lite": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", @@ -4540,9 +4593,9 @@ "license": "ISC" }, "node_modules/brace-expansion": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz", - "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -4564,9 +4617,9 @@ } }, "node_modules/browserslist": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz", - "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==", + "version": "4.28.7", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.7.tgz", + "integrity": "sha512-JxV13hNrFxqjOc8alRbq9dK1MM79NEXYpma2B2J4wAtpWS5zIEIKqWPGCl7N4o7Uc7B7itylh7SuDujATRyyTw==", "dev": true, "funding": [ { @@ -4584,11 +4637,11 @@ ], "license": "MIT", "dependencies": { - "baseline-browser-mapping": "^2.9.0", - "caniuse-lite": "^1.0.30001759", - "electron-to-chromium": "^1.5.263", - "node-releases": "^2.0.27", - "update-browserslist-db": "^1.2.0" + "baseline-browser-mapping": "^2.10.44", + "caniuse-lite": "^1.0.30001806", + "electron-to-chromium": "^1.5.393", + "node-releases": "^2.0.51", + "update-browserslist-db": "^1.2.3" }, "bin": { "browserslist": "cli.js" @@ -4597,6 +4650,34 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, + "node_modules/browserslist/node_modules/caniuse-lite": { + "version": "1.0.30001806", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001806.tgz", + "integrity": "sha512-72Cuvd95zbSYPKq6Fhg8eDJRlzgWDf7/mtoZv6Qe/DYNCEBdNxoA3+rZAU2ZhGCpZlns3EssFavaZomckT5Uuw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" + }, + "node_modules/browserslist/node_modules/electron-to-chromium": { + "version": "1.5.395", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.395.tgz", + "integrity": "sha512-7zt9Aw+SrmxLWLN0zhaTWZQiCdryLVrYTq5R7iZakLvi2UQPYMMsROYV/2qVCzMeCiSXHwKOU+sZ4zOVVlrtKA==", + "dev": true, + "license": "ISC" + }, "node_modules/bun": { "version": "1.3.10", "resolved": "https://registry.npmjs.org/bun/-/bun-1.3.10.tgz", @@ -5005,15 +5086,15 @@ "license": "MIT" }, "node_modules/concurrently": { - "version": "9.2.1", - "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.2.1.tgz", - "integrity": "sha512-fsfrO0MxV64Znoy8/l1vVIjjHa29SZyyqPgQBwhiDcaW8wJc2W3XWVOGx4M3oJBnv/zdUZIIp1gDeS98GzP8Ng==", + "version": "9.2.4", + "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.2.4.tgz", + "integrity": "sha512-TZ0CEhyzvFjgtAvHTusDMgj7wNdihCh7LLLrzdUOXIhdlnL2JBBGA9eJxR24rtqgmdjh3OA3hrN1rCHj6HM8qA==", "dev": true, "license": "MIT", "dependencies": { "chalk": "4.1.2", "rxjs": "7.8.2", - "shell-quote": "1.8.3", + "shell-quote": "1.9.0", "supports-color": "8.1.1", "tree-kill": "1.2.2", "yargs": "17.7.2" @@ -5835,9 +5916,9 @@ "license": "MIT" }, "node_modules/fast-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", - "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.4.tgz", + "integrity": "sha512-8JnbkQ4juDyvYs4mgFGQqg4yCYtFDtUtmp2QIQq11ZZe5CFQ5wcqm1rqDgAh/QdMySuBnPzMUiJUNZG5N/AiQw==", "funding": [ { "type": "github", @@ -5868,9 +5949,9 @@ } }, "node_modules/filelist/node_modules/brace-expansion": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz", - "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.2.tgz", + "integrity": "sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA==", "dev": true, "license": "MIT", "dependencies": { @@ -6171,9 +6252,9 @@ } }, "node_modules/hono": { - "version": "4.12.23", - "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.23.tgz", - "integrity": "sha512-eIaZ9qDgu7XV0pxOCrg7/WhnQ6Ivm22UcxhXx/A3dcbqbbYgBEkc6e/J/s7j2tS96zoB0S9VBdLwQNCWwUo4LA==", + "version": "4.12.31", + "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.31.tgz", + "integrity": "sha512-zJIHFrl6bq3RDd2YusFNCDlM8qUprxKswyi/OPzPyzKDdyBXDqWx8bZlZ7R+saTdSTatUmb3O7K4SspGPaEOQg==", "license": "MIT", "engines": { "node": ">=16.9.0" @@ -6576,10 +6657,20 @@ } }, "node_modules/linkify-it": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", - "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.2.tgz", + "integrity": "sha512-ONTm2jCMAVZjgQa/Fy1kScXsuOoF5NPTsoFBdE1KVIZ2vAh/r9+Bqo+0jINCBYnavTPQZz38QzFTme79ENoN3Q==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/markdown-it" + } + ], "license": "MIT", "dependencies": { "uc.micro": "^2.0.0" @@ -6791,15 +6882,25 @@ } }, "node_modules/markdown-it": { - "version": "14.1.1", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.1.tgz", - "integrity": "sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA==", + "version": "14.3.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.3.0.tgz", + "integrity": "sha512-RCEsPjR+sr0x+AuYp601tKTkgFG4YEPLCzHST3cQ/fhlJkqAkz1L2/Qbp1j9qw5SBwQHFBoW8+hoN5xssOF0Tw==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/markdown-it" + } + ], "license": "MIT", "dependencies": { "argparse": "^2.0.1", - "entities": "^4.4.0", - "linkify-it": "^5.0.0", + "entities": "^4.5.0", + "linkify-it": "^5.0.2", "mdurl": "^2.0.0", "punycode.js": "^2.3.1", "uc.micro": "^2.1.0" @@ -6987,11 +7088,14 @@ } }, "node_modules/node-releases": { - "version": "2.0.27", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz", - "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==", + "version": "2.0.51", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.51.tgz", + "integrity": "sha512-wRNIrw4DmVLKQlbgOMdkMx27Wrpzes2hh5Jtbi2bjPd+4wJstWIqP5A+lscnqbm0xxmT5Bpg8Lec5ItEBwx6BQ==", "dev": true, - "license": "MIT" + "license": "MIT", + "engines": { + "node": ">=18" + } }, "node_modules/nodemon": { "version": "3.1.11", @@ -7615,9 +7719,9 @@ "license": "MIT" }, "node_modules/semver": { - "version": "7.7.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", - "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", "dev": true, "license": "ISC", "bin": { @@ -7700,48 +7804,53 @@ "license": "ISC" }, "node_modules/sharp": { - "version": "0.34.5", - "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.5.tgz", - "integrity": "sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==", + "version": "0.35.3", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.35.3.tgz", + "integrity": "sha512-ej0zVHuZGHCiABXcNxeYhpRnPNPAcvbG8RMdBAhDAxLKkCRVSpK3Iyu7qbqw3JMzoj0REeM6f3tJLtVwl0023Q==", "dev": true, - "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { - "@img/colour": "^1.0.0", + "@img/colour": "^1.1.0", "detect-libc": "^2.1.2", - "semver": "^7.7.3" + "semver": "^7.8.5" }, "engines": { - "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + "node": ">=20.9.0" }, "funding": { "url": "https://opencollective.com/libvips" }, "optionalDependencies": { - "@img/sharp-darwin-arm64": "0.34.5", - "@img/sharp-darwin-x64": "0.34.5", - "@img/sharp-libvips-darwin-arm64": "1.2.4", - "@img/sharp-libvips-darwin-x64": "1.2.4", - "@img/sharp-libvips-linux-arm": "1.2.4", - "@img/sharp-libvips-linux-arm64": "1.2.4", - "@img/sharp-libvips-linux-ppc64": "1.2.4", - "@img/sharp-libvips-linux-riscv64": "1.2.4", - "@img/sharp-libvips-linux-s390x": "1.2.4", - "@img/sharp-libvips-linux-x64": "1.2.4", - "@img/sharp-libvips-linuxmusl-arm64": "1.2.4", - "@img/sharp-libvips-linuxmusl-x64": "1.2.4", - "@img/sharp-linux-arm": "0.34.5", - "@img/sharp-linux-arm64": "0.34.5", - "@img/sharp-linux-ppc64": "0.34.5", - "@img/sharp-linux-riscv64": "0.34.5", - "@img/sharp-linux-s390x": "0.34.5", - "@img/sharp-linux-x64": "0.34.5", - "@img/sharp-linuxmusl-arm64": "0.34.5", - "@img/sharp-linuxmusl-x64": "0.34.5", - "@img/sharp-wasm32": "0.34.5", - "@img/sharp-win32-arm64": "0.34.5", - "@img/sharp-win32-ia32": "0.34.5", - "@img/sharp-win32-x64": "0.34.5" + "@img/sharp-darwin-arm64": "0.35.3", + "@img/sharp-darwin-x64": "0.35.3", + "@img/sharp-freebsd-wasm32": "0.35.3", + "@img/sharp-libvips-darwin-arm64": "1.3.2", + "@img/sharp-libvips-darwin-x64": "1.3.2", + "@img/sharp-libvips-linux-arm": "1.3.2", + "@img/sharp-libvips-linux-arm64": "1.3.2", + "@img/sharp-libvips-linux-ppc64": "1.3.2", + "@img/sharp-libvips-linux-riscv64": "1.3.2", + "@img/sharp-libvips-linux-s390x": "1.3.2", + "@img/sharp-libvips-linux-x64": "1.3.2", + "@img/sharp-libvips-linuxmusl-arm64": "1.3.2", + "@img/sharp-libvips-linuxmusl-x64": "1.3.2", + "@img/sharp-linux-arm": "0.35.3", + "@img/sharp-linux-arm64": "0.35.3", + "@img/sharp-linux-ppc64": "0.35.3", + "@img/sharp-linux-riscv64": "0.35.3", + "@img/sharp-linux-s390x": "0.35.3", + "@img/sharp-linux-x64": "0.35.3", + "@img/sharp-linuxmusl-arm64": "0.35.3", + "@img/sharp-linuxmusl-x64": "0.35.3", + "@img/sharp-webcontainers-wasm32": "0.35.3", + "@img/sharp-win32-arm64": "0.35.3", + "@img/sharp-win32-ia32": "0.35.3", + "@img/sharp-win32-x64": "0.35.3" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + } } }, "node_modules/shebang-command": { @@ -7766,9 +7875,9 @@ } }, "node_modules/shell-quote": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.3.tgz", - "integrity": "sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.9.0.tgz", + "integrity": "sha512-Iov+JwFv/2HcTpcwNMKd8+IWNb8tboQJNQTkAY/LLVK7gGH9jy+LGkVqPxfekHl+yMmiqXszdGWXgkfml7hjqA==", "dev": true, "license": "MIT", "engines": { @@ -9057,17 +9166,34 @@ } }, "node_modules/type-is": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.0.1.tgz", - "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-2.1.0.tgz", + "integrity": "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA==", "license": "MIT", "dependencies": { - "content-type": "^1.0.5", + "content-type": "^2.0.0", "media-typer": "^1.1.0", "mime-types": "^3.0.0" }, "engines": { - "node": ">= 0.6" + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/type-is/node_modules/content-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-2.0.0.tgz", + "integrity": "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/typedoc": { @@ -9108,9 +9234,9 @@ } }, "node_modules/typedoc/node_modules/brace-expansion": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz", - "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.2.tgz", + "integrity": "sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA==", "dev": true, "license": "MIT", "dependencies": { @@ -9162,9 +9288,9 @@ "license": "MIT" }, "node_modules/undici": { - "version": "7.24.7", - "resolved": "https://registry.npmjs.org/undici/-/undici-7.24.7.tgz", - "integrity": "sha512-H/nlJ/h0ggGC+uRL3ovD+G0i4bqhvsDOpbDv7At5eFLlj2b41L8QliGbnl2H7SnDiYhENphh1tQFJZf+MyfLsQ==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.28.0.tgz", + "integrity": "sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==", "license": "MIT", "engines": { "node": ">=20.18.1" @@ -9227,9 +9353,9 @@ } }, "node_modules/vite": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.2.tgz", - "integrity": "sha512-2N/55r4JDJ4gdrCvGgINMy+HH3iRpNIz8K6SFwVsA+JbQScLiC+clmAxBgwiSPgcG9U15QmvqCGWzMbqda5zGQ==", + "version": "6.4.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.3.tgz", + "integrity": "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 8c6ead5..b494003 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "prettier": "^3.6.2", "react": "^19.2.0", "react-dom": "^19.2.0", - "sharp": "^0.34.5", + "sharp": "^0.35.3", "ts-to-zod": "^5.1.0", "tsx": "^4.21.0", "typedoc": "^0.28.14", From e7ffe7c738b2db36d76339ec2f1b0d9c16c29812 Mon Sep 17 00:00:00 2001 From: Enrico <2827496+tonxxd@users.noreply.github.com> Date: Wed, 22 Jul 2026 15:24:49 -0700 Subject: [PATCH 082/107] chore: update MCP SDK packages to beta.5 --- examples/basic-host/package.json | 2 +- examples/basic-server-preact/package.json | 8 +- examples/basic-server-react/package.json | 8 +- examples/basic-server-solid/package.json | 8 +- examples/basic-server-svelte/package.json | 8 +- examples/basic-server-vanillajs/package.json | 8 +- examples/basic-server-vue/package.json | 8 +- examples/budget-allocator-server/package.json | 6 +- examples/cohort-heatmap-server/package.json | 6 +- .../customer-segmentation-server/package.json | 6 +- examples/debug-server/package.json | 6 +- examples/integration-server/package.json | 8 +- examples/lazy-auth-server/package.json | 4 +- examples/map-server/package.json | 8 +- examples/pdf-server/package.json | 8 +- examples/quickstart/package.json | 6 +- examples/scenario-modeler-server/package.json | 6 +- examples/shadertoy-server/package.json | 6 +- examples/sheet-music-server/package.json | 6 +- examples/system-monitor-server/package.json | 6 +- examples/threejs-server/package.json | 8 +- examples/transcript-server/package.json | 6 +- examples/video-resource-server/package.json | 8 +- examples/wiki-explorer-server/package.json | 8 +- package-lock.json | 613 +++--------------- package.json | 17 +- src/generated/schema.json | 56 +- 27 files changed, 235 insertions(+), 613 deletions(-) diff --git a/examples/basic-host/package.json b/examples/basic-host/package.json index 583d2ff..c2a104e 100644 --- a/examples/basic-host/package.json +++ b/examples/basic-host/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", "react": "^19.2.0", "react-dom": "^19.2.0", "zod": "^4.1.13" diff --git a/examples/basic-server-preact/package.json b/examples/basic-server-preact/package.json index 0187827..8722a54 100644 --- a/examples/basic-server-preact/package.json +++ b/examples/basic-server-preact/package.json @@ -24,11 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "preact": "^10.0.0", diff --git a/examples/basic-server-react/package.json b/examples/basic-server-react/package.json index dae7665..0a860c5 100644 --- a/examples/basic-server-react/package.json +++ b/examples/basic-server-react/package.json @@ -34,11 +34,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", diff --git a/examples/basic-server-solid/package.json b/examples/basic-server-solid/package.json index 5d91407..a0d1bfa 100644 --- a/examples/basic-server-solid/package.json +++ b/examples/basic-server-solid/package.json @@ -24,11 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "solid-js": "1.9.10", diff --git a/examples/basic-server-svelte/package.json b/examples/basic-server-svelte/package.json index 18bf7ab..81d73fe 100644 --- a/examples/basic-server-svelte/package.json +++ b/examples/basic-server-svelte/package.json @@ -24,11 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "svelte": "^5.0.0", diff --git a/examples/basic-server-vanillajs/package.json b/examples/basic-server-vanillajs/package.json index 6bb75af..1958b73 100644 --- a/examples/basic-server-vanillajs/package.json +++ b/examples/basic-server-vanillajs/package.json @@ -24,11 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/basic-server-vue/package.json b/examples/basic-server-vue/package.json index 3b34aa6..a872c52 100644 --- a/examples/basic-server-vue/package.json +++ b/examples/basic-server-vue/package.json @@ -24,11 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "vue": "^3.5.0", diff --git a/examples/budget-allocator-server/package.json b/examples/budget-allocator-server/package.json index 5d4fe8e..3b02ddf 100644 --- a/examples/budget-allocator-server/package.json +++ b/examples/budget-allocator-server/package.json @@ -27,9 +27,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/cohort-heatmap-server/package.json b/examples/cohort-heatmap-server/package.json index c54040a..fd4777c 100644 --- a/examples/cohort-heatmap-server/package.json +++ b/examples/cohort-heatmap-server/package.json @@ -27,9 +27,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", diff --git a/examples/customer-segmentation-server/package.json b/examples/customer-segmentation-server/package.json index ef14b32..0846b40 100644 --- a/examples/customer-segmentation-server/package.json +++ b/examples/customer-segmentation-server/package.json @@ -27,9 +27,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/debug-server/package.json b/examples/debug-server/package.json index 0e3f508..f118717 100644 --- a/examples/debug-server/package.json +++ b/examples/debug-server/package.json @@ -35,9 +35,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "zod": "^4.1.13" }, "devDependencies": { diff --git a/examples/integration-server/package.json b/examples/integration-server/package.json index 56fc8ed..2993020 100644 --- a/examples/integration-server/package.json +++ b/examples/integration-server/package.json @@ -15,11 +15,11 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", diff --git a/examples/lazy-auth-server/package.json b/examples/lazy-auth-server/package.json index 6aef3e1..257f96c 100644 --- a/examples/lazy-auth-server/package.json +++ b/examples/lazy-auth-server/package.json @@ -23,8 +23,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "jose": "^6.0.0", diff --git a/examples/map-server/package.json b/examples/map-server/package.json index a3639ce..0a56f85 100644 --- a/examples/map-server/package.json +++ b/examples/map-server/package.json @@ -26,11 +26,11 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/pdf-server/package.json b/examples/pdf-server/package.json index a7eb4bb..ac80173 100644 --- a/examples/pdf-server/package.json +++ b/examples/pdf-server/package.json @@ -26,11 +26,11 @@ }, "dependencies": { "@cantoo/pdf-lib": "^2.6.5", - "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "pdfjs-dist": "^5.0.0", diff --git a/examples/quickstart/package.json b/examples/quickstart/package.json index f741c6e..96bcbfa 100644 --- a/examples/quickstart/package.json +++ b/examples/quickstart/package.json @@ -16,9 +16,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/scenario-modeler-server/package.json b/examples/scenario-modeler-server/package.json index 63a5d48..93b6d8a 100644 --- a/examples/scenario-modeler-server/package.json +++ b/examples/scenario-modeler-server/package.json @@ -27,9 +27,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/shadertoy-server/package.json b/examples/shadertoy-server/package.json index 318f017..ef5f563 100644 --- a/examples/shadertoy-server/package.json +++ b/examples/shadertoy-server/package.json @@ -25,9 +25,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/sheet-music-server/package.json b/examples/sheet-music-server/package.json index 10d7c71..0628f58 100644 --- a/examples/sheet-music-server/package.json +++ b/examples/sheet-music-server/package.json @@ -25,9 +25,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "abcjs": "^6.4.4", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/system-monitor-server/package.json b/examples/system-monitor-server/package.json index 5bc4a95..c5aa008 100644 --- a/examples/system-monitor-server/package.json +++ b/examples/system-monitor-server/package.json @@ -27,9 +27,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/threejs-server/package.json b/examples/threejs-server/package.json index fb97d33..aae13a7 100644 --- a/examples/threejs-server/package.json +++ b/examples/threejs-server/package.json @@ -26,11 +26,11 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", diff --git a/examples/transcript-server/package.json b/examples/transcript-server/package.json index eea4a80..51e7d27 100644 --- a/examples/transcript-server/package.json +++ b/examples/transcript-server/package.json @@ -25,9 +25,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/video-resource-server/package.json b/examples/video-resource-server/package.json index ea816b9..e8535cd 100644 --- a/examples/video-resource-server/package.json +++ b/examples/video-resource-server/package.json @@ -24,11 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/wiki-explorer-server/package.json b/examples/wiki-explorer-server/package.json index bd31d6f..11ec18c 100644 --- a/examples/wiki-explorer-server/package.json +++ b/examples/wiki-explorer-server/package.json @@ -26,11 +26,11 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.4", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cheerio": "^1.0.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/package-lock.json b/package-lock.json index c7d677e..e6e524e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,9 +16,9 @@ }, "devDependencies": { "@boneskull/typedoc-plugin-mermaid": "^0.2.0", - "@modelcontextprotocol/client": "https://pkg.pr.new/@modelcontextprotocol/client@2501", - "@modelcontextprotocol/core": "https://pkg.pr.new/@modelcontextprotocol/core@2501", - "@modelcontextprotocol/server": "https://pkg.pr.new/@modelcontextprotocol/server@2501", + "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/core": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "@playwright/test": "1.57.0", "@types/bun": "^1.3.2", "@types/node": "20.19.27", @@ -52,9 +52,9 @@ "node": ">=20" }, "peerDependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", - "@modelcontextprotocol/core": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/core": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0", "zod": "^4.2.0" @@ -78,7 +78,7 @@ "name": "@modelcontextprotocol/ext-apps-basic-host", "version": "1.7.4", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", "react": "^19.2.0", "react-dom": "^19.2.0", @@ -99,33 +99,16 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/basic-host/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/basic-host/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/basic-server-preact": { "name": "@modelcontextprotocol/server-basic-preact", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "preact": "^10.0.0", @@ -146,33 +129,16 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/basic-server-preact/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/basic-server-preact/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/basic-server-react": { "name": "@modelcontextprotocol/server-basic-react", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", @@ -196,33 +162,16 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/basic-server-react/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/basic-server-react/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/basic-server-solid": { "name": "@modelcontextprotocol/server-basic-solid", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "solid-js": "1.9.10", @@ -243,33 +192,16 @@ "vite-plugin-solid": "^2.11.12" } }, - "examples/basic-server-solid/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/basic-server-solid/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/basic-server-svelte": { "name": "@modelcontextprotocol/server-basic-svelte", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "svelte": "^5.0.0", @@ -290,33 +222,16 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/basic-server-svelte/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/basic-server-svelte/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/basic-server-vanillajs": { "name": "@modelcontextprotocol/server-basic-vanillajs", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -335,33 +250,16 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/basic-server-vanillajs/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/basic-server-vanillajs/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/basic-server-vue": { "name": "@modelcontextprotocol/server-basic-vue", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "vue": "^3.5.0", @@ -382,32 +280,15 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/basic-server-vue/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/basic-server-vue/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/budget-allocator-server": { "name": "@modelcontextprotocol/server-budget-allocator", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -427,32 +308,15 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/budget-allocator-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/budget-allocator-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/cohort-heatmap-server": { "name": "@modelcontextprotocol/server-cohort-heatmap", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", @@ -476,32 +340,15 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/cohort-heatmap-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/cohort-heatmap-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/customer-segmentation-server": { "name": "@modelcontextprotocol/server-customer-segmentation", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -521,32 +368,15 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/customer-segmentation-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/customer-segmentation-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/debug-server": { "name": "@modelcontextprotocol/server-debug", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "zod": "^4.1.13" }, "bin": { @@ -565,31 +395,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/debug-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/debug-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/integration-server": { "version": "1.7.4", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", @@ -612,31 +425,14 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/integration-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/integration-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/lazy-auth-server": { "name": "@modelcontextprotocol/server-lazy-auth", "version": "1.7.4", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "jose": "^6.0.0", @@ -656,33 +452,16 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/lazy-auth-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/lazy-auth-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/map-server": { "name": "@modelcontextprotocol/server-map", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -701,34 +480,17 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/map-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/map-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/pdf-server": { "name": "@modelcontextprotocol/server-pdf", "version": "1.7.4", "license": "MIT", "dependencies": { "@cantoo/pdf-lib": "^2.6.5", - "@modelcontextprotocol/client": "2.0.0-beta.4", - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "pdfjs-dist": "^5.0.0", @@ -748,23 +510,6 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/pdf-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/pdf-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/qr-server": { "name": "@modelcontextprotocol/server-qr", "version": "1.7.4", @@ -777,10 +522,10 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -797,16 +542,6 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/quickstart/node_modules/@types/node": { - "version": "22.19.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.5.tgz", - "integrity": "sha512-HfF8+mYcHPcPypui3w3mvzuIErlNOh2OAG+BCeBZCEwyiD5ls2SiCwEyT47OELtf7M3nHxBdu0FsmzdKxkN52Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.21.0" - } - }, "examples/say-server": { "name": "@modelcontextprotocol/server-say", "version": "1.7.4", @@ -820,10 +555,10 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -848,32 +583,15 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/scenario-modeler-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/scenario-modeler-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/shadertoy-server": { "name": "@modelcontextprotocol/server-shadertoy", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -892,32 +610,15 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/shadertoy-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/shadertoy-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/sheet-music-server": { "name": "@modelcontextprotocol/server-sheet-music", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "abcjs": "^6.4.4", "cors": "^2.8.5", "express": "^5.1.0", @@ -937,32 +638,15 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/sheet-music-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/sheet-music-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/system-monitor-server": { "name": "@modelcontextprotocol/server-system-monitor", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -983,33 +667,16 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/system-monitor-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/system-monitor-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/threejs-server": { "name": "@modelcontextprotocol/server-threejs", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", @@ -1035,32 +702,15 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/threejs-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/threejs-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/transcript-server": { "name": "@modelcontextprotocol/server-transcript", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -1080,33 +730,16 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/transcript-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/transcript-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/video-resource-server": { "name": "@modelcontextprotocol/server-video-resource", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -1125,33 +758,16 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/video-resource-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/video-resource-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "examples/wiki-explorer-server": { "name": "@modelcontextprotocol/server-wiki-explorer", "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", - "@modelcontextprotocol/express": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0-beta.5", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/node": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "cheerio": "^1.0.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -1172,23 +788,6 @@ "vite-plugin-singlefile": "^2.3.0" } }, - "examples/wiki-explorer-server/node_modules/@types/node": { - "version": "22.10.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", - "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "examples/wiki-explorer-server/node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, "node_modules/@babel/code-frame": { "version": "7.28.6", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.28.6.tgz", @@ -2644,12 +2243,12 @@ "license": "MIT" }, "node_modules/@modelcontextprotocol/client": { - "version": "2.0.0-beta.4", - "resolved": "https://pkg.pr.new/@modelcontextprotocol/client@2501", - "integrity": "sha512-5FvmSf2qWlJXlI9ydf8230f1rsDHMEw9Jgcq2ZUGmA3DJShaYV6t49zKJBuawetMcLOzWBGs8+qDzhZOZTk6Fw==", + "version": "2.0.0-beta.5", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/client/-/client-2.0.0-beta.5.tgz", + "integrity": "sha512-YuuNm5f2TMoFQRje1UqVP8TJRjijCXMz4ckvoVpx1cUXuBEmykWQ2d8R536pek6UKcXT41T5nWc4qR1JFIbEmg==", "license": "MIT", "dependencies": { - "@modelcontextprotocol/core": "https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/core@f60b401", + "@modelcontextprotocol/core": "2.0.0-beta.5", "cross-spawn": "^7.0.5", "eventsource": "^3.0.2", "eventsource-parser": "^3.0.0", @@ -2662,9 +2261,9 @@ } }, "node_modules/@modelcontextprotocol/core": { - "version": "2.0.0-beta.4", - "resolved": "https://pkg.pr.new/@modelcontextprotocol/core@2501", - "integrity": "sha512-nsMXd4wQBKzmph6r+WOhum+mXjDYljTAqwY/XUg3hLtvNOQ8+JVqBSJOVCMJvx9lXhTpTOPrGZ3BuNiaNPjSvg==", + "version": "2.0.0-beta.5", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/core/-/core-2.0.0-beta.5.tgz", + "integrity": "sha512-HKbY9XTbsDy1Y6r2I55TGE3JEapM0vg96e1MUmBIF9LGjos5gjhcIrTz1yvBPLg2aFKHjwhUAQfRdrCEnPxNew==", "license": "MIT", "dependencies": { "zod": "^4.2.0" @@ -2674,9 +2273,9 @@ } }, "node_modules/@modelcontextprotocol/express": { - "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/express/-/express-2.0.0-beta.4.tgz", - "integrity": "sha512-7hI8bEomz6rMn8sKYRVIZgQJsrWIjIS9WiPyIp3X2pMyLSCC7hB5km0kg+9SygWygTIRnPfte0tXevRB3mXEHQ==", + "version": "2.0.0-beta.5", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/express/-/express-2.0.0-beta.5.tgz", + "integrity": "sha512-SDHAAKCOkHrxuBRyh6fRQJpjWBt5vrRCmvV7OIyWdmIksQzmTYsw7oEX1p9Kje6PSDqKJHpmqLJzZNUnOhrfCQ==", "license": "MIT", "dependencies": { "cors": "^2.8.5" @@ -2685,7 +2284,7 @@ "node": ">=20" }, "peerDependencies": { - "@modelcontextprotocol/server": "^2.0.0-beta.4", + "@modelcontextprotocol/server": "^2.0.0-beta.5", "express": "^4.18.0 || ^5.0.0" } }, @@ -2723,9 +2322,9 @@ "link": true }, "node_modules/@modelcontextprotocol/node": { - "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/node/-/node-2.0.0-beta.4.tgz", - "integrity": "sha512-OqbrRVNYNfLxBB2BRkP5oIHKHa0IPHluMbaLgw7YCRKcj5be9ExzyWFJY3KVMb+1F2AVn+0SRoH0XKcNzh3HYQ==", + "version": "2.0.0-beta.5", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/node/-/node-2.0.0-beta.5.tgz", + "integrity": "sha512-flrOzx5qFLBM9I8IYRGfYUY02erFmxOvYQ9sEE6iSj/ZZpRYKorXWscM/qrfW9rwlcGLyymHhnP2AaDbMB1lIA==", "license": "MIT", "dependencies": { "@hono/node-server": "^1.19.9" @@ -2734,7 +2333,7 @@ "node": ">=20" }, "peerDependencies": { - "@modelcontextprotocol/server": "^2.0.0-beta.4", + "@modelcontextprotocol/server": "^2.0.0-beta.5", "hono": "^4.11.4" }, "peerDependenciesMeta": { @@ -2789,12 +2388,12 @@ } }, "node_modules/@modelcontextprotocol/server": { - "version": "2.0.0-beta.4", - "resolved": "https://pkg.pr.new/@modelcontextprotocol/server@2501", - "integrity": "sha512-mI+V52bTdSCHDrsrVG3TeOzgy+apDQXz6l1B4KuwKV/8xbRAsV9LZ2Nf67SEoLszuYYH0as4pZQUG4cCMYP5/g==", + "version": "2.0.0-beta.5", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/server/-/server-2.0.0-beta.5.tgz", + "integrity": "sha512-i1E5l75rQKsgY/AKAIspgMBH1vEL7dqiK7tHr0L+raYcb0SWOziqNGJXGIG6NY4AlXDWIKGJQGB7Nqfs3oUi5g==", "license": "MIT", "dependencies": { - "@modelcontextprotocol/core": "https://pkg.pr.new/modelcontextprotocol/typescript-sdk/@modelcontextprotocol/core@f60b401", + "@modelcontextprotocol/core": "2.0.0-beta.5", "zod": "^4.2.0" }, "engines": { diff --git a/package.json b/package.json index 4f88483..ac7897c 100644 --- a/package.json +++ b/package.json @@ -78,9 +78,9 @@ "author": "Olivier Chafik", "devDependencies": { "@boneskull/typedoc-plugin-mermaid": "^0.2.0", - "@modelcontextprotocol/client": "https://pkg.pr.new/@modelcontextprotocol/client@2501", - "@modelcontextprotocol/core": "https://pkg.pr.new/@modelcontextprotocol/core@2501", - "@modelcontextprotocol/server": "https://pkg.pr.new/@modelcontextprotocol/server@2501", + "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/core": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "@playwright/test": "1.57.0", "@types/bun": "^1.3.2", "@types/node": "20.19.27", @@ -111,9 +111,9 @@ "zod": "^4.2.0" }, "peerDependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.4", - "@modelcontextprotocol/core": "2.0.0-beta.4", - "@modelcontextprotocol/server": "2.0.0-beta.4", + "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/core": "2.0.0-beta.5", + "@modelcontextprotocol/server": "2.0.0-beta.5", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0", "zod": "^4.2.0" @@ -136,10 +136,7 @@ "seroval": "1.4.1", "seroval-plugins": "1.4.2", "solid-js": "1.9.10", - "@types/node": "20.19.27", - "@modelcontextprotocol/core": "https://pkg.pr.new/@modelcontextprotocol/core@2501", - "@modelcontextprotocol/client": "https://pkg.pr.new/@modelcontextprotocol/client@2501", - "@modelcontextprotocol/server": "https://pkg.pr.new/@modelcontextprotocol/server@2501" + "@types/node": "20.19.27" }, "dependencies": { "@standard-schema/spec": "^1.1.0" diff --git a/src/generated/schema.json b/src/generated/schema.json index 5f2124a..0932dc4 100644 --- a/src/generated/schema.json +++ b/src/generated/schema.json @@ -5384,26 +5384,52 @@ "_meta": { "type": "object", "properties": { - "progressToken": { - "anyOf": [ - { - "type": "string" - }, - { - "type": "integer", - "minimum": -9007199254740991, - "maximum": 9007199254740991 - } - ] - }, - "io.modelcontextprotocol/related-task": { + "io.modelcontextprotocol/serverInfo": { "type": "object", "properties": { - "taskId": { + "name": { + "type": "string" + }, + "title": { + "type": "string" + }, + "icons": { + "type": "array", + "items": { + "type": "object", + "properties": { + "src": { + "type": "string" + }, + "mimeType": { + "type": "string" + }, + "sizes": { + "type": "array", + "items": { + "type": "string" + } + }, + "theme": { + "type": "string", + "enum": ["light", "dark"] + } + }, + "required": ["src"], + "additionalProperties": false + } + }, + "version": { + "type": "string" + }, + "websiteUrl": { + "type": "string" + }, + "description": { "type": "string" } }, - "required": ["taskId"], + "required": ["name", "version"], "additionalProperties": false } }, From c847bc0887d23c90f79a7acfa95eb32af29e0833 Mon Sep 17 00:00:00 2001 From: Enrico <2827496+tonxxd@users.noreply.github.com> Date: Wed, 22 Jul 2026 15:37:22 -0700 Subject: [PATCH 083/107] docs: align Protocol and role-specific setup --- README.md | 22 ++++++++++++++----- docs/overview.md | 10 ++++----- docs/quickstart.md | 2 +- .../skills/add-app-to-server/SKILL.md | 2 +- .../mcp-apps/skills/convert-web-app/SKILL.md | 2 +- .../mcp-apps/skills/create-mcp-app/SKILL.md | 2 +- src/app-bridge.ts | 10 ++++----- src/app.ts | 7 ++++-- 8 files changed, 35 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index b3f68e7..a514e19 100644 --- a/README.md +++ b/README.md @@ -121,17 +121,27 @@ resources: ## Getting Started +For a View or host: + ```bash npm install -S @modelcontextprotocol/ext-apps \ - @modelcontextprotocol/client@2.0.0-beta.4 \ - @modelcontextprotocol/server@2.0.0-beta.4 \ - @modelcontextprotocol/core@2.0.0-beta.4 \ + @modelcontextprotocol/client@2.0.0-beta.5 \ + @modelcontextprotocol/core@2.0.0-beta.5 \ zod@^4.2.0 ``` -This release uses the split base MCP SDK v2 packages. Install all three at the -exact published beta.4 version so the Apps SDK and your MCP client/server share -one compatible protocol implementation. +For an MCP server: + +```bash +npm install -S @modelcontextprotocol/ext-apps \ + @modelcontextprotocol/server@2.0.0-beta.5 \ + @modelcontextprotocol/core@2.0.0-beta.5 \ + zod@^4.2.0 +``` + +Applications that implement both roles should install both `client` and +`server`. Keep all installed base MCP SDK packages on the exact same published +beta so they share one compatible protocol implementation. **New here?** Start with the [Quickstart Guide](https://apps.extensions.modelcontextprotocol.io/api/documents/Quickstart.html) diff --git a/docs/overview.md b/docs/overview.md index 63156ec..5f3852d 100644 --- a/docs/overview.md +++ b/docs/overview.md @@ -56,11 +56,11 @@ flowchart LR - **Host** — The chat client (e.g., Claude Desktop) that connects to servers, embeds Views in iframes, and proxies communication between them. - **View** — The UI running inside a sandboxed iframe. It receives tool data from the Host and can call server tools or send messages back to the chat. -The View's `App` subclasses the base MCP SDK `Client`. The Host's `AppBridge` -subclasses the base MCP SDK `Server` for the inner iframe channel, while a -separate outer `Client` connects the Host to the actual MCP Server. Keeping -those two connections separate prevents iframe negotiation and capabilities -from leaking into the server connection. +The View's `App` and the Host's `AppBridge` both subclass the base MCP SDK's +public `Protocol` for the iframe channel. A separate outer `Client` connects +the Host to the actual MCP Server. Keeping those two connections separate +preserves the Apps-only iframe handshake and prevents iframe capabilities from +leaking into the server connection. ## Lifecycle diff --git a/docs/quickstart.md b/docs/quickstart.md index eb6b096..3cac872 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -37,7 +37,7 @@ Install the dependencies you'll need: ```bash npm init -y -npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.4 @modelcontextprotocol/core@2.0.0-beta.4 @modelcontextprotocol/server@2.0.0-beta.4 @modelcontextprotocol/node@2.0.0-beta.4 @modelcontextprotocol/express@2.0.0-beta.4 zod@^4.2.0 express cors +npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.5 @modelcontextprotocol/core@2.0.0-beta.5 @modelcontextprotocol/server@2.0.0-beta.5 @modelcontextprotocol/node@2.0.0-beta.5 @modelcontextprotocol/express@2.0.0-beta.5 zod@^4.2.0 express cors npm install -D typescript vite vite-plugin-singlefile @types/express @types/cors @types/node tsx concurrently cross-env ``` diff --git a/plugins/mcp-apps/skills/add-app-to-server/SKILL.md b/plugins/mcp-apps/skills/add-app-to-server/SKILL.md index 69e41f8..fda72b0 100644 --- a/plugins/mcp-apps/skills/add-app-to-server/SKILL.md +++ b/plugins/mcp-apps/skills/add-app-to-server/SKILL.md @@ -77,7 +77,7 @@ Before writing any code, analyze the server's existing tools and determine which ## Step 2: Add Dependencies ```bash -npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.4 @modelcontextprotocol/core@2.0.0-beta.4 @modelcontextprotocol/server@2.0.0-beta.4 zod@^4.2.0 +npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.5 @modelcontextprotocol/core@2.0.0-beta.5 @modelcontextprotocol/server@2.0.0-beta.5 zod@^4.2.0 npm install -D vite vite-plugin-singlefile ``` diff --git a/plugins/mcp-apps/skills/convert-web-app/SKILL.md b/plugins/mcp-apps/skills/convert-web-app/SKILL.md index 22686ef..03fc8d7 100644 --- a/plugins/mcp-apps/skills/convert-web-app/SKILL.md +++ b/plugins/mcp-apps/skills/convert-web-app/SKILL.md @@ -115,7 +115,7 @@ Create a new MCP server with tool and resource registration. This wraps the exis ### Dependencies ```bash -npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.4 @modelcontextprotocol/core@2.0.0-beta.4 @modelcontextprotocol/server@2.0.0-beta.4 zod@^4.2.0 +npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.5 @modelcontextprotocol/core@2.0.0-beta.5 @modelcontextprotocol/server@2.0.0-beta.5 zod@^4.2.0 npm install -D tsx vite vite-plugin-singlefile ``` diff --git a/plugins/mcp-apps/skills/create-mcp-app/SKILL.md b/plugins/mcp-apps/skills/create-mcp-app/SKILL.md index fc41e70..6f1c466 100644 --- a/plugins/mcp-apps/skills/create-mcp-app/SKILL.md +++ b/plugins/mcp-apps/skills/create-mcp-app/SKILL.md @@ -110,7 +110,7 @@ See `/tmp/mcp-ext-apps/docs/patterns.md` for detailed recipes: **Always** use `npm install` to add dependencies rather than manually writing version numbers: ```bash -npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.4 @modelcontextprotocol/core@2.0.0-beta.4 @modelcontextprotocol/server@2.0.0-beta.4 @modelcontextprotocol/node@2.0.0-beta.4 @modelcontextprotocol/express@2.0.0-beta.4 zod@^4.2.0 express cors +npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.5 @modelcontextprotocol/core@2.0.0-beta.5 @modelcontextprotocol/server@2.0.0-beta.5 @modelcontextprotocol/node@2.0.0-beta.5 @modelcontextprotocol/express@2.0.0-beta.5 zod@^4.2.0 express cors npm install -D typescript vite vite-plugin-singlefile concurrently cross-env @types/node @types/express @types/cors ``` diff --git a/src/app-bridge.ts b/src/app-bridge.ts index d6a2368..59ea586 100644 --- a/src/app-bridge.ts +++ b/src/app-bridge.ts @@ -241,11 +241,11 @@ export type AppBridgeEventMap = { /** * Host-side bridge for communicating with a single View ({@link app!App `App`}). * - * `AppBridge` extends the base MCP SDK's public `Server` class and acts as a proxy between - * the host application and a view running in an iframe. When an MCP client - * is provided to the constructor, it automatically forwards MCP server capabilities - * (tools, resources, prompts) to the view. It also handles the initialization - * handshake. + * `AppBridge` extends the base MCP SDK's public `Protocol` class and acts as a + * proxy between the host application and a view running in an iframe. When a + * separate MCP client is provided to the constructor, it automatically forwards + * MCP server capabilities (tools, resources, prompts) to the view. It also + * handles the Apps initialization handshake. * * ## Architecture * diff --git a/src/app.ts b/src/app.ts index 0ff369e..34ef284 100644 --- a/src/app.ts +++ b/src/app.ts @@ -297,7 +297,8 @@ export type AppEventMap = { * * The `App` class provides a framework-agnostic way to build interactive MCP Apps * that run inside host applications. It extends the base MCP SDK's public - * `Client` class and adds the Apps handshake, lifecycle, and high-level APIs. + * `Protocol` class, composes an {@link EventDispatcher}, and adds the Apps + * handshake, lifecycle, and high-level APIs. * * ## Architecture * @@ -314,9 +315,11 @@ export type AppEventMap = { * * ## Protocol and event methods * - * As a subclass of the base MCP SDK's `Client`, `App` provides: + * From the base MCP SDK's `Protocol`, `App` provides: * - `setRequestHandler()` - Register handlers for requests from host * - `setNotificationHandler()` - Register handlers for notifications from host + * + * From its composed {@link EventDispatcher}, `App` also provides: * - `addEventListener()` - Append a listener for a notification event (multi-listener) * - `removeEventListener()` - Remove a previously added listener * From 92f46a574568a3ddac7600343b7d3c4c4ed7b588 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Thu, 23 Jul 2026 12:25:07 +0100 Subject: [PATCH 084/107] chore: bump ext-apps to 1.7.5 (#724) --- examples/basic-host/package.json | 2 +- examples/basic-server-preact/package.json | 2 +- examples/basic-server-react/package.json | 2 +- examples/basic-server-solid/package.json | 2 +- examples/basic-server-svelte/package.json | 2 +- examples/basic-server-vanillajs/package.json | 2 +- examples/basic-server-vue/package.json | 2 +- examples/budget-allocator-server/package.json | 2 +- examples/cohort-heatmap-server/package.json | 2 +- .../customer-segmentation-server/package.json | 2 +- examples/debug-server/package.json | 2 +- examples/integration-server/package.json | 2 +- examples/lazy-auth-server/package.json | 2 +- examples/map-server/package.json | 2 +- examples/pdf-server/package.json | 2 +- examples/qr-server/package.json | 2 +- examples/quickstart/package.json | 2 +- examples/say-server/package.json | 2 +- examples/scenario-modeler-server/package.json | 2 +- examples/shadertoy-server/package.json | 2 +- examples/sheet-music-server/package.json | 2 +- examples/system-monitor-server/package.json | 2 +- examples/threejs-server/package.json | 2 +- examples/transcript-server/package.json | 2 +- examples/video-resource-server/package.json | 2 +- examples/wiki-explorer-server/package.json | 2 +- package-lock.json | 56 +++++++++---------- package.json | 2 +- 28 files changed, 55 insertions(+), 55 deletions(-) diff --git a/examples/basic-host/package.json b/examples/basic-host/package.json index 1b45dcf..f54b237 100644 --- a/examples/basic-host/package.json +++ b/examples/basic-host/package.json @@ -1,7 +1,7 @@ { "homepage": "https://github.com/modelcontextprotocol/ext-apps/tree/main/examples/basic-host", "name": "@modelcontextprotocol/ext-apps-basic-host", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "scripts": { "build": "tsc --noEmit && concurrently \"cross-env INPUT=index.html vite build\" \"cross-env INPUT=sandbox.html vite build\"", diff --git a/examples/basic-server-preact/package.json b/examples/basic-server-preact/package.json index 5127202..81ed0de 100644 --- a/examples/basic-server-preact/package.json +++ b/examples/basic-server-preact/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-preact", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "Basic MCP App Server example using Preact", "repository": { diff --git a/examples/basic-server-react/package.json b/examples/basic-server-react/package.json index e4d1233..5ae783e 100644 --- a/examples/basic-server-react/package.json +++ b/examples/basic-server-react/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-react", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "Basic MCP App Server example using React", "repository": { diff --git a/examples/basic-server-solid/package.json b/examples/basic-server-solid/package.json index 8f75ac8..c2950d9 100644 --- a/examples/basic-server-solid/package.json +++ b/examples/basic-server-solid/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-solid", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "Basic MCP App Server example using Solid", "repository": { diff --git a/examples/basic-server-svelte/package.json b/examples/basic-server-svelte/package.json index f877bf7..8238feb 100644 --- a/examples/basic-server-svelte/package.json +++ b/examples/basic-server-svelte/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-svelte", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "Basic MCP App Server example using Svelte", "repository": { diff --git a/examples/basic-server-vanillajs/package.json b/examples/basic-server-vanillajs/package.json index 5d47f2c..8ca330e 100644 --- a/examples/basic-server-vanillajs/package.json +++ b/examples/basic-server-vanillajs/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-vanillajs", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "Basic MCP App Server example using vanilla JavaScript", "repository": { diff --git a/examples/basic-server-vue/package.json b/examples/basic-server-vue/package.json index d27ddc9..9c0eb7b 100644 --- a/examples/basic-server-vue/package.json +++ b/examples/basic-server-vue/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-vue", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "Basic MCP App Server example using Vue", "repository": { diff --git a/examples/budget-allocator-server/package.json b/examples/budget-allocator-server/package.json index 19a1d25..0cd94d0 100644 --- a/examples/budget-allocator-server/package.json +++ b/examples/budget-allocator-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-budget-allocator", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "Budget allocator MCP App Server with interactive visualization", "repository": { diff --git a/examples/cohort-heatmap-server/package.json b/examples/cohort-heatmap-server/package.json index 8d1268b..9988679 100644 --- a/examples/cohort-heatmap-server/package.json +++ b/examples/cohort-heatmap-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-cohort-heatmap", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "Cohort heatmap MCP App Server for retention analysis", "repository": { diff --git a/examples/customer-segmentation-server/package.json b/examples/customer-segmentation-server/package.json index 4511de9..2fc85f9 100644 --- a/examples/customer-segmentation-server/package.json +++ b/examples/customer-segmentation-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-customer-segmentation", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "Customer segmentation MCP App Server with filtering", "repository": { diff --git a/examples/debug-server/package.json b/examples/debug-server/package.json index 3417a8f..16d2f4c 100644 --- a/examples/debug-server/package.json +++ b/examples/debug-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-debug", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "Debug MCP App Server for testing all SDK capabilities", "repository": { diff --git a/examples/integration-server/package.json b/examples/integration-server/package.json index f6715a4..a8b5421 100644 --- a/examples/integration-server/package.json +++ b/examples/integration-server/package.json @@ -1,6 +1,6 @@ { "name": "integration-server", - "version": "1.7.4", + "version": "1.7.5", "private": true, "type": "module", "scripts": { diff --git a/examples/lazy-auth-server/package.json b/examples/lazy-auth-server/package.json index f3ed6cd..8e96906 100644 --- a/examples/lazy-auth-server/package.json +++ b/examples/lazy-auth-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-lazy-auth", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "MCP App example demonstrating lazy (on-demand) OAuth: public tools work unauthenticated, protected tools return 401 + WWW-Authenticate so the host runs the OAuth flow only when needed", "repository": { diff --git a/examples/map-server/package.json b/examples/map-server/package.json index 5dc23fe..5de1754 100644 --- a/examples/map-server/package.json +++ b/examples/map-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-map", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "MCP App Server example with CesiumJS 3D globe and geocoding", "repository": { diff --git a/examples/pdf-server/package.json b/examples/pdf-server/package.json index 4d960f1..8942a90 100644 --- a/examples/pdf-server/package.json +++ b/examples/pdf-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-pdf", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "MCP server for loading and extracting text from PDF files with chunked pagination and interactive viewer", "repository": { diff --git a/examples/qr-server/package.json b/examples/qr-server/package.json index a5cbf5b..8152866 100644 --- a/examples/qr-server/package.json +++ b/examples/qr-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-qr", - "version": "1.7.4", + "version": "1.7.5", "private": true, "scripts": { "start": "uv run server.py", diff --git a/examples/quickstart/package.json b/examples/quickstart/package.json index 99948cc..e1dcf2d 100644 --- a/examples/quickstart/package.json +++ b/examples/quickstart/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/quickstart", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "private": true, "description": "Quickstart MCP App Server example", diff --git a/examples/say-server/package.json b/examples/say-server/package.json index a0076e6..d51dabd 100644 --- a/examples/say-server/package.json +++ b/examples/say-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-say", - "version": "1.7.4", + "version": "1.7.5", "private": true, "description": "Streaming TTS MCP App Server with karaoke-style text highlighting", "repository": { diff --git a/examples/scenario-modeler-server/package.json b/examples/scenario-modeler-server/package.json index aa1e668..716c7b5 100644 --- a/examples/scenario-modeler-server/package.json +++ b/examples/scenario-modeler-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-scenario-modeler", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "Financial scenario modeling MCP App Server", "repository": { diff --git a/examples/shadertoy-server/package.json b/examples/shadertoy-server/package.json index ccf15a4..0505f47 100644 --- a/examples/shadertoy-server/package.json +++ b/examples/shadertoy-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-shadertoy", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "MCP App Server example for rendering ShaderToy-compatible GLSL shaders", "repository": { diff --git a/examples/sheet-music-server/package.json b/examples/sheet-music-server/package.json index ca9fa90..e9e39cc 100644 --- a/examples/sheet-music-server/package.json +++ b/examples/sheet-music-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-sheet-music", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "MCP App Server for rendering and playing sheet music from ABC notation", "repository": { diff --git a/examples/system-monitor-server/package.json b/examples/system-monitor-server/package.json index 12e8cea..9506c61 100644 --- a/examples/system-monitor-server/package.json +++ b/examples/system-monitor-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-system-monitor", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "System monitor MCP App Server with real-time stats", "repository": { diff --git a/examples/threejs-server/package.json b/examples/threejs-server/package.json index cfb5686..2121460 100644 --- a/examples/threejs-server/package.json +++ b/examples/threejs-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-threejs", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "Three.js 3D visualization MCP App Server", "repository": { diff --git a/examples/transcript-server/package.json b/examples/transcript-server/package.json index dcba3d7..8e9d495 100644 --- a/examples/transcript-server/package.json +++ b/examples/transcript-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-transcript", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "MCP App Server for live speech transcription", "repository": { diff --git a/examples/video-resource-server/package.json b/examples/video-resource-server/package.json index b0d04af..8d8b8ec 100644 --- a/examples/video-resource-server/package.json +++ b/examples/video-resource-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-video-resource", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "MCP App Server demonstrating video resources served as base64 blobs", "repository": { diff --git a/examples/wiki-explorer-server/package.json b/examples/wiki-explorer-server/package.json index fe511ad..af02eae 100644 --- a/examples/wiki-explorer-server/package.json +++ b/examples/wiki-explorer-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-wiki-explorer", - "version": "1.7.4", + "version": "1.7.5", "type": "module", "description": "Wikipedia link explorer MCP App Server with graph visualization", "repository": { diff --git a/package-lock.json b/package-lock.json index 26be03f..9dc76e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@modelcontextprotocol/ext-apps", - "version": "1.7.4", + "version": "1.7.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@modelcontextprotocol/ext-apps", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "workspaces": [ "examples/*" @@ -66,7 +66,7 @@ }, "examples/basic-host": { "name": "@modelcontextprotocol/ext-apps-basic-host", - "version": "1.7.4", + "version": "1.7.5", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", @@ -108,7 +108,7 @@ }, "examples/basic-server-preact": { "name": "@modelcontextprotocol/server-basic-preact", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -152,7 +152,7 @@ }, "examples/basic-server-react": { "name": "@modelcontextprotocol/server-basic-react", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -199,7 +199,7 @@ }, "examples/basic-server-solid": { "name": "@modelcontextprotocol/server-basic-solid", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -243,7 +243,7 @@ }, "examples/basic-server-svelte": { "name": "@modelcontextprotocol/server-basic-svelte", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -287,7 +287,7 @@ }, "examples/basic-server-vanillajs": { "name": "@modelcontextprotocol/server-basic-vanillajs", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -329,7 +329,7 @@ }, "examples/basic-server-vue": { "name": "@modelcontextprotocol/server-basic-vue", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -373,7 +373,7 @@ }, "examples/budget-allocator-server": { "name": "@modelcontextprotocol/server-budget-allocator", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -416,7 +416,7 @@ }, "examples/cohort-heatmap-server": { "name": "@modelcontextprotocol/server-cohort-heatmap", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -463,7 +463,7 @@ }, "examples/customer-segmentation-server": { "name": "@modelcontextprotocol/server-customer-segmentation", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -506,7 +506,7 @@ }, "examples/debug-server": { "name": "@modelcontextprotocol/server-debug", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -547,7 +547,7 @@ "license": "MIT" }, "examples/integration-server": { - "version": "1.7.4", + "version": "1.7.5", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0", @@ -592,7 +592,7 @@ }, "examples/lazy-auth-server": { "name": "@modelcontextprotocol/server-lazy-auth", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -634,7 +634,7 @@ }, "examples/map-server": { "name": "@modelcontextprotocol/server-map", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -676,7 +676,7 @@ }, "examples/pdf-server": { "name": "@modelcontextprotocol/server-pdf", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@cantoo/pdf-lib": "^2.6.5", @@ -720,7 +720,7 @@ }, "examples/qr-server": { "name": "@modelcontextprotocol/server-qr", - "version": "1.7.4", + "version": "1.7.5", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/sdk": "^1.29.0" @@ -728,7 +728,7 @@ }, "examples/quickstart": { "name": "@modelcontextprotocol/quickstart", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -760,7 +760,7 @@ }, "examples/say-server": { "name": "@modelcontextprotocol/server-say", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -769,7 +769,7 @@ }, "examples/scenario-modeler-server": { "name": "@modelcontextprotocol/server-scenario-modeler", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -817,7 +817,7 @@ }, "examples/shadertoy-server": { "name": "@modelcontextprotocol/server-shadertoy", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -859,7 +859,7 @@ }, "examples/sheet-music-server": { "name": "@modelcontextprotocol/server-sheet-music", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -902,7 +902,7 @@ }, "examples/system-monitor-server": { "name": "@modelcontextprotocol/server-system-monitor", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -946,7 +946,7 @@ }, "examples/threejs-server": { "name": "@modelcontextprotocol/server-threejs", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -995,7 +995,7 @@ }, "examples/transcript-server": { "name": "@modelcontextprotocol/server-transcript", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -1038,7 +1038,7 @@ }, "examples/video-resource-server": { "name": "@modelcontextprotocol/server-video-resource", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", @@ -1080,7 +1080,7 @@ }, "examples/wiki-explorer-server": { "name": "@modelcontextprotocol/server-wiki-explorer", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", diff --git a/package.json b/package.json index b494003..15ef5d7 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "url": "https://github.com/modelcontextprotocol/ext-apps" }, "homepage": "https://github.com/modelcontextprotocol/ext-apps", - "version": "1.7.4", + "version": "1.7.5", "license": "MIT", "description": "MCP Apps SDK — Enable MCP servers to display interactive user interfaces in conversational clients.", "type": "module", From 4e4886c5ff7125f5332bd29685e94076caeaac24 Mon Sep 17 00:00:00 2001 From: Enrico <2827496+tonxxd@users.noreply.github.com> Date: Tue, 28 Jul 2026 15:02:48 -0700 Subject: [PATCH 085/107] chore: update MCP SDK packages to stable 2.0.0 --- examples/basic-host/package.json | 2 +- examples/basic-server-preact/package.json | 8 +- examples/basic-server-react/package.json | 8 +- examples/basic-server-solid/package.json | 8 +- examples/basic-server-svelte/package.json | 8 +- examples/basic-server-vanillajs/package.json | 8 +- examples/basic-server-vue/package.json | 8 +- examples/budget-allocator-server/package.json | 6 +- examples/cohort-heatmap-server/package.json | 6 +- .../customer-segmentation-server/package.json | 6 +- examples/debug-server/package.json | 6 +- examples/integration-server/package.json | 8 +- examples/lazy-auth-server/package.json | 4 +- examples/map-server/package.json | 8 +- examples/pdf-server/package.json | 8 +- examples/quickstart/package.json | 6 +- examples/scenario-modeler-server/package.json | 6 +- examples/shadertoy-server/package.json | 6 +- examples/sheet-music-server/package.json | 6 +- examples/system-monitor-server/package.json | 6 +- examples/threejs-server/package.json | 8 +- examples/transcript-server/package.json | 6 +- examples/video-resource-server/package.json | 8 +- examples/wiki-explorer-server/package.json | 8 +- package-lock.json | 212 +++++++++--------- package.json | 12 +- 26 files changed, 193 insertions(+), 193 deletions(-) diff --git a/examples/basic-host/package.json b/examples/basic-host/package.json index c2a104e..7bce111 100644 --- a/examples/basic-host/package.json +++ b/examples/basic-host/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", "react": "^19.2.0", "react-dom": "^19.2.0", "zod": "^4.1.13" diff --git a/examples/basic-server-preact/package.json b/examples/basic-server-preact/package.json index 8722a54..0043486 100644 --- a/examples/basic-server-preact/package.json +++ b/examples/basic-server-preact/package.json @@ -24,11 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "preact": "^10.0.0", diff --git a/examples/basic-server-react/package.json b/examples/basic-server-react/package.json index 0a860c5..69a06df 100644 --- a/examples/basic-server-react/package.json +++ b/examples/basic-server-react/package.json @@ -34,11 +34,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", diff --git a/examples/basic-server-solid/package.json b/examples/basic-server-solid/package.json index a0d1bfa..6cfa17f 100644 --- a/examples/basic-server-solid/package.json +++ b/examples/basic-server-solid/package.json @@ -24,11 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "solid-js": "1.9.10", diff --git a/examples/basic-server-svelte/package.json b/examples/basic-server-svelte/package.json index 81d73fe..dd88b97 100644 --- a/examples/basic-server-svelte/package.json +++ b/examples/basic-server-svelte/package.json @@ -24,11 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "svelte": "^5.0.0", diff --git a/examples/basic-server-vanillajs/package.json b/examples/basic-server-vanillajs/package.json index 1958b73..4a37592 100644 --- a/examples/basic-server-vanillajs/package.json +++ b/examples/basic-server-vanillajs/package.json @@ -24,11 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/basic-server-vue/package.json b/examples/basic-server-vue/package.json index a872c52..e8f929e 100644 --- a/examples/basic-server-vue/package.json +++ b/examples/basic-server-vue/package.json @@ -24,11 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "vue": "^3.5.0", diff --git a/examples/budget-allocator-server/package.json b/examples/budget-allocator-server/package.json index 3b02ddf..4d2b977 100644 --- a/examples/budget-allocator-server/package.json +++ b/examples/budget-allocator-server/package.json @@ -27,9 +27,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/cohort-heatmap-server/package.json b/examples/cohort-heatmap-server/package.json index fd4777c..0761130 100644 --- a/examples/cohort-heatmap-server/package.json +++ b/examples/cohort-heatmap-server/package.json @@ -27,9 +27,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", diff --git a/examples/customer-segmentation-server/package.json b/examples/customer-segmentation-server/package.json index 0846b40..6163424 100644 --- a/examples/customer-segmentation-server/package.json +++ b/examples/customer-segmentation-server/package.json @@ -27,9 +27,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/debug-server/package.json b/examples/debug-server/package.json index f118717..3499abf 100644 --- a/examples/debug-server/package.json +++ b/examples/debug-server/package.json @@ -35,9 +35,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "zod": "^4.1.13" }, "devDependencies": { diff --git a/examples/integration-server/package.json b/examples/integration-server/package.json index 2993020..64a3286 100644 --- a/examples/integration-server/package.json +++ b/examples/integration-server/package.json @@ -15,11 +15,11 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", diff --git a/examples/lazy-auth-server/package.json b/examples/lazy-auth-server/package.json index 257f96c..4691a2e 100644 --- a/examples/lazy-auth-server/package.json +++ b/examples/lazy-auth-server/package.json @@ -23,8 +23,8 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "jose": "^6.0.0", diff --git a/examples/map-server/package.json b/examples/map-server/package.json index 0a56f85..4577636 100644 --- a/examples/map-server/package.json +++ b/examples/map-server/package.json @@ -26,11 +26,11 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/pdf-server/package.json b/examples/pdf-server/package.json index ac80173..e004394 100644 --- a/examples/pdf-server/package.json +++ b/examples/pdf-server/package.json @@ -26,11 +26,11 @@ }, "dependencies": { "@cantoo/pdf-lib": "^2.6.5", - "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "pdfjs-dist": "^5.0.0", diff --git a/examples/quickstart/package.json b/examples/quickstart/package.json index 96bcbfa..4312b75 100644 --- a/examples/quickstart/package.json +++ b/examples/quickstart/package.json @@ -16,9 +16,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/scenario-modeler-server/package.json b/examples/scenario-modeler-server/package.json index 93b6d8a..723491c 100644 --- a/examples/scenario-modeler-server/package.json +++ b/examples/scenario-modeler-server/package.json @@ -27,9 +27,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/shadertoy-server/package.json b/examples/shadertoy-server/package.json index ef5f563..556699d 100644 --- a/examples/shadertoy-server/package.json +++ b/examples/shadertoy-server/package.json @@ -25,9 +25,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/sheet-music-server/package.json b/examples/sheet-music-server/package.json index 0628f58..a8075e6 100644 --- a/examples/sheet-music-server/package.json +++ b/examples/sheet-music-server/package.json @@ -25,9 +25,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "abcjs": "^6.4.4", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/system-monitor-server/package.json b/examples/system-monitor-server/package.json index c5aa008..cc18d4b 100644 --- a/examples/system-monitor-server/package.json +++ b/examples/system-monitor-server/package.json @@ -27,9 +27,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/examples/threejs-server/package.json b/examples/threejs-server/package.json index aae13a7..b4cc6de 100644 --- a/examples/threejs-server/package.json +++ b/examples/threejs-server/package.json @@ -26,11 +26,11 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", diff --git a/examples/transcript-server/package.json b/examples/transcript-server/package.json index 51e7d27..f3617c4 100644 --- a/examples/transcript-server/package.json +++ b/examples/transcript-server/package.json @@ -25,9 +25,9 @@ }, "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/video-resource-server/package.json b/examples/video-resource-server/package.json index e8535cd..64a07e9 100644 --- a/examples/video-resource-server/package.json +++ b/examples/video-resource-server/package.json @@ -24,11 +24,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" diff --git a/examples/wiki-explorer-server/package.json b/examples/wiki-explorer-server/package.json index 11ec18c..e4bd274 100644 --- a/examples/wiki-explorer-server/package.json +++ b/examples/wiki-explorer-server/package.json @@ -26,11 +26,11 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/express": "2.0.0-beta.5", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cheerio": "^1.0.0", "cors": "^2.8.5", "express": "^5.1.0", diff --git a/package-lock.json b/package-lock.json index e6e524e..d4e84ea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,9 +16,9 @@ }, "devDependencies": { "@boneskull/typedoc-plugin-mermaid": "^0.2.0", - "@modelcontextprotocol/client": "2.0.0-beta.5", - "@modelcontextprotocol/core": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/core": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "@playwright/test": "1.57.0", "@types/bun": "^1.3.2", "@types/node": "20.19.27", @@ -52,9 +52,9 @@ "node": ">=20" }, "peerDependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", - "@modelcontextprotocol/core": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/core": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0", "zod": "^4.2.0" @@ -78,7 +78,7 @@ "name": "@modelcontextprotocol/ext-apps-basic-host", "version": "1.7.4", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", "react": "^19.2.0", "react-dom": "^19.2.0", @@ -104,11 +104,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "preact": "^10.0.0", @@ -134,11 +134,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", @@ -167,11 +167,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "solid-js": "1.9.10", @@ -197,11 +197,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "svelte": "^5.0.0", @@ -227,11 +227,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -255,11 +255,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "vue": "^3.5.0", @@ -285,10 +285,10 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -313,10 +313,10 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", @@ -345,10 +345,10 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -373,10 +373,10 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "zod": "^4.1.13" }, "bin": { @@ -398,11 +398,11 @@ "examples/integration-server": { "version": "1.7.4", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", @@ -431,8 +431,8 @@ "license": "MIT", "dependencies": { "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "jose": "^6.0.0", @@ -457,11 +457,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -486,11 +486,11 @@ "license": "MIT", "dependencies": { "@cantoo/pdf-lib": "^2.6.5", - "@modelcontextprotocol/client": "2.0.0-beta.5", - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "pdfjs-dist": "^5.0.0", @@ -522,10 +522,10 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -555,10 +555,10 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -588,10 +588,10 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -615,10 +615,10 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "abcjs": "^6.4.4", "cors": "^2.8.5", "express": "^5.1.0", @@ -643,10 +643,10 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -672,11 +672,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", @@ -707,10 +707,10 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -735,11 +735,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "zod": "^4.1.13" @@ -763,11 +763,11 @@ "version": "1.7.4", "license": "MIT", "dependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", - "@modelcontextprotocol/express": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/express": "2.0.0", "@modelcontextprotocol/ext-apps": "^1.7.0", - "@modelcontextprotocol/node": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/node": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "cheerio": "^1.0.0", "cors": "^2.8.5", "express": "^5.1.0", @@ -2243,12 +2243,12 @@ "license": "MIT" }, "node_modules/@modelcontextprotocol/client": { - "version": "2.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/client/-/client-2.0.0-beta.5.tgz", - "integrity": "sha512-YuuNm5f2TMoFQRje1UqVP8TJRjijCXMz4ckvoVpx1cUXuBEmykWQ2d8R536pek6UKcXT41T5nWc4qR1JFIbEmg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/client/-/client-2.0.0.tgz", + "integrity": "sha512-8f1OghQ2rjzIOfqgUCP+8GiUWqRs89njoWLNqAe8kWmDePv3s1fZXseej+QXemssEuuOvLLmLO/kqM3IQHtISw==", "license": "MIT", "dependencies": { - "@modelcontextprotocol/core": "2.0.0-beta.5", + "@modelcontextprotocol/core": "2.0.0", "cross-spawn": "^7.0.5", "eventsource": "^3.0.2", "eventsource-parser": "^3.0.0", @@ -2261,9 +2261,9 @@ } }, "node_modules/@modelcontextprotocol/core": { - "version": "2.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/core/-/core-2.0.0-beta.5.tgz", - "integrity": "sha512-HKbY9XTbsDy1Y6r2I55TGE3JEapM0vg96e1MUmBIF9LGjos5gjhcIrTz1yvBPLg2aFKHjwhUAQfRdrCEnPxNew==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/core/-/core-2.0.0.tgz", + "integrity": "sha512-pJCEwGG7Lfr/+PQp9ZTwKXNeO5wzbfKL7H3MYpCorM4oFBoQrdjnBgEoqG+RjhsvS1FKrDbKux+M1HhlnGWqcA==", "license": "MIT", "dependencies": { "zod": "^4.2.0" @@ -2273,9 +2273,9 @@ } }, "node_modules/@modelcontextprotocol/express": { - "version": "2.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/express/-/express-2.0.0-beta.5.tgz", - "integrity": "sha512-SDHAAKCOkHrxuBRyh6fRQJpjWBt5vrRCmvV7OIyWdmIksQzmTYsw7oEX1p9Kje6PSDqKJHpmqLJzZNUnOhrfCQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/express/-/express-2.0.0.tgz", + "integrity": "sha512-Snlr8j9FR9LcVvEJPF7qJ7d5zTL4Bes2dk7RcacN9eSZ7OLohwxqhEvWu1+UxELyScgLbLLOdeVEGdwKI1iwVQ==", "license": "MIT", "dependencies": { "cors": "^2.8.5" @@ -2284,7 +2284,7 @@ "node": ">=20" }, "peerDependencies": { - "@modelcontextprotocol/server": "^2.0.0-beta.5", + "@modelcontextprotocol/server": "^2.0.0", "express": "^4.18.0 || ^5.0.0" } }, @@ -2322,9 +2322,9 @@ "link": true }, "node_modules/@modelcontextprotocol/node": { - "version": "2.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/node/-/node-2.0.0-beta.5.tgz", - "integrity": "sha512-flrOzx5qFLBM9I8IYRGfYUY02erFmxOvYQ9sEE6iSj/ZZpRYKorXWscM/qrfW9rwlcGLyymHhnP2AaDbMB1lIA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/node/-/node-2.0.0.tgz", + "integrity": "sha512-Y4hAC2XdGDUdDOCbLDOCA4+aL3NUldjsOWlDL/YwpAxrPhRm1xHd7lZ+mLacvZ9t3PaH28wgNoaLQGrIk1P2pg==", "license": "MIT", "dependencies": { "@hono/node-server": "^1.19.9" @@ -2333,7 +2333,7 @@ "node": ">=20" }, "peerDependencies": { - "@modelcontextprotocol/server": "^2.0.0-beta.5", + "@modelcontextprotocol/server": "^2.0.0", "hono": "^4.11.4" }, "peerDependenciesMeta": { @@ -2388,12 +2388,12 @@ } }, "node_modules/@modelcontextprotocol/server": { - "version": "2.0.0-beta.5", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/server/-/server-2.0.0-beta.5.tgz", - "integrity": "sha512-i1E5l75rQKsgY/AKAIspgMBH1vEL7dqiK7tHr0L+raYcb0SWOziqNGJXGIG6NY4AlXDWIKGJQGB7Nqfs3oUi5g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/server/-/server-2.0.0.tgz", + "integrity": "sha512-YhHWdHfpFMQfd0prsEnxKeS3Qz3ytIGmsS0sth4KDjnacIT7hxk6hXHkJ9KysxlkvTM+WZAtQbbcUhdoP4Hvtw==", "license": "MIT", "dependencies": { - "@modelcontextprotocol/core": "2.0.0-beta.5", + "@modelcontextprotocol/core": "2.0.0", "zod": "^4.2.0" }, "engines": { diff --git a/package.json b/package.json index ac7897c..5e0d3c5 100644 --- a/package.json +++ b/package.json @@ -78,9 +78,9 @@ "author": "Olivier Chafik", "devDependencies": { "@boneskull/typedoc-plugin-mermaid": "^0.2.0", - "@modelcontextprotocol/client": "2.0.0-beta.5", - "@modelcontextprotocol/core": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/core": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "@playwright/test": "1.57.0", "@types/bun": "^1.3.2", "@types/node": "20.19.27", @@ -111,9 +111,9 @@ "zod": "^4.2.0" }, "peerDependencies": { - "@modelcontextprotocol/client": "2.0.0-beta.5", - "@modelcontextprotocol/core": "2.0.0-beta.5", - "@modelcontextprotocol/server": "2.0.0-beta.5", + "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/core": "2.0.0", + "@modelcontextprotocol/server": "2.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0", "zod": "^4.2.0" From 10195ad91851502134930e9b80ec2c04e277a720 Mon Sep 17 00:00:00 2001 From: Quentin Churet <45853629+qchuchu@users.noreply.github.com> Date: Wed, 12 Aug 2026 17:04:54 +0200 Subject: [PATCH 086/107] docs: add Alpic Playground to supported clients (#729) Co-authored-by: Claude Opus 4.8 (1M context) --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2fd89ff..77183ab 100644 --- a/README.md +++ b/README.md @@ -90,6 +90,7 @@ it will guide you through the rest. Postman MCPJam mcp-use + Alpic Playground

> [!NOTE] From 264d9cae448fd07bf5f718d188e5528936796fa0 Mon Sep 17 00:00:00 2001 From: Ken Jo Date: Sat, 11 Jul 2026 21:03:43 +0900 Subject: [PATCH 087/107] fix: add explicit .js extensions to relative imports so declarations resolve under NodeNext/Node16 The emitted .d.ts copy relative specifiers verbatim, and the extensionless form (e.g. `from "./events"`) doesn't resolve under Node16/NodeNext, hiding inherited members such as `addEventListener` (TS2339). Appending `.js` matches the existing SDK-import style and works with both bundler-mode type-checking and Bun.build. Types-only; runtime is unaffected. Fixes #704 --- src/app-bridge.test.ts | 6 +++--- src/app-bridge.ts | 12 ++++++------ src/app.ts | 20 ++++++++++---------- src/message-transport.test.ts | 2 +- src/message-transport.ts | 2 +- src/react/index.tsx | 8 ++++---- src/react/useApp.tsx | 4 ++-- src/react/useAutoResize.ts | 2 +- src/react/useDocumentTheme.ts | 4 ++-- src/react/useHostStyles.ts | 6 +++--- src/server/index.test.ts | 2 +- src/styles.ts | 2 +- 12 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/app-bridge.test.ts b/src/app-bridge.test.ts index e538f26..397e12f 100644 --- a/src/app-bridge.test.ts +++ b/src/app-bridge.test.ts @@ -3,8 +3,8 @@ import { Client, InMemoryTransport } from "@modelcontextprotocol/client"; import { Server, type ServerCapabilities } from "@modelcontextprotocol/server"; import { z } from "zod/v4"; -import { App } from "./app"; -import { LATEST_PROTOCOL_VERSION } from "./types"; +import { App } from "./app.js"; +import { LATEST_PROTOCOL_VERSION } from "./types.js"; import { AppBridge, buildAllowAttribute, @@ -13,7 +13,7 @@ import { isToolVisibilityAppOnly, McpUiOpenLinkResultSchema, type McpUiHostCapabilities, -} from "./app-bridge"; +} from "./app-bridge.js"; /** Wait for pending microtasks to complete */ const flush = () => new Promise((resolve) => setTimeout(resolve, 0)); diff --git a/src/app-bridge.ts b/src/app-bridge.ts index 59ea586..8e48677 100644 --- a/src/app-bridge.ts +++ b/src/app-bridge.ts @@ -34,7 +34,7 @@ import { EmptyResultSchema, LoggingMessageNotificationSchema, } from "@modelcontextprotocol/core"; -import { EventDispatcher } from "./events"; +import { EventDispatcher } from "./events.js"; import type { ZodLiteral, ZodObject, ZodType } from "zod/v4"; type MethodSchema = ZodObject<{ @@ -87,11 +87,11 @@ import { McpUiRequestDisplayModeResultSchema, McpUiResourcePermissions, McpUiToolMeta, -} from "./types"; -export * from "./types"; -export { RESOURCE_URI_META_KEY, RESOURCE_MIME_TYPE } from "./constants"; -import { RESOURCE_URI_META_KEY } from "./constants"; -export { PostMessageTransport } from "./message-transport"; +} from "./types.js"; +export * from "./types.js"; +export { RESOURCE_URI_META_KEY, RESOURCE_MIME_TYPE } from "./constants.js"; +import { RESOURCE_URI_META_KEY } from "./constants.js"; +export { PostMessageTransport } from "./message-transport.js"; /** * Extract UI resource URI from tool metadata. diff --git a/src/app.ts b/src/app.ts index 34ef284..3fe84d6 100644 --- a/src/app.ts +++ b/src/app.ts @@ -22,10 +22,10 @@ import { type Transport, } from "@modelcontextprotocol/client"; import { EmptyResultSchema } from "@modelcontextprotocol/core"; -export { RESOURCE_MIME_TYPE, RESOURCE_URI_META_KEY } from "./constants"; -import { EventDispatcher } from "./events"; -export { EventDispatcher } from "./events"; -import { PostMessageTransport } from "./message-transport"; +export { RESOURCE_MIME_TYPE, RESOURCE_URI_META_KEY } from "./constants.js"; +import { EventDispatcher } from "./events.js"; +export { EventDispatcher } from "./events.js"; +import { PostMessageTransport } from "./message-transport.js"; import { LATEST_PROTOCOL_VERSION, McpUiAppCapabilities, @@ -59,12 +59,12 @@ import { McpUiToolResultNotificationSchema, McpUiRequestDisplayModeRequest, McpUiRequestDisplayModeResultSchema, -} from "./types"; +} from "./types.js"; import { StandardSchemaV1, standardSchemaToJsonSchema, validateStandardSchema, -} from "./standard-schema"; +} from "./standard-schema.js"; import { z, type ZodLiteral, type ZodObject, type ZodType } from "zod/v4"; type MethodSchema = ZodObject<{ @@ -92,16 +92,16 @@ function mergeAppCapabilities( export type { StandardSchemaV1, StandardSchemaWithJSON, -} from "./standard-schema"; +} from "./standard-schema.js"; -export { PostMessageTransport } from "./message-transport"; -export * from "./types"; +export { PostMessageTransport } from "./message-transport.js"; +export * from "./types.js"; export { applyHostStyleVariables, applyHostFonts, getDocumentTheme, applyDocumentTheme, -} from "./styles"; +} from "./styles.js"; /** * Metadata key for associating a UI resource URI with a tool. diff --git a/src/message-transport.test.ts b/src/message-transport.test.ts index 2a115f3..e2518cc 100644 --- a/src/message-transport.test.ts +++ b/src/message-transport.test.ts @@ -1,7 +1,7 @@ import { describe, it, expect, beforeEach, afterEach, mock } from "bun:test"; import type { JSONRPCMessage } from "@modelcontextprotocol/client"; -import { PostMessageTransport } from "./message-transport"; +import { PostMessageTransport } from "./message-transport.js"; /** * Minimal `window` stub for bun's DOM-less test environment. diff --git a/src/message-transport.ts b/src/message-transport.ts index 9483540..afc85e9 100644 --- a/src/message-transport.ts +++ b/src/message-transport.ts @@ -5,7 +5,7 @@ import type { Transport, TransportSendOptions, } from "@modelcontextprotocol/client"; -import { TOOL_INPUT_PARTIAL_METHOD } from "./spec.types"; +import { TOOL_INPUT_PARTIAL_METHOD } from "./spec.types.js"; /** * JSON-RPC transport using `window.postMessage` for iframe↔parent communication. diff --git a/src/react/index.tsx b/src/react/index.tsx index e76e197..9693fb1 100644 --- a/src/react/index.tsx +++ b/src/react/index.tsx @@ -31,7 +31,7 @@ * } * ``` */ -export * from "./useApp"; -export * from "./useAutoResize"; -export * from "./useDocumentTheme"; -export * from "./useHostStyles"; +export * from "./useApp.js"; +export * from "./useAutoResize.js"; +export * from "./useDocumentTheme.js"; +export * from "./useHostStyles.js"; diff --git a/src/react/useApp.tsx b/src/react/useApp.tsx index 0e64a74..a8e1a09 100644 --- a/src/react/useApp.tsx +++ b/src/react/useApp.tsx @@ -5,8 +5,8 @@ import { AppOptions, McpUiAppCapabilities, PostMessageTransport, -} from "../app"; -export * from "../app"; +} from "../app.js"; +export * from "../app.js"; /** * Options for configuring the {@link useApp `useApp`} hook. diff --git a/src/react/useAutoResize.ts b/src/react/useAutoResize.ts index 78217d6..66af07e 100644 --- a/src/react/useAutoResize.ts +++ b/src/react/useAutoResize.ts @@ -1,5 +1,5 @@ import { useEffect, RefObject } from "react"; -import { App } from "../app"; +import { App } from "../app.js"; /** * React hook that automatically reports UI size changes to the host. diff --git a/src/react/useDocumentTheme.ts b/src/react/useDocumentTheme.ts index 2fdfcc2..3dc851e 100644 --- a/src/react/useDocumentTheme.ts +++ b/src/react/useDocumentTheme.ts @@ -1,6 +1,6 @@ import { useEffect, useState } from "react"; -import { getDocumentTheme } from "../styles"; -import { McpUiTheme } from "../types"; +import { getDocumentTheme } from "../styles.js"; +import { McpUiTheme } from "../types.js"; /** * React hook that provides the current document theme reactively. diff --git a/src/react/useHostStyles.ts b/src/react/useHostStyles.ts index e380efa..d8376a0 100644 --- a/src/react/useHostStyles.ts +++ b/src/react/useHostStyles.ts @@ -1,11 +1,11 @@ import { useEffect, useRef } from "react"; -import { App } from "../app"; +import { App } from "../app.js"; import { applyDocumentTheme, applyHostFonts, applyHostStyleVariables, -} from "../styles"; -import { McpUiHostContext } from "../types"; +} from "../styles.js"; +import { McpUiHostContext } from "../types.js"; /** * React hook that applies host style variables and theme as CSS custom properties. diff --git a/src/server/index.test.ts b/src/server/index.test.ts index 5de341f..389cde1 100644 --- a/src/server/index.test.ts +++ b/src/server/index.test.ts @@ -6,7 +6,7 @@ import { RESOURCE_MIME_TYPE, getUiCapability, EXTENSION_ID, -} from "./index"; +} from "./index.js"; import type { McpServer } from "@modelcontextprotocol/server"; describe("registerAppTool", () => { diff --git a/src/styles.ts b/src/styles.ts index ad900e2..895073b 100644 --- a/src/styles.ts +++ b/src/styles.ts @@ -1,4 +1,4 @@ -import { McpUiStyles, McpUiTheme } from "./types"; +import { McpUiStyles, McpUiTheme } from "./types.js"; /** * Get the current document theme from the root HTML element. From 90123733bbc7854a543a05db64c1a6a9b8ee0613 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 7 Sep 2026 11:49:33 +0100 Subject: [PATCH 088/107] test: regenerate lockfile (re-add nested @types/node entries) --- package-lock.json | 401 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 401 insertions(+) diff --git a/package-lock.json b/package-lock.json index 49b1315..ca37f4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -99,6 +99,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/basic-host/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/basic-host/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/basic-server-preact": { "name": "@modelcontextprotocol/server-basic-preact", "version": "1.7.5", @@ -129,6 +146,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/basic-server-preact/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/basic-server-preact/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/basic-server-react": { "name": "@modelcontextprotocol/server-basic-react", "version": "1.7.5", @@ -162,6 +196,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/basic-server-react/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/basic-server-react/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/basic-server-solid": { "name": "@modelcontextprotocol/server-basic-solid", "version": "1.7.5", @@ -192,6 +243,23 @@ "vite-plugin-solid": "^2.11.12" } }, + "examples/basic-server-solid/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/basic-server-solid/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/basic-server-svelte": { "name": "@modelcontextprotocol/server-basic-svelte", "version": "1.7.5", @@ -222,6 +290,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/basic-server-svelte/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/basic-server-svelte/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/basic-server-vanillajs": { "name": "@modelcontextprotocol/server-basic-vanillajs", "version": "1.7.5", @@ -250,6 +335,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/basic-server-vanillajs/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/basic-server-vanillajs/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/basic-server-vue": { "name": "@modelcontextprotocol/server-basic-vue", "version": "1.7.5", @@ -280,6 +382,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/basic-server-vue/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/basic-server-vue/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/budget-allocator-server": { "name": "@modelcontextprotocol/server-budget-allocator", "version": "1.7.5", @@ -308,6 +427,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/budget-allocator-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/budget-allocator-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/cohort-heatmap-server": { "name": "@modelcontextprotocol/server-cohort-heatmap", "version": "1.7.5", @@ -340,6 +476,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/cohort-heatmap-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/cohort-heatmap-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/customer-segmentation-server": { "name": "@modelcontextprotocol/server-customer-segmentation", "version": "1.7.5", @@ -368,6 +521,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/customer-segmentation-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/customer-segmentation-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/debug-server": { "name": "@modelcontextprotocol/server-debug", "version": "1.7.5", @@ -395,6 +565,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/debug-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/debug-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/integration-server": { "version": "1.7.5", "dependencies": { @@ -425,6 +612,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/integration-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/integration-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/lazy-auth-server": { "name": "@modelcontextprotocol/server-lazy-auth", "version": "1.7.5", @@ -452,6 +656,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/lazy-auth-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/lazy-auth-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/map-server": { "name": "@modelcontextprotocol/server-map", "version": "1.7.5", @@ -480,6 +701,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/map-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/map-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/pdf-server": { "name": "@modelcontextprotocol/server-pdf", "version": "1.7.5", @@ -510,6 +748,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/pdf-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/pdf-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/qr-server": { "name": "@modelcontextprotocol/server-qr", "version": "1.7.5", @@ -542,6 +797,16 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/quickstart/node_modules/@types/node": { + "version": "22.19.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.5.tgz", + "integrity": "sha512-HfF8+mYcHPcPypui3w3mvzuIErlNOh2OAG+BCeBZCEwyiD5ls2SiCwEyT47OELtf7M3nHxBdu0FsmzdKxkN52Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.21.0" + } + }, "examples/say-server": { "name": "@modelcontextprotocol/server-say", "version": "1.7.5", @@ -583,6 +848,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/scenario-modeler-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/scenario-modeler-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/shadertoy-server": { "name": "@modelcontextprotocol/server-shadertoy", "version": "1.7.5", @@ -610,6 +892,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/shadertoy-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/shadertoy-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/sheet-music-server": { "name": "@modelcontextprotocol/server-sheet-music", "version": "1.7.5", @@ -638,6 +937,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/sheet-music-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/sheet-music-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/system-monitor-server": { "name": "@modelcontextprotocol/server-system-monitor", "version": "1.7.5", @@ -667,6 +983,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/system-monitor-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/system-monitor-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/threejs-server": { "name": "@modelcontextprotocol/server-threejs", "version": "1.7.5", @@ -702,6 +1035,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/threejs-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/threejs-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/transcript-server": { "name": "@modelcontextprotocol/server-transcript", "version": "1.7.5", @@ -730,6 +1080,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/transcript-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/transcript-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/video-resource-server": { "name": "@modelcontextprotocol/server-video-resource", "version": "1.7.5", @@ -758,6 +1125,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/video-resource-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/video-resource-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "examples/wiki-explorer-server": { "name": "@modelcontextprotocol/server-wiki-explorer", "version": "1.7.5", @@ -788,6 +1172,23 @@ "vite-plugin-singlefile": "^2.3.0" } }, + "examples/wiki-explorer-server/node_modules/@types/node": { + "version": "22.10.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.0.tgz", + "integrity": "sha512-XC70cRZVElFHfIUB40FgZOBbgJYFKKMa5nb9lxcwYstFG/Mi+/Y0bGS+rs6Dmhmkpq4pnNiLiuZAbc02YCOnmA==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.20.0" + } + }, + "examples/wiki-explorer-server/node_modules/undici-types": { + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", + "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", + "dev": true, + "license": "MIT" + }, "node_modules/@babel/code-frame": { "version": "7.29.7", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz", From f28f5ddb3c3d451923d25e5591841ba76ef21df0 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 7 Sep 2026 15:20:52 +0100 Subject: [PATCH 089/107] Harden dependency isolation check and run it in CI npm pack runs the prepare script for directory specs even with --ignore-scripts and its output can pollute stdout, so locate the packed tarball on disk instead of parsing --json output. Run npm with a minimal environment so caller npm config cannot leak into the synthetic consumers, and require exact versions for the consumers' dependencies. Add a CI job that runs the check on Node 22. --- .github/workflows/ci.yml | 15 +++++++ scripts/check-dependency-isolation.mjs | 60 ++++++++++++++++++-------- 2 files changed, 57 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fb41938..756f259 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -114,6 +114,21 @@ jobs: grep -q "Ready" /tmp/mcpb-smoke.log working-directory: examples/pdf-server + dependency-isolation: + name: Dependency isolation + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v6 + + - uses: actions/setup-node@v6 + with: + node-version: "22" + cache: npm + + - run: npm ci + + - run: npm run test:dependency-isolation + e2e: runs-on: ubuntu-latest steps: diff --git a/scripts/check-dependency-isolation.mjs b/scripts/check-dependency-isolation.mjs index 2ec28ce..2dfe577 100644 --- a/scripts/check-dependency-isolation.mjs +++ b/scripts/check-dependency-isolation.mjs @@ -2,6 +2,7 @@ import { execFileSync } from "node:child_process"; import { mkdtempSync, mkdirSync, + readdirSync, readFileSync, rmSync, writeFileSync, @@ -25,33 +26,56 @@ for (const role of [client, server]) { } } +/** + * Exact version for a synthetic consumer dependency. Read from + * devDependencies so the consumers exercise the same SDK version the + * repository tests against; the check would silently drift if a range were + * allowed here. + */ +function exactDevDependency(name) { + const version = packageJson.devDependencies?.[name]; + if (!/^\d+\.\d+\.\d+(-[0-9A-Za-z.-]+)?$/.test(version ?? "")) { + throw new Error( + `devDependencies["${name}"] must be an exact version, got ${JSON.stringify(version)}`, + ); + } + return version; +} + const temporaryRoot = mkdtempSync(join(tmpdir(), "ext-apps-role-peers-")); try { + // Minimal environment: nothing inherited from the caller's npm config + // (registry overrides, auth tokens, npm_config_* set by an outer `npm run`) + // can leak into the synthetic consumers. const npmEnvironment = { - ...process.env, + PATH: process.env.PATH ?? process.env.Path, + HOME: process.env.HOME ?? process.env.USERPROFILE, npm_config_cache: join(temporaryRoot, "npm-cache"), }; - const packOutput = JSON.parse( - execFileSync( - "npm", - [ - "pack", - "--ignore-scripts", - "--json", - "--pack-destination", - temporaryRoot, - ], - { cwd: root, encoding: "utf8", env: npmEnvironment }, - ), + const packDestination = join(temporaryRoot, "pack"); + mkdirSync(packDestination); + // `npm pack` runs the package's `prepare` script even with --ignore-scripts + // (pacote's directory fetcher), and its output can pollute stdout, so do not + // rely on `--json`: locate the tarball on disk instead. + execFileSync( + "npm", + ["pack", "--ignore-scripts", "--pack-destination", packDestination], + { cwd: root, stdio: "pipe", env: npmEnvironment }, ); - const tarball = join(temporaryRoot, packOutput[0].filename); + const tarballs = readdirSync(packDestination).filter((name) => + name.endsWith(".tgz"), + ); + if (tarballs.length !== 1) { + throw new Error(`expected exactly one tarball, found ${tarballs}`); + } + const tarball = join(packDestination, tarballs[0]); const consumers = [ { name: "app-only", dependencies: { - "@types/node": packageJson.devDependencies["@types/node"], - [client]: packageJson.devDependencies[client], + "@types/node": exactDevDependency("@types/node"), + [client]: exactDevDependency(client), "@modelcontextprotocol/ext-apps": `file:${tarball}`, }, absent: server, @@ -61,9 +85,9 @@ try { { name: "server-only", dependencies: { - "@types/node": packageJson.devDependencies["@types/node"], + "@types/node": exactDevDependency("@types/node"), "@modelcontextprotocol/ext-apps": `file:${tarball}`, - [server]: packageJson.devDependencies[server], + [server]: exactDevDependency(server), }, absent: client, entry: From 50eb30ec8dff82b0b505ec5351b1bbf52cd9d2fc Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 7 Sep 2026 15:24:13 +0100 Subject: [PATCH 090/107] Bump to 2.0.0 and widen SDK peer ranges to ^2.0.0 The client, core and server packages become ^2.0.0 peers and client is now a required peer (App and AppBridge extend its Protocol class); server stays optional for View-only consumers. Examples move to zod ^4.2.0 to match the library peer range. The root package is not yet published at 2.0.0, so the lockfile now links the examples' @modelcontextprotocol/ext-apps dependency to the repository root instead of a registry copy. This drops the stale 1.x tarball (and its sdk 1.x peer) from the lockfile and makes scripts/link-self.mjs a no-op. --- examples/basic-host/package.json | 6 +- examples/basic-server-preact/package.json | 6 +- examples/basic-server-react/package.json | 6 +- examples/basic-server-solid/package.json | 6 +- examples/basic-server-svelte/package.json | 6 +- examples/basic-server-vanillajs/package.json | 6 +- examples/basic-server-vue/package.json | 6 +- examples/budget-allocator-server/package.json | 6 +- examples/cohort-heatmap-server/package.json | 6 +- .../customer-segmentation-server/package.json | 6 +- examples/debug-server/package.json | 6 +- examples/integration-server/package.json | 6 +- examples/lazy-auth-server/package.json | 6 +- examples/map-server/package.json | 6 +- examples/pdf-server/package.json | 6 +- examples/qr-server/package.json | 4 +- examples/quickstart/package.json | 6 +- examples/say-server/package.json | 4 +- examples/scenario-modeler-server/package.json | 6 +- examples/shadertoy-server/package.json | 6 +- examples/sheet-music-server/package.json | 6 +- examples/system-monitor-server/package.json | 6 +- examples/threejs-server/package.json | 6 +- examples/transcript-server/package.json | 6 +- examples/video-resource-server/package.json | 6 +- examples/wiki-explorer-server/package.json | 6 +- package-lock.json | 357 ++++-------------- package.json | 11 +- 28 files changed, 163 insertions(+), 357 deletions(-) diff --git a/examples/basic-host/package.json b/examples/basic-host/package.json index 06d1a05..cefe9d5 100644 --- a/examples/basic-host/package.json +++ b/examples/basic-host/package.json @@ -1,7 +1,7 @@ { "homepage": "https://github.com/modelcontextprotocol/ext-apps/tree/main/examples/basic-host", "name": "@modelcontextprotocol/ext-apps-basic-host", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "scripts": { "build": "tsc --noEmit && concurrently \"cross-env INPUT=index.html vite build\" \"cross-env INPUT=sandbox.html vite build\"", @@ -11,11 +11,11 @@ "dev": "cross-env NODE_ENV=development concurrently \"npm run watch\" \"npm run serve\"" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/client": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "react": "^19.2.0", "react-dom": "^19.2.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/express": "^5.0.0", diff --git a/examples/basic-server-preact/package.json b/examples/basic-server-preact/package.json index 82a30bb..c88a306 100644 --- a/examples/basic-server-preact/package.json +++ b/examples/basic-server-preact/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-preact", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "Basic MCP App Server example using Preact", "repository": { @@ -25,14 +25,14 @@ }, "dependencies": { "@modelcontextprotocol/client": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "preact": "^10.0.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@preact/preset-vite": "^2.0.0", diff --git a/examples/basic-server-react/package.json b/examples/basic-server-react/package.json index b2b9540..07a9d3b 100644 --- a/examples/basic-server-react/package.json +++ b/examples/basic-server-react/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-react", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "Basic MCP App Server example using React", "repository": { @@ -35,15 +35,15 @@ }, "dependencies": { "@modelcontextprotocol/client": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", "react-dom": "^19.2.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/basic-server-solid/package.json b/examples/basic-server-solid/package.json index 2e3bc79..a459ebc 100644 --- a/examples/basic-server-solid/package.json +++ b/examples/basic-server-solid/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-solid", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "Basic MCP App Server example using Solid", "repository": { @@ -25,14 +25,14 @@ }, "dependencies": { "@modelcontextprotocol/client": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "solid-js": "1.9.10", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/basic-server-svelte/package.json b/examples/basic-server-svelte/package.json index cd7fb41..3e0279f 100644 --- a/examples/basic-server-svelte/package.json +++ b/examples/basic-server-svelte/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-svelte", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "Basic MCP App Server example using Svelte", "repository": { @@ -25,14 +25,14 @@ }, "dependencies": { "@modelcontextprotocol/client": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "svelte": "^5.0.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "^5.0.0", diff --git a/examples/basic-server-vanillajs/package.json b/examples/basic-server-vanillajs/package.json index 50f0f42..1404b65 100644 --- a/examples/basic-server-vanillajs/package.json +++ b/examples/basic-server-vanillajs/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-vanillajs", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "Basic MCP App Server example using vanilla JavaScript", "repository": { @@ -25,13 +25,13 @@ }, "dependencies": { "@modelcontextprotocol/client": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/basic-server-vue/package.json b/examples/basic-server-vue/package.json index 2ff3e0a..32083c6 100644 --- a/examples/basic-server-vue/package.json +++ b/examples/basic-server-vue/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-basic-vue", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "Basic MCP App Server example using Vue", "repository": { @@ -25,14 +25,14 @@ }, "dependencies": { "@modelcontextprotocol/client": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "vue": "^3.5.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/budget-allocator-server/package.json b/examples/budget-allocator-server/package.json index 9208e91..e44a147 100644 --- a/examples/budget-allocator-server/package.json +++ b/examples/budget-allocator-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-budget-allocator", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "Budget allocator MCP App Server with interactive visualization", "repository": { @@ -26,14 +26,14 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/cohort-heatmap-server/package.json b/examples/cohort-heatmap-server/package.json index eb58415..de20f13 100644 --- a/examples/cohort-heatmap-server/package.json +++ b/examples/cohort-heatmap-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-cohort-heatmap", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "Cohort heatmap MCP App Server for retention analysis", "repository": { @@ -26,15 +26,15 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", "react-dom": "^19.2.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/customer-segmentation-server/package.json b/examples/customer-segmentation-server/package.json index f6999ee..643db17 100644 --- a/examples/customer-segmentation-server/package.json +++ b/examples/customer-segmentation-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-customer-segmentation", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "Customer segmentation MCP App Server with filtering", "repository": { @@ -26,14 +26,14 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/debug-server/package.json b/examples/debug-server/package.json index 33cede4..5be9291 100644 --- a/examples/debug-server/package.json +++ b/examples/debug-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-debug", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "Debug MCP App Server for testing all SDK capabilities", "repository": { @@ -34,11 +34,11 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/integration-server/package.json b/examples/integration-server/package.json index 18f22e6..7e04f4a 100644 --- a/examples/integration-server/package.json +++ b/examples/integration-server/package.json @@ -1,6 +1,6 @@ { "name": "integration-server", - "version": "1.7.5", + "version": "2.0.0", "private": true, "type": "module", "scripts": { @@ -16,15 +16,15 @@ }, "dependencies": { "@modelcontextprotocol/client": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", "react-dom": "^19.2.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/lazy-auth-server/package.json b/examples/lazy-auth-server/package.json index 6e7aaa7..b12b29b 100644 --- a/examples/lazy-auth-server/package.json +++ b/examples/lazy-auth-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-lazy-auth", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "MCP App example demonstrating lazy (on-demand) OAuth: public tools work unauthenticated, protected tools return 401 + WWW-Authenticate so the host runs the OAuth flow only when needed", "repository": { @@ -22,13 +22,13 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "jose": "^6.0.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/map-server/package.json b/examples/map-server/package.json index a59445e..dc6a37f 100644 --- a/examples/map-server/package.json +++ b/examples/map-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-map", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "MCP App Server example with CesiumJS 3D globe and geocoding", "repository": { @@ -27,13 +27,13 @@ }, "dependencies": { "@modelcontextprotocol/client": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/pdf-server/package.json b/examples/pdf-server/package.json index 8c2c2ee..ae0870a 100644 --- a/examples/pdf-server/package.json +++ b/examples/pdf-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-pdf", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "MCP server for loading and extracting text from PDF files with chunked pagination and interactive viewer", "repository": { @@ -27,14 +27,14 @@ "dependencies": { "@cantoo/pdf-lib": "^2.6.5", "@modelcontextprotocol/client": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "pdfjs-dist": "^5.0.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/qr-server/package.json b/examples/qr-server/package.json index e1b849b..425728e 100644 --- a/examples/qr-server/package.json +++ b/examples/qr-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-qr", - "version": "1.7.5", + "version": "2.0.0", "private": true, "scripts": { "start": "uv run server.py", @@ -8,6 +8,6 @@ "build": "echo 'No build step needed for Python server'" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0" + "@modelcontextprotocol/ext-apps": "^2.0.0" } } diff --git a/examples/quickstart/package.json b/examples/quickstart/package.json index 6874b49..eecb080 100644 --- a/examples/quickstart/package.json +++ b/examples/quickstart/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/quickstart", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "private": true, "description": "Quickstart MCP App Server example", @@ -15,13 +15,13 @@ "start": "concurrently --raw \"cross-env NODE_ENV=development INPUT=mcp-app.html vite build --watch\" \"tsx watch main.ts\"" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/say-server/package.json b/examples/say-server/package.json index 5f0f738..cff7024 100644 --- a/examples/say-server/package.json +++ b/examples/say-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-say", - "version": "1.7.5", + "version": "2.0.0", "private": true, "description": "Streaming TTS MCP App Server with karaoke-style text highlighting", "repository": { @@ -15,6 +15,6 @@ "build": "echo 'No build step needed for Python server'" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0" + "@modelcontextprotocol/ext-apps": "^2.0.0" } } diff --git a/examples/scenario-modeler-server/package.json b/examples/scenario-modeler-server/package.json index 76d692a..d82424d 100644 --- a/examples/scenario-modeler-server/package.json +++ b/examples/scenario-modeler-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-scenario-modeler", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "Financial scenario modeling MCP App Server", "repository": { @@ -26,8 +26,8 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "chart.js": "^4.4.0", @@ -35,7 +35,7 @@ "express": "^5.1.0", "react": "^19.2.0", "react-dom": "^19.2.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/shadertoy-server/package.json b/examples/shadertoy-server/package.json index 57edf08..3e16a92 100644 --- a/examples/shadertoy-server/package.json +++ b/examples/shadertoy-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-shadertoy", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "MCP App Server example for rendering ShaderToy-compatible GLSL shaders", "repository": { @@ -24,13 +24,13 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/sheet-music-server/package.json b/examples/sheet-music-server/package.json index 55c2870..1b233bb 100644 --- a/examples/sheet-music-server/package.json +++ b/examples/sheet-music-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-sheet-music", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "MCP App Server for rendering and playing sheet music from ABC notation", "repository": { @@ -24,14 +24,14 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "abcjs": "^6.4.4", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/system-monitor-server/package.json b/examples/system-monitor-server/package.json index b0c2f20..f3a5763 100644 --- a/examples/system-monitor-server/package.json +++ b/examples/system-monitor-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-system-monitor", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "System monitor MCP App Server with real-time stats", "repository": { @@ -26,15 +26,15 @@ "serve": "bun --watch main.ts" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", "systeminformation": "^5.31.6", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/threejs-server/package.json b/examples/threejs-server/package.json index 40d1c25..f8df10f 100644 --- a/examples/threejs-server/package.json +++ b/examples/threejs-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-threejs", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "Three.js 3D visualization MCP App Server", "repository": { @@ -27,8 +27,8 @@ }, "dependencies": { "@modelcontextprotocol/client": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", @@ -36,7 +36,7 @@ "react": "^19.2.0", "react-dom": "^19.2.0", "three": "^0.181.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/transcript-server/package.json b/examples/transcript-server/package.json index e7c5dba..405f85f 100644 --- a/examples/transcript-server/package.json +++ b/examples/transcript-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-transcript", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "MCP App Server for live speech transcription", "repository": { @@ -24,13 +24,13 @@ "prepublishOnly": "npm run build" }, "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/video-resource-server/package.json b/examples/video-resource-server/package.json index 199a373..dea8fcb 100644 --- a/examples/video-resource-server/package.json +++ b/examples/video-resource-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-video-resource", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "MCP App Server demonstrating video resources served as base64 blobs", "repository": { @@ -25,13 +25,13 @@ }, "dependencies": { "@modelcontextprotocol/client": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/examples/wiki-explorer-server/package.json b/examples/wiki-explorer-server/package.json index 090a851..0831670 100644 --- a/examples/wiki-explorer-server/package.json +++ b/examples/wiki-explorer-server/package.json @@ -1,6 +1,6 @@ { "name": "@modelcontextprotocol/server-wiki-explorer", - "version": "1.7.5", + "version": "2.0.0", "type": "module", "description": "Wikipedia link explorer MCP App Server with graph visualization", "repository": { @@ -27,14 +27,14 @@ }, "dependencies": { "@modelcontextprotocol/client": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", "@modelcontextprotocol/express": "2.0.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cheerio": "^1.0.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", diff --git a/package-lock.json b/package-lock.json index ca37f4b..f63b3d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@modelcontextprotocol/ext-apps", - "version": "1.7.5", + "version": "2.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@modelcontextprotocol/ext-apps", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "workspaces": [ "examples/*" @@ -52,17 +52,14 @@ "node": ">=20" }, "peerDependencies": { - "@modelcontextprotocol/client": "2.0.0", - "@modelcontextprotocol/core": "2.0.0", - "@modelcontextprotocol/server": "2.0.0", + "@modelcontextprotocol/client": "^2.0.0", + "@modelcontextprotocol/core": "^2.0.0", + "@modelcontextprotocol/server": "^2.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0", "zod": "^4.2.0" }, "peerDependenciesMeta": { - "@modelcontextprotocol/client": { - "optional": true - }, "@modelcontextprotocol/server": { "optional": true }, @@ -76,13 +73,13 @@ }, "examples/basic-host": { "name": "@modelcontextprotocol/ext-apps-basic-host", - "version": "1.7.5", + "version": "2.0.0", "dependencies": { "@modelcontextprotocol/client": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "react": "^19.2.0", "react-dom": "^19.2.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/express": "^5.0.0", @@ -118,18 +115,18 @@ }, "examples/basic-server-preact": { "name": "@modelcontextprotocol/server-basic-preact", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "preact": "^10.0.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-server-basic-preact": "dist/index.js" @@ -165,19 +162,19 @@ }, "examples/basic-server-react": { "name": "@modelcontextprotocol/server-basic-react", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", "react-dom": "^19.2.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-server-basic-react": "dist/index.js" @@ -215,18 +212,18 @@ }, "examples/basic-server-solid": { "name": "@modelcontextprotocol/server-basic-solid", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "solid-js": "1.9.10", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-server-basic-solid": "dist/index.js" @@ -262,18 +259,18 @@ }, "examples/basic-server-svelte": { "name": "@modelcontextprotocol/server-basic-svelte", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "svelte": "^5.0.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-server-basic-svelte": "dist/index.js" @@ -309,17 +306,17 @@ }, "examples/basic-server-vanillajs": { "name": "@modelcontextprotocol/server-basic-vanillajs", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-server-basic-vanillajs": "dist/index.js" @@ -354,18 +351,18 @@ }, "examples/basic-server-vue": { "name": "@modelcontextprotocol/server-basic-vue", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "vue": "^3.5.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-server-basic-vue": "dist/index.js" @@ -401,17 +398,17 @@ }, "examples/budget-allocator-server": { "name": "@modelcontextprotocol/server-budget-allocator", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-budget-allocator-server": "dist/index.js" @@ -446,18 +443,18 @@ }, "examples/cohort-heatmap-server": { "name": "@modelcontextprotocol/server-cohort-heatmap", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", "react-dom": "^19.2.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-cohort-heatmap-server": "dist/index.js" @@ -495,17 +492,17 @@ }, "examples/customer-segmentation-server": { "name": "@modelcontextprotocol/server-customer-segmentation", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-customer-segmentation-server": "dist/index.js" @@ -540,14 +537,14 @@ }, "examples/debug-server": { "name": "@modelcontextprotocol/server-debug", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-server-debug": "dist/index.js" @@ -583,18 +580,18 @@ "license": "MIT" }, "examples/integration-server": { - "version": "1.7.5", + "version": "2.0.0", "dependencies": { "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "react": "^19.2.0", "react-dom": "^19.2.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-integration-server": "dist/index.js" @@ -631,16 +628,16 @@ }, "examples/lazy-auth-server": { "name": "@modelcontextprotocol/server-lazy-auth", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "jose": "^6.0.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-server-lazy-auth": "dist/index.js" @@ -675,17 +672,17 @@ }, "examples/map-server": { "name": "@modelcontextprotocol/server-map", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-map-server": "dist/index.js" @@ -720,19 +717,19 @@ }, "examples/pdf-server": { "name": "@modelcontextprotocol/server-pdf", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@cantoo/pdf-lib": "^2.6.5", "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", "pdfjs-dist": "^5.0.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-pdf-server": "dist/index.js" @@ -767,23 +764,23 @@ }, "examples/qr-server": { "name": "@modelcontextprotocol/server-qr", - "version": "1.7.5", + "version": "2.0.0", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0" + "@modelcontextprotocol/ext-apps": "^2.0.0" } }, "examples/quickstart": { "name": "@modelcontextprotocol/quickstart", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "devDependencies": { "@types/cors": "^2.8.19", @@ -809,19 +806,19 @@ }, "examples/say-server": { "name": "@modelcontextprotocol/server-say", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { - "@modelcontextprotocol/ext-apps": "^1.7.0" + "@modelcontextprotocol/ext-apps": "^2.0.0" } }, "examples/scenario-modeler-server": { "name": "@modelcontextprotocol/server-scenario-modeler", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "chart.js": "^4.4.0", @@ -829,7 +826,7 @@ "express": "^5.1.0", "react": "^19.2.0", "react-dom": "^19.2.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-scenario-modeler-server": "dist/index.js" @@ -867,16 +864,16 @@ }, "examples/shadertoy-server": { "name": "@modelcontextprotocol/server-shadertoy", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-shadertoy-server": "dist/index.js" @@ -911,17 +908,17 @@ }, "examples/sheet-music-server": { "name": "@modelcontextprotocol/server-sheet-music", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "abcjs": "^6.4.4", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-sheet-music-server": "dist/index.js" @@ -956,18 +953,18 @@ }, "examples/system-monitor-server": { "name": "@modelcontextprotocol/server-system-monitor", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "chart.js": "^4.4.0", "cors": "^2.8.5", "express": "^5.1.0", "systeminformation": "^5.31.6", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-system-monitor-server": "dist/index.js" @@ -1002,12 +999,12 @@ }, "examples/threejs-server": { "name": "@modelcontextprotocol/server-threejs", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", @@ -1015,7 +1012,7 @@ "react": "^19.2.0", "react-dom": "^19.2.0", "three": "^0.181.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-threejs-server": "dist/index.js" @@ -1054,16 +1051,16 @@ }, "examples/transcript-server": { "name": "@modelcontextprotocol/server-transcript", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-transcript-server": "dist/index.js" @@ -1099,17 +1096,17 @@ }, "examples/video-resource-server": { "name": "@modelcontextprotocol/server-video-resource", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-video-resource-server": "dist/index.js" @@ -1144,18 +1141,18 @@ }, "examples/wiki-explorer-server": { "name": "@modelcontextprotocol/server-wiki-explorer", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "dependencies": { "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/express": "2.0.0", - "@modelcontextprotocol/ext-apps": "^1.7.0", + "@modelcontextprotocol/ext-apps": "^2.0.0", "@modelcontextprotocol/node": "2.0.0", "@modelcontextprotocol/server": "2.0.0", "cheerio": "^1.0.0", "cors": "^2.8.5", "express": "^5.1.0", - "zod": "^4.1.13" + "zod": "^4.2.0" }, "bin": { "mcp-wiki-explorer-server": "dist/index.js" @@ -2727,33 +2724,8 @@ } }, "node_modules/@modelcontextprotocol/ext-apps": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/ext-apps/-/ext-apps-1.7.1.tgz", - "integrity": "sha512-J3WdG1A4JSSKnSWKyU+895dBVYBV2Utgtf7fUsUK45mlkETm53a/1DR6Pm3hUGKqLLQthZLmpxOg8VPzJi/lyg==", - "license": "MIT", - "workspaces": [ - "examples/*" - ], - "dependencies": { - "@standard-schema/spec": "^1.1.0" - }, - "engines": { - "node": ">=20" - }, - "peerDependencies": { - "@modelcontextprotocol/sdk": "^1.29.0", - "react": "^17.0.0 || ^18.0.0 || ^19.0.0", - "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0", - "zod": "^3.25.0 || ^4.0.0" - }, - "peerDependenciesMeta": { - "react": { - "optional": true - }, - "react-dom": { - "optional": true - } - } + "resolved": "", + "link": true }, "node_modules/@modelcontextprotocol/ext-apps-basic-host": { "resolved": "examples/basic-host", @@ -2784,47 +2756,6 @@ "resolved": "examples/quickstart", "link": true }, - "node_modules/@modelcontextprotocol/sdk": { - "version": "1.29.0", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.29.0.tgz", - "integrity": "sha512-zo37mZA9hJWpULgkRpowewez1y6ML5GsXJPY8FI0tBBCd77HEvza4jDqRKOXgHNn867PVGCyTdzqpz0izu5ZjQ==", - "license": "MIT", - "peer": true, - "dependencies": { - "@hono/node-server": "^1.19.9", - "ajv": "^8.17.1", - "ajv-formats": "^3.0.1", - "content-type": "^1.0.5", - "cors": "^2.8.5", - "cross-spawn": "^7.0.5", - "eventsource": "^3.0.2", - "eventsource-parser": "^3.0.0", - "express": "^5.2.1", - "express-rate-limit": "^8.2.1", - "hono": "^4.11.4", - "jose": "^6.1.3", - "json-schema-typed": "^8.0.2", - "pkce-challenge": "^5.0.0", - "raw-body": "^3.0.0", - "zod": "^3.25 || ^4.0", - "zod-to-json-schema": "^3.25.1" - }, - "engines": { - "node": ">=18" - }, - "peerDependencies": { - "@cfworker/json-schema": "^4.1.1", - "zod": "^3.25 || ^4.0" - }, - "peerDependenciesMeta": { - "@cfworker/json-schema": { - "optional": true - }, - "zod": { - "optional": false - } - } - }, "node_modules/@modelcontextprotocol/server": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@modelcontextprotocol/server/-/server-2.0.0.tgz", @@ -4444,41 +4375,6 @@ "node": ">=0.4.0" } }, - "node_modules/ajv": { - "version": "8.18.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", - "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", - "license": "MIT", - "peer": true, - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ajv-formats": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", - "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", - "license": "MIT", - "peer": true, - "dependencies": { - "ajv": "^8.0.0" - }, - "peerDependencies": { - "ajv": "^8.0.0" - }, - "peerDependenciesMeta": { - "ajv": { - "optional": true - } - } - }, "node_modules/ansi-escapes": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", @@ -6041,49 +5937,6 @@ "url": "https://opencollective.com/express" } }, - "node_modules/express-rate-limit": { - "version": "8.5.2", - "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.5.2.tgz", - "integrity": "sha512-5Kb34ipNX694DH48vN9irak1Qx30nb0PLYHXfJgw4YEjiC3ZEmZJhwOp+VfiCYwFzvFTdB9QkArYS5kXa2cx2A==", - "license": "MIT", - "peer": true, - "dependencies": { - "ip-address": "^10.2.0" - }, - "engines": { - "node": ">= 16" - }, - "funding": { - "url": "https://github.com/sponsors/express-rate-limit" - }, - "peerDependencies": { - "express": ">= 4.11" - } - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "license": "MIT", - "peer": true - }, - "node_modules/fast-uri": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.4.tgz", - "integrity": "sha512-8JnbkQ4juDyvYs4mgFGQqg4yCYtFDtUtmp2QIQq11ZZe5CFQ5wcqm1rqDgAh/QdMySuBnPzMUiJUNZG5N/AiQw==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fastify" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/fastify" - } - ], - "license": "BSD-3-Clause", - "peer": true - }, "node_modules/fflate": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz", @@ -6546,16 +6399,6 @@ "node": ">=12" } }, - "node_modules/ip-address": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", - "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", - "license": "MIT", - "peer": true, - "engines": { - "node": ">= 12" - } - }, "node_modules/ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", @@ -6743,20 +6586,6 @@ "node": ">=6" } }, - "node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "license": "MIT", - "peer": true - }, - "node_modules/json-schema-typed": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.2.tgz", - "integrity": "sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==", - "license": "BSD-2-Clause", - "peer": true - }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", @@ -7749,16 +7578,6 @@ "node": ">=0.10.0" } }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "license": "MIT", - "peer": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/resolve-pkg-maps": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", @@ -9897,16 +9716,6 @@ "funding": { "url": "https://github.com/sponsors/colinhacks" } - }, - "node_modules/zod-to-json-schema": { - "version": "3.25.1", - "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.1.tgz", - "integrity": "sha512-pM/SU9d3YAggzi6MtR4h7ruuQlqKtad8e9S0fmxcMi+ueAK5Korys/aWcV9LIIHTVbj01NdzxcnXSN+O74ZIVA==", - "license": "ISC", - "peer": true, - "peerDependencies": { - "zod": "^3.25 || ^4" - } } } } diff --git a/package.json b/package.json index fc887fa..da82a66 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "url": "https://github.com/modelcontextprotocol/ext-apps" }, "homepage": "https://github.com/modelcontextprotocol/ext-apps", - "version": "1.7.5", + "version": "2.0.0", "license": "MIT", "description": "MCP Apps SDK — Enable MCP servers to display interactive user interfaces in conversational clients.", "type": "module", @@ -111,17 +111,14 @@ "zod": "^4.2.0" }, "peerDependencies": { - "@modelcontextprotocol/client": "2.0.0", - "@modelcontextprotocol/core": "2.0.0", - "@modelcontextprotocol/server": "2.0.0", + "@modelcontextprotocol/client": "^2.0.0", + "@modelcontextprotocol/core": "^2.0.0", + "@modelcontextprotocol/server": "^2.0.0", "react": "^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0", "zod": "^4.2.0" }, "peerDependenciesMeta": { - "@modelcontextprotocol/client": { - "optional": true - }, "@modelcontextprotocol/server": { "optional": true }, From 040942b3af064bf76b705021e3472b6593ae839e Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 7 Sep 2026 15:26:00 +0100 Subject: [PATCH 091/107] Import shared wire types from @modelcontextprotocol/client spec.types.ts previously inferred CallToolResult, ContentBlock and friends from core's Zod schemas via a local core-types module so that the type surface stayed free of a client package edge. Now that client is a required peer, take the types from it directly and delete the indirection. Generated schemas are unchanged. --- scripts/generate-schemas.ts | 8 +++++--- src/core-types.ts | 20 -------------------- src/spec.types.ts | 2 +- 3 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 src/core-types.ts diff --git a/scripts/generate-schemas.ts b/scripts/generate-schemas.ts index 85225f5..0ff9f04 100644 --- a/scripts/generate-schemas.ts +++ b/scripts/generate-schemas.ts @@ -22,10 +22,12 @@ * * **Problem**: ts-to-zod cannot resolve types imported from external packages. * When it encounters types like `ContentBlock`, `CallToolResult`, `Implementation`, - * `RequestId`, and `Tool` from `@modelcontextprotocol/core`, it generates `z.any()` - * as a placeholder. + * `RequestId`, and `Tool` (imported by spec.types.ts from + * `@modelcontextprotocol/client`), it generates `z.any()` as a placeholder. * - * **Solution**: Import the schemas from MCP SDK and remove the z.any() placeholders. + * **Solution**: Import the corresponding Zod schemas from + * `@modelcontextprotocol/core` (the role-neutral package both client and + * server re-export) and remove the z.any() placeholders. * * ### 3. Index Signatures (`z.record().and()` → `z.object().passthrough()`) * diff --git a/src/core-types.ts b/src/core-types.ts deleted file mode 100644 index 19392d2..0000000 --- a/src/core-types.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { - CallToolResultSchema, - ContentBlockSchema, - EmbeddedResourceSchema, - ImplementationSchema, - RequestIdSchema, - ResourceLinkSchema, - ToolSchema, -} from "@modelcontextprotocol/core"; -import type { z } from "zod/v4"; - -// Infer shared wire types from the public role-neutral schemas so declarations -// used by every entrypoint do not acquire a client or server package edge. -export type CallToolResult = z.infer; -export type ContentBlock = z.infer; -export type EmbeddedResource = z.infer; -export type Implementation = z.infer; -export type RequestId = z.infer; -export type ResourceLink = z.infer; -export type Tool = z.infer; diff --git a/src/spec.types.ts b/src/spec.types.ts index 5d3fda6..0c45396 100644 --- a/src/spec.types.ts +++ b/src/spec.types.ts @@ -18,7 +18,7 @@ import type { RequestId, ResourceLink, Tool, -} from "./core-types"; +} from "@modelcontextprotocol/client"; /** * Current protocol version supported by this SDK. From d6ebcca9a0f4536779666b2223916d64f3700a64 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 7 Sep 2026 15:27:11 +0100 Subject: [PATCH 092/107] Accept raw zod shapes in registerAppTool as a deprecated overload SDK v2 registerTool takes Standard JSON Schema objects (z.object(...)) and keeps a deprecated overload for the v1 raw-shape form. Mirror that here so existing servers passing { field: z.string() } keep compiling; the call is forwarded to the SDK, which auto-wraps the shape. Tests exercise both forms end to end through a real McpServer and Client. --- src/server/index.test.ts | 121 ++++++++++++++++++++++++++++++++++++++- src/server/index.ts | 78 ++++++++++++++++++++++++- 2 files changed, 195 insertions(+), 4 deletions(-) diff --git a/src/server/index.test.ts b/src/server/index.test.ts index 389cde1..489d0b0 100644 --- a/src/server/index.test.ts +++ b/src/server/index.test.ts @@ -7,7 +7,13 @@ import { getUiCapability, EXTENSION_ID, } from "./index.js"; -import type { McpServer } from "@modelcontextprotocol/server"; +import { + InMemoryTransport, + McpServer as RealMcpServer, + type McpServer, +} from "@modelcontextprotocol/server"; +import { Client } from "@modelcontextprotocol/client"; +import { z } from "zod/v4"; describe("registerAppTool", () => { it("should pass through config to server.registerTool", () => { @@ -197,6 +203,119 @@ describe("registerAppTool", () => { }); }); +describe("registerAppTool schema forms", () => { + /** Registers tools on a fresh server, then connects a client to it. */ + async function connect(register: (server: RealMcpServer) => void) { + const server = new RealMcpServer({ name: "test", version: "0.0.0" }); + register(server); + const client = new Client({ name: "client", version: "0.0.0" }); + const [clientTransport, serverTransport] = + InMemoryTransport.createLinkedPair(); + await server.connect(serverTransport); + await client.connect(clientTransport); + return client; + } + + it("accepts a z.object() input schema and validates arguments", async () => { + const client = await connect((server) => + registerAppTool( + server, + "greet", + { + inputSchema: z.object({ name: z.string() }), + _meta: { ui: { resourceUri: "ui://greet/view.html" } }, + }, + async ({ name }) => ({ + content: [{ type: "text", text: `hello ${name}` }], + }), + ), + ); + + const { tools } = await client.listTools(); + expect(tools).toHaveLength(1); + expect(tools[0].inputSchema).toMatchObject({ + type: "object", + properties: { name: { type: "string" } }, + }); + expect(tools[0]._meta).toMatchObject({ + ui: { resourceUri: "ui://greet/view.html" }, + [RESOURCE_URI_META_KEY]: "ui://greet/view.html", + }); + + const result = await client.callTool({ + name: "greet", + arguments: { name: "world" }, + }); + expect(result.content).toEqual([{ type: "text", text: "hello world" }]); + + const invalid = await client.callTool({ + name: "greet", + arguments: { name: 42 }, + }); + expect(invalid.isError).toBe(true); + }); + + it("accepts a raw zod shape (deprecated form) and wraps it with z.object()", async () => { + const client = await connect((server) => + registerAppTool( + server, + "greet", + { + inputSchema: { name: z.string() }, + outputSchema: { greeting: z.string() }, + _meta: { ui: { resourceUri: "ui://greet/view.html" } }, + }, + async ({ name }) => ({ + content: [{ type: "text", text: `hello ${name}` }], + structuredContent: { greeting: `hello ${name}` }, + }), + ), + ); + + const { tools } = await client.listTools(); + expect(tools[0].inputSchema).toMatchObject({ + type: "object", + properties: { name: { type: "string" } }, + }); + expect(tools[0].outputSchema).toMatchObject({ + type: "object", + properties: { greeting: { type: "string" } }, + }); + + const result = await client.callTool({ + name: "greet", + arguments: { name: "world" }, + }); + expect(result.structuredContent).toEqual({ greeting: "hello world" }); + + const invalid = await client.callTool({ + name: "greet", + arguments: { name: 42 }, + }); + expect(invalid.isError).toBe(true); + }); + + it("accepts the raw-shape form without an input schema", async () => { + const client = await connect((server) => + registerAppTool( + server, + "ping", + { + outputSchema: { ok: z.boolean() }, + _meta: { ui: { resourceUri: "ui://ping/view.html" } }, + }, + async () => ({ + content: [{ type: "text", text: "pong" }], + structuredContent: { ok: true }, + }), + ), + ); + + const result = await client.callTool({ name: "ping", arguments: {} }); + expect(result.structuredContent).toEqual({ ok: true }); + }); +}); + describe("registerAppResource", () => { it("should register a resource with default MIME type", () => { let capturedName: string | undefined; diff --git a/src/server/index.ts b/src/server/index.ts index dc9a1f3..5fad055 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -39,31 +39,69 @@ import { } from "../spec.types.js"; import { RESOURCE_URI_META_KEY, RESOURCE_MIME_TYPE } from "../constants.js"; import type { + CallToolResult, ClientCapabilities, + InputRequiredResult, McpServer, ReadResourceResult, RegisteredTool, ResourceMetadata, + ServerContext, StandardSchemaWithJSON, ToolAnnotations, ToolCallback, ReadResourceCallback as _ReadResourceCallback, RegisteredResource, } from "@modelcontextprotocol/server"; +import type { z } from "zod/v4"; // Re-exports for convenience export { RESOURCE_URI_META_KEY, RESOURCE_MIME_TYPE }; export type { ResourceMetadata, ToolCallback }; +/** + * A plain `{ field: z.string() }` record accepted by the deprecated raw-shape + * form of {@link registerAppTool `registerAppTool`}; the SDK auto-wraps it with `z.object()`. + * + * @deprecated Wrap with `z.object({...})` instead. + */ +export type ZodRawShape = Record; + +/** + * {@link ToolCallback `ToolCallback`} variant used when `inputSchema` is a {@link ZodRawShape `ZodRawShape`}. + * Mirrors the callback type of the SDK's deprecated `registerTool` overload. + * + * @deprecated Wrap with `z.object({...})` instead and use {@link ToolCallback `ToolCallback`}. + */ +export type LegacyToolCallback = + Args extends ZodRawShape + ? ( + args: z.infer>, + ctx: ServerContext, + ) => + | CallToolResult + | InputRequiredResult + | Promise + : ( + ctx: ServerContext, + ) => + | CallToolResult + | InputRequiredResult + | Promise; + /** * Base tool configuration matching the standard MCP server tool options. * Extended by {@link McpUiAppToolConfig `McpUiAppToolConfig`} to add UI metadata requirements. + * + * `inputSchema`/`outputSchema` accept any Standard JSON Schema (zod v4, ArkType, + * Valibot, ...). A raw zod shape (`{ field: z.string() }`) is still accepted for + * backward compatibility but deprecated. */ export interface ToolConfig { title?: string; description?: string; - inputSchema?: StandardSchemaWithJSON; - outputSchema?: StandardSchemaWithJSON; + inputSchema?: ZodRawShape | StandardSchemaWithJSON; + outputSchema?: ZodRawShape | StandardSchemaWithJSON; annotations?: ToolAnnotations; _meta?: Record; } @@ -217,6 +255,31 @@ export function registerAppTool< outputSchema?: OutputArgs; }, cb: ToolCallback, +): RegisteredTool; +/** + * @deprecated Wrap with `z.object({...})` instead. Raw-shape form: + * `inputSchema`/`outputSchema` may be a plain `{ field: z.string() }` record; + * the SDK auto-wraps it with `z.object()`. + */ +export function registerAppTool< + InputArgs extends ZodRawShape, + OutputArgs extends ZodRawShape | StandardSchemaWithJSON | undefined = + undefined, +>( + server: Pick, + name: string, + config: McpUiAppToolConfig & { + inputSchema?: InputArgs; + outputSchema?: OutputArgs; + }, + cb: LegacyToolCallback, +): RegisteredTool; +export function registerAppTool( + server: Pick, + name: string, + config: McpUiAppToolConfig, + // Widest callback shape accepted by either overload above. + cb: (...args: never[]) => unknown, ): RegisteredTool { // Normalize metadata for backward compatibility: // - If _meta.ui.resourceUri is set, also set the legacy flat key @@ -234,7 +297,16 @@ export function registerAppTool< normalizedMeta = { ...meta, ui: { ...uiMeta, resourceUri: legacyUri } }; } - return server.registerTool(name, { ...config, _meta: normalizedMeta }, cb); + // The public overloads above guarantee `config`/`cb` match one of the SDK's + // own registerTool overloads; the union-typed implementation cannot select + // between them, so widen for the forwarding call. + return server.registerTool( + name, + { ...config, _meta: normalizedMeta } as Parameters< + McpServer["registerTool"] + >[1], + cb as ToolCallback, + ); } export type McpUiReadResourceResult = ReadResourceResult & { From 7f686ff2b47b518db2f106db1710ead2ceea3227 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 7 Sep 2026 15:28:23 +0100 Subject: [PATCH 093/107] Update dependency isolation check for the required client peer The app-only consumer now also exercises the ./react entry. The server-only consumer no longer asserts that client is absent from node_modules (npm auto-installs required peers) but still checks that the server entry does not bundle it. Surface npm and esbuild errors instead of swallowing them. --- scripts/check-dependency-isolation.mjs | 62 ++++++++++++++++++-------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/scripts/check-dependency-isolation.mjs b/scripts/check-dependency-isolation.mjs index 2dfe577..3809224 100644 --- a/scripts/check-dependency-isolation.mjs +++ b/scripts/check-dependency-isolation.mjs @@ -17,13 +17,20 @@ const packageJson = JSON.parse( const client = "@modelcontextprotocol/client"; const server = "@modelcontextprotocol/server"; +// App and AppBridge extend the client package's Protocol class, so client is +// a required peer for every consumer. The server helpers are only needed by +// server authors, so server stays optional: View-only consumers must not have +// it installed or bundled. for (const role of [client, server]) { if (!packageJson.peerDependencies?.[role]) { throw new Error(`${role} must remain a peer dependency`); } - if (packageJson.peerDependenciesMeta?.[role]?.optional !== true) { - throw new Error(`${role} must be an optional peer dependency`); - } +} +if (packageJson.peerDependenciesMeta?.[client]?.optional) { + throw new Error(`${client} must be a required peer dependency`); +} +if (packageJson.peerDependenciesMeta?.[server]?.optional !== true) { + throw new Error(`${server} must be an optional peer dependency`); } /** @@ -42,6 +49,13 @@ function exactDevDependency(name) { return version; } +/** Exact version of a package as installed in this repository's node_modules. */ +function installedVersion(name) { + return JSON.parse( + readFileSync(join(root, "node_modules", name, "package.json"), "utf8"), + ).version; +} + const temporaryRoot = mkdtempSync(join(tmpdir(), "ext-apps-role-peers-")); try { // Minimal environment: nothing inherited from the caller's npm config @@ -72,17 +86,25 @@ try { const consumers = [ { + // View / host author: ext-apps + client (+ react for the hooks entry). name: "app-only", dependencies: { "@types/node": exactDevDependency("@types/node"), + "@types/react": installedVersion("@types/react"), [client]: exactDevDependency(client), "@modelcontextprotocol/ext-apps": `file:${tarball}`, + react: installedVersion("react"), }, absent: server, + // server must be neither installed (it is an optional peer) nor bundled. + mustNotInstall: true, entry: - 'import { App } from "@modelcontextprotocol/ext-apps"; import { AppBridge } from "@modelcontextprotocol/ext-apps/app-bridge"; console.log(App, AppBridge);', + 'import { App } from "@modelcontextprotocol/ext-apps"; import { AppBridge } from "@modelcontextprotocol/ext-apps/app-bridge"; import { useApp } from "@modelcontextprotocol/ext-apps/react"; console.log(App, AppBridge, useApp);', }, { + // Server author: ext-apps + server. npm auto-installs client as a + // required peer (its types back the shared wire types), but the server + // entry must not pull it into a runtime bundle. name: "server-only", dependencies: { "@types/node": exactDevDependency("@types/node"), @@ -90,6 +112,7 @@ try { [server]: exactDevDependency(server), }, absent: client, + mustNotInstall: false, entry: 'import { registerAppTool } from "@modelcontextprotocol/ext-apps/server"; console.log(registerAppTool);', }, @@ -115,22 +138,24 @@ try { "--no-audit", "--no-fund", ], - { cwd: directory, stdio: "pipe", env: npmEnvironment }, + { cwd: directory, stdio: "inherit", env: npmEnvironment }, ); - const absentPath = join( - directory, - "node_modules", - ...consumer.absent.split("/"), - "package.json", - ); - try { - readFileSync(absentPath); - throw new Error( - `${consumer.name} unexpectedly installed ${consumer.absent}`, + if (consumer.mustNotInstall) { + const absentPath = join( + directory, + "node_modules", + ...consumer.absent.split("/"), + "package.json", ); - } catch (error) { - if (error?.code !== "ENOENT") throw error; + try { + readFileSync(absentPath); + throw new Error( + `${consumer.name} unexpectedly installed ${consumer.absent}`, + ); + } catch (error) { + if (error?.code !== "ENOENT") throw error; + } } writeFileSync(join(directory, "entry.ts"), consumer.entry); @@ -138,6 +163,7 @@ try { join(directory, "tsconfig.json"), JSON.stringify({ compilerOptions: { + jsx: "react-jsx", lib: ["ES2020", "DOM"], module: "ESNext", moduleResolution: "bundler", @@ -165,7 +191,7 @@ try { "--outfile=bundle.js", `--metafile=${metafile}`, ], - { cwd: directory, stdio: "pipe" }, + { cwd: directory, stdio: "inherit" }, ); const bundleInputs = Object.keys( JSON.parse(readFileSync(metafile, "utf8")).inputs, From 0a477bb25da7c5b0fdb88ab4f917c071f26c3729 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 7 Sep 2026 15:28:53 +0100 Subject: [PATCH 094/107] Use explicit .js extensions in relative imports Consumers using moduleResolution NodeNext need explicit extensions in the emitted declaration files. Covers every source file except app.ts, app-bridge.ts and events.ts (and their tests), which are being reworked separately. --- src/events.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/events.test.ts b/src/events.test.ts index 7fd8708..60e7c35 100644 --- a/src/events.test.ts +++ b/src/events.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, spyOn } from "bun:test"; -import { EventDispatcher } from "./events"; +import { EventDispatcher } from "./events.js"; type TestEventMap = { change: { value: number }; From 09bf2aae3cc3d7911894300efe95e6099c43238f Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 7 Sep 2026 15:29:42 +0100 Subject: [PATCH 095/107] Drop the zod 3 JSON Schema fallback The zod peer range is ^4.2.0, whose schemas implement ~standard.jsonSchema, so the lazy zod/v4 toJSONSchema fallback for zod 3.25 is dead code. Re-export StandardSchemaWithJSON from the client package instead of keeping a structurally identical local copy. --- src/standard-schema.ts | 44 +++++++++++------------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/src/standard-schema.ts b/src/standard-schema.ts index 4bb85de..a06864a 100644 --- a/src/standard-schema.ts +++ b/src/standard-schema.ts @@ -4,36 +4,22 @@ import type { StandardTypedV1, } from "@standard-schema/spec"; -export type { StandardJSONSchemaV1, StandardSchemaV1, StandardTypedV1 }; - -// TODO(sdk-v2): once @modelcontextprotocol/core v2 is stable, import -// StandardSchemaWithJSON / standardSchemaToJsonSchema / validateStandardSchema -// from there and delete this file. At that point decide whether to tighten -// App.registerTool to StandardSchemaWithJSON (drops zod 3 from the peer range -// and the lazy z.toJSONSchema fallback below). +import type { StandardSchemaWithJSON } from "@modelcontextprotocol/client"; /** * A schema that implements both Standard Schema (validation) and Standard JSON * Schema (serialization). Zod v4, ArkType, and Valibot (via - * `@valibot/to-json-schema`) all satisfy this. - * - * Mirrors the type of the same name in `@modelcontextprotocol/core` v2 so that - * bumping to that package later is a drop-in import swap. + * `@valibot/to-json-schema`) all satisfy this. Re-exported from the SDK so + * View authors can import it alongside {@link app!App `App`}. * * @see https://standardschema.dev/ - * @see https://github.com/modelcontextprotocol/typescript-sdk/pull/1689 */ -export interface StandardSchemaWithJSON { - readonly "~standard": StandardSchemaV1.Props & - StandardJSONSchemaV1.Props; -} - -export namespace StandardSchemaWithJSON { - export type InferInput = - StandardTypedV1.InferInput; - export type InferOutput = - StandardTypedV1.InferOutput; -} +export type { + StandardJSONSchemaV1, + StandardSchemaV1, + StandardSchemaWithJSON, + StandardTypedV1, +}; /** JSON-Schema target draft used for tool input/output schemas (matches core MCP). */ const TARGET = { target: "draft-2020-12" } as const; @@ -41,11 +27,8 @@ const TARGET = { target: "draft-2020-12" } as const; /** * Serialize a Standard Schema to JSON Schema for the given direction. * - * Uses `~standard.jsonSchema` when present (zod v4, ArkType, Valibot, …). - * Falls back to a lazy `zod/v4` import for zod v3.25.x — which implements - * `~standard.validate` but not yet `~standard.jsonSchema` — so the existing - * `^3.25.0 || ^4.0.0` peer range keeps working. Non-zod schemas without - * `jsonSchema` throw. + * Requires `~standard.jsonSchema` (zod v4, ArkType, Valibot, …); schemas + * without it throw. */ export async function standardSchemaToJsonSchema( schema: StandardSchemaV1, @@ -57,11 +40,6 @@ export async function standardSchemaToJsonSchema( if (std.jsonSchema) { return std.jsonSchema[io](TARGET); } - if (std.vendor === "zod") { - const { z } = await import("zod/v4"); - // eslint-disable-next-line @typescript-eslint/no-explicit-any -- bridging StandardSchemaV1 → zod's $ZodType for the v3.25 fallback - return z.toJSONSchema(schema as any, { io }); - } throw new Error( `Schema (vendor: ${std.vendor}) does not implement Standard JSON Schema (~standard.jsonSchema). ` + `Use a library that does (zod v4, ArkType, Valibot) or wrap your schema accordingly.`, From c5b25431155d72a0a2cb4f45f635e243ad1ea844 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 7 Sep 2026 15:31:22 +0100 Subject: [PATCH 096/107] Document the 2.x install matrix and add a migration guide Install instructions now list the split base MCP SDK packages at ^2.0.0 by role (core comes in transitively, server only for server authors), require Node 20+, and state that the wire protocol is unchanged so 2.x Views and 1.x hosts interoperate. The agent skills lose the exact prerelease wording and add-app-to-server gains a v1 to v2 import mapping. docs/migrate-to-2.md lists the breaking changes, the peer matrix and the host-side error deltas. --- AGENTS.md | 4 +- README.md | 22 +++-- docs/migrate-to-2.md | 94 +++++++++++++++++++ docs/overview.md | 4 +- docs/quickstart.md | 2 +- docs/testing-mcp-apps.md | 2 +- examples/transcript-server/README.md | 2 +- .../skills/add-app-to-server/SKILL.md | 22 ++++- .../mcp-apps/skills/convert-web-app/SKILL.md | 8 +- .../mcp-apps/skills/create-mcp-app/SKILL.md | 8 +- typedoc.config.mjs | 2 + 11 files changed, 144 insertions(+), 26 deletions(-) create mode 100644 docs/migrate-to-2.md diff --git a/AGENTS.md b/AGENTS.md index 4b0faa0..219b947 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -60,8 +60,8 @@ rm -fR package-lock.json node_modules && \ ### Key Source Files -- `src/app.ts` - `App` subclasses the base MCP SDK `Protocol`, handles View initialization, tool calls, and messaging -- `src/app-bridge.ts` - `AppBridge` subclasses the base MCP SDK `Protocol` for the iframe channel and proxies through a separate outer `Client` +- `src/app.ts` - `App` subclasses `Protocol` from `@modelcontextprotocol/client`, handles View initialization, tool calls, and messaging +- `src/app-bridge.ts` - `AppBridge` subclasses `Protocol` from `@modelcontextprotocol/client` for the iframe channel and proxies through a separate outer `Client` - `src/server/index.ts` - Helpers for MCP servers to register tools/resources with UI metadata - `src/types.ts` - Protocol types re-exported from `spec.types.ts` and Zod schemas from `generated/schema.ts` (auto-generated during build) - `src/message-transport.ts` - `PostMessageTransport` for iframe communication diff --git a/README.md b/README.md index ff47e1e..4b92f0c 100644 --- a/README.md +++ b/README.md @@ -122,27 +122,33 @@ resources: ## Getting Started +Requires Node.js 20+. The base MCP SDK packages are `^2.0.0` peers of +`ext-apps` (`@modelcontextprotocol/core` is pulled in transitively). + For a View or host: ```bash npm install -S @modelcontextprotocol/ext-apps \ - @modelcontextprotocol/client@2.0.0-beta.5 \ - @modelcontextprotocol/core@2.0.0-beta.5 \ + @modelcontextprotocol/client@^2.0.0 \ zod@^4.2.0 ``` -For an MCP server: +For an MCP server, add the server package (and, for HTTP transports, the Node +and Express adapters): ```bash npm install -S @modelcontextprotocol/ext-apps \ - @modelcontextprotocol/server@2.0.0-beta.5 \ - @modelcontextprotocol/core@2.0.0-beta.5 \ + @modelcontextprotocol/client@^2.0.0 \ + @modelcontextprotocol/server@^2.0.0 \ + @modelcontextprotocol/node@^2.0.0 \ + @modelcontextprotocol/express@^2.0.0 \ zod@^4.2.0 ``` -Applications that implement both roles should install both `client` and -`server`. Keep all installed base MCP SDK packages on the exact same published -beta so they share one compatible protocol implementation. +The wire protocol is unchanged between `ext-apps` 1.x and 2.x: a 2.x View works +in a 1.x host and a 2.x host renders 1.x Views. See the +[migration guide](https://apps.extensions.modelcontextprotocol.io/api/documents/migrate-to-v2.html) +when upgrading from 1.x. **New here?** Start with the [Quickstart Guide](https://apps.extensions.modelcontextprotocol.io/api/documents/Quickstart.html) diff --git a/docs/migrate-to-2.md b/docs/migrate-to-2.md new file mode 100644 index 0000000..3f6db7b --- /dev/null +++ b/docs/migrate-to-2.md @@ -0,0 +1,94 @@ +--- +title: Migrate to v2 +group: Getting Started +description: Upgrade from ext-apps 1.x to 2.x — new base MCP SDK peer packages, API changes for Views and hosts, and what stays wire-compatible. +--- + +# Migrating from ext-apps 1.x to 2.x + +ext-apps 2.x is built on the base MCP TypeScript SDK 2.x, which replaced the +single `@modelcontextprotocol/sdk` package with `@modelcontextprotocol/client`, +`server`, `core`, `node` and `express`. The MCP Apps wire protocol did not +change; the breaking changes are in dependencies and in the TypeScript API. + +## Host compatibility + +The `ui/*` messages exchanged over the iframe channel are byte-identical to +1.x. A 2.x View runs in a 1.x host and a 2.x host renders 1.x Views. The only +host-side deltas are in error responses (see below). + +## Peer dependencies by role + +| Role | Install | +| ------------------- | ---------------------------------------------------------------------------------------------------------------------------- | +| View author | `@modelcontextprotocol/ext-apps`, `@modelcontextprotocol/client@^2.0.0`, `zod@^4.2.0` (+ `react`/`react-dom` for `./react`) | +| Host author | same as View author | +| MCP server author | View author packages + `@modelcontextprotocol/server@^2.0.0`; `@modelcontextprotocol/node` and `express` for HTTP transports | +| CDN / `*-with-deps` | nothing extra: `./app-with-deps` and `./react-with-deps` bundle client, core and zod (about 25% larger than the 1.x bundles) | + +`@modelcontextprotocol/client` is a required peer (`App` and `AppBridge` extend +its `Protocol` class); `@modelcontextprotocol/core` is installed transitively; +`@modelcontextprotocol/server` stays optional and is only needed for the +`./server` helpers. Node.js 20+ is required. + +## Breaking changes + +- **Peer packages.** `@modelcontextprotocol/sdk@^1` is replaced by the split + 2.x packages above, all at `^2.0.0`. Remove the 1.x package from your + project; the two SDKs do not interoperate. +- **zod 3 dropped.** The peer range is `zod@^4.2.0`. Tool schemas must + implement Standard JSON Schema (`~standard.jsonSchema`): zod v4, ArkType, + Valibot. Raw zod shapes (`{ q: z.string() }`) still work with + `registerAppTool` but are deprecated; wrap them with `z.object({...})`. +- **`App` / `AppBridge` extend `Protocol` from `@modelcontextprotocol/client`.** + `ProtocolWithEvents`, `AppRequest`, `AppNotification` and `AppResult` are + gone; use the SDK's `Protocol`, `Request`, `Notification` and `Result`. +- **Handler context.** Custom handlers receive the SDK 2.x context: + `extra.signal` → `extra.mcpReq.signal`, `extra.requestId` → + `extra.mcpReq.id`. +- **`setRequestHandler` / `setNotificationHandler` take method names.** + `app.setRequestHandler(SomeRequestSchema, handler)` becomes + `app.setRequestHandler("some/method", handler)` (pass the params schema as the + optional extra argument for validation). +- **Errors.** Remote JSON-RPC errors are `ProtocolError` (numeric `code`); + local conditions are `SdkError` with a string `code`: request timeout → + `"REQUEST_TIMEOUT"`, connection closed → `"CONNECTION_CLOSED"`. Cancelling a + request with an `AbortSignal` also rejects with `"REQUEST_TIMEOUT"` (the + message is the abort reason). Messages no longer carry the `MCP error N:` + prefix. + +## Host-side wire deltas + +Observed when a 2.x `AppBridge` answers a View; a 1.x View sees these too. + +| Situation | 1.x host | 2.x host | +| --------------------------------------------------------- | ------------------------------ | --------------------------------------------------- | +| A handler throws `-32002` (resource not found) | `error.code: -32002` | `error.code: -32602` (the SDK never emits `-32002`) | +| Invalid params on a `ui/*` request | `-32603` with a zod issue dump | `-32602 Invalid params for : …` | +| Error message text | `MCP error -32602: …` prefix | plain message | +| `tools/call` to an unknown tool through a 2.x `McpServer` | `result.isError: true` | JSON-RPC error `-32602` (`callServerTool` rejects) | + +## `schema.json` + +The published `./schema.json` export is regenerated from the 2.x core schemas: + +- `McpUiToolResultNotification.params.structuredContent` is any JSON value (was + `type: "object"`). +- Result `_meta` documents `io.modelcontextprotocol/serverInfo` and no longer + lists `progressToken` / `related-task` (both still pass through). +- `McpUiHostContext.toolInfo.tool.inputSchema` is a loose object. +- A recursive `$defs.__schema0` JSON-value definition is added. + +## Checklist + +1. `npm uninstall @modelcontextprotocol/sdk` and install the packages for your + role from the table above. +2. Replace `sdk/...` imports with the split packages (`sdk/server/mcp.js` → + `@modelcontextprotocol/server`, `sdk/server/streamableHttp.js` → + `NodeStreamableHTTPServerTransport` from `@modelcontextprotocol/node`, + `sdk/server/stdio.js` → `@modelcontextprotocol/server/stdio`, `sdk/types.js` + → `@modelcontextprotocol/client` or `server`). +3. Wrap raw zod shapes with `z.object({...})`. +4. Update custom handlers to the `extra.mcpReq.*` context and method-keyed + `setRequestHandler` calls. +5. Replace `McpError` / numeric-code checks with `ProtocolError` / `SdkError`. diff --git a/docs/overview.md b/docs/overview.md index 5f3852d..8eda95d 100644 --- a/docs/overview.md +++ b/docs/overview.md @@ -56,8 +56,8 @@ flowchart LR - **Host** — The chat client (e.g., Claude Desktop) that connects to servers, embeds Views in iframes, and proxies communication between them. - **View** — The UI running inside a sandboxed iframe. It receives tool data from the Host and can call server tools or send messages back to the chat. -The View's `App` and the Host's `AppBridge` both subclass the base MCP SDK's -public `Protocol` for the iframe channel. A separate outer `Client` connects +The View's `App` and the Host's `AppBridge` both subclass the `Protocol` class +exported by `@modelcontextprotocol/client` for the iframe channel. A separate outer `Client` connects the Host to the actual MCP Server. Keeping those two connections separate preserves the Apps-only iframe handshake and prevents iframe capabilities from leaking into the server connection. diff --git a/docs/quickstart.md b/docs/quickstart.md index 3cac872..2039dc1 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -37,7 +37,7 @@ Install the dependencies you'll need: ```bash npm init -y -npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.5 @modelcontextprotocol/core@2.0.0-beta.5 @modelcontextprotocol/server@2.0.0-beta.5 @modelcontextprotocol/node@2.0.0-beta.5 @modelcontextprotocol/express@2.0.0-beta.5 zod@^4.2.0 express cors +npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@^2.0.0 @modelcontextprotocol/server@^2.0.0 @modelcontextprotocol/node@^2.0.0 @modelcontextprotocol/express@^2.0.0 zod@^4.2.0 express cors npm install -D typescript vite vite-plugin-singlefile @types/express @types/cors @types/node tsx concurrently cross-env ``` diff --git a/docs/testing-mcp-apps.md b/docs/testing-mcp-apps.md index e5d82b5..a8eb333 100644 --- a/docs/testing-mcp-apps.md +++ b/docs/testing-mcp-apps.md @@ -29,7 +29,7 @@ The [`basic-host`](https://github.com/modelcontextprotocol/ext-apps/tree/main/ex ``` The root install runs the package build, including type-checking the - documentation snippets against the exact base MCP SDK beta.4 packages. Do + documentation snippets against the pinned base MCP SDK 2.x packages. Do not bypass a failed build before testing the host. 2. Start basic-host, pointing it to your MCP server: diff --git a/examples/transcript-server/README.md b/examples/transcript-server/README.md index 3b3fa42..559ffad 100644 --- a/examples/transcript-server/README.md +++ b/examples/transcript-server/README.md @@ -56,7 +56,7 @@ To test local modifications, use this configuration (replace `~/code/ext-apps` w ### Prerequisites -- Node.js 18+ +- Node.js 20+ - Chrome, Edge, or Safari (Web Speech API support) ### Installation diff --git a/plugins/mcp-apps/skills/add-app-to-server/SKILL.md b/plugins/mcp-apps/skills/add-app-to-server/SKILL.md index fda72b0..df7d931 100644 --- a/plugins/mcp-apps/skills/add-app-to-server/SKILL.md +++ b/plugins/mcp-apps/skills/add-app-to-server/SKILL.md @@ -77,15 +77,27 @@ Before writing any code, analyze the server's existing tools and determine which ## Step 2: Add Dependencies ```bash -npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.5 @modelcontextprotocol/core@2.0.0-beta.5 @modelcontextprotocol/server@2.0.0-beta.5 zod@^4.2.0 +npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@^2.0.0 @modelcontextprotocol/server@^2.0.0 zod@^4.2.0 npm install -D vite vite-plugin-singlefile ``` -Plus framework-specific dependencies if needed (e.g., `react`, `react-dom`, `@vitejs/plugin-react` for React). +Plus framework-specific dependencies if needed (e.g., `react`, `react-dom`, `@vitejs/plugin-react` for React), and `@modelcontextprotocol/node` / `@modelcontextprotocol/express` if the server uses HTTP transports. -Use the exact base MCP SDK prerelease required by ext-apps. Existing servers -that still import `@modelcontextprotocol/sdk` v1 must migrate those imports and -handler schemas before adding the App integration. +ext-apps 2.x requires the split base MCP SDK packages at `^2.0.0` +(`@modelcontextprotocol/core` comes in transitively). Existing servers that +still import `@modelcontextprotocol/sdk` v1 must migrate those imports and +handler schemas before adding the App integration: + +| SDK v1 (`@modelcontextprotocol/sdk`) | SDK v2 | +|---|---| +| `sdk/server/mcp.js` (`McpServer`) | `@modelcontextprotocol/server` | +| `sdk/server/streamableHttp.js` (`StreamableHTTPServerTransport`) | `NodeStreamableHTTPServerTransport` from `@modelcontextprotocol/node` | +| Express wiring by hand | `createMcpExpressApp` from `@modelcontextprotocol/express` | +| `sdk/server/stdio.js` | `@modelcontextprotocol/server/stdio` | +| `sdk/types.js` (types, schemas) | `@modelcontextprotocol/client` or `@modelcontextprotocol/server` | +| Raw zod shapes: `inputSchema: { q: z.string() }` | `inputSchema: z.object({ q: z.string() })` | +| `extra.signal` in tool callbacks | `extra.mcpReq.signal` | +| `setRequestHandler(SomeRequestSchema, handler)` | `setRequestHandler("some/method", handler)` | ## Step 3: Set Up the Build Pipeline diff --git a/plugins/mcp-apps/skills/convert-web-app/SKILL.md b/plugins/mcp-apps/skills/convert-web-app/SKILL.md index 03fc8d7..8fb7fa0 100644 --- a/plugins/mcp-apps/skills/convert-web-app/SKILL.md +++ b/plugins/mcp-apps/skills/convert-web-app/SKILL.md @@ -115,12 +115,14 @@ Create a new MCP server with tool and resource registration. This wraps the exis ### Dependencies ```bash -npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.5 @modelcontextprotocol/core@2.0.0-beta.5 @modelcontextprotocol/server@2.0.0-beta.5 zod@^4.2.0 +npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@^2.0.0 @modelcontextprotocol/server@^2.0.0 zod@^4.2.0 npm install -D tsx vite vite-plugin-singlefile ``` -Use `npm install` with the exact base MCP SDK prerelease required by ext-apps. -Do not substitute unpublished local packages or guess a different prerelease. +Use `npm install` so the package manager resolves versions; ext-apps 2.x needs +the split base MCP SDK packages at `^2.0.0` (`@modelcontextprotocol/core` comes +in transitively). Do not add the legacy `@modelcontextprotocol/sdk` v1 package +or substitute unpublished local packages. ### Server Code diff --git a/plugins/mcp-apps/skills/create-mcp-app/SKILL.md b/plugins/mcp-apps/skills/create-mcp-app/SKILL.md index 6f1c466..d73dc90 100644 --- a/plugins/mcp-apps/skills/create-mcp-app/SKILL.md +++ b/plugins/mcp-apps/skills/create-mcp-app/SKILL.md @@ -110,12 +110,14 @@ See `/tmp/mcp-ext-apps/docs/patterns.md` for detailed recipes: **Always** use `npm install` to add dependencies rather than manually writing version numbers: ```bash -npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@2.0.0-beta.5 @modelcontextprotocol/core@2.0.0-beta.5 @modelcontextprotocol/server@2.0.0-beta.5 @modelcontextprotocol/node@2.0.0-beta.5 @modelcontextprotocol/express@2.0.0-beta.5 zod@^4.2.0 express cors +npm install @modelcontextprotocol/ext-apps @modelcontextprotocol/client@^2.0.0 @modelcontextprotocol/server@^2.0.0 @modelcontextprotocol/node@^2.0.0 @modelcontextprotocol/express@^2.0.0 zod@^4.2.0 express cors npm install -D typescript vite vite-plugin-singlefile concurrently cross-env @types/node @types/express @types/cors ``` -Use the exact base MCP SDK prerelease required by ext-apps. Do not substitute -unpublished local packages or guess a different prerelease. +ext-apps 2.x requires the split base MCP SDK packages (`@modelcontextprotocol/client`, +`server`, `node`, `express`) at `^2.0.0`; `@modelcontextprotocol/core` comes in +transitively. Do not add the legacy `@modelcontextprotocol/sdk` v1 package or +substitute unpublished local packages. ### TypeScript Server Execution diff --git a/typedoc.config.mjs b/typedoc.config.mjs index 1531bdc..c9b9476 100644 --- a/typedoc.config.mjs +++ b/typedoc.config.mjs @@ -19,6 +19,7 @@ const config = { "docs/authorization.md", "docs/csp-cors.md", "docs/migrate_from_openai_apps.md", + "docs/migrate-to-2.md", ], entryPoints: [ "src/server/index.ts", @@ -43,6 +44,7 @@ const config = { ResponseCacheStore: BASE_SDK_DOCS, SdkError: BASE_SDK_DOCS, "SdkErrorCode.MethodNotSupportedByProtocolVersion": BASE_SDK_DOCS, + StandardJSONSchemaV1: BASE_SDK_DOCS, "SdkErrorCode.UnsupportedResultType": BASE_SDK_DOCS, "__type.enforceStrictCapabilities": BASE_SDK_DOCS, }, From ea6b89c9e2670b9ef73ad8b61d989cf6f2f1cc05 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 7 Sep 2026 15:33:01 +0100 Subject: [PATCH 097/107] Add wire compatibility tests against captured 1.x traffic Replay JSON-RPC messages recorded from ext-apps 1.7.x (sdk 1.x key order and ids) through the 2.x App and AppBridge over a raw in-memory transport and assert exactly what 2.x emits: the ui/initialize handshake, params-less ui/notifications/initialized, tools/call in both directions, and the -32002 to -32602 re-encoding on the host side. Also check that AppBridge never sends an MCP initialize toward the View and that the outer-client proxy works with a default (non-legacy) 2.x Client/Server pair. --- src/wire-compat.test.ts | 576 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 576 insertions(+) create mode 100644 src/wire-compat.test.ts diff --git a/src/wire-compat.test.ts b/src/wire-compat.test.ts new file mode 100644 index 0000000..5fdca8b --- /dev/null +++ b/src/wire-compat.test.ts @@ -0,0 +1,576 @@ +/** + * Cross-version wire compatibility. + * + * Replays JSON-RPC messages captured from ext-apps 1.7.x (built on + * `@modelcontextprotocol/sdk` 1.x) through the 2.x `App` and `AppBridge` over + * a raw in-memory transport, and asserts what 2.x emits back. The MCP Apps + * wire protocol is meant to be unchanged across the major bump; the few + * host-side error deltas are pinned here so they stay deliberate. + */ +import { describe, it, expect, afterEach } from "bun:test"; +import { + Client, + InMemoryTransport, + ProtocolError, + type JSONRPCMessage, + type Transport, +} from "@modelcontextprotocol/client"; +import { McpServer } from "@modelcontextprotocol/server"; +import { z } from "zod/v4"; + +import { App } from "./app.js"; +import { + AppBridge, + type McpUiHostCapabilities, + type McpUiHostContext, +} from "./app-bridge.js"; +import { LATEST_PROTOCOL_VERSION } from "./types.js"; + +/** Wait for pending microtasks/timers to complete. */ +const flush = () => new Promise((resolve) => setTimeout(resolve, 5)); + +/** + * One end of a raw in-memory channel. The 2.x side gets `transport`; the test + * plays the role of the 1.x peer by calling `inject()` with captured JSON and + * reading `sent` to see exactly what 2.x put on the wire. + */ +function createRawChannel() { + const sent: JSONRPCMessage[] = []; + let closed = false; + const transport: Transport = { + async start() {}, + async send(message) { + // Serialize like a real transport would so we assert on plain JSON. + sent.push(JSON.parse(JSON.stringify(message))); + }, + async close() { + if (closed) return; + closed = true; + transport.onclose?.(); + }, + }; + return { + transport, + sent, + /** Deliver a raw message (as the 1.x peer would have sent it). */ + inject(message: unknown) { + transport.onmessage?.(message as JSONRPCMessage); + }, + /** Messages sent after the given index. */ + since(index: number) { + return sent.slice(index); + }, + }; +} + +const hostInfo = { name: "TestHost", version: "9.9.9" }; +const hostCapabilities: McpUiHostCapabilities = { + openLinks: {}, + serverTools: {}, + serverResources: {}, + logging: {}, + updateModelContext: {}, +}; +const hostContext: McpUiHostContext = { + theme: "dark", + displayMode: "inline", + locale: "en-US", +}; + +/** Captured from ext-apps 1.7.x View (sdk 1.x key order, numeric ids from 0). */ +const v1View = { + initialize: { + method: "ui/initialize", + params: { + appCapabilities: { tools: { listChanged: true } }, + appInfo: { name: "TestView", version: "1.2.3" }, + protocolVersion: "2026-01-26", + }, + jsonrpc: "2.0", + id: 0, + }, + initialized: { method: "ui/notifications/initialized", jsonrpc: "2.0" }, + callTool: { + method: "tools/call", + params: { name: "echo", arguments: { a: 1 }, _meta: { progressToken: 6 } }, + jsonrpc: "2.0", + id: 6, + }, + readResource: { + method: "resources/read", + params: { uri: "test://x" }, + jsonrpc: "2.0", + id: 12, + }, + toolsListResult: (id: number) => ({ + result: { + tools: [ + { + name: "viewtool", + description: "view tool", + inputSchema: { + type: "object", + properties: { x: { type: "number" } }, + }, + }, + ], + }, + jsonrpc: "2.0", + id, + }), +}; + +/** Captured from ext-apps 1.7.x AppBridge (sdk 1.x). */ +const v1Host = { + initializeResult: (id: number) => ({ + result: { + protocolVersion: "2026-01-26", + hostCapabilities, + hostInfo, + hostContext, + }, + jsonrpc: "2.0", + id, + }), + toolInput: { + method: "ui/notifications/tool-input", + params: { arguments: { location: "NYC" } }, + jsonrpc: "2.0", + }, + callToolResult: (id: number) => ({ + result: { content: [{ type: "text", text: "echo 1" }] }, + jsonrpc: "2.0", + id, + }), + /** McpServer 1.x reports an unknown tool as an isError result, not an error. */ + callToolUnknownResult: (id: number) => ({ + result: { + content: [ + { type: "text", text: "MCP error -32602: Tool nope not found" }, + ], + isError: true, + }, + jsonrpc: "2.0", + id, + }), + resourceNotFoundError: (id: number) => ({ + jsonrpc: "2.0", + id, + error: { + code: -32002, + message: "MCP error -32002: Resource not found (host-thrown -32002)", + }, + }), + toolsList: { method: "tools/list", jsonrpc: "2.0", id: 0 }, + callViewTool: { + method: "tools/call", + params: { name: "viewtool", arguments: { x: 7 } }, + jsonrpc: "2.0", + id: 1, + }, +}; + +describe("wire compatibility: 2.x AppBridge with a 1.x View", () => { + let bridge: AppBridge; + + afterEach(async () => { + await bridge?.close().catch(() => {}); + }); + + async function connectBridge() { + const channel = createRawChannel(); + bridge = new AppBridge(null, hostInfo, hostCapabilities, { hostContext }); + await bridge.connect(channel.transport); + return channel; + } + + async function handshake() { + const channel = await connectBridge(); + let initialized = 0; + bridge.oninitialized = () => { + initialized++; + }; + channel.inject(v1View.initialize); + await flush(); + channel.inject(v1View.initialized); + await flush(); + return { channel, initialized: () => initialized }; + } + + it("sends nothing on connect: no MCP initialize toward the View", async () => { + const channel = await connectBridge(); + await flush(); + expect(channel.sent).toEqual([]); + }); + + it("answers a 1.x ui/initialize with the 1.x result shape and same id", async () => { + const channel = await connectBridge(); + channel.inject(v1View.initialize); + await flush(); + + expect(channel.sent).toEqual([ + { + jsonrpc: "2.0", + id: 0, + result: { + protocolVersion: LATEST_PROTOCOL_VERSION, + hostCapabilities, + hostInfo, + hostContext, + }, + }, + ]); + expect(bridge.getAppCapabilities()).toEqual({ + tools: { listChanged: true }, + }); + expect(bridge.getAppVersion()).toEqual({ + name: "TestView", + version: "1.2.3", + }); + }); + + it("accepts ui/notifications/initialized without params", async () => { + const { channel, initialized } = await handshake(); + expect(initialized()).toBe(1); + // Only the initialize response went out; the notification gets no reply + // and the bridge never starts an MCP handshake of its own. + expect(channel.sent).toHaveLength(1); + expect(channel.sent.some((m) => "method" in m)).toBe(false); + }); + + it("answers a 1.x tools/call request through oncalltool", async () => { + const { channel } = await handshake(); + bridge.oncalltool = async (params) => ({ + content: [{ type: "text", text: `echo ${params.arguments?.a}` }], + }); + const mark = channel.sent.length; + channel.inject(v1View.callTool); + await flush(); + + expect(channel.since(mark)).toEqual([ + { + jsonrpc: "2.0", + id: 6, + result: { content: [{ type: "text", text: "echo 1" }] }, + }, + ]); + }); + + it("re-encodes a handler-thrown -32002 as -32602 without the MCP error prefix", async () => { + // Documented host-side delta: SDK 2.x never emits -32002 on the wire. + const { channel } = await handshake(); + bridge.onreadresource = async () => { + throw new ProtocolError( + -32002, + "Resource not found (host-thrown -32002)", + ); + }; + const mark = channel.sent.length; + channel.inject(v1View.readResource); + await flush(); + + const [reply] = channel.since(mark); + expect(reply).toMatchObject({ + jsonrpc: "2.0", + id: 12, + error: { code: -32602 }, + }); + const message = (reply as { error: { message: string } }).error.message; + expect(message).toBe("Resource not found (host-thrown -32002)"); + expect(message).not.toMatch(/^MCP error/); + }); + + it("rejects invalid params on a ui/* request with -32602", async () => { + const { channel } = await handshake(); + bridge.onopenlink = async () => ({}); + const mark = channel.sent.length; + channel.inject({ + method: "ui/open-link", + params: { url: 42 }, + jsonrpc: "2.0", + id: 14, + }); + await flush(); + + expect(channel.since(mark)).toHaveLength(1); + expect(channel.since(mark)[0]).toMatchObject({ + jsonrpc: "2.0", + id: 14, + error: { code: -32602 }, + }); + }); + + it("lists and calls View tools with 1.x-shaped responses", async () => { + const { channel } = await handshake(); + const mark = channel.sent.length; + const listPromise = bridge.listTools({}); + await flush(); + + const [listRequest] = channel.since(mark) as Array<{ + id: number; + method: string; + }>; + expect(listRequest).toMatchObject({ jsonrpc: "2.0", method: "tools/list" }); + channel.inject(v1View.toolsListResult(listRequest.id)); + const list = await listPromise; + expect(list.tools.map((t) => t.name)).toEqual(["viewtool"]); + + const callPromise = bridge.callTool({ + name: "viewtool", + arguments: { x: 7 }, + }); + await flush(); + const [callRequest] = channel.since(mark + 1) as Array<{ id: number }>; + expect(callRequest).toMatchObject({ + jsonrpc: "2.0", + method: "tools/call", + params: { name: "viewtool", arguments: { x: 7 } }, + }); + channel.inject({ + result: { content: [{ type: "text", text: "view got 7" }] }, + jsonrpc: "2.0", + id: callRequest.id, + }); + expect(await callPromise).toEqual({ + content: [{ type: "text", text: "view got 7" }], + }); + }); + + it("only ever emits jsonrpc 2.0 messages, never an initialize request", async () => { + const { channel } = await handshake(); + bridge.oncalltool = async () => ({ content: [] }); + channel.inject(v1View.callTool); + bridge.sendToolInput({ arguments: { q: "x" } }); + bridge.sendToolResult({ content: [] }); + await flush(); + + for (const message of channel.sent) { + expect(message.jsonrpc).toBe("2.0"); + } + const methods = channel.sent + .filter((m): m is JSONRPCMessage & { method: string } => "method" in m) + .map((m) => m.method); + expect(methods).toEqual([ + "ui/notifications/tool-input", + "ui/notifications/tool-result", + ]); + expect(methods).not.toContain("initialize"); + expect(methods).not.toContain("notifications/initialized"); + }); +}); + +describe("wire compatibility: 2.x App with a 1.x host", () => { + let app: App; + + afterEach(async () => { + await app?.close().catch(() => {}); + }); + + /** Connect the App and answer its ui/initialize the way a 1.x host did. */ + async function handshake( + capabilities: ConstructorParameters[1] = {}, + setup: (app: App) => void = () => {}, + ) { + const channel = createRawChannel(); + app = new App({ name: "TestView", version: "1.2.3" }, capabilities, { + autoResize: false, + }); + setup(app); + const connected = app.connect(channel.transport); + await flush(); + + const [initialize] = channel.sent as Array<{ id: number }>; + channel.inject(v1Host.initializeResult(initialize.id)); + await connected; + await flush(); + return { channel, initialize }; + } + + it("sends a 1.x-compatible ui/initialize and ui/notifications/initialized", async () => { + const { channel } = await handshake({ tools: { listChanged: true } }); + + expect(channel.sent).toEqual([ + { + jsonrpc: "2.0", + id: 0, + method: "ui/initialize", + params: { + protocolVersion: LATEST_PROTOCOL_VERSION, + appInfo: { name: "TestView", version: "1.2.3" }, + appCapabilities: { tools: { listChanged: true } }, + }, + }, + { jsonrpc: "2.0", method: "ui/notifications/initialized" }, + ]); + expect(app.getHostContext()).toEqual(hostContext); + expect(app.getHostCapabilities()).toEqual(hostCapabilities); + expect(app.getHostVersion()).toEqual(hostInfo); + }); + + it("delivers a 1.x notification with sdk-1 key order to ontoolinput", async () => { + const received: unknown[] = []; + const { channel } = await handshake({}, (app) => { + app.ontoolinput = (params) => { + received.push(params); + }; + }); + channel.inject(v1Host.toolInput); + await flush(); + expect(received).toEqual([{ arguments: { location: "NYC" } }]); + }); + + it("resolves callServerTool from a 1.x tools/call response", async () => { + const { channel } = await handshake(); + const mark = channel.sent.length; + const promise = app.callServerTool({ name: "echo", arguments: { a: 1 } }); + await flush(); + + const [request] = channel.since(mark) as Array<{ id: number }>; + expect(request).toMatchObject({ + jsonrpc: "2.0", + method: "tools/call", + params: { + name: "echo", + arguments: { a: 1 }, + _meta: { progressToken: request.id }, + }, + }); + channel.inject(v1Host.callToolResult(request.id)); + expect(await promise).toEqual({ + content: [{ type: "text", text: "echo 1" }], + }); + }); + + it("passes through a 1.x isError tool result unchanged", async () => { + const { channel } = await handshake(); + const mark = channel.sent.length; + const promise = app.callServerTool({ name: "nope", arguments: {} }); + await flush(); + const [request] = channel.since(mark) as Array<{ id: number }>; + channel.inject(v1Host.callToolUnknownResult(request.id)); + expect(await promise).toEqual({ + content: [ + { type: "text", text: "MCP error -32602: Tool nope not found" }, + ], + isError: true, + }); + }); + + it("surfaces a 1.x -32002 error as a ProtocolError with code -32002", async () => { + const { channel } = await handshake(); + const mark = channel.sent.length; + const promise = app.readServerResource({ uri: "test://x" }); + await flush(); + const [request] = channel.since(mark) as Array<{ id: number }>; + channel.inject(v1Host.resourceNotFoundError(request.id)); + + const error = await promise.then( + () => undefined, + (e: unknown) => e, + ); + expect(error).toBeInstanceOf(ProtocolError); + expect((error as ProtocolError).code).toBe(-32002); + expect((error as ProtocolError).message).toContain( + "Resource not found (host-thrown -32002)", + ); + }); + + it("answers 1.x tools/list (no params) and tools/call requests from the host", async () => { + const { channel } = await handshake({ tools: { listChanged: true } }); + app.registerTool( + "viewtool", + { description: "view tool", inputSchema: z.object({ x: z.number() }) }, + async ({ x }) => ({ + content: [{ type: "text", text: `view got ${x}` }], + }), + ); + await flush(); + const mark = channel.sent.length; + + channel.inject(v1Host.toolsList); + await flush(); + const [listReply] = channel.since(mark) as unknown as Array<{ + result: { tools: Array<{ name: string; inputSchema: unknown }> }; + }>; + expect(listReply).toMatchObject({ jsonrpc: "2.0", id: 0 }); + expect(listReply.result.tools).toHaveLength(1); + expect(listReply.result.tools[0]).toMatchObject({ + name: "viewtool", + description: "view tool", + inputSchema: { + type: "object", + properties: { x: { type: "number" } }, + required: ["x"], + }, + }); + + channel.inject(v1Host.callViewTool); + await flush(); + expect(channel.since(mark + 1)).toEqual([ + { + jsonrpc: "2.0", + id: 1, + result: { content: [{ type: "text", text: "view got 7" }] }, + }, + ]); + }); +}); + +describe("AppBridge proxy over a default (modern era) 2.x Client/Server", () => { + let client: Client; + let server: McpServer; + let app: App; + let bridge: AppBridge; + + afterEach(async () => { + await app?.close().catch(() => {}); + await bridge?.close().catch(() => {}); + await client?.close().catch(() => {}); + await server?.close().catch(() => {}); + }); + + it("forwards tools/call and tools/list_changed with default negotiation", async () => { + server = new McpServer({ name: "ActualServer", version: "1.0.0" }); + server.registerTool( + "echo", + { inputSchema: z.object({ a: z.number() }) }, + async ({ a }) => ({ content: [{ type: "text", text: `echo ${a}` }] }), + ); + const [clientTransport, serverTransport] = + InMemoryTransport.createLinkedPair(); + await server.connect(serverTransport); + + client = new Client({ name: "HostOuterClient", version: "1.0.0" }); + await client.connect(clientTransport); + expect(client.getServerCapabilities()?.tools).toEqual({ + listChanged: true, + }); + + bridge = new AppBridge(client, hostInfo, hostCapabilities, { + hostContext, + }); + app = new App( + { name: "TestView", version: "1.2.3" }, + {}, + { + autoResize: false, + }, + ); + const listChanged: string[] = []; + app.setNotificationHandler("notifications/tools/list_changed", () => { + listChanged.push("tools"); + }); + const [appTransport, bridgeTransport] = + InMemoryTransport.createLinkedPair(); + await bridge.connect(bridgeTransport); + await app.connect(appTransport); + + expect( + await app.callServerTool({ name: "echo", arguments: { a: 1 } }), + ).toMatchObject({ content: [{ type: "text", text: "echo 1" }] }); + + server.sendToolListChanged(); + await flush(); + expect(listChanged).toEqual(["tools"]); + }); +}); From cfdc0c725f03b41ba9f3ccb2299386a2369cb9ed Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 7 Sep 2026 15:21:49 +0100 Subject: [PATCH 098/107] fix: restore double-registration guard on App and AppBridge handlers The base SDK Protocol silently replaces an existing request or notification handler. v1's ProtocolWithEvents threw instead, so a stray setRequestHandler / setNotificationHandler could not disconnect on* handlers or addEventListener listeners. Restore that guard on both App and AppBridge with a small MethodRegistry, keep replace semantics for the on* setters via a protected replaceRequestHandler, and release methods on removeRequestHandler / removeNotificationHandler. Also: - give oncreatesamplingmessage a getter, a replace warning and the same clearable shape as the other request setters - let App register handlers for custom (non-spec) methods; the default branch of assertRequestHandlerCapability threw a misleading "No handler for method X registered" error - move the RESOURCE_URI_META_KEY / RESOURCE_MIME_TYPE docs to src/constants.ts where the constants now live - fix stale "inherited from Server" wording and point @see links at @modelcontextprotocol/client, which is what hosts install --- src/app-bridge.test.ts | 85 +++++++++++++++++++- src/app-bridge.ts | 176 ++++++++++++++++++++++++++++++++--------- src/app.test.ts | 111 +++++++++++++++++++++++--- src/app.ts | 159 ++++++++++++++++++++----------------- src/constants.ts | 65 ++++++++++++++- src/events.ts | 41 ++++++++++ 6 files changed, 510 insertions(+), 127 deletions(-) diff --git a/src/app-bridge.test.ts b/src/app-bridge.test.ts index 397e12f..ea85320 100644 --- a/src/app-bridge.test.ts +++ b/src/app-bridge.test.ts @@ -3016,16 +3016,95 @@ describe("isToolVisibilityAppOnly", () => { expect(app.onteardown).toBe(handler); }); - it("direct setRequestHandler uses base SDK replacement semantics", () => { + it("direct setRequestHandler throws when called twice", () => { const bridge2 = new AppBridge( createMockClient() as Client, testHostInfo, testHostCapabilities, ); - bridge2.setRequestHandler("ping", () => ({})); + const params = z.object({}); + bridge2.setRequestHandler("test/method", { params }, () => ({})); expect(() => { - bridge2.setRequestHandler("ping", () => ({})); + bridge2.setRequestHandler("test/method", { params }, () => ({})); + }).toThrow(/already registered/); + }); + + it("direct setRequestHandler cannot silently replace an on* host handler", () => { + const bridge2 = new AppBridge( + createMockClient() as Client, + testHostInfo, + testHostCapabilities, + ); + bridge2.onopenlink = async () => ({}); + expect(() => { + bridge2.setRequestHandler( + "ui/open-link", + { params: z.object({}) }, + () => ({}), + ); + }).toThrow(/already registered/); + }); + + it("direct setNotificationHandler throws for event-mapped methods", () => { + const bridge2 = new AppBridge( + createMockClient() as Client, + testHostInfo, + testHostCapabilities, + ); + bridge2.onsizechange = () => {}; + expect(() => { + bridge2.setNotificationHandler( + "ui/notifications/size-changed", + { params: z.object({}) }, + () => {}, + ); + }).toThrow(/already registered/); + }); + + it("removeRequestHandler releases the method so an on* setter can re-register", () => { + const bridge2 = new AppBridge( + createMockClient() as Client, + testHostInfo, + testHostCapabilities, + ); + bridge2.removeRequestHandler("tools/call"); + expect(() => { + bridge2.setRequestHandler("tools/call", async () => ({ content: [] })); }).not.toThrow(); + expect(() => { + bridge2.oncalltool = async () => ({ content: [] }); + }).not.toThrow(); + }); + + it("oncreatesamplingmessage has a getter, replace semantics, and a replace warning", () => { + const bridge2 = new AppBridge( + createMockClient() as Client, + testHostInfo, + testHostCapabilities, + ); + expect(bridge2.oncreatesamplingmessage).toBeUndefined(); + const first = async () => ({ + role: "assistant" as const, + content: { type: "text" as const, text: "" }, + model: "m", + }); + bridge2.oncreatesamplingmessage = first; + expect(bridge2.oncreatesamplingmessage).toBe(first); + + const warn = spyOn(console, "warn").mockImplementation(() => {}); + try { + expect(() => { + bridge2.oncreatesamplingmessage = first; + }).not.toThrow(); + expect(warn).toHaveBeenCalledWith( + expect.stringContaining("oncreatesamplingmessage handler replaced"), + ); + } finally { + warn.mockRestore(); + } + + bridge2.oncreatesamplingmessage = undefined; + expect(bridge2.oncreatesamplingmessage).toBeUndefined(); }); }); }); diff --git a/src/app-bridge.ts b/src/app-bridge.ts index 8e48677..04ccb4f 100644 --- a/src/app-bridge.ts +++ b/src/app-bridge.ts @@ -34,7 +34,7 @@ import { EmptyResultSchema, LoggingMessageNotificationSchema, } from "@modelcontextprotocol/core"; -import { EventDispatcher } from "./events.js"; +import { EventDispatcher, MethodRegistry } from "./events.js"; import type { ZodLiteral, ZodObject, ZodType } from "zod/v4"; type MethodSchema = ZodObject<{ @@ -42,6 +42,8 @@ type MethodSchema = ZodObject<{ params: ZodType; }>; +type UntypedHandlerSetter = (this: unknown, ...args: unknown[]) => void; + import { type McpUiSandboxResourceReadyNotification, type McpUiSizeChangedNotification, @@ -216,8 +218,8 @@ export const SUPPORTED_PROTOCOL_VERSIONS = [LATEST_PROTOCOL_VERSION]; /** * Extra metadata passed to request handlers. * - * This type represents the additional context provided by the base MCP SDK - * `Server` when handling requests. + * This type represents the additional context (`BaseContext`) provided by the + * base MCP SDK `Protocol` when handling requests. * * @internal */ @@ -302,6 +304,81 @@ export class AppBridge extends Protocol { private _initializedReceived = false; private readonly _registeredEvents = new Set(); private readonly _events = new EventDispatcher(); + private readonly _methods = new MethodRegistry(); + + // ── Handler registration with double-set protection ───────────────── + // + // The base SDK `Protocol` silently replaces an existing handler. The four + // overrides below restore the v1 behaviour: a direct `setRequestHandler` / + // `setNotificationHandler` for a method that already has a handler throws, + // so a stray registration cannot silently replace a host's `on*` handler + // (for example the URL allow-listing in `onopenlink`) or disconnect + // `addEventListener` listeners. They are arrow-function class fields rather + // than prototype methods so that `Protocol`'s constructor — which registers + // its own ping/cancelled/progress handlers before our fields initialize — + // hits the base implementation and skips tracking. + + /** + * Registers a request handler. Throws if a handler for the same method has + * already been registered — use the `on*` setter for replace semantics. + * + * @throws {Error} if a handler for this method is already registered. + */ + override setRequestHandler: Protocol["setRequestHandler"] = ( + method: string, + ...rest: unknown[] + ) => { + this._methods.claim(method, "setRequestHandler"); + (super.setRequestHandler as unknown as UntypedHandlerSetter).call( + this, + method, + ...rest, + ); + }; + + /** + * Registers a notification handler. Throws if a handler for the same method + * has already been registered — use the `on*` setter (replace semantics) or + * `addEventListener` (multi-listener) for mapped events. + * + * @throws {Error} if a handler for this method is already registered. + */ + override setNotificationHandler: Protocol["setNotificationHandler"] = + (method: string, ...rest: unknown[]) => { + this._methods.claim(method, "setNotificationHandler"); + (super.setNotificationHandler as unknown as UntypedHandlerSetter).call( + this, + method, + ...rest, + ); + }; + + override removeRequestHandler: Protocol["removeRequestHandler"] = + (method: string) => { + this._methods.release(method); + super.removeRequestHandler(method); + }; + + override removeNotificationHandler: Protocol["removeNotificationHandler"] = + (method: string) => { + this._methods.release(method); + super.removeNotificationHandler(method); + }; + + /** + * Register a request handler with replace semantics, bypassing the + * double-set protection of {@link setRequestHandler `setRequestHandler`}. + * Used by the `on*` request-handler setters. + */ + protected replaceRequestHandler: Protocol["setRequestHandler"] = + (method: string, ...rest: unknown[]) => { + this._methods.replace(method); + (super.setRequestHandler as unknown as UntypedHandlerSetter).call( + this, + method, + ...rest, + ); + }; /** * The base MCP SDK calls this hook for every standard and custom request @@ -419,7 +496,7 @@ export class AppBridge extends Protocol { * manually using the {@link oncalltool `oncalltool`}, {@link onlistresources `onlistresources`}, etc. setters. * @param _hostInfo - Host application identification (name and version) * @param _hostCapabilities - Features and capabilities the host supports - * @param options - Configuration options (inherited from Server) + * @param options - Configuration options (`ProtocolOptions` from the base MCP SDK plus `hostContext`) * * @example With MCP client (automatic forwarding) * ```ts source="./app-bridge.examples.ts#AppBridge_constructor_withMcpClient" @@ -455,7 +532,7 @@ export class AppBridge extends Protocol { this._hostContext = options?.hostContext || {}; - this.setRequestHandler( + this.replaceRequestHandler( "ui/initialize", { params: McpUiInitializeRequestSchema.shape.params, @@ -464,14 +541,14 @@ export class AppBridge extends Protocol { (params) => this._onAppsInitialize(params), ); - this.setRequestHandler("ping", (request, extra) => { + this.replaceRequestHandler("ping", (request, extra) => { this.onping?.(request.params, extra); return {}; }); // Default handler for requestDisplayMode - returns current mode from host context. // Hosts can override this by setting bridge.onrequestdisplaymode = ... - this.setRequestHandler( + this.replaceRequestHandler( "ui/request-display-mode", { params: McpUiRequestDisplayModeRequestSchema.shape.params, @@ -746,7 +823,7 @@ export class AppBridge extends Protocol { ) { this.warnIfRequestHandlerReplaced("onmessage", this._onmessage, callback); this._onmessage = callback; - this.setRequestHandler( + this.replaceRequestHandler( "ui/message", { params: McpUiMessageRequestSchema.shape.params, @@ -819,7 +896,7 @@ export class AppBridge extends Protocol { ) { this.warnIfRequestHandlerReplaced("onopenlink", this._onopenlink, callback); this._onopenlink = callback; - this.setRequestHandler( + this.replaceRequestHandler( "ui/open-link", { params: McpUiOpenLinkRequestSchema.shape.params, @@ -895,7 +972,7 @@ export class AppBridge extends Protocol { callback, ); this._ondownloadfile = callback; - this.setRequestHandler( + this.replaceRequestHandler( "ui/download-file", { params: McpUiDownloadFileRequestSchema.shape.params, @@ -999,7 +1076,7 @@ export class AppBridge extends Protocol { callback, ); this._onrequestdisplaymode = callback; - this.setRequestHandler( + this.replaceRequestHandler( "ui/request-display-mode", { params: McpUiRequestDisplayModeRequestSchema.shape.params, @@ -1100,7 +1177,7 @@ export class AppBridge extends Protocol { callback, ); this._onupdatemodelcontext = callback; - this.setRequestHandler( + this.replaceRequestHandler( "ui/update-model-context", { params: McpUiUpdateModelContextRequestSchema.shape.params, @@ -1136,8 +1213,8 @@ export class AppBridge extends Protocol { * }; * ``` * - * @see `CallToolRequest` from @modelcontextprotocol/server for the request type - * @see `CallToolResult` from @modelcontextprotocol/server for the result type + * @see `CallToolRequest` from @modelcontextprotocol/client forthe request type + * @see `CallToolResult` from @modelcontextprotocol/client forthe result type */ private _oncalltool?: ( params: CallToolRequest["params"], @@ -1156,7 +1233,7 @@ export class AppBridge extends Protocol { ) { this.warnIfRequestHandlerReplaced("oncalltool", this._oncalltool, callback); this._oncalltool = callback; - this.setRequestHandler("tools/call", async (request, extra) => { + this.replaceRequestHandler("tools/call", async (request, extra) => { if (!this._oncalltool) throw new Error("No oncalltool handler set"); return this._oncalltool(request.params, extra); }); @@ -1190,18 +1267,39 @@ export class AppBridge extends Protocol { * }; * ``` * - * @see `CreateMessageRequest` from @modelcontextprotocol/server for the request type - * @see `CreateMessageResult` / `CreateMessageResultWithTools` from @modelcontextprotocol/server for result types + * @see `CreateMessageRequest` from @modelcontextprotocol/client forthe request type + * @see `CreateMessageResult` / `CreateMessageResultWithTools` from @modelcontextprotocol/client forresult types */ + private _oncreatesamplingmessage?: ( + params: CreateMessageRequest["params"], + extra: RequestHandlerExtra, + ) => Promise; + get oncreatesamplingmessage() { + return this._oncreatesamplingmessage; + } set oncreatesamplingmessage( - callback: ( - params: CreateMessageRequest["params"], - extra: RequestHandlerExtra, - ) => Promise, + callback: + | (( + params: CreateMessageRequest["params"], + extra: RequestHandlerExtra, + ) => Promise) + | undefined, ) { - this.setRequestHandler("sampling/createMessage", async (request, extra) => { - return callback(request.params, extra); - }); + this.warnIfRequestHandlerReplaced( + "oncreatesamplingmessage", + this._oncreatesamplingmessage, + callback, + ); + this._oncreatesamplingmessage = callback; + this.replaceRequestHandler( + "sampling/createMessage", + async (request, extra) => { + if (!this._oncreatesamplingmessage) { + throw new Error("No oncreatesamplingmessage handler set"); + } + return this._oncreatesamplingmessage(request.params, extra); + }, + ); } /** @@ -1221,7 +1319,7 @@ export class AppBridge extends Protocol { * }); * ``` * - * @see `ToolListChangedNotification` from @modelcontextprotocol/server for the notification type + * @see `ToolListChangedNotification` from @modelcontextprotocol/client forthe notification type */ sendToolListChanged(params: ToolListChangedNotification["params"] = {}) { return this.notification({ @@ -1252,8 +1350,8 @@ export class AppBridge extends Protocol { * }; * ``` * - * @see `ListResourcesRequest` from @modelcontextprotocol/server for the request type - * @see `ListResourcesResult` from @modelcontextprotocol/server for the result type + * @see `ListResourcesRequest` from @modelcontextprotocol/client forthe request type + * @see `ListResourcesResult` from @modelcontextprotocol/client forthe result type */ private _onlistresources?: ( params: ListResourcesRequest["params"], @@ -1276,7 +1374,7 @@ export class AppBridge extends Protocol { callback, ); this._onlistresources = callback; - this.setRequestHandler("resources/list", async (request, extra) => { + this.replaceRequestHandler("resources/list", async (request, extra) => { if (!this._onlistresources) throw new Error("No onlistresources handler set"); return this._onlistresources(request.params, extra); @@ -1305,8 +1403,8 @@ export class AppBridge extends Protocol { * }; * ``` * - * @see `ListResourceTemplatesRequest` from @modelcontextprotocol/server for the request type - * @see `ListResourceTemplatesResult` from @modelcontextprotocol/server for the result type + * @see `ListResourceTemplatesRequest` from @modelcontextprotocol/client forthe request type + * @see `ListResourceTemplatesResult` from @modelcontextprotocol/client forthe result type */ private _onlistresourcetemplates?: ( params: ListResourceTemplatesRequest["params"], @@ -1329,7 +1427,7 @@ export class AppBridge extends Protocol { callback, ); this._onlistresourcetemplates = callback; - this.setRequestHandler( + this.replaceRequestHandler( "resources/templates/list", async (request, extra) => { if (!this._onlistresourcetemplates) @@ -1361,8 +1459,8 @@ export class AppBridge extends Protocol { * }; * ``` * - * @see `ReadResourceRequest` from @modelcontextprotocol/server for the request type - * @see `ReadResourceResult` from @modelcontextprotocol/server for the result type + * @see `ReadResourceRequest` from @modelcontextprotocol/client forthe request type + * @see `ReadResourceResult` from @modelcontextprotocol/client forthe result type */ private _onreadresource?: ( params: ReadResourceRequest["params"], @@ -1385,7 +1483,7 @@ export class AppBridge extends Protocol { callback, ); this._onreadresource = callback; - this.setRequestHandler("resources/read", async (request, extra) => { + this.replaceRequestHandler("resources/read", async (request, extra) => { if (!this._onreadresource) throw new Error("No onreadresource handler set"); return this._onreadresource(request.params, extra); @@ -1409,7 +1507,7 @@ export class AppBridge extends Protocol { * }); * ``` * - * @see `ResourceListChangedNotification` from @modelcontextprotocol/server for the notification type + * @see `ResourceListChangedNotification` from @modelcontextprotocol/client forthe notification type */ sendResourceListChanged( params: ResourceListChangedNotification["params"] = {}, @@ -1442,8 +1540,8 @@ export class AppBridge extends Protocol { * }; * ``` * - * @see `ListPromptsRequest` from @modelcontextprotocol/server for the request type - * @see `ListPromptsResult` from @modelcontextprotocol/server for the result type + * @see `ListPromptsRequest` from @modelcontextprotocol/client forthe request type + * @see `ListPromptsResult` from @modelcontextprotocol/client forthe result type */ private _onlistprompts?: ( params: ListPromptsRequest["params"], @@ -1466,7 +1564,7 @@ export class AppBridge extends Protocol { callback, ); this._onlistprompts = callback; - this.setRequestHandler("prompts/list", async (request, extra) => { + this.replaceRequestHandler("prompts/list", async (request, extra) => { if (!this._onlistprompts) throw new Error("No onlistprompts handler set"); return this._onlistprompts(request.params, extra); }); @@ -1489,7 +1587,7 @@ export class AppBridge extends Protocol { * }); * ``` * - * @see `PromptListChangedNotification` from @modelcontextprotocol/server for the notification type + * @see `PromptListChangedNotification` from @modelcontextprotocol/client forthe notification type */ sendPromptListChanged(params: PromptListChangedNotification["params"] = {}) { return this.notification({ diff --git a/src/app.test.ts b/src/app.test.ts index 9057710..35a924f 100644 --- a/src/app.test.ts +++ b/src/app.test.ts @@ -248,25 +248,62 @@ describe("App base MCP SDK v2 Protocol migration", () => { }).toThrow(/handler registered after connect/); }); - it("uses base MCP SDK replacement semantics for request handlers", async () => { + it("direct setRequestHandler throws when a handler is already registered", async () => { const pair = await connectPair(); connected.push(pair); + const params = z.object({}); let handledBy = 0; - pair.app.setRequestHandler("ping", () => { + pair.app.setRequestHandler("test/method", { params }, () => { handledBy = 1; return {}; }); - pair.app.setRequestHandler("ping", () => { + expect(() => { + pair.app.setRequestHandler("test/method", { params }, () => { + handledBy = 2; + return {}; + }); + }).toThrow(/already registered/); + + await pair.server.request( + { method: "test/method", params: {} }, + z.object({}), + ); + expect(handledBy).toBe(1); + }); + + it("direct setRequestHandler throws for methods owned by the App itself", async () => { + const pair = await connectPair(); + connected.push(pair); + expect(() => { + pair.app.setRequestHandler("ping", () => ({})); + }).toThrow(/already registered/); + }); + + it("removeRequestHandler releases the method for re-registration", async () => { + const pair = await connectPair(); + connected.push(pair); + const params = z.object({}); + let handledBy = 0; + + pair.app.setRequestHandler("test/method", { params }, () => { + handledBy = 1; + return {}; + }); + pair.app.removeRequestHandler("test/method"); + pair.app.setRequestHandler("test/method", { params }, () => { handledBy = 2; return {}; }); - await pair.server.request({ method: "ping", params: {} }); + await pair.server.request( + { method: "test/method", params: {} }, + z.object({}), + ); expect(handledBy).toBe(2); }); - it("uses base MCP SDK replacement semantics for non-event notifications", async () => { + it("direct setNotificationHandler throws when a handler is already registered", async () => { const pair = await connectPair(); connected.push(pair); const calls: number[] = []; @@ -275,14 +312,70 @@ describe("App base MCP SDK v2 Protocol migration", () => { pair.app.setNotificationHandler("test/notification", { params }, () => { calls.push(1); }); - pair.app.setNotificationHandler("test/notification", { params }, () => { - calls.push(2); - }); + expect(() => { + pair.app.setNotificationHandler("test/notification", { params }, () => { + calls.push(2); + }); + }).toThrow(/already registered/); await pair.server.notification({ method: "test/notification", params: {}, }); - expect(calls).toEqual([2]); + expect(calls).toEqual([1]); + }); + + it("direct setNotificationHandler throws for event-mapped methods (listener first)", () => { + const app = new App( + { name: "view-app", version: "1.0.0" }, + {}, + { autoResize: false }, + ); + app.addEventListener("toolinput", () => {}); + expect(() => { + app.setNotificationHandler( + "ui/notifications/tool-input", + { params: z.object({}) }, + () => {}, + ); + }).toThrow(/already registered/); + }); + + it("event registration throws when a direct handler already owns the method", () => { + const app = new App( + { name: "view-app", version: "1.0.0" }, + {}, + { autoResize: false }, + ); + app.setNotificationHandler( + "ui/notifications/tool-input", + { params: z.object({}) }, + () => {}, + ); + expect(() => { + app.ontoolinput = () => {}; + }).toThrow(/already registered/); + expect(() => { + app.addEventListener("toolinput", () => {}); + }).toThrow(/already registered/); + }); + + it("on* request setters keep replace semantics", async () => { + const pair = await connectPair(); + connected.push(pair); + let handledBy = 0; + pair.app.onteardown = async () => { + handledBy = 1; + return {}; + }; + pair.app.onteardown = async () => { + handledBy = 2; + return {}; + }; + await pair.server.request( + { method: "ui/resource-teardown", params: {} }, + z.object({}), + ); + expect(handledBy).toBe(2); }); }); diff --git a/src/app.ts b/src/app.ts index 3fe84d6..fd6bbc7 100644 --- a/src/app.ts +++ b/src/app.ts @@ -23,8 +23,10 @@ import { } from "@modelcontextprotocol/client"; import { EmptyResultSchema } from "@modelcontextprotocol/core"; export { RESOURCE_MIME_TYPE, RESOURCE_URI_META_KEY } from "./constants.js"; -import { EventDispatcher } from "./events.js"; +import { EventDispatcher, MethodRegistry } from "./events.js"; export { EventDispatcher } from "./events.js"; + +type UntypedHandlerSetter = (this: unknown, ...args: unknown[]) => void; import { PostMessageTransport } from "./message-transport.js"; import { LATEST_PROTOCOL_VERSION, @@ -103,71 +105,6 @@ export { applyDocumentTheme, } from "./styles.js"; -/** - * Metadata key for associating a UI resource URI with a tool. - * - * MCP servers include this key in tool definition metadata (via `tools/list`) - * to indicate which UI resource should be displayed when the tool is called. - * When hosts see a tool with this metadata, they fetch and render the - * corresponding {@link App `App`}. - * - * **Note**: This constant is provided for reference and backwards compatibility. - * Server developers should use {@link server-helpers!registerAppTool `registerAppTool`} - * with the `_meta.ui.resourceUri` format instead. Host developers must check both - * formats for compatibility. - * - * @example Modern format (server-side, not in Apps) - * ```ts source="./app.examples.ts#RESOURCE_URI_META_KEY_modernFormat" - * // Preferred: Use registerAppTool with nested ui.resourceUri - * registerAppTool( - * server, - * "weather", - * { - * description: "Get weather forecast", - * _meta: { - * ui: { resourceUri: "ui://weather/forecast" }, - * }, - * }, - * handler, - * ); - * ``` - * - * @example Legacy format (deprecated, for backwards compatibility) - * ```ts source="./app.examples.ts#RESOURCE_URI_META_KEY_legacyFormat" - * // Deprecated: Direct use of RESOURCE_URI_META_KEY - * server.registerTool( - * "weather", - * { - * description: "Get weather forecast", - * _meta: { - * [RESOURCE_URI_META_KEY]: "ui://weather/forecast", - * }, - * }, - * handler, - * ); - * ``` - * - * @example How hosts check for this metadata (must support both formats) - * ```ts source="./app.examples.ts#RESOURCE_URI_META_KEY_hostSide" - * // Hosts should check both modern and legacy formats - * const meta = tool._meta; - * const uiMeta = meta?.ui as McpUiToolMeta | undefined; - * const legacyUri = meta?.[RESOURCE_URI_META_KEY] as string | undefined; - * const uiUri = uiMeta?.resourceUri ?? legacyUri; - * if (typeof uiUri === "string" && uiUri.startsWith("ui://")) { - * // Fetch the resource and display the UI - * } - * ``` - */ - -/** - * MIME type for MCP UI resources. - * - * Identifies HTML content as an MCP App UI resource. - * - * Used by {@link server-helpers!registerAppResource `registerAppResource`} as the default MIME type for app resources. - */ - /** * Options for configuring {@link App `App`} behavior. * @@ -359,6 +296,80 @@ export class App extends Protocol { private _initializedSent = false; private readonly _registeredEvents = new Set(); private readonly _events = new EventDispatcher(); + private readonly _methods = new MethodRegistry(); + + // ── Handler registration with double-set protection ───────────────── + // + // The base SDK `Protocol` silently replaces an existing handler. The four + // overrides below restore the v1 behaviour: a direct `setRequestHandler` / + // `setNotificationHandler` for a method that already has a handler throws, + // so a stray registration cannot silently disconnect `on*` handlers or + // `addEventListener` listeners. They are arrow-function class fields rather + // than prototype methods so that `Protocol`'s constructor — which registers + // its own ping/cancelled/progress handlers before our fields initialize — + // hits the base implementation and skips tracking. + + /** + * Registers a request handler. Throws if a handler for the same method has + * already been registered — use the `on*` setter for replace semantics. + * + * @throws {Error} if a handler for this method is already registered. + */ + override setRequestHandler: Protocol["setRequestHandler"] = ( + method: string, + ...rest: unknown[] + ) => { + this._methods.claim(method, "setRequestHandler"); + (super.setRequestHandler as unknown as UntypedHandlerSetter).call( + this, + method, + ...rest, + ); + }; + + /** + * Registers a notification handler. Throws if a handler for the same method + * has already been registered — use the `on*` setter (replace semantics) or + * `addEventListener` (multi-listener) for mapped events. + * + * @throws {Error} if a handler for this method is already registered. + */ + override setNotificationHandler: Protocol["setNotificationHandler"] = + (method: string, ...rest: unknown[]) => { + this._methods.claim(method, "setNotificationHandler"); + (super.setNotificationHandler as unknown as UntypedHandlerSetter).call( + this, + method, + ...rest, + ); + }; + + override removeRequestHandler: Protocol["removeRequestHandler"] = + (method: string) => { + this._methods.release(method); + super.removeRequestHandler(method); + }; + + override removeNotificationHandler: Protocol["removeNotificationHandler"] = + (method: string) => { + this._methods.release(method); + super.removeNotificationHandler(method); + }; + + /** + * Register a request handler with replace semantics, bypassing the + * double-set protection of {@link setRequestHandler `setRequestHandler`}. + * Used by the `on*` request-handler setters. + */ + protected replaceRequestHandler: Protocol["setRequestHandler"] = + (method: string, ...rest: unknown[]) => { + this._methods.replace(method); + (super.setRequestHandler as unknown as UntypedHandlerSetter).call( + this, + method, + ...rest, + ); + }; /** * Warn if a host-bound method is called before {@link connect `connect`} has @@ -524,7 +535,7 @@ export class App extends Protocol { z.config({ jitless: true }); } - this.setRequestHandler("ping", (request) => { + this.replaceRequestHandler("ping", (request) => { console.log("Received ping:", request.params); return {}; }); @@ -1056,7 +1067,7 @@ export class App extends Protocol { ) { this.warnIfRequestHandlerReplaced("onteardown", this._onteardown, callback); this._onteardown = callback; - this.setRequestHandler( + this.replaceRequestHandler( "ui/resource-teardown", { params: McpUiResourceTeardownRequestSchema.shape.params, @@ -1114,7 +1125,7 @@ export class App extends Protocol { ) { this.warnIfRequestHandlerReplaced("oncalltool", this._oncalltool, callback); this._oncalltool = callback; - this.setRequestHandler("tools/call", (request, extra) => { + this.replaceRequestHandler("tools/call", (request, extra) => { if (!this._oncalltool) throw new Error("No oncalltool handler set"); return this._oncalltool(request.params, extra); }); @@ -1185,7 +1196,7 @@ export class App extends Protocol { callback, ); this._onlisttools = callback; - this.setRequestHandler("tools/list", (request, extra) => { + this.replaceRequestHandler("tools/list", (request, extra) => { if (!this._onlisttools) throw new Error("No onlisttools handler set"); return this._onlisttools(request.params, extra); }); @@ -1221,11 +1232,11 @@ export class App extends Protocol { ); } return; - case "ping": - case "ui/resource-teardown": - return; default: - throw new Error(`No handler for method ${method} registered`); + // `ping`, `ui/*`, and custom (vendor-prefixed) methods need no + // declared capability. The base SDK explicitly supports custom + // request handlers via the `{ params, result }` form. + return; } } diff --git a/src/constants.ts b/src/constants.ts index f69cfa5..c879a03 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -1,5 +1,66 @@ -/** Legacy metadata key associating an MCP tool with its App resource. */ +/** + * Metadata key for associating a UI resource URI with a tool. + * + * MCP servers include this key in tool definition metadata (via `tools/list`) + * to indicate which UI resource should be displayed when the tool is called. + * When hosts see a tool with this metadata, they fetch and render the + * corresponding {@link app!App `App`}. + * + * **Note**: This constant is provided for reference and backwards compatibility. + * Server developers should use {@link server-helpers!registerAppTool `registerAppTool`} + * with the `_meta.ui.resourceUri` format instead. Host developers must check both + * formats for compatibility. + * + * @example Modern format (server-side, not in Apps) + * ```ts source="./app.examples.ts#RESOURCE_URI_META_KEY_modernFormat" + * // Preferred: Use registerAppTool with nested ui.resourceUri + * registerAppTool( + * server, + * "weather", + * { + * description: "Get weather forecast", + * _meta: { + * ui: { resourceUri: "ui://weather/forecast" }, + * }, + * }, + * handler, + * ); + * ``` + * + * @example Legacy format (deprecated, for backwards compatibility) + * ```ts source="./app.examples.ts#RESOURCE_URI_META_KEY_legacyFormat" + * // Deprecated: Direct use of RESOURCE_URI_META_KEY + * server.registerTool( + * "weather", + * { + * description: "Get weather forecast", + * _meta: { + * [RESOURCE_URI_META_KEY]: "ui://weather/forecast", + * }, + * }, + * handler, + * ); + * ``` + * + * @example How hosts check for this metadata (must support both formats) + * ```ts source="./app.examples.ts#RESOURCE_URI_META_KEY_hostSide" + * // Hosts should check both modern and legacy formats + * const meta = tool._meta; + * const uiMeta = meta?.ui as McpUiToolMeta | undefined; + * const legacyUri = meta?.[RESOURCE_URI_META_KEY] as string | undefined; + * const uiUri = uiMeta?.resourceUri ?? legacyUri; + * if (typeof uiUri === "string" && uiUri.startsWith("ui://")) { + * // Fetch the resource and display the UI + * } + * ``` + */ export const RESOURCE_URI_META_KEY = "ui/resourceUri"; -/** MIME type for MCP App HTML resources. */ +/** + * MIME type for MCP UI resources. + * + * Identifies HTML content as an MCP App UI resource. + * + * Used by {@link server-helpers!registerAppResource `registerAppResource`} as the default MIME type for app resources. + */ export const RESOURCE_MIME_TYPE = "text/html;profile=mcp-app"; diff --git a/src/events.ts b/src/events.ts index aff1446..aa2e862 100644 --- a/src/events.ts +++ b/src/events.ts @@ -89,3 +89,44 @@ export class EventDispatcher> { return slot; } } + +/** + * Tracks which JSON-RPC methods already have a handler registered through the + * owning `App` / `AppBridge`, so a second direct `setRequestHandler` / + * `setNotificationHandler` call for the same method throws instead of + * silently replacing the first handler (the base SDK `Protocol` replaces). + * + * The `on*` setters use {@link replace} for DOM-style replace semantics, and + * `removeRequestHandler` / `removeNotificationHandler` use {@link release}. + * + * @internal + */ +export class MethodRegistry { + private readonly _methods = new Set(); + + /** Claim `method`. Throws if a handler is already registered for it. */ + claim(method: string, via: string): void { + if (this._methods.has(method)) { + throw new Error( + `Handler for "${method}" already registered (via ${via}). ` + + `Use addEventListener() to attach multiple listeners, ` + + `or the on* setter for replace semantics.`, + ); + } + this._methods.add(method); + } + + /** Claim `method` with replace semantics (never throws). */ + replace(method: string): void { + this._methods.add(method); + } + + /** Release `method` so it can be claimed again. */ + release(method: string): void { + this._methods.delete(method); + } + + has(method: string): boolean { + return this._methods.has(method); + } +} From f722753c8fa8d85714390c134877722ee4d6800b Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Mon, 7 Sep 2026 15:36:30 +0100 Subject: [PATCH 099/107] Finish .js import extensions and drop the zod 3 fallback test Add explicit .js extensions to the relative imports in app.ts, app-bridge.ts and their tests so the emitted declarations resolve under NodeNext (#704). Replace the zod 3 JSON Schema fallback test, whose code path was removed, with the remaining non-Standard-JSON-Schema rejection case as its own test. --- src/app-bridge.test.ts | 35 +++-------------------------------- src/app.test.ts | 4 ++-- 2 files changed, 5 insertions(+), 34 deletions(-) diff --git a/src/app-bridge.test.ts b/src/app-bridge.test.ts index ea85320..a87b0e7 100644 --- a/src/app-bridge.test.ts +++ b/src/app-bridge.test.ts @@ -1551,40 +1551,9 @@ describe("App <-> AppBridge integration", () => { ).rejects.toThrow(/Invalid input for tool translate/); }); - it("falls back to z.toJSONSchema for zod schemas lacking ~standard.jsonSchema (zod v3.25.x)", async () => { - // zod v3.25 implements ~standard.validate but not ~standard.jsonSchema. - // Simulate by stripping jsonSchema from a real zod schema. - const v4Schema = z.object({ q: z.string() }); - const zod3LikeSchema = Object.assign(Object.create(v4Schema), { - "~standard": { - version: 1 as const, - vendor: "zod", - validate: v4Schema["~standard"].validate, - types: undefined as - | undefined - | { - readonly input: { q: string }; - readonly output: { q: string }; - }, - // no jsonSchema - }, - }); - + it("rejects listTools when a tool schema does not implement Standard JSON Schema", async () => { const appCapabilities = { tools: { listChanged: true } }; app = new App(testAppInfo, appCapabilities, { autoResize: false }); - app.registerTool( - "search", - { inputSchema: zod3LikeSchema }, - async ({ q }: { q: string }) => ({ - content: [{ type: "text" as const, text: q }], - }), - ); - await app.connect(appTransport); - - const list = await bridge.listTools({}); - expect(list.tools[0].inputSchema.properties).toHaveProperty("q"); - - // Non-zod schema without jsonSchema → listTools rejects with guidance. app.registerTool( "broken", { @@ -1598,6 +1567,8 @@ describe("App <-> AppBridge integration", () => { }, async () => ({ content: [] }), ); + await app.connect(appTransport); + expect(bridge.listTools({})).rejects.toThrow( /does not implement Standard JSON Schema/, ); diff --git a/src/app.test.ts b/src/app.test.ts index 35a924f..8420e81 100644 --- a/src/app.test.ts +++ b/src/app.test.ts @@ -6,13 +6,13 @@ import { } from "@modelcontextprotocol/server"; import { z } from "zod/v4"; -import { App } from "./app"; +import { App } from "./app.js"; import { LATEST_PROTOCOL_VERSION, McpUiInitializeRequestSchema, McpUiInitializeResultSchema, McpUiInitializedNotificationSchema, -} from "./types"; +} from "./types.js"; type ConnectedPair = { app: App; From 6d083cd69f7b8214f236b75cc0ce52fe18617a7a Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 8 Sep 2026 13:09:13 +0100 Subject: [PATCH 100/107] Address review: MCPB build, guard the SDK's own handlers, doc fixes - pdf-server build-mcpb.mjs packs the ext-apps build from this checkout into the staging dir instead of asking the registry for ^2.0.0, which is not published yet; CI's "Build MCPB bundle" step failed on ETARGET. - Claim notifications/cancelled and notifications/progress in the MethodRegistry right after super() so a direct setNotificationHandler cannot silently replace the base Protocol's own handlers. - Migration guide and add-app-to-server skill: custom methods use the three-argument setRequestHandler("m", { params }, handler) form (the two-argument form is only for spec methods); zod schemas live in @modelcontextprotocol/core, not client/server; it is toolInfo.tool.outputSchema that loosened in schema.json, and the recursive JSON-value def is nested under three definitions; core is a required peer that client already depends on. - app-bridge.ts: fix "forthe"/"forresult" typos in @see links, update three JSDoc examples to the method-string setNotificationHandler form, move the UntypedHandlerSetter type below the import block (same in app.ts). - wire-compat.test.ts: say the fixtures are 1.x-shaped, not captures. --- README.md | 2 +- docs/migrate-to-2.md | 24 +++++++---- examples/pdf-server/build-mcpb.mjs | 15 +++++++ .../skills/add-app-to-server/SKILL.md | 5 ++- src/app-bridge.ts | 42 ++++++++++--------- src/app.ts | 7 +++- src/wire-compat.test.ts | 4 +- 7 files changed, 65 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 4b92f0c..acfc661 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ resources: ## Getting Started Requires Node.js 20+. The base MCP SDK packages are `^2.0.0` peers of -`ext-apps` (`@modelcontextprotocol/core` is pulled in transitively). +`ext-apps` (`@modelcontextprotocol/core` is a required peer that `client` already depends on, so npm installs it for you). For a View or host: diff --git a/docs/migrate-to-2.md b/docs/migrate-to-2.md index 3f6db7b..2164b83 100644 --- a/docs/migrate-to-2.md +++ b/docs/migrate-to-2.md @@ -27,7 +27,7 @@ host-side deltas are in error responses (see below). | CDN / `*-with-deps` | nothing extra: `./app-with-deps` and `./react-with-deps` bundle client, core and zod (about 25% larger than the 1.x bundles) | `@modelcontextprotocol/client` is a required peer (`App` and `AppBridge` extend -its `Protocol` class); `@modelcontextprotocol/core` is installed transitively; +its `Protocol` class); `@modelcontextprotocol/core` is a required peer that `client` already depends on, so npm installs it without you listing it; `@modelcontextprotocol/server` stays optional and is only needed for the `./server` helpers. Node.js 20+ is required. @@ -48,8 +48,10 @@ its `Protocol` class); `@modelcontextprotocol/core` is installed transitively; `extra.mcpReq.id`. - **`setRequestHandler` / `setNotificationHandler` take method names.** `app.setRequestHandler(SomeRequestSchema, handler)` becomes - `app.setRequestHandler("some/method", handler)` (pass the params schema as the - optional extra argument for validation). + `app.setRequestHandler("some/method", { params: SomeParamsSchema }, (params, ctx) => …)` + for custom methods (the handler receives the parsed params); the two-argument + `setRequestHandler("tools/call", handler)` form exists only for spec-defined + method names. - **Errors.** Remote JSON-RPC errors are `ProtocolError` (numeric `code`); local conditions are `SdkError` with a string `code`: request timeout → `"REQUEST_TIMEOUT"`, connection closed → `"CONNECTION_CLOSED"`. Cancelling a @@ -74,10 +76,15 @@ The published `./schema.json` export is regenerated from the 2.x core schemas: - `McpUiToolResultNotification.params.structuredContent` is any JSON value (was `type: "object"`). -- Result `_meta` documents `io.modelcontextprotocol/serverInfo` and no longer - lists `progressToken` / `related-task` (both still pass through). -- `McpUiHostContext.toolInfo.tool.inputSchema` is a loose object. -- A recursive `$defs.__schema0` JSON-value definition is added. +- `McpUiToolResultNotification.params._meta` documents + `io.modelcontextprotocol/serverInfo` and no longer lists `progressToken` / + `related-task` (both still pass through). +- `McpUiHostContext.toolInfo.tool.outputSchema` is a loose object (only + `$schema` is documented); `inputSchema.properties` values are now typed as + JSON values. +- A recursive JSON-value definition (`__schema0`) is added under the `$defs` of + `McpUiHostContext`, `McpUiHostContextChangedNotification` and + `McpUiInitializeResult`. ## Checklist @@ -87,7 +94,8 @@ The published `./schema.json` export is regenerated from the 2.x core schemas: `@modelcontextprotocol/server`, `sdk/server/streamableHttp.js` → `NodeStreamableHTTPServerTransport` from `@modelcontextprotocol/node`, `sdk/server/stdio.js` → `@modelcontextprotocol/server/stdio`, `sdk/types.js` - → `@modelcontextprotocol/client` or `server`). + → `@modelcontextprotocol/client` or `server` for the types, + `@modelcontextprotocol/core` for the zod schemas). 3. Wrap raw zod shapes with `z.object({...})`. 4. Update custom handlers to the `extra.mcpReq.*` context and method-keyed `setRequestHandler` calls. diff --git a/examples/pdf-server/build-mcpb.mjs b/examples/pdf-server/build-mcpb.mjs index c1c3469..2917334 100644 --- a/examples/pdf-server/build-mcpb.mjs +++ b/examples/pdf-server/build-mcpb.mjs @@ -43,6 +43,21 @@ writeFileSync( path.join(stage, "manifest.json"), JSON.stringify(manifest, null, 2), ); +// The bundle must ship the ext-apps build from this checkout, not whatever +// the registry has: pack the repo root and point the staged manifest at it. +const repoRoot = path.resolve(here, "..", ".."); +const packed = JSON.parse( + execSync( + "npm pack --json --ignore-scripts --pack-destination " + + JSON.stringify(stage), + { + cwd: repoRoot, + encoding: "utf8", + }, + ).replace(/^[^[]*/, ""), +); +pkg.dependencies["@modelcontextprotocol/ext-apps"] = + "file:./" + packed[0].filename; writeFileSync(path.join(stage, "package.json"), JSON.stringify(pkg, null, 2)); const run = (cmd) => execSync(cmd, { cwd: stage, stdio: "inherit" }); diff --git a/plugins/mcp-apps/skills/add-app-to-server/SKILL.md b/plugins/mcp-apps/skills/add-app-to-server/SKILL.md index df7d931..5a473f0 100644 --- a/plugins/mcp-apps/skills/add-app-to-server/SKILL.md +++ b/plugins/mcp-apps/skills/add-app-to-server/SKILL.md @@ -94,10 +94,11 @@ handler schemas before adding the App integration: | `sdk/server/streamableHttp.js` (`StreamableHTTPServerTransport`) | `NodeStreamableHTTPServerTransport` from `@modelcontextprotocol/node` | | Express wiring by hand | `createMcpExpressApp` from `@modelcontextprotocol/express` | | `sdk/server/stdio.js` | `@modelcontextprotocol/server/stdio` | -| `sdk/types.js` (types, schemas) | `@modelcontextprotocol/client` or `@modelcontextprotocol/server` | +| `sdk/types.js` types (`CallToolResult`, …) | `@modelcontextprotocol/client` or `@modelcontextprotocol/server` | +| `sdk/types.js` zod schemas (`CallToolResultSchema`, …) | `@modelcontextprotocol/core` | | Raw zod shapes: `inputSchema: { q: z.string() }` | `inputSchema: z.object({ q: z.string() })` | | `extra.signal` in tool callbacks | `extra.mcpReq.signal` | -| `setRequestHandler(SomeRequestSchema, handler)` | `setRequestHandler("some/method", handler)` | +| `setRequestHandler(SomeRequestSchema, handler)` | `setRequestHandler("some/method", { params: ParamsSchema }, handler)` (the 2-arg form is only for spec methods such as `"tools/call"`) | ## Step 3: Set Up the Build Pipeline diff --git a/src/app-bridge.ts b/src/app-bridge.ts index 04ccb4f..3d145d4 100644 --- a/src/app-bridge.ts +++ b/src/app-bridge.ts @@ -42,8 +42,6 @@ type MethodSchema = ZodObject<{ params: ZodType; }>; -type UntypedHandlerSetter = (this: unknown, ...args: unknown[]) => void; - import { type McpUiSandboxResourceReadyNotification, type McpUiSizeChangedNotification, @@ -93,6 +91,8 @@ import { export * from "./types.js"; export { RESOURCE_URI_META_KEY, RESOURCE_MIME_TYPE } from "./constants.js"; import { RESOURCE_URI_META_KEY } from "./constants.js"; + +type UntypedHandlerSetter = (this: unknown, ...args: unknown[]) => void; export { PostMessageTransport } from "./message-transport.js"; /** @@ -527,6 +527,8 @@ export class AppBridge extends Protocol { options?: HostOptions, ) { super(options); + this._methods.replace("notifications/cancelled"); + this._methods.replace("notifications/progress"); this._ensureEventSlot("initialized"); @@ -1213,8 +1215,8 @@ export class AppBridge extends Protocol { * }; * ``` * - * @see `CallToolRequest` from @modelcontextprotocol/client forthe request type - * @see `CallToolResult` from @modelcontextprotocol/client forthe result type + * @see `CallToolRequest` from @modelcontextprotocol/client for the request type + * @see `CallToolResult` from @modelcontextprotocol/client for the result type */ private _oncalltool?: ( params: CallToolRequest["params"], @@ -1267,8 +1269,8 @@ export class AppBridge extends Protocol { * }; * ``` * - * @see `CreateMessageRequest` from @modelcontextprotocol/client forthe request type - * @see `CreateMessageResult` / `CreateMessageResultWithTools` from @modelcontextprotocol/client forresult types + * @see `CreateMessageRequest` from @modelcontextprotocol/client for the request type + * @see `CreateMessageResult` / `CreateMessageResultWithTools` from @modelcontextprotocol/client for result types */ private _oncreatesamplingmessage?: ( params: CreateMessageRequest["params"], @@ -1314,12 +1316,12 @@ export class AppBridge extends Protocol { * @example * ```typescript * // In your MCP client notification handler: - * mcpClient.setNotificationHandler(ToolListChangedNotificationSchema, () => { + * mcpClient.setNotificationHandler("notifications/tools/list_changed", () => { * bridge.sendToolListChanged(); * }); * ``` * - * @see `ToolListChangedNotification` from @modelcontextprotocol/client forthe notification type + * @see `ToolListChangedNotification` from @modelcontextprotocol/client for the notification type */ sendToolListChanged(params: ToolListChangedNotification["params"] = {}) { return this.notification({ @@ -1350,8 +1352,8 @@ export class AppBridge extends Protocol { * }; * ``` * - * @see `ListResourcesRequest` from @modelcontextprotocol/client forthe request type - * @see `ListResourcesResult` from @modelcontextprotocol/client forthe result type + * @see `ListResourcesRequest` from @modelcontextprotocol/client for the request type + * @see `ListResourcesResult` from @modelcontextprotocol/client for the result type */ private _onlistresources?: ( params: ListResourcesRequest["params"], @@ -1403,8 +1405,8 @@ export class AppBridge extends Protocol { * }; * ``` * - * @see `ListResourceTemplatesRequest` from @modelcontextprotocol/client forthe request type - * @see `ListResourceTemplatesResult` from @modelcontextprotocol/client forthe result type + * @see `ListResourceTemplatesRequest` from @modelcontextprotocol/client for the request type + * @see `ListResourceTemplatesResult` from @modelcontextprotocol/client for the result type */ private _onlistresourcetemplates?: ( params: ListResourceTemplatesRequest["params"], @@ -1459,8 +1461,8 @@ export class AppBridge extends Protocol { * }; * ``` * - * @see `ReadResourceRequest` from @modelcontextprotocol/client forthe request type - * @see `ReadResourceResult` from @modelcontextprotocol/client forthe result type + * @see `ReadResourceRequest` from @modelcontextprotocol/client for the request type + * @see `ReadResourceResult` from @modelcontextprotocol/client for the result type */ private _onreadresource?: ( params: ReadResourceRequest["params"], @@ -1502,12 +1504,12 @@ export class AppBridge extends Protocol { * @example * ```typescript * // In your MCP client notification handler: - * mcpClient.setNotificationHandler(ResourceListChangedNotificationSchema, () => { + * mcpClient.setNotificationHandler("notifications/resources/list_changed", () => { * bridge.sendResourceListChanged(); * }); * ``` * - * @see `ResourceListChangedNotification` from @modelcontextprotocol/client forthe notification type + * @see `ResourceListChangedNotification` from @modelcontextprotocol/client for the notification type */ sendResourceListChanged( params: ResourceListChangedNotification["params"] = {}, @@ -1540,8 +1542,8 @@ export class AppBridge extends Protocol { * }; * ``` * - * @see `ListPromptsRequest` from @modelcontextprotocol/client forthe request type - * @see `ListPromptsResult` from @modelcontextprotocol/client forthe result type + * @see `ListPromptsRequest` from @modelcontextprotocol/client for the request type + * @see `ListPromptsResult` from @modelcontextprotocol/client for the result type */ private _onlistprompts?: ( params: ListPromptsRequest["params"], @@ -1582,12 +1584,12 @@ export class AppBridge extends Protocol { * @example * ```typescript * // In your MCP client notification handler: - * mcpClient.setNotificationHandler(PromptListChangedNotificationSchema, () => { + * mcpClient.setNotificationHandler("notifications/prompts/list_changed", () => { * bridge.sendPromptListChanged(); * }); * ``` * - * @see `PromptListChangedNotification` from @modelcontextprotocol/client forthe notification type + * @see `PromptListChangedNotification` from @modelcontextprotocol/client for the notification type */ sendPromptListChanged(params: PromptListChangedNotification["params"] = {}) { return this.notification({ diff --git a/src/app.ts b/src/app.ts index fd6bbc7..58ea9da 100644 --- a/src/app.ts +++ b/src/app.ts @@ -26,7 +26,6 @@ export { RESOURCE_MIME_TYPE, RESOURCE_URI_META_KEY } from "./constants.js"; import { EventDispatcher, MethodRegistry } from "./events.js"; export { EventDispatcher } from "./events.js"; -type UntypedHandlerSetter = (this: unknown, ...args: unknown[]) => void; import { PostMessageTransport } from "./message-transport.js"; import { LATEST_PROTOCOL_VERSION, @@ -69,6 +68,8 @@ import { } from "./standard-schema.js"; import { z, type ZodLiteral, type ZodObject, type ZodType } from "zod/v4"; +type UntypedHandlerSetter = (this: unknown, ...args: unknown[]) => void; + type MethodSchema = ZodObject<{ method: ZodLiteral; params: ZodType; @@ -530,6 +531,10 @@ export class App extends Protocol { private options: AppOptions = { autoResize: true }, ) { super(options); + // Claim the handlers the base Protocol constructor installed so a direct + // setNotificationHandler cannot silently replace them either. + this._methods.replace("notifications/cancelled"); + this._methods.replace("notifications/progress"); if (!options.allowUnsafeEval) { z.config({ jitless: true }); diff --git a/src/wire-compat.test.ts b/src/wire-compat.test.ts index 5fdca8b..762ac77 100644 --- a/src/wire-compat.test.ts +++ b/src/wire-compat.test.ts @@ -77,7 +77,7 @@ const hostContext: McpUiHostContext = { locale: "en-US", }; -/** Captured from ext-apps 1.7.x View (sdk 1.x key order, numeric ids from 0). */ +/** Shaped like ext-apps 1.7.x View traffic (sdk-1 key order, 0-based numeric ids); not a recorded capture. */ const v1View = { initialize: { method: "ui/initialize", @@ -120,7 +120,7 @@ const v1View = { }), }; -/** Captured from ext-apps 1.7.x AppBridge (sdk 1.x). */ +/** Shaped like ext-apps 1.7.x AppBridge traffic (sdk 1.x); not a recorded capture. */ const v1Host = { initializeResult: (id: number) => ({ result: { From 728b0bf38ece48aa636a39be4fa3f44deaead010 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 8 Sep 2026 14:24:25 +0100 Subject: [PATCH 101/107] Keep the 1.x handler registration forms as deprecated overloads Consumers on 1.x wrote setRequestHandler(Schema, handler) and setNotificationHandler(Schema, handler) with a whole-message Zod schema. SDK 2.0 keys handlers by method name, so App and AppBridge now accept that form as a third, deprecated overload: a small helper detects the schema, extracts the method literal, forwards to the 2.x (method, { params }, handler) form, and hands the legacy handler the reassembled { method, params } message plus a 1.x-shaped extra (signal, requestId, sessionId, _meta). A one-time console warning points at the new form. The double-registration guard applies to both forms. The AppRequest, AppNotification and AppResult unions that 1.x fed to the SDK's Protocol generics come back as deprecated type aliases, since they leaked through the root entry and cost nothing to keep. Both go away in 3.0. --- docs/migrate-to-2.md | 11 ++- src/app-bridge.ts | 42 +++++++---- src/app.ts | 42 +++++++---- src/legacy-handlers.test.ts | 145 ++++++++++++++++++++++++++++++++++++ src/legacy-handlers.ts | 94 +++++++++++++++++++++++ src/types.ts | 117 +++++++++++++++++++++++++++++ 6 files changed, 420 insertions(+), 31 deletions(-) create mode 100644 src/legacy-handlers.test.ts create mode 100644 src/legacy-handlers.ts diff --git a/docs/migrate-to-2.md b/docs/migrate-to-2.md index 2164b83..515c363 100644 --- a/docs/migrate-to-2.md +++ b/docs/migrate-to-2.md @@ -41,8 +41,9 @@ its `Protocol` class); `@modelcontextprotocol/core` is a required peer that `cli Valibot. Raw zod shapes (`{ q: z.string() }`) still work with `registerAppTool` but are deprecated; wrap them with `z.object({...})`. - **`App` / `AppBridge` extend `Protocol` from `@modelcontextprotocol/client`.** - `ProtocolWithEvents`, `AppRequest`, `AppNotification` and `AppResult` are - gone; use the SDK's `Protocol`, `Request`, `Notification` and `Result`. + `ProtocolWithEvents` is gone; use the SDK's `Protocol`. The `AppRequest`, + `AppNotification` and `AppResult` unions are kept as deprecated type + aliases (nothing in 2.x consumes them) and will be removed in 3.0. - **Handler context.** Custom handlers receive the SDK 2.x context: `extra.signal` → `extra.mcpReq.signal`, `extra.requestId` → `extra.mcpReq.id`. @@ -51,7 +52,11 @@ its `Protocol` class); `@modelcontextprotocol/core` is a required peer that `cli `app.setRequestHandler("some/method", { params: SomeParamsSchema }, (params, ctx) => …)` for custom methods (the handler receives the parsed params); the two-argument `setRequestHandler("tools/call", handler)` form exists only for spec-defined - method names. + method names. The 1.x `(Schema, handler)` form still works on `App` and + `AppBridge` as a deprecated overload: it logs a one-time warning, hands the + handler the whole `{ method, params }` message as before, and gives request + handlers a 1.x-shaped `extra` (`signal`, `requestId`, `sessionId`, `_meta`). + It will be removed in 3.0. - **Errors.** Remote JSON-RPC errors are `ProtocolError` (numeric `code`); local conditions are `SdkError` with a string `code`: request timeout → `"REQUEST_TIMEOUT"`, connection closed → `"CONNECTION_CLOSED"`. Cancelling a diff --git a/src/app-bridge.ts b/src/app-bridge.ts index 3d145d4..c61dfa4 100644 --- a/src/app-bridge.ts +++ b/src/app-bridge.ts @@ -35,6 +35,12 @@ import { LoggingMessageNotificationSchema, } from "@modelcontextprotocol/core"; import { EventDispatcher, MethodRegistry } from "./events.js"; +import { + toModernArgs, + type LegacyMethodSchema, + type LegacyNotificationHandler, + type LegacyRequestHandler, +} from "./legacy-handlers.js"; import type { ZodLiteral, ZodObject, ZodType } from "zod/v4"; type MethodSchema = ZodObject<{ @@ -324,11 +330,14 @@ export class AppBridge extends Protocol { * * @throws {Error} if a handler for this method is already registered. */ - override setRequestHandler: Protocol["setRequestHandler"] = ( - method: string, - ...rest: unknown[] - ) => { - this._methods.claim(method, "setRequestHandler"); + override setRequestHandler: Protocol["setRequestHandler"] & + (( + /** @deprecated Pass the method name and `{ params }` instead. */ + schema: S, + handler: LegacyRequestHandler, + ) => void) = (...args: unknown[]) => { + const [method, ...rest] = toModernArgs("request", args) ?? args; + this._methods.claim(method as string, "setRequestHandler"); (super.setRequestHandler as unknown as UntypedHandlerSetter).call( this, method, @@ -343,15 +352,20 @@ export class AppBridge extends Protocol { * * @throws {Error} if a handler for this method is already registered. */ - override setNotificationHandler: Protocol["setNotificationHandler"] = - (method: string, ...rest: unknown[]) => { - this._methods.claim(method, "setNotificationHandler"); - (super.setNotificationHandler as unknown as UntypedHandlerSetter).call( - this, - method, - ...rest, - ); - }; + override setNotificationHandler: Protocol["setNotificationHandler"] & + (( + /** @deprecated Pass the method name and `{ params }` instead. */ + schema: S, + handler: LegacyNotificationHandler, + ) => void) = (...args: unknown[]) => { + const [method, ...rest] = toModernArgs("notification", args) ?? args; + this._methods.claim(method as string, "setNotificationHandler"); + (super.setNotificationHandler as unknown as UntypedHandlerSetter).call( + this, + method, + ...rest, + ); + }; override removeRequestHandler: Protocol["removeRequestHandler"] = (method: string) => { diff --git a/src/app.ts b/src/app.ts index 58ea9da..da27b43 100644 --- a/src/app.ts +++ b/src/app.ts @@ -24,6 +24,12 @@ import { import { EmptyResultSchema } from "@modelcontextprotocol/core"; export { RESOURCE_MIME_TYPE, RESOURCE_URI_META_KEY } from "./constants.js"; import { EventDispatcher, MethodRegistry } from "./events.js"; +import { + toModernArgs, + type LegacyMethodSchema, + type LegacyNotificationHandler, + type LegacyRequestHandler, +} from "./legacy-handlers.js"; export { EventDispatcher } from "./events.js"; import { PostMessageTransport } from "./message-transport.js"; @@ -316,11 +322,14 @@ export class App extends Protocol { * * @throws {Error} if a handler for this method is already registered. */ - override setRequestHandler: Protocol["setRequestHandler"] = ( - method: string, - ...rest: unknown[] - ) => { - this._methods.claim(method, "setRequestHandler"); + override setRequestHandler: Protocol["setRequestHandler"] & + (( + /** @deprecated Pass the method name and `{ params }` instead. */ + schema: S, + handler: LegacyRequestHandler, + ) => void) = (...args: unknown[]) => { + const [method, ...rest] = toModernArgs("request", args) ?? args; + this._methods.claim(method as string, "setRequestHandler"); (super.setRequestHandler as unknown as UntypedHandlerSetter).call( this, method, @@ -335,15 +344,20 @@ export class App extends Protocol { * * @throws {Error} if a handler for this method is already registered. */ - override setNotificationHandler: Protocol["setNotificationHandler"] = - (method: string, ...rest: unknown[]) => { - this._methods.claim(method, "setNotificationHandler"); - (super.setNotificationHandler as unknown as UntypedHandlerSetter).call( - this, - method, - ...rest, - ); - }; + override setNotificationHandler: Protocol["setNotificationHandler"] & + (( + /** @deprecated Pass the method name and `{ params }` instead. */ + schema: S, + handler: LegacyNotificationHandler, + ) => void) = (...args: unknown[]) => { + const [method, ...rest] = toModernArgs("notification", args) ?? args; + this._methods.claim(method as string, "setNotificationHandler"); + (super.setNotificationHandler as unknown as UntypedHandlerSetter).call( + this, + method, + ...rest, + ); + }; override removeRequestHandler: Protocol["removeRequestHandler"] = (method: string) => { diff --git a/src/legacy-handlers.test.ts b/src/legacy-handlers.test.ts new file mode 100644 index 0000000..0ef36d6 --- /dev/null +++ b/src/legacy-handlers.test.ts @@ -0,0 +1,145 @@ +import { afterEach, beforeEach, describe, expect, it, spyOn } from "bun:test"; +import { InMemoryTransport, Server } from "@modelcontextprotocol/server"; +import { z } from "zod/v4"; + +import { App } from "./app.js"; +import { AppBridge } from "./app-bridge.js"; +import { + McpUiInitializeRequestSchema, + McpUiInitializeResultSchema, + McpUiInitializedNotificationSchema, + McpUiResourceTeardownRequestSchema, + McpUiToolInputNotificationSchema, + McpUiSizeChangedNotificationSchema, + McpUiOpenLinkRequestSchema, +} from "./types.js"; + +const CustomRequestSchema = z.object({ + method: z.literal("test/echo"), + params: z.object({ text: z.string() }), +}); + +const CustomNotificationSchema = z.object({ + method: z.literal("test/ping"), + params: z.object({ n: z.number() }), +}); + +let warn: ReturnType; +beforeEach(() => { + warn = spyOn(console, "warn").mockImplementation(() => {}); +}); +afterEach(() => warn.mockRestore()); + +describe("1.x setRequestHandler(Schema, handler) on App", () => { + it("registers a custom request and hands the handler the whole message plus a 1.x extra", async () => { + const app = new App({ name: "a", version: "1" }, {}, { autoResize: false }); + const server = new Server( + { name: "s", version: "1" }, + { capabilities: {} }, + ); + server.setRequestHandler( + "ui/initialize", + { + params: McpUiInitializeRequestSchema.shape.params, + result: McpUiInitializeResultSchema, + }, + () => ({ + protocolVersion: "2026-01-26", + hostCapabilities: {}, + hostInfo: { name: "h", version: "1" }, + hostContext: {}, + }), + ); + server.setNotificationHandler( + "ui/notifications/initialized", + { params: McpUiInitializedNotificationSchema.shape.params }, + () => {}, + ); + + let seen: unknown; + let seenExtra: { signal: AbortSignal; requestId: unknown } | undefined; + app.setRequestHandler(CustomRequestSchema, (request, extra) => { + seen = request; + seenExtra = extra; + return { echoed: request.params.text }; + }); + + const [at, st] = InMemoryTransport.createLinkedPair(); + await server.connect(st); + await app.connect(at); + + const result = await server.request( + { method: "test/echo", params: { text: "hi" } }, + z.object({ echoed: z.string() }), + ); + + expect(result).toEqual({ echoed: "hi" }); + expect(seen).toEqual({ method: "test/echo", params: { text: "hi" } }); + expect(seenExtra?.signal).toBeInstanceOf(AbortSignal); + expect(seenExtra?.requestId).toBeDefined(); + expect(warn).toHaveBeenCalledTimes(1); + expect(String(warn.mock.calls[0][0])).toContain( + 'setRequestHandler("test/echo", { params: Schema.shape.params }, handler)', + ); + + await app.close(); + await server.close(); + }); + + it("still throws for a method an on* setter already owns", () => { + const app = new App({ name: "a", version: "1" }, {}, { autoResize: false }); + app.onteardown = async () => ({}); + expect(() => + app.setRequestHandler( + McpUiResourceTeardownRequestSchema, + async () => ({}), + ), + ).toThrow(/already registered/); + }); + + it("still throws for an event-mapped notification", () => { + const app = new App({ name: "a", version: "1" }, {}, { autoResize: false }); + app.ontoolinput = () => {}; + expect(() => + app.setNotificationHandler(McpUiToolInputNotificationSchema, () => {}), + ).toThrow(/already registered/); + }); +}); + +describe("1.x setNotificationHandler(Schema, handler) on AppBridge", () => { + it("registers a custom notification and hands the handler the whole message", async () => { + const bridge = new AppBridge(null, { name: "h", version: "1" }, {}); + // A bare Server stands in for the View: unlike Client, connect() sends no + // MCP initialize, matching what a real App does on this channel. + const view = new Server({ name: "v", version: "1" }, { capabilities: {} }); + let seen: unknown; + bridge.setNotificationHandler(CustomNotificationSchema, (n) => { + seen = n; + }); + + const [bt, vt] = InMemoryTransport.createLinkedPair(); + await bridge.connect(bt); + await view.connect(vt); + await view.notification({ method: "test/ping", params: { n: 3 } }); + await new Promise((r) => setTimeout(r, 10)); + + expect(seen).toEqual({ method: "test/ping", params: { n: 3 } }); + await view.close(); + await bridge.close(); + }); + + it("still throws for a method an on* setter already owns", () => { + const bridge = new AppBridge(null, { name: "h", version: "1" }, {}); + bridge.onsizechange = () => {}; + expect(() => + bridge.setNotificationHandler( + McpUiSizeChangedNotificationSchema, + () => {}, + ), + ).toThrow(/already registered/); + bridge.onopenlink = async () => ({}); + expect(() => + bridge.setRequestHandler(McpUiOpenLinkRequestSchema, async () => ({})), + ).toThrow(/already registered/); + }); +}); diff --git a/src/legacy-handlers.ts b/src/legacy-handlers.ts new file mode 100644 index 0000000..b4d1157 --- /dev/null +++ b/src/legacy-handlers.ts @@ -0,0 +1,94 @@ +import type { BaseContext, RequestId } from "@modelcontextprotocol/client"; +import type { ZodLiteral, ZodObject, ZodType } from "zod/v4"; + +/** + * A whole-message Zod schema (`method` literal plus `params`), as accepted by + * the 1.x `setRequestHandler(Schema, handler)` forms. + */ +export type LegacyMethodSchema = ZodObject<{ + method: ZodLiteral; + params: ZodType; +}>; + +/** + * The `extra` argument 1.x request handlers received. + * + * @deprecated Use the 2.x `BaseContext` (`extra.mcpReq.signal`, `extra.mcpReq.id`). + */ +export type LegacyRequestHandlerExtra = { + signal: AbortSignal; + requestId: RequestId; + sessionId?: string; + _meta?: BaseContext["mcpReq"]["_meta"]; + sendRequest: BaseContext["mcpReq"]["send"]; + sendNotification: BaseContext["mcpReq"]["notify"]; + authInfo?: NonNullable["authInfo"]; +}; + +/** @deprecated Use `setRequestHandler("method", { params, result }, (params, ctx) => …)`. */ +export type LegacyRequestHandler = ( + request: S["_output"], + extra: LegacyRequestHandlerExtra, +) => unknown; + +/** @deprecated Use `setNotificationHandler("method", { params }, (params) => …)`. */ +export type LegacyNotificationHandler = ( + notification: S["_output"], +) => void | Promise; + +/** + * Arguments for the 2.x three-argument `setRequestHandler` / + * `setNotificationHandler` form. + */ +type ModernArgs = [ + method: string, + schemas: { params: ZodType }, + handler: (params: unknown, ctx: BaseContext) => unknown, +]; + +const warned = new Set(); + +/** + * Translate a 1.x `(Schema, handler)` registration into the 2.x + * `(method, { params }, handler)` form, or return `undefined` when the call + * is already in the 2.x form. The 1.x handler receives the reassembled + * `{ method, params }` message and, for requests, a 1.x-shaped `extra`. + */ +export function toModernArgs( + kind: "request" | "notification", + args: unknown[], +): ModernArgs | undefined { + const [first, handler] = args; + const shape = (first as Partial | undefined)?.shape; + if (typeof shape?.method?.value !== "string") return undefined; + const method = shape.method.value; + const setter = + kind === "request" ? "setRequestHandler" : "setNotificationHandler"; + if (!warned.has(setter)) { + warned.add(setter); + console.warn( + `[ext-apps] ${setter}(Schema, handler) is deprecated; use ` + + `${setter}("${method}", { params: Schema.shape.params }, handler).`, + ); + } + const call = handler as (...a: unknown[]) => unknown; + return [ + method, + { params: shape.params }, + kind === "request" + ? (params, ctx) => call({ method, params }, legacyExtra(ctx)) + : (params) => call({ method, params }), + ]; +} + +function legacyExtra(ctx: BaseContext): LegacyRequestHandlerExtra { + return { + signal: ctx.mcpReq.signal, + requestId: ctx.mcpReq.id, + sessionId: ctx.sessionId, + _meta: ctx.mcpReq._meta, + sendRequest: ctx.mcpReq.send, + sendNotification: ctx.mcpReq.notify, + authInfo: ctx.http?.authInfo, + }; +} diff --git a/src/types.ts b/src/types.ts index 655812b..e4ed629 100644 --- a/src/types.ts +++ b/src/types.ts @@ -9,6 +9,55 @@ * @see `generated/schema.test.ts` for compile-time verification */ +import type { + CallToolRequest, + CallToolResult, + CreateMessageRequest, + CreateMessageResult, + CreateMessageResultWithTools, + EmptyResult, + ListPromptsRequest, + ListPromptsResult, + ListResourceTemplatesRequest, + ListResourceTemplatesResult, + ListResourcesRequest, + ListResourcesResult, + ListToolsRequest, + ListToolsResult, + LoggingMessageNotification, + PingRequest, + PromptListChangedNotification, + ReadResourceRequest, + ReadResourceResult, + ResourceListChangedNotification, + ToolListChangedNotification, +} from "@modelcontextprotocol/client"; +import type { + McpUiDownloadFileRequest, + McpUiDownloadFileResult, + McpUiHostContextChangedNotification, + McpUiInitializeRequest, + McpUiInitializeResult, + McpUiInitializedNotification, + McpUiMessageRequest, + McpUiMessageResult, + McpUiOpenLinkRequest, + McpUiOpenLinkResult, + McpUiRequestDisplayModeRequest, + McpUiRequestDisplayModeResult, + McpUiRequestTeardownNotification, + McpUiResourceTeardownRequest, + McpUiResourceTeardownResult, + McpUiSandboxProxyReadyNotification, + McpUiSandboxResourceReadyNotification, + McpUiSizeChangedNotification, + McpUiToolCancelledNotification, + McpUiToolInputNotification, + McpUiToolInputPartialNotification, + McpUiToolResultNotification, + McpUiUpdateModelContextRequest, +} from "./spec.types.js"; + // Re-export all types from spec.types.ts export { LATEST_PROTOCOL_VERSION, @@ -108,3 +157,71 @@ export { McpUiToolVisibilitySchema, McpUiToolMetaSchema, } from "./generated/schema.js"; + +/** + * Union of every request an {@link app!App `App`} may send or receive. + * + * @deprecated 1.x fed this to the SDK's `Protocol` generics; SDK 2.x derives + * request types from the method name, so nothing consumes it anymore. + */ +export type AppRequest = + | McpUiInitializeRequest + | McpUiOpenLinkRequest + | McpUiDownloadFileRequest + | McpUiMessageRequest + | McpUiUpdateModelContextRequest + | McpUiResourceTeardownRequest + | McpUiRequestDisplayModeRequest + | CallToolRequest + | ListToolsRequest + | ListResourcesRequest + | ListResourceTemplatesRequest + | ReadResourceRequest + | ListPromptsRequest + | CreateMessageRequest + | PingRequest; + +/** + * Union of every notification an {@link app!App `App`} may send or receive. + * + * @deprecated See {@link AppRequest}. + */ +export type AppNotification = + // Sent to app + | McpUiHostContextChangedNotification + | McpUiToolInputNotification + | McpUiToolInputPartialNotification + | McpUiToolResultNotification + | McpUiToolCancelledNotification + | McpUiSandboxResourceReadyNotification + | ToolListChangedNotification + | ResourceListChangedNotification + | PromptListChangedNotification + // Received from app + | McpUiInitializedNotification + | McpUiSizeChangedNotification + | McpUiSandboxProxyReadyNotification + | McpUiRequestTeardownNotification + | LoggingMessageNotification; + +/** + * Union of every result an {@link app!App `App`} may send or receive. + * + * @deprecated See {@link AppRequest}. + */ +export type AppResult = + | McpUiInitializeResult + | McpUiOpenLinkResult + | McpUiDownloadFileResult + | McpUiMessageResult + | McpUiResourceTeardownResult + | McpUiRequestDisplayModeResult + | CallToolResult + | ListToolsResult + | ListResourcesResult + | ListResourceTemplatesResult + | ReadResourceResult + | ListPromptsResult + | CreateMessageResult + | CreateMessageResultWithTools + | EmptyResult; From 4eab52e372e064f4a58dfcb24040df9155564f7d Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 8 Sep 2026 15:31:03 +0100 Subject: [PATCH 102/107] Export the legacy handler types from the root entry They appear in App's public setRequestHandler / setNotificationHandler signatures, so TypeDoc's link validation needs them reachable from the entry point. --- src/app.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/app.ts b/src/app.ts index da27b43..0ab51ac 100644 --- a/src/app.ts +++ b/src/app.ts @@ -30,6 +30,12 @@ import { type LegacyNotificationHandler, type LegacyRequestHandler, } from "./legacy-handlers.js"; +export type { + LegacyMethodSchema, + LegacyNotificationHandler, + LegacyRequestHandler, + LegacyRequestHandlerExtra, +} from "./legacy-handlers.js"; export { EventDispatcher } from "./events.js"; import { PostMessageTransport } from "./message-transport.js"; From 5f6346ef8662c17b25f6edec1c9719b19413fd77 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 8 Sep 2026 14:34:47 +0100 Subject: [PATCH 103/107] Add cross-version interop test against published ext-apps 1.7.5 Install @modelcontextprotocol/ext-apps@1.7.5 under the npm alias ext-apps-v1 (plus @modelcontextprotocol/sdk@1.30.0, its peer) as devDependencies and run the 2.x App against the 1.x AppBridge and vice versa over an in-memory duplex, with each bridge fronting a real Client+McpServer of its own SDK generation. Covers initialize, notifications, view-to-host requests, tool/resource proxying, error codes, AbortSignal cancellation, teardown and close. --- package-lock.json | 198 ++++++++++++++++++++- package.json | 3 + src/interop-v1.test.ts | 379 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 579 insertions(+), 1 deletion(-) create mode 100644 src/interop-v1.test.ts diff --git a/package-lock.json b/package-lock.json index f63b3d8..0189ca2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "@boneskull/typedoc-plugin-mermaid": "^0.2.0", "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/core": "2.0.0", + "@modelcontextprotocol/sdk": "1.30.0", "@modelcontextprotocol/server": "2.0.0", "@playwright/test": "1.57.0", "@types/bun": "^1.3.2", @@ -33,6 +34,7 @@ "electron-to-chromium": "1.5.267", "esbuild": "^0.25.12", "express": "^5.1.0", + "ext-apps-v1": "npm:@modelcontextprotocol/ext-apps@1.7.5", "husky": "^9.1.7", "nodemon": "^3.1.0", "playwright": "1.57.0", @@ -2756,6 +2758,47 @@ "resolved": "examples/quickstart", "link": true }, + "node_modules/@modelcontextprotocol/sdk": { + "version": "1.30.0", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.30.0.tgz", + "integrity": "sha512-xKd8OIzlqNzcqcNumGAa6g+PW2kjD5vrpcKOnfldAUPP3j7lnqMPwlTXQm8gF+UwH72z0lqaRbjr9hqGz0eITA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@hono/node-server": "^1.19.9 || ^2.0.5", + "ajv": "^8.17.1", + "ajv-formats": "^3.0.1", + "content-type": "^1.0.5", + "cors": "^2.8.5", + "cross-spawn": "^7.0.5", + "eventsource": "^3.0.2", + "eventsource-parser": "^3.0.0", + "express": "^5.2.1", + "express-rate-limit": "^8.2.1", + "hono": "^4.11.4", + "jose": "^6.1.3", + "json-schema-typed": "^8.0.2", + "pkce-challenge": "^5.0.0", + "raw-body": "^3.0.0", + "zod": "^3.25 || ^4.0", + "zod-to-json-schema": "^3.25.1" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@cfworker/json-schema": "^4.1.1", + "zod": "^3.25 || ^4.0" + }, + "peerDependenciesMeta": { + "@cfworker/json-schema": { + "optional": true + }, + "zod": { + "optional": false + } + } + }, "node_modules/@modelcontextprotocol/server": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@modelcontextprotocol/server/-/server-2.0.0.tgz", @@ -4375,6 +4418,41 @@ "node": ">=0.4.0" } }, + "node_modules/ajv": { + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", + "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ajv-formats": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz", + "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^8.0.0" + }, + "peerDependencies": { + "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, "node_modules/ansi-escapes": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", @@ -5937,6 +6015,81 @@ "url": "https://opencollective.com/express" } }, + "node_modules/express-rate-limit": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-8.7.0.tgz", + "integrity": "sha512-hOwV7WOxXfjRpAM1DSJWZDXx3GhplwD8IfwuwvogD8i1Qnkgosw/H45s4ZnFAUHDAhPjlY9hLBvJhKmGMyY26g==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^4.4.3", + "ip-address": "^10.2.0" + }, + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://github.com/sponsors/express-rate-limit" + }, + "peerDependencies": { + "express": ">= 4.11" + } + }, + "node_modules/ext-apps-v1": { + "name": "@modelcontextprotocol/ext-apps", + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/ext-apps/-/ext-apps-1.7.5.tgz", + "integrity": "sha512-TjPH2S2y5UEGKhmI6+XGFuqfqOV4ppe1x6DA3txnUaEWkgtA4G5vo14jGKFZmegdkZ1H4QMLyujLvoU1BEdnAg==", + "dev": true, + "license": "MIT", + "workspaces": [ + "examples/*" + ], + "dependencies": { + "@standard-schema/spec": "^1.1.0" + }, + "engines": { + "node": ">=20" + }, + "peerDependencies": { + "@modelcontextprotocol/sdk": "^1.29.0", + "react": "^17.0.0 || ^18.0.0 || ^19.0.0", + "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0", + "zod": "^3.25.0 || ^4.0.0" + }, + "peerDependenciesMeta": { + "react": { + "optional": true + }, + "react-dom": { + "optional": true + } + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-uri": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.7.tgz", + "integrity": "sha512-dOvZVzjdZdz7phd9v6jCbwxrBW3fK6n8Rc0CtdmM4bumzMnxywBYhuph6J819RRw/ku+rLbelwfMunktuzVVHg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], + "license": "BSD-3-Clause" + }, "node_modules/fflate": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz", @@ -6262,7 +6415,6 @@ "resolved": "https://registry.npmjs.org/hono/-/hono-4.12.31.tgz", "integrity": "sha512-zJIHFrl6bq3RDd2YusFNCDlM8qUprxKswyi/OPzPyzKDdyBXDqWx8bZlZ7R+saTdSTatUmb3O7K4SspGPaEOQg==", "license": "MIT", - "peer": true, "engines": { "node": ">=16.9.0" } @@ -6399,6 +6551,16 @@ "node": ">=12" } }, + "node_modules/ip-address": { + "version": "10.7.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.7.0.tgz", + "integrity": "sha512-BGFsyJd5mpXp3rK6jIdADLNgpJUK1jnjzvYF8lK+VyDab9JAmqN0YOKDdP17HlgKb2+ehPgDc8EtnRLbGCAMhA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 12" + } + }, "node_modules/ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", @@ -6586,6 +6748,20 @@ "node": ">=6" } }, + "node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-typed": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.2.tgz", + "integrity": "sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==", + "dev": true, + "license": "BSD-2-Clause" + }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", @@ -7578,6 +7754,16 @@ "node": ">=0.10.0" } }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/resolve-pkg-maps": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", @@ -9716,6 +9902,16 @@ "funding": { "url": "https://github.com/sponsors/colinhacks" } + }, + "node_modules/zod-to-json-schema": { + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/zod-to-json-schema/-/zod-to-json-schema-3.25.2.tgz", + "integrity": "sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA==", + "dev": true, + "license": "ISC", + "peerDependencies": { + "zod": "^3.25.28 || ^4" + } } } } diff --git a/package.json b/package.json index da82a66..bcea649 100644 --- a/package.json +++ b/package.json @@ -76,10 +76,12 @@ "update-lock:docker": "rm -rf node_modules package-lock.json examples/*/node_modules && docker run --rm --platform linux/amd64 -v $(pwd):/work -w /work -e HOME=/tmp node:latest npm i --registry=https://registry.npmjs.org/ --ignore-scripts && rm -rf node_modules examples/*/node_modules && npm i --registry=https://registry.npmjs.org/" }, "author": "Olivier Chafik", + "//interop": "The @modelcontextprotocol/sdk 1.x and ext-apps-v1 devDependencies exist only for src/interop-v1.test.ts, which runs the published 1.7.5 package against this build. The library does not use them.", "devDependencies": { "@boneskull/typedoc-plugin-mermaid": "^0.2.0", "@modelcontextprotocol/client": "2.0.0", "@modelcontextprotocol/core": "2.0.0", + "@modelcontextprotocol/sdk": "1.30.0", "@modelcontextprotocol/server": "2.0.0", "@playwright/test": "1.57.0", "@types/bun": "^1.3.2", @@ -95,6 +97,7 @@ "electron-to-chromium": "1.5.267", "esbuild": "^0.25.12", "express": "^5.1.0", + "ext-apps-v1": "npm:@modelcontextprotocol/ext-apps@1.7.5", "husky": "^9.1.7", "nodemon": "^3.1.0", "playwright": "1.57.0", diff --git a/src/interop-v1.test.ts b/src/interop-v1.test.ts new file mode 100644 index 0000000..31dbfa1 --- /dev/null +++ b/src/interop-v1.test.ts @@ -0,0 +1,379 @@ +/** + * Cross-version interop against the *published* 1.x package. + * + * `ext-apps-v1` is an npm alias for `@modelcontextprotocol/ext-apps@1.7.5` + * (built on `@modelcontextprotocol/sdk` 1.x). Each pairing wires a real + * `App` to a real `AppBridge` of the other major over an in-memory duplex, + * with the bridge fronting a real MCP `Client`+`McpServer` of its own SDK + * generation, and asserts the observable outcomes. Complements + * `wire-compat.test.ts`, which replays hand-shaped 1.x JSON instead. + */ +import { describe, it, expect, beforeAll, afterAll } from "bun:test"; +import { readFileSync } from "node:fs"; +import { + Client as ClientV2, + InMemoryTransport as InMemoryTransportV2, + ProtocolError, + type Transport, +} from "@modelcontextprotocol/client"; +import { EmptyResultSchema as EmptyResultSchemaV2 } from "@modelcontextprotocol/core"; +import { McpServer as McpServerV2 } from "@modelcontextprotocol/server"; +import { Client as ClientV1 } from "@modelcontextprotocol/sdk/client/index.js"; +import { InMemoryTransport as InMemoryTransportV1 } from "@modelcontextprotocol/sdk/inMemory.js"; +import { McpServer as McpServerV1 } from "@modelcontextprotocol/sdk/server/mcp.js"; +import { Protocol as ProtocolV1 } from "@modelcontextprotocol/sdk/shared/protocol.js"; +import { + EmptyResultSchema as EmptyResultSchemaV1, + McpError, +} from "@modelcontextprotocol/sdk/types.js"; +import { App as AppV1 } from "ext-apps-v1"; +import { AppBridge as AppBridgeV1 } from "ext-apps-v1/app-bridge"; +import { z } from "zod/v4"; + +import { App as AppV2 } from "./app.js"; +import { AppBridge as AppBridgeV2 } from "./app-bridge.js"; + +const flush = () => new Promise((resolve) => setTimeout(resolve, 5)); + +/** In-memory duplex. Structurally a `Transport` for both SDK generations. */ +function createDuplex(): [Transport, Transport] { + const make = () => { + let closed = false; + const t: Transport & { peer?: typeof t } = { + async start() {}, + async send(message) { + // Serialize like a real transport so each side parses plain JSON. + t.peer?.onmessage?.(JSON.parse(JSON.stringify(message))); + }, + async close() { + if (closed) return; + closed = true; + t.onclose?.(); + await t.peer?.close(); + }, + }; + return t; + }; + const [a, b] = [make(), make()]; + a.peer = b; + b.peer = a; + return [a, b]; +} + +/** One SDK generation's MCP pieces, as used by the App side or the host side. */ +const sdkV1 = { + Client: ClientV1, + McpServer: McpServerV1, + InMemoryTransport: InMemoryTransportV1, + EmptyResultSchema: EmptyResultSchemaV1, + error: (code: number, message: string): Error => new McpError(code, message), +}; +const sdkV2 = { + Client: ClientV2, + McpServer: McpServerV2, + InMemoryTransport: InMemoryTransportV2, + EmptyResultSchema: EmptyResultSchemaV2, + error: (code: number, message: string): Error => + new ProtocolError(code, message), +}; + +const pairings = [ + { + name: "2.x App with 1.x AppBridge (sdk 1.x host)", + App: AppV2 as any, + AppBridge: AppBridgeV1 as any, + view: sdkV2, + host: sdkV1, + // sdk 1.x reports a Zod params failure as InternalError. + invalidParamsCode: -32603, + // sdk 1.x forwards a handler-thrown -32002 unchanged. + handlerThrown32002Code: -32002, + // McpServer 1.x answers an unknown tool with an isError result. + unknownToolRejects: false, + }, + { + name: "1.x App with 2.x AppBridge (sdk 2.x host)", + App: AppV1 as any, + AppBridge: AppBridgeV2 as any, + view: sdkV1, + host: sdkV2, + invalidParamsCode: -32602, + // SDK 2.x never emits -32002 on the wire (see wire-compat.test.ts). + handlerThrown32002Code: -32602, + // McpServer 2.x answers an unknown tool with a JSON-RPC error. + unknownToolRejects: true, + }, +]; + +const hostInfo = { name: "TestHost", version: "9.9.9" }; +const appInfo = { name: "TestView", version: "1.2.3" }; +const hostCapabilities = { + openLinks: {}, + serverTools: {}, + serverResources: {}, + logging: {}, + updateModelContext: {}, +}; +const hostContext = { theme: "dark", displayMode: "inline", locale: "en-US" }; + +it("pits 2.x against the published 1.x package, not against itself", () => { + const v1PackageJson = JSON.parse( + readFileSync( + new URL("../../package.json", import.meta.resolve("ext-apps-v1")), + "utf8", + ), + ); + expect(v1PackageJson).toMatchObject({ + name: "@modelcontextprotocol/ext-apps", + version: "1.7.5", + }); + // 1.x classes extend the sdk-1 Protocol; 2.x classes do not. + expect(AppV1.prototype).toBeInstanceOf(ProtocolV1); + expect(AppBridgeV1.prototype).toBeInstanceOf(ProtocolV1); + expect(AppV2.prototype).not.toBeInstanceOf(ProtocolV1); + expect(AppBridgeV2.prototype).not.toBeInstanceOf(ProtocolV1); +}); + +// The tests in each pairing share one connected App/AppBridge fixture and run +// in file order (bun does not randomize); later tests assume earlier ones +// left the pair connected. +describe.each(pairings)("$name", (pairing) => { + const { view, host } = pairing; + let server: any, client: any, bridge: any, app: any; + const events: string[] = []; + const record = (name: string) => (params?: unknown) => { + events.push(`${name}:${JSON.stringify(params ?? null)}`); + }; + const drain = () => events.splice(0); + // Captured inside oninitialized: the bridge must have processed + // ui/initialize before ui/notifications/initialized arrives. + let appVersionAtInitialized: unknown = "not-fired"; + let hostAbortReason: unknown; + + beforeAll(async () => { + server = new host.McpServer({ name: "TestServer", version: "1.0.0" }); + server.registerTool( + "echo", + { inputSchema: z.object({ a: z.number() }) }, + async ({ a }: { a: number }) => ({ + content: [{ type: "text", text: `echo ${a}` }], + }), + ); + server.registerTool("boom", { inputSchema: z.object({}) }, async () => { + throw new Error("tool exploded"); + }); + server.registerResource( + "res", + "test://res", + { mimeType: "text/plain" }, + async (uri: URL) => ({ + contents: [{ uri: uri.href, mimeType: "text/plain", text: "hello" }], + }), + ); + const [clientTransport, serverTransport] = + host.InMemoryTransport.createLinkedPair(); + await server.connect(serverTransport); + client = new host.Client({ name: "HostOuterClient", version: "1.0.0" }); + await client.connect(clientTransport); + + bridge = new pairing.AppBridge(client, hostInfo, hostCapabilities, { + hostContext, + }); + app = new pairing.App( + appInfo, + { tools: { listChanged: true } }, + { + autoResize: false, + }, + ); + bridge.oninitialized = () => { + appVersionAtInitialized = bridge.getAppVersion(); + }; + for (const name of ["onsizechange", "onloggingmessage"]) { + bridge[name] = record(`bridge.${name}`); + } + for (const name of ["onmessage", "onupdatemodelcontext"]) { + bridge[name] = async (params: unknown) => { + record(`bridge.${name}`)(params); + return {}; + }; + } + bridge.onopenlink = (params: { url: string }, extra: any) => { + record("bridge.onopenlink")(params); + if (params.url !== "https://slow") return {}; + // Hang until the view cancels; sdk 1.x passes `extra.signal`, 2.x `extra.mcpReq.signal`. + const signal: AbortSignal = extra.signal ?? extra.mcpReq.signal; + return new Promise((_resolve, reject) => { + signal.addEventListener("abort", () => { + hostAbortReason = signal.reason; + reject(new Error("aborted")); + }); + }); + }; + for (const name of [ + "ontoolinput", + "ontoolresult", + "ontoolcancelled", + "onhostcontextchanged", + ]) { + app[name] = record(`app.${name}`); + } + app.onteardown = async (params: unknown) => { + record("app.onteardown")(params); + return {}; + }; + }); + + afterAll(async () => { + await app?.close().catch(() => {}); + await bridge?.close().catch(() => {}); + await client?.close().catch(() => {}); + await server?.close().catch(() => {}); + }); + + it("completes ui/initialize and delivers initialized in order", async () => { + const [appTransport, bridgeTransport] = createDuplex(); + // Tap the raw ui/initialize result so an additive key on the 2.x side + // (which the getters below would not surface) still fails here. + let initializeResult: unknown; + const send = bridgeTransport.send.bind(bridgeTransport); + bridgeTransport.send = async (message, options) => { + if ("result" in message && "id" in message && message.id === 0) { + initializeResult = message.result; + } + await send(message, options); + }; + await bridge.connect(bridgeTransport); + await app.connect(appTransport); + await flush(); + + expect(app.getHostContext()).toEqual(hostContext); + expect(app.getHostCapabilities()).toEqual(hostCapabilities); + expect(app.getHostVersion()).toEqual(hostInfo); + expect(bridge.getAppCapabilities()).toEqual({ + tools: { listChanged: true }, + }); + expect(appVersionAtInitialized).toEqual(appInfo); + expect(initializeResult).toEqual({ + protocolVersion: "2026-01-26", + hostCapabilities, + hostInfo, + hostContext, + }); + }); + + it("delivers host-to-view notifications", async () => { + bridge.sendToolInput({ arguments: { location: "NYC" } }); + bridge.sendToolResult({ content: [{ type: "text", text: "sunny" }] }); + bridge.sendToolCancelled({ reason: "user" }); + bridge.setHostContext({ theme: "light" }); + await flush(); + + expect(drain()).toEqual([ + 'app.ontoolinput:{"arguments":{"location":"NYC"}}', + 'app.ontoolresult:{"content":[{"type":"text","text":"sunny"}]}', + 'app.ontoolcancelled:{"reason":"user"}', + 'app.onhostcontextchanged:{"theme":"light"}', + ]); + expect(app.getHostContext()).toEqual({ ...hostContext, theme: "light" }); + }); + + it("round-trips view-to-host requests and notifications", async () => { + const message = { role: "user", content: [{ type: "text", text: "hi" }] }; + expect(await app.sendMessage(message)).toEqual({}); + expect(await app.openLink({ url: "https://example.com" })).toEqual({}); + expect(await app.requestDisplayMode({ mode: "fullscreen" })).toEqual({ + mode: "inline", + }); + bridge.onrequestdisplaymode = async (params: { mode: string }) => params; + expect(await app.requestDisplayMode({ mode: "fullscreen" })).toEqual({ + mode: "fullscreen", + }); + const context = { content: [{ type: "text", text: "ctx" }] }; + expect(await app.updateModelContext(context)).toEqual({}); + await app.sendLog({ level: "info", data: { m: "hello" } }); + await app.sendSizeChanged({ width: 320, height: 240 }); + await flush(); + + expect(drain()).toEqual([ + `bridge.onmessage:${JSON.stringify(message)}`, + 'bridge.onopenlink:{"url":"https://example.com"}', + `bridge.onupdatemodelcontext:${JSON.stringify(context)}`, + 'bridge.onloggingmessage:{"level":"info","data":{"m":"hello"}}', + 'bridge.onsizechange:{"width":320,"height":240}', + ]); + }); + + it("proxies tools/call and resources/read to the real MCP server", async () => { + expect( + await app.callServerTool({ name: "echo", arguments: { a: 1 } }), + ).toEqual({ content: [{ type: "text", text: "echo 1" }] }); + expect( + await app.callServerTool({ name: "boom", arguments: {} }), + ).toMatchObject({ + isError: true, + content: [{ type: "text", text: "tool exploded" }], + }); + const unknown = app.callServerTool({ name: "nope", arguments: {} }); + if (pairing.unknownToolRejects) { + await expect(unknown).rejects.toMatchObject({ code: -32602 }); + } else { + expect(await unknown).toMatchObject({ isError: true }); + } + expect(await app.readServerResource({ uri: "test://res" })).toEqual({ + contents: [{ uri: "test://res", mimeType: "text/plain", text: "hello" }], + }); + }); + + it("propagates JSON-RPC errors with the expected codes", async () => { + const raw = (method: string, params: unknown) => + app.request({ method, params }, view.EmptyResultSchema); + await expect(raw("ui/does-not-exist", {})).rejects.toMatchObject({ + code: -32601, + }); + await expect(raw("ui/open-link", { url: 42 })).rejects.toMatchObject({ + code: pairing.invalidParamsCode, + }); + bridge.onreadresource = async () => { + throw host.error(-32002, "Resource not found (host-thrown -32002)"); + }; + const notFound = app.readServerResource({ uri: "test://missing" }); + await expect(notFound).rejects.toMatchObject({ + code: pairing.handlerThrown32002Code, + message: expect.stringContaining( + "Resource not found (host-thrown -32002)", + ), + }); + }); + + it("cancels an in-flight request via AbortSignal on both ends", async () => { + const controller = new AbortController(); + const pending = app.openLink( + { url: "https://slow" }, + { signal: controller.signal }, + ); + await flush(); + controller.abort("user-cancelled"); + await expect(pending).rejects.toMatchObject({ + message: expect.stringContaining("user-cancelled"), + }); + await flush(); + expect(String(hostAbortReason)).toContain("user-cancelled"); + drain(); + }); + + it("tears down, then closes both ends", async () => { + expect(await bridge.teardownResource({})).toEqual({}); + expect(drain()).toEqual(["app.onteardown:{}"]); + + const closed: string[] = []; + app.onclose = () => closed.push("app"); + bridge.onclose = () => closed.push("bridge"); + await app.close(); + await flush(); + expect(closed.sort()).toEqual(["app", "bridge"]); + await expect(app.openLink({ url: "https://after-close" })).rejects.toThrow( + "Not connected", + ); + }); +}); From 853c9f749c2c04e9b8391919905935dee411300b Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 8 Sep 2026 18:01:18 +0100 Subject: [PATCH 104/107] Migration guide fixes and editor-visible deprecation for the 1.x handler form Guide: name @modelcontextprotocol/express in the server-author row, say the two SDKs share no types rather than "do not interoperate" (they speak the same wire protocol), note zod 4.0/4.1 lack ~standard.jsonSchema, list the full 1.x-shaped extra, cover tool callbacks in the handler-context bullet, document that the double-registration guard now covers the base Protocol's notifications/progress and notifications/cancelled handlers, mention ResourceNotFoundError, add the Express row to the import map, and add a "What stays the same" section. The @deprecated tag on the legacy setRequestHandler / setNotificationHandler overload sat on the parameter inside an intersection type, which TypeScript does not report. The overload now comes from LegacyRequestHandlerSetter / LegacyNotificationHandlerSetter, named types with a documented call signature, so editors flag the 1.x call and not the 2.x forms. README links to the quickstart use the lowercase slug typedoc emits. --- README.md | 6 ++--- docs/migrate-to-2.md | 55 ++++++++++++++++++++++++++++++------------ src/app-bridge.ts | 23 ++++++------------ src/app.ts | 25 ++++++++----------- src/legacy-handlers.ts | 27 +++++++++++++++++++++ 5 files changed, 87 insertions(+), 49 deletions(-) diff --git a/README.md b/README.md index acfc661..ab4004d 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@

Why · - Quickstart + Quickstart · API Docs · @@ -151,7 +151,7 @@ in a 1.x host and a 2.x host renders 1.x Views. See the when upgrading from 1.x. **New here?** Start with the -[Quickstart Guide](https://apps.extensions.modelcontextprotocol.io/api/documents/Quickstart.html) +[Quickstart Guide](https://apps.extensions.modelcontextprotocol.io/api/documents/quickstart.html) to build your first MCP App. ## Using the SDK @@ -272,7 +272,7 @@ point your client at a local build: ## Resources -- [Quickstart Guide](https://apps.extensions.modelcontextprotocol.io/api/documents/Quickstart.html) +- [Quickstart Guide](https://apps.extensions.modelcontextprotocol.io/api/documents/quickstart.html) - [API Documentation](https://apps.extensions.modelcontextprotocol.io/api/) - [Specification (2026-01-26)](https://github.com/modelcontextprotocol/ext-apps/blob/main/specification/2026-01-26/apps.mdx) ([Draft](https://github.com/modelcontextprotocol/ext-apps/blob/main/specification/draft/apps.mdx)) diff --git a/docs/migrate-to-2.md b/docs/migrate-to-2.md index 515c363..f9341d0 100644 --- a/docs/migrate-to-2.md +++ b/docs/migrate-to-2.md @@ -17,14 +17,22 @@ The `ui/*` messages exchanged over the iframe channel are byte-identical to 1.x. A 2.x View runs in a 1.x host and a 2.x host renders 1.x Views. The only host-side deltas are in error responses (see below). +## What stays the same + +`App` / `AppBridge` constructors, the `on*` setters, `addEventListener`, +`callServerTool`, `readServerResource`, `registerAppResource`, the React hooks +and the `_meta.ui.resourceUri` handling are unchanged. Published `.d.ts` files +now resolve under `moduleResolution: NodeNext` / `Node16` without workarounds +(#705). + ## Peer dependencies by role -| Role | Install | -| ------------------- | ---------------------------------------------------------------------------------------------------------------------------- | -| View author | `@modelcontextprotocol/ext-apps`, `@modelcontextprotocol/client@^2.0.0`, `zod@^4.2.0` (+ `react`/`react-dom` for `./react`) | -| Host author | same as View author | -| MCP server author | View author packages + `@modelcontextprotocol/server@^2.0.0`; `@modelcontextprotocol/node` and `express` for HTTP transports | -| CDN / `*-with-deps` | nothing extra: `./app-with-deps` and `./react-with-deps` bundle client, core and zod (about 25% larger than the 1.x bundles) | +| Role | Install | +| ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| View author | `@modelcontextprotocol/ext-apps`, `@modelcontextprotocol/client@^2.0.0`, `zod@^4.2.0` (+ `react`/`react-dom` for `./react`) | +| Host author | same as View author | +| MCP server author | View author packages + `@modelcontextprotocol/server@^2.0.0`; for HTTP transports also `@modelcontextprotocol/node@^2.0.0` (`NodeStreamableHTTPServerTransport`) and `@modelcontextprotocol/express@^2.0.0` (`createMcpExpressApp`, which peers on `express`) | +| CDN / `*-with-deps` | nothing extra: `./app-with-deps` and `./react-with-deps` bundle client, core and zod (about 25% larger than the 1.x bundles) | `@modelcontextprotocol/client` is a required peer (`App` and `AppBridge` extend its `Protocol` class); `@modelcontextprotocol/core` is a required peer that `client` already depends on, so npm installs it without you listing it; @@ -35,18 +43,23 @@ its `Protocol` class); `@modelcontextprotocol/core` is a required peer that `cli - **Peer packages.** `@modelcontextprotocol/sdk@^1` is replaced by the split 2.x packages above, all at `^2.0.0`. Remove the 1.x package from your - project; the two SDKs do not interoperate. + project: the two SDKs share no classes or types (a 1.x `McpError` or + `Client` cannot be passed to 2.x code), even though they speak the same + wire protocol. - **zod 3 dropped.** The peer range is `zod@^4.2.0`. Tool schemas must - implement Standard JSON Schema (`~standard.jsonSchema`): zod v4, ArkType, - Valibot. Raw zod shapes (`{ q: z.string() }`) still work with + implement Standard JSON Schema (`~standard.jsonSchema`): zod 4.2+, ArkType, + Valibot. zod 4.0 and 4.1 do not expose `~standard.jsonSchema` and are + rejected too. Raw zod shapes (`{ q: z.string() }`) still work with `registerAppTool` but are deprecated; wrap them with `z.object({...})`. - **`App` / `AppBridge` extend `Protocol` from `@modelcontextprotocol/client`.** `ProtocolWithEvents` is gone; use the SDK's `Protocol`. The `AppRequest`, `AppNotification` and `AppResult` unions are kept as deprecated type aliases (nothing in 2.x consumes them) and will be removed in 3.0. -- **Handler context.** Custom handlers receive the SDK 2.x context: - `extra.signal` → `extra.mcpReq.signal`, `extra.requestId` → - `extra.mcpReq.id`. +- **Handler context.** Custom request handlers, `registerAppTool` callbacks + (server) and `app.registerTool` callbacks (View) receive the SDK 2.x + context: `extra.signal` → `extra.mcpReq.signal`, `extra.requestId` → + `extra.mcpReq.id`; `extra.sessionId` is unchanged and `extra.authInfo` + moved to `extra.http?.authInfo`. - **`setRequestHandler` / `setNotificationHandler` take method names.** `app.setRequestHandler(SomeRequestSchema, handler)` becomes `app.setRequestHandler("some/method", { params: SomeParamsSchema }, (params, ctx) => …)` @@ -55,14 +68,23 @@ its `Protocol` class); `@modelcontextprotocol/core` is a required peer that `cli method names. The 1.x `(Schema, handler)` form still works on `App` and `AppBridge` as a deprecated overload: it logs a one-time warning, hands the handler the whole `{ method, params }` message as before, and gives request - handlers a 1.x-shaped `extra` (`signal`, `requestId`, `sessionId`, `_meta`). - It will be removed in 3.0. + handlers a 1.x-shaped `extra` (`signal`, `requestId`, `sessionId`, `_meta`, + `sendRequest`, `sendNotification`, `authInfo`; exported as + `LegacyRequestHandlerExtra`). It will be removed in 3.0. +- **Double-registration guard covers the SDK's own handlers.** Registering a + handler for `notifications/progress` or `notifications/cancelled` (which + the base `Protocol` already owns) now throws `already registered`, as + `ping` and the `on*`-owned methods did in 1.x. Use `addEventListener` or + the SDK's progress callbacks instead of replacing these. - **Errors.** Remote JSON-RPC errors are `ProtocolError` (numeric `code`); local conditions are `SdkError` with a string `code`: request timeout → `"REQUEST_TIMEOUT"`, connection closed → `"CONNECTION_CLOSED"`. Cancelling a request with an `AbortSignal` also rejects with `"REQUEST_TIMEOUT"` (the message is the abort reason). Messages no longer carry the `MCP error N:` prefix. + A resource-not-found reply that carries `data.uri` arrives as + `ResourceNotFoundError` (a `ProtocolError` subclass, `code` `-32602`, with a + `.uri` getter). ## Host-side wire deltas @@ -98,8 +120,9 @@ The published `./schema.json` export is regenerated from the 2.x core schemas: 2. Replace `sdk/...` imports with the split packages (`sdk/server/mcp.js` → `@modelcontextprotocol/server`, `sdk/server/streamableHttp.js` → `NodeStreamableHTTPServerTransport` from `@modelcontextprotocol/node`, - `sdk/server/stdio.js` → `@modelcontextprotocol/server/stdio`, `sdk/types.js` - → `@modelcontextprotocol/client` or `server` for the types, + `sdk/server/stdio.js` → `@modelcontextprotocol/server/stdio`, hand-written + Express routing → `createMcpExpressApp` from `@modelcontextprotocol/express`, + `sdk/types.js` → `@modelcontextprotocol/client` or `server` for the types, `@modelcontextprotocol/core` for the zod schemas). 3. Wrap raw zod shapes with `z.object({...})`. 4. Update custom handlers to the `extra.mcpReq.*` context and method-keyed diff --git a/src/app-bridge.ts b/src/app-bridge.ts index c61dfa4..1ac4db4 100644 --- a/src/app-bridge.ts +++ b/src/app-bridge.ts @@ -37,9 +37,8 @@ import { import { EventDispatcher, MethodRegistry } from "./events.js"; import { toModernArgs, - type LegacyMethodSchema, - type LegacyNotificationHandler, - type LegacyRequestHandler, + type LegacyNotificationHandlerSetter, + type LegacyRequestHandlerSetter, } from "./legacy-handlers.js"; import type { ZodLiteral, ZodObject, ZodType } from "zod/v4"; @@ -330,12 +329,9 @@ export class AppBridge extends Protocol { * * @throws {Error} if a handler for this method is already registered. */ - override setRequestHandler: Protocol["setRequestHandler"] & - (( - /** @deprecated Pass the method name and `{ params }` instead. */ - schema: S, - handler: LegacyRequestHandler, - ) => void) = (...args: unknown[]) => { + override setRequestHandler: LegacyRequestHandlerSetter< + Protocol["setRequestHandler"] + > = (...args: unknown[]) => { const [method, ...rest] = toModernArgs("request", args) ?? args; this._methods.claim(method as string, "setRequestHandler"); (super.setRequestHandler as unknown as UntypedHandlerSetter).call( @@ -352,12 +348,9 @@ export class AppBridge extends Protocol { * * @throws {Error} if a handler for this method is already registered. */ - override setNotificationHandler: Protocol["setNotificationHandler"] & - (( - /** @deprecated Pass the method name and `{ params }` instead. */ - schema: S, - handler: LegacyNotificationHandler, - ) => void) = (...args: unknown[]) => { + override setNotificationHandler: LegacyNotificationHandlerSetter< + Protocol["setNotificationHandler"] + > = (...args: unknown[]) => { const [method, ...rest] = toModernArgs("notification", args) ?? args; this._methods.claim(method as string, "setNotificationHandler"); (super.setNotificationHandler as unknown as UntypedHandlerSetter).call( diff --git a/src/app.ts b/src/app.ts index 0ab51ac..89c6c35 100644 --- a/src/app.ts +++ b/src/app.ts @@ -26,15 +26,16 @@ export { RESOURCE_MIME_TYPE, RESOURCE_URI_META_KEY } from "./constants.js"; import { EventDispatcher, MethodRegistry } from "./events.js"; import { toModernArgs, - type LegacyMethodSchema, - type LegacyNotificationHandler, - type LegacyRequestHandler, + type LegacyNotificationHandlerSetter, + type LegacyRequestHandlerSetter, } from "./legacy-handlers.js"; export type { LegacyMethodSchema, LegacyNotificationHandler, + LegacyNotificationHandlerSetter, LegacyRequestHandler, LegacyRequestHandlerExtra, + LegacyRequestHandlerSetter, } from "./legacy-handlers.js"; export { EventDispatcher } from "./events.js"; @@ -328,12 +329,9 @@ export class App extends Protocol { * * @throws {Error} if a handler for this method is already registered. */ - override setRequestHandler: Protocol["setRequestHandler"] & - (( - /** @deprecated Pass the method name and `{ params }` instead. */ - schema: S, - handler: LegacyRequestHandler, - ) => void) = (...args: unknown[]) => { + override setRequestHandler: LegacyRequestHandlerSetter< + Protocol["setRequestHandler"] + > = (...args: unknown[]) => { const [method, ...rest] = toModernArgs("request", args) ?? args; this._methods.claim(method as string, "setRequestHandler"); (super.setRequestHandler as unknown as UntypedHandlerSetter).call( @@ -350,12 +348,9 @@ export class App extends Protocol { * * @throws {Error} if a handler for this method is already registered. */ - override setNotificationHandler: Protocol["setNotificationHandler"] & - (( - /** @deprecated Pass the method name and `{ params }` instead. */ - schema: S, - handler: LegacyNotificationHandler, - ) => void) = (...args: unknown[]) => { + override setNotificationHandler: LegacyNotificationHandlerSetter< + Protocol["setNotificationHandler"] + > = (...args: unknown[]) => { const [method, ...rest] = toModernArgs("notification", args) ?? args; this._methods.claim(method as string, "setNotificationHandler"); (super.setNotificationHandler as unknown as UntypedHandlerSetter).call( diff --git a/src/legacy-handlers.ts b/src/legacy-handlers.ts index b4d1157..237b8eb 100644 --- a/src/legacy-handlers.ts +++ b/src/legacy-handlers.ts @@ -36,6 +36,33 @@ export type LegacyNotificationHandler = ( notification: S["_output"], ) => void | Promise; +/** + * `setRequestHandler` with the 1.x `(Schema, handler)` form kept as a + * deprecated overload next to the 2.x forms in `Modern`. + */ +export type LegacyRequestHandlerSetter = Modern & { + /** + * @deprecated 1.x form. Pass the method name and `{ params }` instead; + * removed in 3.0. + */ + ( + schema: S, + handler: LegacyRequestHandler, + ): void; +}; + +/** `setNotificationHandler` counterpart of {@link LegacyRequestHandlerSetter}. */ +export type LegacyNotificationHandlerSetter = Modern & { + /** + * @deprecated 1.x form. Pass the method name and `{ params }` instead; + * removed in 3.0. + */ + ( + schema: S, + handler: LegacyNotificationHandler, + ): void; +}; + /** * Arguments for the 2.x three-argument `setRequestHandler` / * `setNotificationHandler` form. From a0dcf168432d52ad1e71cd3a37958ed0c03849b3 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 8 Sep 2026 18:38:58 +0100 Subject: [PATCH 105/107] CI: build the WSL job on ext4, skip the unused Chromium download, list tsconfig types The Windows WSL job is the critical path of every CI run (589 to 752 s). Its checkout sits on the Windows drive, which WSL reaches over 9P, and writing node_modules there is what makes npm ci take about three minutes where the Linux job takes 23 s. The step now copies the tree onto the distro's ext4 filesystem before installing and building, as Microsoft's WSL guidance recommends for I/O-heavy work. The e2e job downloaded the full Chromium build (about 165 MB) on every run, but a headless run with no channel launches chromium-headless-shell and never opens it. `--only-shell` skips that download. Every tsconfig now lists the @types packages it uses (node, bun, vite/client, dom-speech-recognition) instead of relying on TypeScript auto-including everything under node_modules/@types. On TypeScript 5.9 this is a no-op: identical diagnostics across all 48 projects and byte-identical emitted .d.ts files. It is a prerequisite for TypeScript 7, which drops the auto-inclusion; with these lists the Go compiler passes all 48 projects, so that upgrade becomes a version bump once TypeDoc supports it. Two cache-based approaches were evaluated and rejected: an npm cache for the WSL job (npm ci is slow there because of 9P, not downloads, and a prefix-restored cache grows without bound) and a Playwright browser cache (Playwright's docs advise against it; the download is under 10 s). --- .github/workflows/ci.yml | 9 ++++++++- examples/basic-host/tsconfig.json | 1 + examples/basic-server-preact/tsconfig.json | 1 + examples/basic-server-preact/tsconfig.server.json | 1 + examples/basic-server-react/tsconfig.json | 1 + examples/basic-server-react/tsconfig.server.json | 1 + examples/basic-server-solid/tsconfig.json | 1 + examples/basic-server-solid/tsconfig.server.json | 1 + examples/basic-server-svelte/tsconfig.json | 1 + examples/basic-server-svelte/tsconfig.server.json | 1 + examples/basic-server-vanillajs/tsconfig.json | 1 + examples/basic-server-vanillajs/tsconfig.server.json | 1 + examples/basic-server-vue/tsconfig.json | 1 + examples/basic-server-vue/tsconfig.server.json | 1 + examples/budget-allocator-server/tsconfig.json | 1 + examples/budget-allocator-server/tsconfig.server.json | 1 + examples/cohort-heatmap-server/tsconfig.json | 1 + examples/cohort-heatmap-server/tsconfig.server.json | 1 + examples/customer-segmentation-server/tsconfig.json | 1 + .../customer-segmentation-server/tsconfig.server.json | 1 + examples/debug-server/tsconfig.json | 1 + examples/debug-server/tsconfig.server.json | 1 + examples/integration-server/tsconfig.json | 1 + examples/integration-server/tsconfig.server.json | 1 + examples/lazy-auth-server/tsconfig.json | 1 + examples/lazy-auth-server/tsconfig.server.json | 1 + examples/map-server/tsconfig.json | 1 + examples/map-server/tsconfig.server.json | 1 + examples/pdf-server/tsconfig.json | 1 + examples/pdf-server/tsconfig.server.json | 1 + examples/quickstart/tsconfig.json | 1 + examples/quickstart/tsconfig.server.json | 1 + examples/scenario-modeler-server/tsconfig.json | 1 + examples/scenario-modeler-server/tsconfig.server.json | 1 + examples/shadertoy-server/tsconfig.json | 1 + examples/shadertoy-server/tsconfig.server.json | 1 + examples/sheet-music-server/tsconfig.json | 1 + examples/sheet-music-server/tsconfig.server.json | 1 + examples/system-monitor-server/tsconfig.json | 1 + examples/system-monitor-server/tsconfig.server.json | 1 + examples/threejs-server/tsconfig.json | 1 + examples/threejs-server/tsconfig.server.json | 1 + examples/transcript-server/tsconfig.json | 1 + examples/transcript-server/tsconfig.server.json | 1 + examples/video-resource-server/tsconfig.json | 1 + examples/video-resource-server/tsconfig.server.json | 1 + examples/wiki-explorer-server/tsconfig.json | 1 + examples/wiki-explorer-server/tsconfig.server.json | 1 + tsconfig.json | 1 + 49 files changed, 56 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 756f259..6848e4c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -147,8 +147,10 @@ jobs: - run: npm ci + # Headless runs without a channel use chromium-headless-shell, so the + # full Chromium build (about 165 MB) would only be downloaded, never run. - name: Install Playwright browsers - run: npx playwright install --with-deps chromium + run: npx playwright install --with-deps --only-shell chromium - name: Run E2E tests run: npx playwright test --reporter=list @@ -180,9 +182,14 @@ jobs: curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash - sudo apt-get install -y nodejs + # The checkout lives on the Windows drive, which WSL reaches over 9P; + # writing node_modules there is what makes this job slow (npm ci alone + # took about 3 minutes). Copy the tree onto the distro's ext4 filesystem + # first, as Microsoft's WSL guidance recommends for anything I/O heavy. - name: Build and test in WSL shell: wsl-bash {0} run: | + cp -r "$(pwd)" ~/ext-apps && cd ~/ext-apps npm ci npm run build npm run examples:build diff --git a/examples/basic-host/tsconfig.json b/examples/basic-host/tsconfig.json index 9d7c3bc..3c143ca 100644 --- a/examples/basic-host/tsconfig.json +++ b/examples/basic-host/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/basic-server-preact/tsconfig.json b/examples/basic-server-preact/tsconfig.json index 32182d9..9bf9389 100644 --- a/examples/basic-server-preact/tsconfig.json +++ b/examples/basic-server-preact/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/basic-server-preact/tsconfig.server.json b/examples/basic-server-preact/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/basic-server-preact/tsconfig.server.json +++ b/examples/basic-server-preact/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/basic-server-react/tsconfig.json b/examples/basic-server-react/tsconfig.json index fc3c210..3ecbdad 100644 --- a/examples/basic-server-react/tsconfig.json +++ b/examples/basic-server-react/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/basic-server-react/tsconfig.server.json b/examples/basic-server-react/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/basic-server-react/tsconfig.server.json +++ b/examples/basic-server-react/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/basic-server-solid/tsconfig.json b/examples/basic-server-solid/tsconfig.json index 84f0efe..bb13a01 100644 --- a/examples/basic-server-solid/tsconfig.json +++ b/examples/basic-server-solid/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/basic-server-solid/tsconfig.server.json b/examples/basic-server-solid/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/basic-server-solid/tsconfig.server.json +++ b/examples/basic-server-solid/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/basic-server-svelte/tsconfig.json b/examples/basic-server-svelte/tsconfig.json index 5edb66a..4fd3cd7 100644 --- a/examples/basic-server-svelte/tsconfig.json +++ b/examples/basic-server-svelte/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/basic-server-svelte/tsconfig.server.json b/examples/basic-server-svelte/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/basic-server-svelte/tsconfig.server.json +++ b/examples/basic-server-svelte/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/basic-server-vanillajs/tsconfig.json b/examples/basic-server-vanillajs/tsconfig.json index 535267b..b028ff5 100644 --- a/examples/basic-server-vanillajs/tsconfig.json +++ b/examples/basic-server-vanillajs/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/basic-server-vanillajs/tsconfig.server.json b/examples/basic-server-vanillajs/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/basic-server-vanillajs/tsconfig.server.json +++ b/examples/basic-server-vanillajs/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/basic-server-vue/tsconfig.json b/examples/basic-server-vue/tsconfig.json index 5edb66a..4fd3cd7 100644 --- a/examples/basic-server-vue/tsconfig.json +++ b/examples/basic-server-vue/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/basic-server-vue/tsconfig.server.json b/examples/basic-server-vue/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/basic-server-vue/tsconfig.server.json +++ b/examples/basic-server-vue/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/budget-allocator-server/tsconfig.json b/examples/budget-allocator-server/tsconfig.json index 535267b..b028ff5 100644 --- a/examples/budget-allocator-server/tsconfig.json +++ b/examples/budget-allocator-server/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/budget-allocator-server/tsconfig.server.json b/examples/budget-allocator-server/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/budget-allocator-server/tsconfig.server.json +++ b/examples/budget-allocator-server/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/cohort-heatmap-server/tsconfig.json b/examples/cohort-heatmap-server/tsconfig.json index fc3c210..3ecbdad 100644 --- a/examples/cohort-heatmap-server/tsconfig.json +++ b/examples/cohort-heatmap-server/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/cohort-heatmap-server/tsconfig.server.json b/examples/cohort-heatmap-server/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/cohort-heatmap-server/tsconfig.server.json +++ b/examples/cohort-heatmap-server/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/customer-segmentation-server/tsconfig.json b/examples/customer-segmentation-server/tsconfig.json index 535267b..b028ff5 100644 --- a/examples/customer-segmentation-server/tsconfig.json +++ b/examples/customer-segmentation-server/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/customer-segmentation-server/tsconfig.server.json b/examples/customer-segmentation-server/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/customer-segmentation-server/tsconfig.server.json +++ b/examples/customer-segmentation-server/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/debug-server/tsconfig.json b/examples/debug-server/tsconfig.json index 535267b..b028ff5 100644 --- a/examples/debug-server/tsconfig.json +++ b/examples/debug-server/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/debug-server/tsconfig.server.json b/examples/debug-server/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/debug-server/tsconfig.server.json +++ b/examples/debug-server/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/integration-server/tsconfig.json b/examples/integration-server/tsconfig.json index fc3c210..3ecbdad 100644 --- a/examples/integration-server/tsconfig.json +++ b/examples/integration-server/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/integration-server/tsconfig.server.json b/examples/integration-server/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/integration-server/tsconfig.server.json +++ b/examples/integration-server/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/lazy-auth-server/tsconfig.json b/examples/lazy-auth-server/tsconfig.json index 6c553b5..d6a42ce 100644 --- a/examples/lazy-auth-server/tsconfig.json +++ b/examples/lazy-auth-server/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/lazy-auth-server/tsconfig.server.json b/examples/lazy-auth-server/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/lazy-auth-server/tsconfig.server.json +++ b/examples/lazy-auth-server/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/map-server/tsconfig.json b/examples/map-server/tsconfig.json index 535267b..b028ff5 100644 --- a/examples/map-server/tsconfig.json +++ b/examples/map-server/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/map-server/tsconfig.server.json b/examples/map-server/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/map-server/tsconfig.server.json +++ b/examples/map-server/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/pdf-server/tsconfig.json b/examples/pdf-server/tsconfig.json index 0501827..2fe7e62 100644 --- a/examples/pdf-server/tsconfig.json +++ b/examples/pdf-server/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client", "bun"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/pdf-server/tsconfig.server.json b/examples/pdf-server/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/pdf-server/tsconfig.server.json +++ b/examples/pdf-server/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/quickstart/tsconfig.json b/examples/quickstart/tsconfig.json index 6c553b5..d6a42ce 100644 --- a/examples/quickstart/tsconfig.json +++ b/examples/quickstart/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/quickstart/tsconfig.server.json b/examples/quickstart/tsconfig.server.json index 7e65f5f..72552e2 100644 --- a/examples/quickstart/tsconfig.server.json +++ b/examples/quickstart/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/scenario-modeler-server/tsconfig.json b/examples/scenario-modeler-server/tsconfig.json index fc3c210..3ecbdad 100644 --- a/examples/scenario-modeler-server/tsconfig.json +++ b/examples/scenario-modeler-server/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/scenario-modeler-server/tsconfig.server.json b/examples/scenario-modeler-server/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/scenario-modeler-server/tsconfig.server.json +++ b/examples/scenario-modeler-server/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/shadertoy-server/tsconfig.json b/examples/shadertoy-server/tsconfig.json index 535267b..b028ff5 100644 --- a/examples/shadertoy-server/tsconfig.json +++ b/examples/shadertoy-server/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/shadertoy-server/tsconfig.server.json b/examples/shadertoy-server/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/shadertoy-server/tsconfig.server.json +++ b/examples/shadertoy-server/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/sheet-music-server/tsconfig.json b/examples/sheet-music-server/tsconfig.json index 535267b..b028ff5 100644 --- a/examples/sheet-music-server/tsconfig.json +++ b/examples/sheet-music-server/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/sheet-music-server/tsconfig.server.json b/examples/sheet-music-server/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/sheet-music-server/tsconfig.server.json +++ b/examples/sheet-music-server/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/system-monitor-server/tsconfig.json b/examples/system-monitor-server/tsconfig.json index 535267b..b028ff5 100644 --- a/examples/system-monitor-server/tsconfig.json +++ b/examples/system-monitor-server/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/system-monitor-server/tsconfig.server.json b/examples/system-monitor-server/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/system-monitor-server/tsconfig.server.json +++ b/examples/system-monitor-server/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/threejs-server/tsconfig.json b/examples/threejs-server/tsconfig.json index fc3c210..3ecbdad 100644 --- a/examples/threejs-server/tsconfig.json +++ b/examples/threejs-server/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/threejs-server/tsconfig.server.json b/examples/threejs-server/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/threejs-server/tsconfig.server.json +++ b/examples/threejs-server/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/transcript-server/tsconfig.json b/examples/transcript-server/tsconfig.json index 535267b..00e4801 100644 --- a/examples/transcript-server/tsconfig.json +++ b/examples/transcript-server/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client", "dom-speech-recognition"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/transcript-server/tsconfig.server.json b/examples/transcript-server/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/transcript-server/tsconfig.server.json +++ b/examples/transcript-server/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/video-resource-server/tsconfig.json b/examples/video-resource-server/tsconfig.json index 535267b..b028ff5 100644 --- a/examples/video-resource-server/tsconfig.json +++ b/examples/video-resource-server/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/video-resource-server/tsconfig.server.json b/examples/video-resource-server/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/video-resource-server/tsconfig.server.json +++ b/examples/video-resource-server/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/examples/wiki-explorer-server/tsconfig.json b/examples/wiki-explorer-server/tsconfig.json index 535267b..b028ff5 100644 --- a/examples/wiki-explorer-server/tsconfig.json +++ b/examples/wiki-explorer-server/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", diff --git a/examples/wiki-explorer-server/tsconfig.server.json b/examples/wiki-explorer-server/tsconfig.server.json index 05ddd8e..27eb28f 100644 --- a/examples/wiki-explorer-server/tsconfig.server.json +++ b/examples/wiki-explorer-server/tsconfig.server.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", diff --git a/tsconfig.json b/tsconfig.json index 08ff110..934b950 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "types": ["node", "bun"], "target": "ES2020", "module": "ESNext", "lib": ["ES2020", "DOM"], From ae4f7e0ad0607ed46862a26af664a05f94b0246a Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 8 Sep 2026 18:39:50 +0100 Subject: [PATCH 106/107] Sync the quickstart tsconfig snippets --- docs/quickstart.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/quickstart.md b/docs/quickstart.md index 2039dc1..a021912 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -59,6 +59,7 @@ npm pkg set scripts.start='concurrently --raw "cross-env NODE_ENV=development IN ```json source="../examples/quickstart/tsconfig.json" { "compilerOptions": { + "types": ["node", "vite/client"], "target": "ESNext", "lib": ["ESNext", "DOM", "DOM.Iterable"], "module": "ESNext", @@ -87,6 +88,7 @@ npm pkg set scripts.start='concurrently --raw "cross-env NODE_ENV=development IN ```json source="../examples/quickstart/tsconfig.server.json" { "compilerOptions": { + "types": ["node"], "target": "ES2022", "lib": ["ES2022"], "module": "NodeNext", From 2be172defbadb4dc2a92b2cb447b534aebb56d41 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Tue, 8 Sep 2026 19:37:47 +0100 Subject: [PATCH 107/107] Use the canonical git+https form for repository.url MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit npm normalizes the bare https URL to git+https://….git at publish time and warns about it on every package. Storing the canonical form removes the warning and matches what npm's trusted-publisher check compares against the repository. --- examples/basic-server-preact/package.json | 2 +- examples/basic-server-react/package.json | 2 +- examples/basic-server-solid/package.json | 2 +- examples/basic-server-svelte/package.json | 2 +- examples/basic-server-vanillajs/package.json | 2 +- examples/basic-server-vue/package.json | 2 +- examples/budget-allocator-server/package.json | 2 +- examples/cohort-heatmap-server/package.json | 2 +- examples/customer-segmentation-server/package.json | 2 +- examples/debug-server/package.json | 2 +- examples/lazy-auth-server/package.json | 2 +- examples/map-server/package.json | 2 +- examples/pdf-server/package.json | 2 +- examples/quickstart/package.json | 2 +- examples/say-server/package.json | 2 +- examples/scenario-modeler-server/package.json | 2 +- examples/shadertoy-server/package.json | 2 +- examples/sheet-music-server/package.json | 2 +- examples/system-monitor-server/package.json | 2 +- examples/threejs-server/package.json | 2 +- examples/transcript-server/package.json | 2 +- examples/video-resource-server/package.json | 2 +- examples/wiki-explorer-server/package.json | 2 +- package.json | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/examples/basic-server-preact/package.json b/examples/basic-server-preact/package.json index c88a306..60aa40d 100644 --- a/examples/basic-server-preact/package.json +++ b/examples/basic-server-preact/package.json @@ -5,7 +5,7 @@ "description": "Basic MCP App Server example using Preact", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/basic-server-preact" }, "license": "MIT", diff --git a/examples/basic-server-react/package.json b/examples/basic-server-react/package.json index 07a9d3b..ea51a8a 100644 --- a/examples/basic-server-react/package.json +++ b/examples/basic-server-react/package.json @@ -5,7 +5,7 @@ "description": "Basic MCP App Server example using React", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/basic-server-react" }, "license": "MIT", diff --git a/examples/basic-server-solid/package.json b/examples/basic-server-solid/package.json index a459ebc..b3ca909 100644 --- a/examples/basic-server-solid/package.json +++ b/examples/basic-server-solid/package.json @@ -5,7 +5,7 @@ "description": "Basic MCP App Server example using Solid", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/basic-server-solid" }, "license": "MIT", diff --git a/examples/basic-server-svelte/package.json b/examples/basic-server-svelte/package.json index 3e0279f..19fe4c9 100644 --- a/examples/basic-server-svelte/package.json +++ b/examples/basic-server-svelte/package.json @@ -5,7 +5,7 @@ "description": "Basic MCP App Server example using Svelte", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/basic-server-svelte" }, "license": "MIT", diff --git a/examples/basic-server-vanillajs/package.json b/examples/basic-server-vanillajs/package.json index 1404b65..ebfebbb 100644 --- a/examples/basic-server-vanillajs/package.json +++ b/examples/basic-server-vanillajs/package.json @@ -5,7 +5,7 @@ "description": "Basic MCP App Server example using vanilla JavaScript", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/basic-server-vanillajs" }, "license": "MIT", diff --git a/examples/basic-server-vue/package.json b/examples/basic-server-vue/package.json index 32083c6..858dd89 100644 --- a/examples/basic-server-vue/package.json +++ b/examples/basic-server-vue/package.json @@ -5,7 +5,7 @@ "description": "Basic MCP App Server example using Vue", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/basic-server-vue" }, "license": "MIT", diff --git a/examples/budget-allocator-server/package.json b/examples/budget-allocator-server/package.json index e44a147..6e41622 100644 --- a/examples/budget-allocator-server/package.json +++ b/examples/budget-allocator-server/package.json @@ -5,7 +5,7 @@ "description": "Budget allocator MCP App Server with interactive visualization", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/budget-allocator-server" }, "license": "MIT", diff --git a/examples/cohort-heatmap-server/package.json b/examples/cohort-heatmap-server/package.json index de20f13..7e2d2e2 100644 --- a/examples/cohort-heatmap-server/package.json +++ b/examples/cohort-heatmap-server/package.json @@ -5,7 +5,7 @@ "description": "Cohort heatmap MCP App Server for retention analysis", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/cohort-heatmap-server" }, "license": "MIT", diff --git a/examples/customer-segmentation-server/package.json b/examples/customer-segmentation-server/package.json index 643db17..bac3b89 100644 --- a/examples/customer-segmentation-server/package.json +++ b/examples/customer-segmentation-server/package.json @@ -5,7 +5,7 @@ "description": "Customer segmentation MCP App Server with filtering", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/customer-segmentation-server" }, "license": "MIT", diff --git a/examples/debug-server/package.json b/examples/debug-server/package.json index 5be9291..e28f4d3 100644 --- a/examples/debug-server/package.json +++ b/examples/debug-server/package.json @@ -5,7 +5,7 @@ "description": "Debug MCP App Server for testing all SDK capabilities", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/debug-server" }, "license": "MIT", diff --git a/examples/lazy-auth-server/package.json b/examples/lazy-auth-server/package.json index b12b29b..dbd4601 100644 --- a/examples/lazy-auth-server/package.json +++ b/examples/lazy-auth-server/package.json @@ -5,7 +5,7 @@ "description": "MCP App example demonstrating lazy (on-demand) OAuth: public tools work unauthenticated, protected tools return 401 + WWW-Authenticate so the host runs the OAuth flow only when needed", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/lazy-auth-server" }, "license": "MIT", diff --git a/examples/map-server/package.json b/examples/map-server/package.json index dc6a37f..cc4585f 100644 --- a/examples/map-server/package.json +++ b/examples/map-server/package.json @@ -5,7 +5,7 @@ "description": "MCP App Server example with CesiumJS 3D globe and geocoding", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/map-server" }, "license": "MIT", diff --git a/examples/pdf-server/package.json b/examples/pdf-server/package.json index ae0870a..c8d9cf8 100644 --- a/examples/pdf-server/package.json +++ b/examples/pdf-server/package.json @@ -5,7 +5,7 @@ "description": "MCP server for loading and extracting text from PDF files with chunked pagination and interactive viewer", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/pdf-server" }, "license": "MIT", diff --git a/examples/quickstart/package.json b/examples/quickstart/package.json index eecb080..57f8444 100644 --- a/examples/quickstart/package.json +++ b/examples/quickstart/package.json @@ -6,7 +6,7 @@ "description": "Quickstart MCP App Server example", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/quickstart" }, "license": "MIT", diff --git a/examples/say-server/package.json b/examples/say-server/package.json index cff7024..cc12249 100644 --- a/examples/say-server/package.json +++ b/examples/say-server/package.json @@ -5,7 +5,7 @@ "description": "Streaming TTS MCP App Server with karaoke-style text highlighting", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/say-server" }, "license": "MIT", diff --git a/examples/scenario-modeler-server/package.json b/examples/scenario-modeler-server/package.json index d82424d..e6f37c0 100644 --- a/examples/scenario-modeler-server/package.json +++ b/examples/scenario-modeler-server/package.json @@ -5,7 +5,7 @@ "description": "Financial scenario modeling MCP App Server", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/scenario-modeler-server" }, "license": "MIT", diff --git a/examples/shadertoy-server/package.json b/examples/shadertoy-server/package.json index 3e16a92..aec56c6 100644 --- a/examples/shadertoy-server/package.json +++ b/examples/shadertoy-server/package.json @@ -5,7 +5,7 @@ "description": "MCP App Server example for rendering ShaderToy-compatible GLSL shaders", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/shadertoy-server" }, "license": "MIT", diff --git a/examples/sheet-music-server/package.json b/examples/sheet-music-server/package.json index 1b233bb..85ca6bb 100644 --- a/examples/sheet-music-server/package.json +++ b/examples/sheet-music-server/package.json @@ -5,7 +5,7 @@ "description": "MCP App Server for rendering and playing sheet music from ABC notation", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/sheet-music-server" }, "license": "MIT", diff --git a/examples/system-monitor-server/package.json b/examples/system-monitor-server/package.json index f3a5763..2dc3ef1 100644 --- a/examples/system-monitor-server/package.json +++ b/examples/system-monitor-server/package.json @@ -5,7 +5,7 @@ "description": "System monitor MCP App Server with real-time stats", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/system-monitor-server" }, "license": "MIT", diff --git a/examples/threejs-server/package.json b/examples/threejs-server/package.json index f8df10f..68864d9 100644 --- a/examples/threejs-server/package.json +++ b/examples/threejs-server/package.json @@ -5,7 +5,7 @@ "description": "Three.js 3D visualization MCP App Server", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/threejs-server" }, "license": "MIT", diff --git a/examples/transcript-server/package.json b/examples/transcript-server/package.json index 405f85f..46a8f98 100644 --- a/examples/transcript-server/package.json +++ b/examples/transcript-server/package.json @@ -5,7 +5,7 @@ "description": "MCP App Server for live speech transcription", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/transcript-server" }, "license": "MIT", diff --git a/examples/video-resource-server/package.json b/examples/video-resource-server/package.json index dea8fcb..4a7a61f 100644 --- a/examples/video-resource-server/package.json +++ b/examples/video-resource-server/package.json @@ -5,7 +5,7 @@ "description": "MCP App Server demonstrating video resources served as base64 blobs", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/video-resource-server" }, "license": "MIT", diff --git a/examples/wiki-explorer-server/package.json b/examples/wiki-explorer-server/package.json index 0831670..52304cf 100644 --- a/examples/wiki-explorer-server/package.json +++ b/examples/wiki-explorer-server/package.json @@ -5,7 +5,7 @@ "description": "Wikipedia link explorer MCP App Server with graph visualization", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps", + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git", "directory": "examples/wiki-explorer-server" }, "license": "MIT", diff --git a/package.json b/package.json index bcea649..c86efa9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@modelcontextprotocol/ext-apps", "repository": { "type": "git", - "url": "https://github.com/modelcontextprotocol/ext-apps" + "url": "git+https://github.com/modelcontextprotocol/ext-apps.git" }, "homepage": "https://github.com/modelcontextprotocol/ext-apps", "version": "2.0.0",