Merge ochafik/pre-handshake-guard into feat/app-tool-registration

ochafik · ochafik · commit ac024155cb79 · 2026-04-21T11:46:17.000+01:00
Conflict resolution: - src/app.ts: kept both _registeredTools (#72) and _initializedSent/_assertInitialized (#623) private fields. - typedoc.config.mjs: dropped AppOptions (now exported per #623), kept RequestHandlerExtra (#72) → ["MethodSchema", "RequestHandlerExtra"]. - .husky/pre-commit: took main's --diff-filter=d (both sides had equivalent fixes for staged-deletion re-add failure). Guard application to #72's new App methods: - sendToolListChanged: added _assertInitialized guard. - registerTool's notify() helper: gated on _initializedSent instead of transport so enable/disable/update during the handshake window doesn't fire a premature list_changed notification. - registerTool itself is intentionally NOT guarded — it's a pre-connect setup method (analogous to setting ontoolresult). AppBridge: #72 adds no setRequestHandler/replaceRequestHandler calls; the existing override auto-covers any new replaceRequestHandler users.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -15,9 +15,9 @@ if grep -E '"resolved": "https?://' package-lock.json | grep -v registry.npmjs.o
 fi
 
 # Capture staged files so we only re-stage what the user intended to commit
-# (avoids sweeping unrelated WIP into the commit). Exclude deletions since
-# they can't be re-added from the working tree.
-STAGED=$(git diff --name-only --cached --diff-filter=ACMR)
+# (avoids sweeping unrelated WIP into the commit). --diff-filter=d skips
+# deletions so the xargs git add below doesn't fail on removed paths.
+STAGED=$(git diff --name-only --cached --diff-filter=d)
 
 npm run build:all
 npm run prettier:fix
diff --git 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.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-basic-preact",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-basic-react",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-basic-solid",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-basic-svelte",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-basic-vanillajs",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-basic-vue",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-budget-allocator",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-cohort-heatmap",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-customer-segmentation",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-debug",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "integration-server",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/examples/map-server/package.json b/examples/map-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-map",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-pdf",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-qr",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "private": true,
   "scripts": {
     "start": "uv run server.py",
diff --git a/examples/quickstart/package.json b/examples/quickstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/quickstart",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-say",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-scenario-modeler",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-shadertoy",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-sheet-music",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-system-monitor",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-threejs",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-transcript",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-video-resource",
-  "version": "1.5.0",
+  "version": "1.6.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
@@ -1,6 +1,6 @@
 {
   "name": "@modelcontextprotocol/server-wiki-explorer",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "type": "module",
   "description": "Wikipedia link explorer MCP App Server with graph visualization",
   "repository": {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/scripts/link-self.mjs b/scripts/link-self.mjs
diff --git a/src/app-bridge.test.ts b/src/app-bridge.test.ts
diff --git a/src/app-bridge.ts b/src/app-bridge.ts
diff --git a/src/app.ts b/src/app.ts
diff --git a/src/react/useApp.tsx b/src/react/useApp.tsx
diff --git a/typedoc.config.mjs b/typedoc.config.mjs

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"homepage": "https://github.com/modelcontextprotocol/ext-apps/tree/main/examples/basic-host",`
`3`	`3`	`"name": "@modelcontextprotocol/ext-apps-basic-host",`
`4`		`- "version": "1.5.0",`
	`4`	`+ "version": "1.6.0",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"build": "tsc --noEmit && concurrently \"cross-env INPUT=index.html vite build\" \"cross-env INPUT=sandbox.html vite build\"",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@modelcontextprotocol/server-basic-preact",`
`3`		`- "version": "1.5.0",`
	`3`	`+ "version": "1.6.0",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"description": "Basic MCP App Server example using Preact",`
`6`	`6`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@modelcontextprotocol/server-cohort-heatmap",`
`3`		`- "version": "1.5.0",`
	`3`	`+ "version": "1.6.0",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"description": "Cohort heatmap MCP App Server for retention analysis",`
`6`	`6`	`"repository": {`