@lalalic/markcut 3.2.10 → 3.2.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lalalic/markcut",
-  "version": "3.2.10",
+  "version": "3.2.12",
   "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/preview.mjs

@@ -5,6 +5,25 @@ 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-v2.html";
+export const RESOURCE_MIME_TYPE = "text/html;profile=mcp-app";
+
+export function buildPreviewResourceResult() {
+  return {
+    ttlMs: 0,
+    cacheScope: "private",
+    contents: [{
+      uri: RESOURCE_URI,
+      mimeType: RESOURCE_MIME_TYPE,
+      text: buildPreviewHtml({ path: "", markdown: "" }),
+      _meta: {
+        ui: {
+          prefersBorder: true,
+          csp: { connectDomains: [], resourceDomains: [] },
+        },
+      },
+    }],
+  };
+}
 
 export function validateMarkdownPath(value) {
   if (typeof value !== "string" || !isAbsolute(value)) {

package/src/mcp/server.mjs

@@ -1,81 +1,88 @@
 #!/usr/bin/env node
-import { Server } from "@modelcontextprotocol/sdk/server/index.js";
-import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { McpServer } from "@modelcontextprotocol/server";
+import { StdioServerTransport } from "@modelcontextprotocol/server/stdio";
+import { registerAppResource, registerAppTool } from "@modelcontextprotocol/ext-apps/server";
+import { z } from "zod";
 import {
-  CallToolRequestSchema, ListResourcesRequestSchema, ListToolsRequestSchema,
-  ReadResourceRequestSchema,
-} from "@modelcontextprotocol/sdk/types.js";
-import {
-  TOOL_NAME, SUBMIT_TOOL_NAME, RESOURCE_URI, buildPreviewHtml, readMarkdownPreview, reviewResult,
+  TOOL_NAME, SUBMIT_TOOL_NAME, RESOURCE_URI, buildPreviewResourceResult, 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",
-    _meta: { ui: { prefersBorder: true, csp: { connectDomains: [], resourceDomains: [] } } },
-  }],
-}));
-
-server.setRequestHandler(ReadResourceRequestSchema, async (request) => ({
-  contents: [{
-    uri: RESOURCE_URI,
-    mimeType: "text/html;profile=mcp-app",
-    text: buildPreviewHtml({ path: "", markdown: "" }),
-    _meta: { ui: { prefersBorder: true, csp: { connectDomains: [], resourceDomains: [] } } },
-  }],
-}));
-
-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 },
-      _meta: {
-        "ui/resourceUri": RESOURCE_URI,
-        ui: { resourceUri: RESOURCE_URI, props: { path, markdown } },
+  },
+);
+
+registerAppResource(
+  server,
+  "MarkCut Markdown review",
+  RESOURCE_URI,
+  {
+    _meta: {
+      ui: {
+        prefersBorder: true,
+        csp: { connectDomains: [], resourceDomains: [] },
       },
-    };
-  } catch (error) {
-    return { isError: true, content: [{ type: "text", text: error instanceof Error ? error.message : String(error) }] };
-  }
-});
+    },
+  },
+  async () => buildPreviewResourceResult(),
+);
 
 await server.connect(new StdioServerTransport());

package/tests/mcp-preview.test.ts

@@ -3,7 +3,16 @@ import { mkdtempSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { tmpdir } from "node:os";
 import vm from "node:vm";
-import { buildPreviewHtml, readMarkdownPreview, reviewMessage, reviewResult, validateMarkdownPath } from "../src/mcp/preview.mjs";
+import {
+  buildPreviewHtml,
+  buildPreviewResourceResult,
+  readMarkdownPreview,
+  RESOURCE_MIME_TYPE,
+  RESOURCE_URI,
+  reviewMessage,
+  reviewResult,
+  validateMarkdownPath,
+} from "../src/mcp/preview.mjs";
 import { buildPreviewBridgeScript } from "../src/mcp/bridge.mjs";
 
 describe("MarkCut MCP Markdown preview", () => {
@@ -29,6 +38,19 @@ describe("MarkCut MCP Markdown preview", () => {
     expect(html).toContain("review.md");
   });
 
+  it("returns Codex-compatible private no-cache resource metadata", () => {
+    const result = buildPreviewResourceResult();
+    expect(result.ttlMs).toBe(0);
+    expect(result.cacheScope).toBe("private");
+    expect(result.contents).toHaveLength(1);
+    expect(result.contents[0]).toMatchObject({
+      uri: RESOURCE_URI,
+      mimeType: RESOURCE_MIME_TYPE,
+    });
+    expect(result.contents[0].text).toContain("ui/initialize");
+    expect(result.contents[0].text).toContain("ui/notifications/initialized");
+  });
+
   it("returns approved", () => {
     expect(reviewResult("approved")).toEqual({ decision: "approved" });
   });