Merge origin/main, resolve README.md conflicts

Take main's simplified config patterns and preserve inlined-server-java references.

Author: ochafik

.prettierignore

@@ -4,4 +4,5 @@ examples/basic-server-*/**/*.ts
 examples/basic-server-*/**/*.tsx
 examples/quickstart/**/*.ts
 **/vendor/**
+**/.build/**
 SKILL.md

README.md

@@ -6,10 +6,12 @@ title: Agent Skills
 
 [Agent Skills](https://agentskills.io/) are instruction sets that guide AI coding agents through tasks. When you invoke a skill, the agent takes the lead — it asks clarifying questions, makes decisions based on your codebase, and executes the work.
 
-This repository provides two skills:
+This repository provides four skills:
 
 - [**create-mcp-app**](https://github.com/modelcontextprotocol/ext-apps/blob/main/plugins/mcp-apps/skills/create-mcp-app/SKILL.md) — scaffolds a new MCP App with an interactive UI
 - [**migrate-oai-app**](https://github.com/modelcontextprotocol/ext-apps/blob/main/plugins/mcp-apps/skills/migrate-oai-app/SKILL.md) — migrates an existing OpenAI App to the MCP Apps SDK
+- [**add-app-to-server**](https://github.com/modelcontextprotocol/ext-apps/blob/main/plugins/mcp-apps/skills/add-app-to-server/SKILL.md) — adds interactive UI to an existing MCP server's tools
+- [**convert-web-app**](https://github.com/modelcontextprotocol/ext-apps/blob/main/plugins/mcp-apps/skills/convert-web-app/SKILL.md) — converts an existing web application into an MCP App
 
 ## Install the Skills
 
@@ -51,14 +53,16 @@ Then copy the skills from `plugins/mcp-apps/skills/` to your agent's skills dire
 
 ## Verify Installation
 
-Ask your agent "What skills do you have?" — you should see `create-mcp-app` and `migrate-oai-app` among the available skills.
+Ask your agent "What skills do you have?" — you should see `create-mcp-app`, `migrate-oai-app`, `add-app-to-server`, and `convert-web-app` among the available skills.
 
 ## Invoke a Skill
 
 Try invoking the skills by asking your agent:
 
 - "Create an MCP App" — scaffolds a new MCP App with an interactive UI
 - "Migrate from OpenAI Apps SDK" — converts an existing OpenAI App to use the MCP Apps SDK
+- "Add UI to my MCP server" — adds interactive UI to an existing MCP server's tools
+- "Convert my web app to an MCP App" — converts an existing web application into an MCP App
 
 The agent will guide you through the process, asking clarifying questions as needed.
 

docs/agent-skills.md

@@ -1,7 +1,7 @@
 {
   "homepage": "https://github.com/modelcontextprotocol/ext-apps/tree/main/examples/basic-host",
   "name": "@modelcontextprotocol/ext-apps-basic-host",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "type": "module",
   "scripts": {
     "build": "tsc --noEmit && concurrently \"cross-env INPUT=index.html vite build\" \"cross-env INPUT=sandbox.html vite build\"",

examples/basic-host/package.json

@@ -82,6 +82,8 @@ function buildCspHeader(csp?: McpUiResourceCsp): string {
     `img-src 'self' data: blob: ${resourceDomains}`.trim(),
     // Fonts: same-origin + data/blob URIs + specified domains
     `font-src 'self' data: blob: ${resourceDomains}`.trim(),
+    // Media (audio/video): same-origin + data/blob URIs + specified domains
+    `media-src 'self' data: blob: ${resourceDomains}`.trim(),
     // Network requests: same-origin + specified API/tile domains
     `connect-src 'self' ${connectDomains}`.trim(),
     // Workers: same-origin + blob (dynamic workers) + specified domains

examples/basic-host/serve.ts

@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-basic-preact",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "type": "module",
   "description": "Basic MCP App Server example using Preact",
   "repository": {

examples/basic-server-preact/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-basic-react",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "type": "module",
   "description": "Basic MCP App Server example using React",
   "repository": {

examples/basic-server-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-basic-solid",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "type": "module",
   "description": "Basic MCP App Server example using Solid",
   "repository": {

examples/basic-server-solid/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-basic-svelte",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "type": "module",
   "description": "Basic MCP App Server example using Svelte",
   "repository": {

examples/basic-server-svelte/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-basic-vanillajs",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "type": "module",
   "description": "Basic MCP App Server example using vanilla JavaScript",
   "repository": {