@lalalic/markcut 3.2.9 → 3.2.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lalalic/markcut",
-  "version": "3.2.9",
+  "version": "3.2.11",
   "description": "Markdown-to-video engine. Describe scenes in markdown, get a rendered video.",
   "bin": {
     "markcut": "bin/markcut"
@@ -38,7 +38,8 @@
   },
   "dependencies": {
     "@babel/standalone": "^8.0.3",
-    "@modelcontextprotocol/sdk": "^1.32.1",
+    "@modelcontextprotocol/ext-apps": "^2.0.3",
+    "@modelcontextprotocol/server": "^2.3.1",
     "@remotion/cli": "4.0.469",
     "@remotion/media-parser": "4.0.469",
     "@remotion/media-utils": "4.0.469",

package/src/mcp/bridge.mjs

@@ -8,7 +8,7 @@ function rpcRequest(method,params){const id=++nextRequestId;send({jsonrpc:'2.0',
 function applyToolResult(params){const result=params?.result||params||{},data=result.structuredContent||result.structured_content||{};if(typeof data.path==='string')pathLabel.textContent=data.path;if(typeof data.markdown==='string'){article.innerHTML=data.markdown.split(/\\r?\\n/).map(line=>{const escaped=line.replace(/[&<>"']/g,c=>({'&':'&amp;','<':'&lt;','>':'&gt;','"':'&quot;',"'":'&#39;'}[c]));if(line.startsWith('### '))return '<h3>'+escaped.slice(4)+'</h3>';if(line.startsWith('## '))return '<h2>'+escaped.slice(3)+'</h2>';if(line.startsWith('# '))return '<h1>'+escaped.slice(2)+'</h1>';if(line.startsWith('- '))return '<li>'+escaped.slice(2)+'</li>';return line.trim()?'<p>'+escaped+'</p>':''}).join('\\n');}}
 window.addEventListener('message',event=>{if(event.source!==window.parent)return;const message=event.data;if(!message||typeof message!=='object'||message.jsonrpc!=='2.0')return;if(Object.prototype.hasOwnProperty.call(message,'id')&&pendingRequests.has(message.id)){const pending=pendingRequests.get(message.id);pendingRequests.delete(message.id);if(message.error)pending.reject(new Error(message.error.message||'MCP request failed'));else pending.resolve(message.result);return;}if(message.method==='ui/notifications/tool-result')applyToolResult(message.params);});
 async function initializeBridge(){try{await rpcRequest('ui/initialize',{appInfo:{name:'Markcut Preview',version:'1.0.0'},appCapabilities:{},protocolVersion:'2026-01-26'});send({jsonrpc:'2.0',method:'ui/notifications/initialized'});status.textContent='Ready for review.';}catch(error){status.textContent=error.message||'MCP initialization failed.';}}
-async function submit(decision){const value=feedback.value.trim();if(decision==='changes_requested'&&!value){status.textContent='Feedback is required.';feedback.focus();return;}const result={decision};if(value&&decision==='changes_requested')result.feedback=value;status.textContent='Submitting...';try{await rpcRequest('tools/call',{name:'${submitToolName}',arguments:result});send({jsonrpc:'2.0',method:'ui/message',params:{role:'user',content:[{type:'text',text:JSON.stringify(result)}]}});status.textContent=decision==='approved'?'Approved.':'Changes requested.';}catch(error){status.textContent=error.message||'Unable to submit review.';}}
+async function submit(decision){const value=feedback.value.trim();if(decision==='changes_requested'&&!value){status.textContent='Feedback is required.';feedback.focus();return;}const result={decision};if(value&&decision==='changes_requested')result.feedback=value;status.textContent='Submitting...';try{await rpcRequest('tools/call',{name:'${submitToolName}',arguments:result});await rpcRequest('ui/message',{role:'user',content:[{type:'text',text:JSON.stringify(result)}]});status.textContent=decision==='approved'?'Approved.':'Changes requested.';}catch(error){status.textContent=error.message||'Unable to submit review.';}}
 initializeBridge();
 document.getElementById('approve').onclick=()=>submit('approved');document.getElementById('changes').onclick=()=>submit('changes_requested');
 `;

package/src/mcp/preview.mjs

@@ -4,7 +4,7 @@ import { buildPreviewBridgeScript } from "./bridge.mjs";
 
 export const TOOL_NAME = "markcut.preview";
 export const SUBMIT_TOOL_NAME = "markcut.preview.submit";
-export const RESOURCE_URI = "ui://markcut/markdown-preview.html";
+export const RESOURCE_URI = "ui://markcut/markdown-preview-v2.html";
 
 export function validateMarkdownPath(value) {
   if (typeof value !== "string" || !isAbsolute(value)) {

package/src/mcp/server.mjs

@@ -1,71 +1,100 @@
 #!/usr/bin/env node
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import {
-  CallToolRequestSchema, ListResourcesRequestSchema, ListToolsRequestSchema,
-  ReadResourceRequestSchema,
-} from "@modelcontextprotocol/sdk/types.js";
+import { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
+import { registerAppResource, registerAppTool, RESOURCE_MIME_TYPE } from "@modelcontextprotocol/ext-apps/server";
+import { z } from "zod";
 import {
   TOOL_NAME, SUBMIT_TOOL_NAME, RESOURCE_URI, buildPreviewHtml, readMarkdownPreview, reviewResult,
 } from "./preview.mjs";
 
-const server = new Server(
-  { name: "markcut", version: "3.2.0" },
-  { capabilities: { tools: {}, resources: {} } },
-);
+const server = new McpServer({ name: "markcut", version: "3.2.0" });
 
-server.setRequestHandler(ListToolsRequestSchema, async () => ({
-  tools: [{
-    name: TOOL_NAME,
+registerAppTool(
+  server,
+  TOOL_NAME,
+  {
     description: "Ask a human to review a Markdown file and return an approval or requested changes.",
-    inputSchema: {
-      type: "object", properties: { path: { type: "string", description: "Absolute path to a .md file" } },
-      required: ["path"], additionalProperties: false,
+    inputSchema: z.object({
+      path: z.string().describe("Absolute path to a .md file"),
+    }),
+    _meta: {
+      ui: { resourceUri: RESOURCE_URI },
     },
-    _meta: { "ui/resourceUri": RESOURCE_URI, ui: { resourceUri: RESOURCE_URI } },
-  }, {
-    name: SUBMIT_TOOL_NAME,
+  },
+  async ({ path }) => {
+    try {
+      const preview = await readMarkdownPreview(path);
+      return {
+        content: [{ type: "text", text: `Markdown ready for review: ${preview.path}` }],
+        structuredContent: { ...preview, resourceUri: RESOURCE_URI },
+        _meta: {
+          ui: { resourceUri: RESOURCE_URI, props: preview },
+          "ui/resourceUri": RESOURCE_URI,
+        },
+      };
+    } catch (error) {
+      return {
+        isError: true,
+        content: [{ type: "text", text: error instanceof Error ? error.message : String(error) }],
+      };
+    }
+  },
+);
+
+registerAppTool(
+  server,
+  SUBMIT_TOOL_NAME,
+  {
     description: "Submit the review decision from the Markdown preview UI.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        decision: { type: "string", enum: ["approved", "changes_requested"] },
-        feedback: { type: "string" },
-      },
-      required: ["decision"], additionalProperties: false,
+    inputSchema: z.object({
+      decision: z.enum(["approved", "changes_requested"]),
+      feedback: z.string().optional(),
+    }),
+    _meta: {
+      ui: { visibility: ["app"] },
     },
-    _meta: { ui: { visibility: ["app"] } },
-  }],
-}));
-
-server.setRequestHandler(ListResourcesRequestSchema, async () => ({
-  resources: [{ uri: RESOURCE_URI, name: "MarkCut Markdown review", mimeType: "text/html;profile=mcp-app" }],
-}));
-
-server.setRequestHandler(ReadResourceRequestSchema, async (request) => ({
-  contents: [{ uri: RESOURCE_URI, mimeType: "text/html;profile=mcp-app", text: buildPreviewHtml({ path: "", markdown: "" }) }],
-}));
-
-server.setRequestHandler(CallToolRequestSchema, async (request) => {
-  try {
-    const input = request.params.arguments ?? {};
-    if (request.params.name === SUBMIT_TOOL_NAME) {
-      const decision = reviewResult(input.decision, input.feedback);
-      return { content: [{ type: "text", text: JSON.stringify(decision) }], structuredContent: decision };
+  },
+  async ({ decision, feedback }) => {
+    try {
+      const result = reviewResult(decision, feedback);
+      return {
+        content: [{ type: "text", text: JSON.stringify(result) }],
+        structuredContent: result,
+      };
+    } catch (error) {
+      return {
+        isError: true,
+        content: [{ type: "text", text: error instanceof Error ? error.message : String(error) }],
+      };
     }
-    if (request.params.name !== TOOL_NAME) throw new Error(`unknown tool: ${request.params.name}`);
-    const { path, markdown } = await readMarkdownPreview(input.path);
-    return {
-      content: [{ type: "text", text: `Markdown ready for review: ${path}` }],
-      structuredContent: { path, markdown, resourceUri: RESOURCE_URI },
+  },
+);
+
+registerAppResource(
+  server,
+  "MarkCut Markdown review",
+  RESOURCE_URI,
+  {
+    _meta: {
+      ui: {
+        prefersBorder: true,
+        csp: { connectDomains: [], resourceDomains: [] },
+      },
+    },
+  },
+  async () => ({
+    contents: [{
+      uri: RESOURCE_URI,
+      mimeType: RESOURCE_MIME_TYPE,
+      text: buildPreviewHtml({ path: "", markdown: "" }),
       _meta: {
-        "ui/resourceUri": RESOURCE_URI,
-        ui: { resourceUri: RESOURCE_URI, props: { path, markdown } },
+        ui: {
+          prefersBorder: true,
+          csp: { connectDomains: [], resourceDomains: [] },
+        },
       },
-    };
-  } catch (error) {
-    return { isError: true, content: [{ type: "text", text: error instanceof Error ? error.message : String(error) }] };
-  }
-});
+    }],
+  }),
+);
 
 await server.connect(new StdioServerTransport());

package/tests/mcp-preview.test.ts

@@ -82,7 +82,7 @@ describe("MarkCut MCP Markdown preview", () => {
     harness.respond({ id: 2, result: { structuredContent: { decision: "approved" } } });
     await tick();
     expect(harness.messages[3]).toMatchObject({ method: "ui/message" });
-    expect(new Set(harness.messages.filter((message) => "id" in message).map((message) => message.id)).size).toBe(2);
+    expect(new Set(harness.messages.filter((message) => "id" in message).map((message) => message.id)).size).toBe(3);
   });
 
   it("surfaces submit errors without sending a decision message and rejects invalid bridge messages", async () => {