Merge remote-tracking branch 'origin/main' into ochafik/bump-1.1.3

Author: ochafik

docs/quickstart.md

@@ -46,11 +46,11 @@ Configure your [`package.json`](https://github.com/modelcontextprotocol/ext-apps
 ```bash
 npm pkg set type=module
 npm pkg set scripts.build="tsc --noEmit && tsc -p tsconfig.server.json && cross-env INPUT=mcp-app.html vite build"
-npm pkg set scripts.start='concurrently "cross-env NODE_ENV=development INPUT=mcp-app.html vite build --watch" "tsx watch main.ts"'
+npm pkg set scripts.start='concurrently --raw "cross-env NODE_ENV=development INPUT=mcp-app.html vite build --watch" "tsx watch main.ts"'
 ```
 
 > [!NOTE]
-> Windows `cmd.exe` users will need to convert quotes in the above command: `npm pkg set scripts.start="concurrently ""cross-env NODE_ENV=development INPUT=mcp-app.html vite build --watch"" ""tsx watch main.ts"""`.
+> Windows `cmd.exe` users will need to convert quotes in the above command: `npm pkg set scripts.start="concurrently --raw ""cross-env NODE_ENV=development INPUT=mcp-app.html vite build --watch"" ""tsx watch main.ts"""`.
 
 <details>
 <summary>Create <a href="https://github.com/modelcontextprotocol/ext-apps/blob/main/examples/quickstart/tsconfig.json"><code>tsconfig.json</code></a>:</summary>
@@ -113,7 +113,7 @@ npm pkg set scripts.start='concurrently "cross-env NODE_ENV=development INPUT=mc
 
 <!-- prettier-ignore -->
 ```ts source="../examples/quickstart/vite.config.ts"
-import { defineConfig } from "vite";
+import { createLogger, defineConfig } from "vite";
 import { viteSingleFile } from "vite-plugin-singlefile";
 
 const INPUT = process.env.INPUT;
@@ -123,7 +123,14 @@ if (!INPUT) {
 
 const isDevelopment = process.env.NODE_ENV === "development";
 
+const prefixedLogger = createLogger();
+for (const level of ["info", "warn", "error"] as const) {
+  const fn = prefixedLogger[level];
+  prefixedLogger[level] = (msg, opts) => fn(msg.replace(/^/mg, "[vite] "), opts);
+}
+
 export default defineConfig({
+  customLogger: prefixedLogger,
   plugins: [viteSingleFile()],
   build: {
     sourcemap: isDevelopment ? "inline" : undefined,

examples/map-server/server.ts

@@ -17,15 +17,14 @@ import {
   registerAppTool,
   registerAppResource,
   RESOURCE_MIME_TYPE,
-  RESOURCE_URI_META_KEY,
 } from "@modelcontextprotocol/ext-apps/server";
 import { randomUUID } from "crypto";
 
 // 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;
-const RESOURCE_URI = "ui://cesium-map/mcp-app.html";
+const resourceUri = "ui://cesium-map/mcp-app.html";
 
 // Nominatim API response type
 interface NominatimResult {
@@ -118,8 +117,8 @@ export function createServer(): McpServer {
   // Register the CesiumJS map resource with CSP for external tile sources
   registerAppResource(
     server,
-    RESOURCE_URI,
-    RESOURCE_URI,
+    resourceUri,
+    resourceUri,
     { mimeType: RESOURCE_MIME_TYPE },
     async (): Promise<ReadResourceResult> => {
       const html = await fs.readFile(
@@ -130,7 +129,7 @@ export function createServer(): McpServer {
         contents: [
           // CSP metadata on the content item takes precedence over listing-level _meta
           {
-            uri: RESOURCE_URI,
+            uri: resourceUri,
             mimeType: RESOURCE_MIME_TYPE,
             text: html,
             _meta: cspMeta,
@@ -175,7 +174,7 @@ export function createServer(): McpServer {
           .optional()
           .describe("Optional label to display on the map"),
       },
-      _meta: { [RESOURCE_URI_META_KEY]: RESOURCE_URI },
+      _meta: { ui: { resourceUri } },
     },
     async ({ west, south, east, north, label }): Promise<CallToolResult> => ({
       content: [

examples/quickstart/package.json

@@ -12,7 +12,7 @@
   "license": "MIT",
   "scripts": {
     "build": "tsc --noEmit && tsc -p tsconfig.server.json && cross-env INPUT=mcp-app.html vite build",
-    "start": "concurrently \"cross-env NODE_ENV=development INPUT=mcp-app.html vite build --watch\" \"tsx watch main.ts\""
+    "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",

examples/quickstart/vite.config.ts

@@ -1,4 +1,4 @@
-import { defineConfig } from "vite";
+import { createLogger, defineConfig } from "vite";
 import { viteSingleFile } from "vite-plugin-singlefile";
 
 const INPUT = process.env.INPUT;
@@ -8,7 +8,14 @@ if (!INPUT) {
 
 const isDevelopment = process.env.NODE_ENV === "development";
 
+const prefixedLogger = createLogger();
+for (const level of ["info", "warn", "error"] as const) {
+  const fn = prefixedLogger[level];
+  prefixedLogger[level] = (msg, opts) => fn(msg.replace(/^/mg, "[vite] "), opts);
+}
+
 export default defineConfig({
+  customLogger: prefixedLogger,
   plugins: [viteSingleFile()],
   build: {
     sourcemap: isDevelopment ? "inline" : undefined,

examples/transcript-server/server.ts

@@ -9,13 +9,12 @@ import {
   registerAppTool,
   registerAppResource,
   RESOURCE_MIME_TYPE,
-  RESOURCE_URI_META_KEY,
 } from "@modelcontextprotocol/ext-apps/server";
 // 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;
-const RESOURCE_URI = "ui://transcript/mcp-app.html";
+const resourceUri = "ui://transcript/mcp-app.html";
 
 /**
  * Creates a new MCP server instance with tools and resources registered.
@@ -35,7 +34,7 @@ export function createServer(): McpServer {
       description:
         "Opens a live speech transcription interface using the Web Speech API.",
       inputSchema: {},
-      _meta: { [RESOURCE_URI_META_KEY]: RESOURCE_URI },
+      _meta: { ui: { resourceUri } },
     },
     async (): Promise<CallToolResult> => {
       return {
@@ -55,8 +54,8 @@ export function createServer(): McpServer {
   // Register the UI resource
   registerAppResource(
     server,
-    RESOURCE_URI,
-    RESOURCE_URI,
+    resourceUri,
+    resourceUri,
     { mimeType: RESOURCE_MIME_TYPE, description: "Transcript UI" },
     async (): Promise<ReadResourceResult> => {
       const html = await fs.readFile(
@@ -67,7 +66,7 @@ export function createServer(): McpServer {
       return {
         contents: [
           {
-            uri: RESOURCE_URI,
+            uri: resourceUri,
             mimeType: RESOURCE_MIME_TYPE,
             text: html,
             _meta: {