strapi-plugin-ai-sdk 0.7.9 → 0.9.0

package/README.md

@@ -302,18 +302,52 @@ Additionally, the AI SDK automatically discovers tools from other installed plug
 
 ## MCP Server
 
-The plugin exposes an [MCP](https://modelcontextprotocol.io/) server at `/api/ai-sdk/mcp` that lets external AI clients call the public tools directly.
+The plugin exposes an [MCP](https://modelcontextprotocol.io/) server at `/api/ai-sdk/mcp` that lets external AI clients (Claude Desktop, Claude Code, Cursor, Windsurf, etc.) call the public tools directly.
 
 ### How It Works
 
+- Uses the low-level MCP `Server` class for full control over JSON Schema output, ensuring compatibility with `mcp-remote` and all MCP clients regardless of Zod version
+- Uses the [Streamable HTTP transport](https://modelcontextprotocol.io/specification/2025-03-26/basic/transports#streamable-http) (MCP 2025-03-26 spec)
 - Sessions are created on first request and identified by the `mcp-session-id` header
 - Tool names are converted from camelCase to snake_case (`listContentTypes` -> `list_content_types`)
+- Each tool includes a `title` (e.g. "Strapi: Search Content") and `annotations` (`readOnlyHint`, `destructiveHint`) for better client integration
+- All tool schemas include `additionalProperties: false` to ensure compatibility with `mcp-remote` and Claude Desktop
+- The server returns dynamic `instructions` during initialization so clients know when to load tools — plugins that provide `getMeta()` get keyword-driven entries (e.g. `/youtube`, `/octalens`), others get auto-generated summaries
 - Sessions expire after the configured timeout (default: 4 hours)
 - Maximum concurrent sessions can be configured (default: 100)
 
+### Setup
+
+#### 1. Enable permissions
+
+In the Strapi admin panel:
+
+1. Go to **Settings > API Tokens**
+2. Create a new API token (or use an existing one)
+3. Under **Permissions**, enable the **Ai-sdk** actions: `handle` (covers POST, GET, DELETE for MCP)
+4. Copy the token
+
+Alternatively, for public access without a token:
+
+1. Go to **Settings > Users & Permissions > Roles > Public**
+2. Under **Ai-sdk**, enable `handle`
+3. Save
+
+#### 2. Connect your AI client
+
+The MCP endpoint URL is:
+
+```
+http://localhost:1337/api/ai-sdk/mcp
+```
+
+For remote deployments, replace `localhost:1337` with your Strapi URL.
+
 ### Connecting from Claude Desktop
 
-Add to your Claude Desktop MCP config:
+Add to `~/Library/Application Support/Claude/claude_desktop_config.json` (macOS) or `%APPDATA%\Claude\claude_desktop_config.json` (Windows):
+
+**Without authentication (public permissions enabled):**
 
 ```json
 {
@@ -325,9 +359,53 @@ Add to your Claude Desktop MCP config:
 }
 ```
 
+**With an API token:**
+
+```json
+{
+  "mcpServers": {
+    "strapi": {
+      "command": "npx",
+      "args": [
+        "mcp-remote",
+        "http://localhost:1337/api/ai-sdk/mcp",
+        "--header",
+        "Authorization: Bearer YOUR_STRAPI_API_TOKEN"
+      ]
+    }
+  }
+}
+```
+
+Restart Claude Desktop after saving the config.
+
+### Connecting from Claude Code
+
+Add to `~/.claude/settings.json`:
+
+```json
+{
+  "mcpServers": {
+    "strapi": {
+      "command": "npx",
+      "args": [
+        "mcp-remote",
+        "http://localhost:1337/api/ai-sdk/mcp",
+        "--header",
+        "Authorization: Bearer YOUR_STRAPI_API_TOKEN"
+      ]
+    }
+  }
+}
+```
+
+Or run: `claude mcp add strapi -- npx mcp-remote http://localhost:1337/api/ai-sdk/mcp --header "Authorization: Bearer YOUR_STRAPI_API_TOKEN"`
+
 ### Connecting from Cursor
 
-Add to your Cursor MCP settings:
+Add to your Cursor MCP settings (`.cursor/mcp.json`):
+
+**Without authentication:**
 
 ```json
 {
@@ -339,6 +417,71 @@ Add to your Cursor MCP settings:
 }
 ```
 
+**With an API token:**
+
+```json
+{
+  "mcpServers": {
+    "strapi": {
+      "command": "npx",
+      "args": [
+        "mcp-remote",
+        "http://localhost:1337/api/ai-sdk/mcp",
+        "--header",
+        "Authorization: Bearer YOUR_STRAPI_API_TOKEN"
+      ]
+    }
+  }
+}
+```
+
+### Testing with cURL
+
+```bash
+# 1. Initialize a session
+curl -s -X POST http://localhost:1337/api/ai-sdk/mcp \
+  -H "Content-Type: application/json" \
+  -H "Accept: application/json, text/event-stream" \
+  -H "Authorization: Bearer YOUR_STRAPI_API_TOKEN" \
+  -d '{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"protocolVersion":"2025-03-26","capabilities":{},"clientInfo":{"name":"test","version":"1.0.0"}}}'
+
+# 2. Send initialized notification (use the mcp-session-id from step 1)
+curl -s -X POST http://localhost:1337/api/ai-sdk/mcp \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer YOUR_STRAPI_API_TOKEN" \
+  -H "mcp-session-id: SESSION_ID_FROM_STEP_1" \
+  -d '{"jsonrpc":"2.0","method":"notifications/initialized"}'
+
+# 3. List available tools
+curl -s -X POST http://localhost:1337/api/ai-sdk/mcp \
+  -H "Content-Type: application/json" \
+  -H "Accept: application/json, text/event-stream" \
+  -H "Authorization: Bearer YOUR_STRAPI_API_TOKEN" \
+  -H "mcp-session-id: SESSION_ID_FROM_STEP_1" \
+  -d '{"jsonrpc":"2.0","id":2,"method":"tools/list"}'
+
+# 4. Call a tool
+curl -s -X POST http://localhost:1337/api/ai-sdk/mcp \
+  -H "Content-Type: application/json" \
+  -H "Accept: application/json, text/event-stream" \
+  -H "Authorization: Bearer YOUR_STRAPI_API_TOKEN" \
+  -H "mcp-session-id: SESSION_ID_FROM_STEP_1" \
+  -d '{"jsonrpc":"2.0","id":3,"method":"tools/call","params":{"name":"list_content_types","arguments":{}}}'
+```
+
+### MCP Configuration
+
+```typescript
+// config/plugins.ts
+config: {
+  mcp: {
+    sessionTimeoutMs: 4 * 60 * 60 * 1000,  // 4 hours (default)
+    maxSessions: 100,                        // default
+    cleanupInterval: 100,                    // cleanup expired sessions every N requests
+  },
+}
+```
+
 ## Guardrails
 
 The plugin includes a guardrail middleware that checks all user input before it reaches the AI. It runs on every AI endpoint (`/ask`, `/ask-stream`, `/chat`, `/mcp`).
@@ -533,7 +676,7 @@ export const mySearchTool = {
 };
 ```
 
-**2. Create the `ai-tools` service:**
+**2. Create the `ai-tools` service with optional `getMeta()`:**
 
 ```typescript
 // server/src/services/ai-tools.ts
@@ -544,6 +687,19 @@ export default ({ strapi }: { strapi: Core.Strapi }) => ({
   getTools() {
     return tools;
   },
+
+  /**
+   * Optional: provide metadata so the MCP server instructions
+   * include your plugin's capabilities and trigger keywords.
+   * Without this, a summary is auto-generated from tool descriptions.
+   */
+  getMeta() {
+    return {
+      label: 'My Plugin',
+      description: 'Search and manage my plugin data with relevance ranking',
+      keywords: ['/my-plugin', 'my data', 'search my stuff'],
+    };
+  },
 });
 ```
 
@@ -575,6 +731,22 @@ interface ToolDefinition {
 }
 ```
 
+#### ToolSourceMeta Interface (optional `getMeta()`)
+
+When your plugin provides `getMeta()` on its `ai-tools` service, the MCP server instructions include your plugin's capabilities with trigger keywords. This helps Claude Desktop's "Load tools when needed" mode activate the right server for your plugin's queries.
+
+Without `getMeta()`, the AI SDK auto-generates a summary from your tool descriptions — so this is optional but recommended for better discoverability.
+
+```typescript
+interface ToolSourceMeta {
+  label: string;          // Human-readable label, e.g. "YouTube Transcripts"
+  description: string;    // One-line capability summary for MCP instructions
+  keywords?: string[];    // Trigger keywords/prefixes, e.g. ["/youtube", "/yt", "transcript"]
+}
+```
+
+Keywords that start with `/` are rendered as slash-command hints in the instructions (e.g. `/youtube or /yt — Fetch and search YouTube transcripts`). Other keywords are included as natural-language triggers.
+
 #### Canonical Architecture Pattern
 
 The recommended pattern is to define tools once in `server/src/tools/` and consume them from both the AI SDK service and MCP handlers:

package/dist/server/index.js

@@ -1,6 +1,7 @@
 "use strict";
 const anthropic = require("@ai-sdk/anthropic");
-const mcp_js = require("@modelcontextprotocol/sdk/server/mcp.js");
+const index_js = require("@modelcontextprotocol/sdk/server/index.js");
+const types_js = require("@modelcontextprotocol/sdk/types.js");
 const ai = require("ai");
 const zod = require("zod");
 const fs = require("fs");
@@ -34,7 +35,7 @@ function toSnakeCase$1(str) {
   return str.replace(/:/g, "__").replace(/-/g, "_").replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
 }
 function extractType(field) {
-  const def = field?._zod?.def;
+  const def = field?._zod?.def ?? field?.def;
   if (!def) return "unknown";
   switch (def.type) {
     case "string":
@@ -44,11 +45,11 @@ function extractType(field) {
     case "boolean":
       return "boolean";
     case "enum":
-      return Object.keys(def.entries).join(" | ");
+      return def.entries ? Object.keys(def.entries).join(" | ") : "enum";
     case "optional":
-      return extractType({ _zod: { def: def.innerType } });
+      return extractType(def.innerType);
     case "default":
-      return extractType({ _zod: { def: def.innerType } });
+      return extractType(def.innerType);
     case "record":
       return "object";
     case "array":
@@ -117,67 +118,246 @@ function generateToolGuide(registry) {
 function toSnakeCase(str) {
   return str.replace(/:/g, "__").replace(/-/g, "_").replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
 }
+function toTitle(mcpName, source) {
+  const prefix = source === "built-in" ? "Strapi" : source.replace(/_/g, "-");
+  const shortName = mcpName.replace(/^[a-z_]+__/, "").replace(/_/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
+  return `${prefix}: ${shortName}`;
+}
+function getToolSource(name) {
+  const sep = name.indexOf("__");
+  return sep === -1 ? "built-in" : name.substring(0, sep);
+}
+function summarizeTools(tools, registry) {
+  const summaries = [];
+  for (const name of tools) {
+    const def = registry.get(name);
+    if (!def) continue;
+    const first = def.description.split(/\.\s/)[0].replace(/\.$/, "");
+    summaries.push(first);
+  }
+  return summaries.join(". ") + ".";
+}
+function buildInstructions(registry) {
+  const sources = registry.getToolSources();
+  const lines = [];
+  lines.push(
+    "Strapi CMS MCP server. Use this server for ANY of the following:"
+  );
+  lines.push(
+    "- /strapi — Query, create, update, delete CMS content (articles, pages, authors, categories, media, any custom content types)"
+  );
+  for (const source of sources) {
+    if (source.id === "built-in") continue;
+    const meta = registry.getSourceMeta(source.id);
+    if (meta) {
+      const prefix = meta.keywords?.length ? meta.keywords.map((k) => k.startsWith("/") ? k : `/${k}`).join(" or ") : `/${source.id.replace(/_/g, "-")}`;
+      lines.push(`- ${prefix} — ${meta.description}`);
+    } else {
+      const label = source.id.replace(/_/g, "-");
+      const summary = summarizeTools(source.tools, registry);
+      lines.push(`- /${label} — ${summary}`);
+    }
+  }
+  lines.push(
+    "- /memory — Save and recall user facts and preferences",
+    "- /notes — Save and recall research notes, code snippets, ideas",
+    "- /tasks — Create, update, complete, and list tasks",
+    "- /email — Send emails",
+    "- /media — Upload media files to the CMS"
+  );
+  return lines.join("\n");
+}
+function zodToInputSchema(schema2) {
+  const shape = schema2.shape;
+  const properties = {};
+  const required = [];
+  for (const [key, fieldDef] of Object.entries(shape)) {
+    const prop = zodFieldToJsonSchema(fieldDef);
+    properties[key] = prop;
+    if (!isOptionalOrDefaulted(fieldDef)) {
+      required.push(key);
+    }
+  }
+  const result = {
+    type: "object",
+    properties,
+    additionalProperties: false
+  };
+  if (required.length > 0) {
+    result.required = required;
+  }
+  return result;
+}
+function isOptionalOrDefaulted(field) {
+  if (!field) return true;
+  const def = field._def;
+  if (!def) return false;
+  const typeName = def.typeName;
+  if (typeName === "ZodOptional" || typeName === "ZodDefault") return true;
+  if (def.innerType) return isOptionalOrDefaulted(def.innerType);
+  return false;
+}
+function zodFieldToJsonSchema(field) {
+  if (!field?._def) return {};
+  const def = field._def;
+  const typeName = def.typeName;
+  const prop = {};
+  if (def.description) prop.description = def.description;
+  switch (typeName) {
+    case "ZodString":
+      prop.type = "string";
+      break;
+    case "ZodNumber":
+      prop.type = "number";
+      if (def.checks) {
+        for (const check of def.checks) {
+          if (check.kind === "min") prop.minimum = check.value;
+          if (check.kind === "max") prop.maximum = check.value;
+          if (check.kind === "int") prop.type = "integer";
+        }
+      }
+      break;
+    case "ZodBoolean":
+      prop.type = "boolean";
+      break;
+    case "ZodEnum":
+      prop.type = "string";
+      prop.enum = def.values;
+      break;
+    case "ZodArray":
+      prop.type = "array";
+      if (def.type) {
+        prop.items = zodFieldToJsonSchema(def.type);
+      }
+      break;
+    case "ZodObject":
+      prop.type = "object";
+      if (field.shape) {
+        const nested = {};
+        for (const [k, v] of Object.entries(field.shape)) {
+          nested[k] = zodFieldToJsonSchema(v);
+        }
+        prop.properties = nested;
+        prop.additionalProperties = false;
+      }
+      break;
+    case "ZodOptional":
+      return { ...zodFieldToJsonSchema(def.innerType), ...def.description ? { description: def.description } : {} };
+    case "ZodDefault":
+      return {
+        ...zodFieldToJsonSchema(def.innerType),
+        default: def.defaultValue(),
+        ...def.description ? { description: def.description } : {}
+      };
+    case "ZodEffects":
+      return zodFieldToJsonSchema(def.schema);
+    case "ZodNullable":
+      return zodFieldToJsonSchema(def.innerType);
+    case "ZodUnion":
+      if (def.options?.length) {
+        return zodFieldToJsonSchema(def.options[0]);
+      }
+      break;
+    case "ZodRecord":
+      prop.type = "object";
+      break;
+  }
+  return prop;
+}
 function createMcpServer(strapi) {
   const plugin = strapi.plugin("ai-sdk");
   const registry = plugin.toolRegistry;
   if (!registry) {
     throw new Error("Tool registry not initialized");
   }
-  const server = new mcp_js.McpServer(
+  const instructions = buildInstructions(registry);
+  const server = new index_js.Server(
     {
-      name: "ai-sdk-mcp",
+      name: "strapi-ai-sdk",
       version: "1.0.0"
     },
     {
       capabilities: {
         tools: {},
         resources: {}
-      }
+      },
+      instructions
     }
   );
-  const toolNames = [];
+  const toolList = [];
+  const toolHandlers = /* @__PURE__ */ new Map();
   for (const [name, def] of registry.getPublic()) {
     const mcpName = toSnakeCase(name);
-    toolNames.push(mcpName);
-    server.registerTool(
-      mcpName,
-      {
-        description: def.description,
-        inputSchema: def.schema.shape
-      },
-      async (args) => {
-        strapi.log.debug(`[ai-sdk:mcp] Tool call: ${mcpName}`);
-        const result = await def.execute(args, strapi);
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify(result, null, 2)
-            }
-          ]
-        };
+    const source = getToolSource(name);
+    toolList.push({
+      name: mcpName,
+      title: toTitle(mcpName, source),
+      description: def.description,
+      inputSchema: zodToInputSchema(def.schema),
+      annotations: {
+        readOnlyHint: def.publicSafe ?? false,
+        destructiveHint: false
       }
-    );
+    });
+    toolHandlers.set(mcpName, def);
   }
+  server.setRequestHandler(types_js.ListToolsRequestSchema, async () => {
+    strapi.log.debug("[ai-sdk:mcp] Listing tools");
+    return { tools: toolList };
+  });
+  server.setRequestHandler(types_js.CallToolRequestSchema, async (request) => {
+    const { name, arguments: args } = request.params;
+    strapi.log.debug(`[ai-sdk:mcp] Tool call: ${name}`);
+    const def = toolHandlers.get(name);
+    if (!def) {
+      return {
+        content: [{ type: "text", text: JSON.stringify({ error: `Unknown tool: ${name}` }) }],
+        isError: true
+      };
+    }
+    try {
+      const result = await def.execute(args ?? {}, strapi);
+      return {
+        content: [{ type: "text", text: JSON.stringify(result, null, 2) }]
+      };
+    } catch (error) {
+      strapi.log.error(`[ai-sdk:mcp] Tool ${name} failed:`, {
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return {
+        content: [{ type: "text", text: JSON.stringify({ error: true, message: String(error) }) }],
+        isError: true
+      };
+    }
+  });
   const guideMarkdown = generateToolGuide(registry);
-  server.registerResource(
-    "Tool Guide",
-    "strapi://tools/guide",
-    {
-      description: "Complete guide to all available Strapi AI tools with parameters and usage examples",
-      mimeType: "text/markdown"
-    },
-    async () => ({
-      contents: [
-        {
-          uri: "strapi://tools/guide",
-          mimeType: "text/markdown",
-          text: guideMarkdown
-        }
-      ]
-    })
-  );
+  server.setRequestHandler(types_js.ListResourcesRequestSchema, async () => ({
+    resources: [
+      {
+        uri: "strapi://tools/guide",
+        name: "Tool Guide",
+        description: "Complete guide to all available Strapi AI tools with parameters and usage examples",
+        mimeType: "text/markdown"
+      }
+    ]
+  }));
+  server.setRequestHandler(types_js.ReadResourceRequestSchema, async (request) => {
+    if (request.params.uri === "strapi://tools/guide") {
+      return {
+        contents: [
+          {
+            uri: "strapi://tools/guide",
+            mimeType: "text/markdown",
+            text: guideMarkdown
+          }
+        ]
+      };
+    }
+    throw new Error(`Resource not found: ${request.params.uri}`);
+  });
+  const toolNames = toolList.map((t) => t.name);
   strapi.log.info("[ai-sdk:mcp] MCP server created with tools:", { tools: toolNames });
+  strapi.log.debug("[ai-sdk:mcp] Server instructions:", instructions);
   return server;
 }
 const DEFAULT_MODEL = "claude-sonnet-4-20250514";
@@ -280,6 +460,15 @@ class AIProvider {
 class ToolRegistry {
   constructor() {
     this.tools = /* @__PURE__ */ new Map();
+    this.sourceMeta = /* @__PURE__ */ new Map();
+  }
+  /** Register metadata for a tool source (plugin namespace) */
+  setSourceMeta(sourceId, meta) {
+    this.sourceMeta.set(sourceId, meta);
+  }
+  /** Get metadata for a tool source, if provided */
+  getSourceMeta(sourceId) {
+    return this.sourceMeta.get(sourceId);
   }
   register(def) {
     this.tools.set(def.name, def);
@@ -1492,6 +1681,13 @@ function discoverPluginTools(strapi, registry) {
       const count = registerContributedTools(strapi, registry, pluginName, contributed);
       if (count > 0) {
         strapi.log.info(`[${PLUGIN_ID$2}] Registered ${count} tools from plugin: ${pluginName}`);
+        const safeName = pluginName.replace(/[^a-zA-Z0-9_-]/g, "_");
+        if (typeof aiToolsService.getMeta === "function") {
+          const meta = aiToolsService.getMeta();
+          if (meta?.label && meta?.description) {
+            registry.setSourceMeta(safeName, meta);
+          }
+        }
       }
     } catch (err) {
       strapi.log.warn(`[${PLUGIN_ID$2}] Tool discovery failed for ${pluginName}: ${err}`);
@@ -3131,6 +3327,26 @@ function describeTools(tools) {
   return `Available tools:
 ${lines.join("\n")}`;
 }
+function trimMessages(messages, max) {
+  if (messages.length <= max) return messages;
+  const sliced = messages.slice(-max);
+  while (sliced.length > 0 && hasOrphanedToolCalls(sliced[0])) {
+    sliced.shift();
+  }
+  return sliced;
+}
+function hasOrphanedToolCalls(message) {
+  if (message.role !== "assistant") return false;
+  if (message.parts) {
+    return message.parts.some(
+      (part) => part.type === "tool-invocation"
+    );
+  }
+  if (message.toolInvocations?.length) {
+    return true;
+  }
+  return false;
+}
 const DEFAULT_PREAMBLE = `You are a Strapi CMS assistant. Use your tools to fulfill user requests. When asked to create or update content, use the appropriate tool — do not tell the user you cannot. When performing bulk operations (e.g. publish multiple items), call multiple tools in parallel in a single step rather than one at a time.
 
 For analytics and counting questions (e.g. "how many", "count", "distribution", "trends", "breakdown"), use the aggregateContent tool instead of searchContent — it is faster and purpose-built for these queries. Present analytics results as markdown tables. After showing analytics results, suggest 2-3 follow-up questions the user might find useful under a "**You might also want to know:**" heading.
@@ -3194,7 +3410,7 @@ const service = ({ strapi }) => {
       const maxMessages = config2?.maxConversationMessages ?? DEFAULT_MAX_CONVERSATION_MESSAGES;
       const maxOutputTokens = config2?.maxOutputTokens ?? DEFAULT_MAX_OUTPUT_TOKENS;
       const maxSteps = config2?.maxSteps ?? DEFAULT_MAX_STEPS;
-      const trimmedMessages = messages.length > maxMessages ? messages.slice(-maxMessages) : messages;
+      const trimmedMessages = trimMessages(messages, maxMessages);
       const modelMessages = await ai.convertToModelMessages(trimmedMessages);
       const tools = createTools(strapi, { adminUserId: options2?.adminUserId, enabledToolSources: options2?.enabledToolSources });
       const toolsDescription = describeTools(tools);
@@ -3239,7 +3455,7 @@ ${lines.join("\n")}`;
       const publicModel = publicConfig?.chatModel ?? DEFAULT_PUBLIC_CHAT_MODEL;
       const allowedContentTypes = publicConfig?.allowedContentTypes ?? [];
       const publicToolSources = publicConfig?.publicToolSources;
-      const trimmedMessages = messages.length > maxMessages ? messages.slice(-maxMessages) : messages;
+      const trimmedMessages = trimMessages(messages, maxMessages);
       const modelMessages = await ai.convertToModelMessages(trimmedMessages);
       const tools = createPublicTools(strapi, allowedContentTypes, publicToolSources);
       const toolsDescription = describeTools(tools);

package/dist/server/index.mjs

@@ -1,5 +1,6 @@
 import { createAnthropic } from "@ai-sdk/anthropic";
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { Server } from "@modelcontextprotocol/sdk/server/index.js";
+import { ListToolsRequestSchema, CallToolRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 import { generateText, streamText, tool, zodSchema, convertToModelMessages, stepCountIs } from "ai";
 import { z } from "zod";
 import { mkdtempSync, writeFileSync, unlinkSync, rmdirSync } from "fs";
@@ -14,7 +15,7 @@ function toSnakeCase$1(str) {
   return str.replace(/:/g, "__").replace(/-/g, "_").replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
 }
 function extractType(field) {
-  const def = field?._zod?.def;
+  const def = field?._zod?.def ?? field?.def;
   if (!def) return "unknown";
   switch (def.type) {
     case "string":
@@ -24,11 +25,11 @@ function extractType(field) {
     case "boolean":
       return "boolean";
     case "enum":
-      return Object.keys(def.entries).join(" | ");
+      return def.entries ? Object.keys(def.entries).join(" | ") : "enum";
     case "optional":
-      return extractType({ _zod: { def: def.innerType } });
+      return extractType(def.innerType);
     case "default":
-      return extractType({ _zod: { def: def.innerType } });
+      return extractType(def.innerType);
     case "record":
       return "object";
     case "array":
@@ -97,67 +98,246 @@ function generateToolGuide(registry) {
 function toSnakeCase(str) {
   return str.replace(/:/g, "__").replace(/-/g, "_").replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
 }
+function toTitle(mcpName, source) {
+  const prefix = source === "built-in" ? "Strapi" : source.replace(/_/g, "-");
+  const shortName = mcpName.replace(/^[a-z_]+__/, "").replace(/_/g, " ").replace(/\b\w/g, (c) => c.toUpperCase());
+  return `${prefix}: ${shortName}`;
+}
+function getToolSource(name) {
+  const sep = name.indexOf("__");
+  return sep === -1 ? "built-in" : name.substring(0, sep);
+}
+function summarizeTools(tools, registry) {
+  const summaries = [];
+  for (const name of tools) {
+    const def = registry.get(name);
+    if (!def) continue;
+    const first = def.description.split(/\.\s/)[0].replace(/\.$/, "");
+    summaries.push(first);
+  }
+  return summaries.join(". ") + ".";
+}
+function buildInstructions(registry) {
+  const sources = registry.getToolSources();
+  const lines = [];
+  lines.push(
+    "Strapi CMS MCP server. Use this server for ANY of the following:"
+  );
+  lines.push(
+    "- /strapi — Query, create, update, delete CMS content (articles, pages, authors, categories, media, any custom content types)"
+  );
+  for (const source of sources) {
+    if (source.id === "built-in") continue;
+    const meta = registry.getSourceMeta(source.id);
+    if (meta) {
+      const prefix = meta.keywords?.length ? meta.keywords.map((k) => k.startsWith("/") ? k : `/${k}`).join(" or ") : `/${source.id.replace(/_/g, "-")}`;
+      lines.push(`- ${prefix} — ${meta.description}`);
+    } else {
+      const label = source.id.replace(/_/g, "-");
+      const summary = summarizeTools(source.tools, registry);
+      lines.push(`- /${label} — ${summary}`);
+    }
+  }
+  lines.push(
+    "- /memory — Save and recall user facts and preferences",
+    "- /notes — Save and recall research notes, code snippets, ideas",
+    "- /tasks — Create, update, complete, and list tasks",
+    "- /email — Send emails",
+    "- /media — Upload media files to the CMS"
+  );
+  return lines.join("\n");
+}
+function zodToInputSchema(schema2) {
+  const shape = schema2.shape;
+  const properties = {};
+  const required = [];
+  for (const [key, fieldDef] of Object.entries(shape)) {
+    const prop = zodFieldToJsonSchema(fieldDef);
+    properties[key] = prop;
+    if (!isOptionalOrDefaulted(fieldDef)) {
+      required.push(key);
+    }
+  }
+  const result = {
+    type: "object",
+    properties,
+    additionalProperties: false
+  };
+  if (required.length > 0) {
+    result.required = required;
+  }
+  return result;
+}
+function isOptionalOrDefaulted(field) {
+  if (!field) return true;
+  const def = field._def;
+  if (!def) return false;
+  const typeName = def.typeName;
+  if (typeName === "ZodOptional" || typeName === "ZodDefault") return true;
+  if (def.innerType) return isOptionalOrDefaulted(def.innerType);
+  return false;
+}
+function zodFieldToJsonSchema(field) {
+  if (!field?._def) return {};
+  const def = field._def;
+  const typeName = def.typeName;
+  const prop = {};
+  if (def.description) prop.description = def.description;
+  switch (typeName) {
+    case "ZodString":
+      prop.type = "string";
+      break;
+    case "ZodNumber":
+      prop.type = "number";
+      if (def.checks) {
+        for (const check of def.checks) {
+          if (check.kind === "min") prop.minimum = check.value;
+          if (check.kind === "max") prop.maximum = check.value;
+          if (check.kind === "int") prop.type = "integer";
+        }
+      }
+      break;
+    case "ZodBoolean":
+      prop.type = "boolean";
+      break;
+    case "ZodEnum":
+      prop.type = "string";
+      prop.enum = def.values;
+      break;
+    case "ZodArray":
+      prop.type = "array";
+      if (def.type) {
+        prop.items = zodFieldToJsonSchema(def.type);
+      }
+      break;
+    case "ZodObject":
+      prop.type = "object";
+      if (field.shape) {
+        const nested = {};
+        for (const [k, v] of Object.entries(field.shape)) {
+          nested[k] = zodFieldToJsonSchema(v);
+        }
+        prop.properties = nested;
+        prop.additionalProperties = false;
+      }
+      break;
+    case "ZodOptional":
+      return { ...zodFieldToJsonSchema(def.innerType), ...def.description ? { description: def.description } : {} };
+    case "ZodDefault":
+      return {
+        ...zodFieldToJsonSchema(def.innerType),
+        default: def.defaultValue(),
+        ...def.description ? { description: def.description } : {}
+      };
+    case "ZodEffects":
+      return zodFieldToJsonSchema(def.schema);
+    case "ZodNullable":
+      return zodFieldToJsonSchema(def.innerType);
+    case "ZodUnion":
+      if (def.options?.length) {
+        return zodFieldToJsonSchema(def.options[0]);
+      }
+      break;
+    case "ZodRecord":
+      prop.type = "object";
+      break;
+  }
+  return prop;
+}
 function createMcpServer(strapi) {
   const plugin = strapi.plugin("ai-sdk");
   const registry = plugin.toolRegistry;
   if (!registry) {
     throw new Error("Tool registry not initialized");
   }
-  const server = new McpServer(
+  const instructions = buildInstructions(registry);
+  const server = new Server(
     {
-      name: "ai-sdk-mcp",
+      name: "strapi-ai-sdk",
       version: "1.0.0"
     },
     {
       capabilities: {
         tools: {},
         resources: {}
-      }
+      },
+      instructions
     }
   );
-  const toolNames = [];
+  const toolList = [];
+  const toolHandlers = /* @__PURE__ */ new Map();
   for (const [name, def] of registry.getPublic()) {
     const mcpName = toSnakeCase(name);
-    toolNames.push(mcpName);
-    server.registerTool(
-      mcpName,
-      {
-        description: def.description,
-        inputSchema: def.schema.shape
-      },
-      async (args) => {
-        strapi.log.debug(`[ai-sdk:mcp] Tool call: ${mcpName}`);
-        const result = await def.execute(args, strapi);
-        return {
-          content: [
-            {
-              type: "text",
-              text: JSON.stringify(result, null, 2)
-            }
-          ]
-        };
+    const source = getToolSource(name);
+    toolList.push({
+      name: mcpName,
+      title: toTitle(mcpName, source),
+      description: def.description,
+      inputSchema: zodToInputSchema(def.schema),
+      annotations: {
+        readOnlyHint: def.publicSafe ?? false,
+        destructiveHint: false
       }
-    );
+    });
+    toolHandlers.set(mcpName, def);
   }
+  server.setRequestHandler(ListToolsRequestSchema, async () => {
+    strapi.log.debug("[ai-sdk:mcp] Listing tools");
+    return { tools: toolList };
+  });
+  server.setRequestHandler(CallToolRequestSchema, async (request) => {
+    const { name, arguments: args } = request.params;
+    strapi.log.debug(`[ai-sdk:mcp] Tool call: ${name}`);
+    const def = toolHandlers.get(name);
+    if (!def) {
+      return {
+        content: [{ type: "text", text: JSON.stringify({ error: `Unknown tool: ${name}` }) }],
+        isError: true
+      };
+    }
+    try {
+      const result = await def.execute(args ?? {}, strapi);
+      return {
+        content: [{ type: "text", text: JSON.stringify(result, null, 2) }]
+      };
+    } catch (error) {
+      strapi.log.error(`[ai-sdk:mcp] Tool ${name} failed:`, {
+        error: error instanceof Error ? error.message : String(error)
+      });
+      return {
+        content: [{ type: "text", text: JSON.stringify({ error: true, message: String(error) }) }],
+        isError: true
+      };
+    }
+  });
   const guideMarkdown = generateToolGuide(registry);
-  server.registerResource(
-    "Tool Guide",
-    "strapi://tools/guide",
-    {
-      description: "Complete guide to all available Strapi AI tools with parameters and usage examples",
-      mimeType: "text/markdown"
-    },
-    async () => ({
-      contents: [
-        {
-          uri: "strapi://tools/guide",
-          mimeType: "text/markdown",
-          text: guideMarkdown
-        }
-      ]
-    })
-  );
+  server.setRequestHandler(ListResourcesRequestSchema, async () => ({
+    resources: [
+      {
+        uri: "strapi://tools/guide",
+        name: "Tool Guide",
+        description: "Complete guide to all available Strapi AI tools with parameters and usage examples",
+        mimeType: "text/markdown"
+      }
+    ]
+  }));
+  server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
+    if (request.params.uri === "strapi://tools/guide") {
+      return {
+        contents: [
+          {
+            uri: "strapi://tools/guide",
+            mimeType: "text/markdown",
+            text: guideMarkdown
+          }
+        ]
+      };
+    }
+    throw new Error(`Resource not found: ${request.params.uri}`);
+  });
+  const toolNames = toolList.map((t) => t.name);
   strapi.log.info("[ai-sdk:mcp] MCP server created with tools:", { tools: toolNames });
+  strapi.log.debug("[ai-sdk:mcp] Server instructions:", instructions);
   return server;
 }
 const DEFAULT_MODEL = "claude-sonnet-4-20250514";
@@ -260,6 +440,15 @@ class AIProvider {
 class ToolRegistry {
   constructor() {
     this.tools = /* @__PURE__ */ new Map();
+    this.sourceMeta = /* @__PURE__ */ new Map();
+  }
+  /** Register metadata for a tool source (plugin namespace) */
+  setSourceMeta(sourceId, meta) {
+    this.sourceMeta.set(sourceId, meta);
+  }
+  /** Get metadata for a tool source, if provided */
+  getSourceMeta(sourceId) {
+    return this.sourceMeta.get(sourceId);
   }
   register(def) {
     this.tools.set(def.name, def);
@@ -1472,6 +1661,13 @@ function discoverPluginTools(strapi, registry) {
       const count = registerContributedTools(strapi, registry, pluginName, contributed);
       if (count > 0) {
         strapi.log.info(`[${PLUGIN_ID$2}] Registered ${count} tools from plugin: ${pluginName}`);
+        const safeName = pluginName.replace(/[^a-zA-Z0-9_-]/g, "_");
+        if (typeof aiToolsService.getMeta === "function") {
+          const meta = aiToolsService.getMeta();
+          if (meta?.label && meta?.description) {
+            registry.setSourceMeta(safeName, meta);
+          }
+        }
       }
     } catch (err) {
       strapi.log.warn(`[${PLUGIN_ID$2}] Tool discovery failed for ${pluginName}: ${err}`);
@@ -3111,6 +3307,26 @@ function describeTools(tools) {
   return `Available tools:
 ${lines.join("\n")}`;
 }
+function trimMessages(messages, max) {
+  if (messages.length <= max) return messages;
+  const sliced = messages.slice(-max);
+  while (sliced.length > 0 && hasOrphanedToolCalls(sliced[0])) {
+    sliced.shift();
+  }
+  return sliced;
+}
+function hasOrphanedToolCalls(message) {
+  if (message.role !== "assistant") return false;
+  if (message.parts) {
+    return message.parts.some(
+      (part) => part.type === "tool-invocation"
+    );
+  }
+  if (message.toolInvocations?.length) {
+    return true;
+  }
+  return false;
+}
 const DEFAULT_PREAMBLE = `You are a Strapi CMS assistant. Use your tools to fulfill user requests. When asked to create or update content, use the appropriate tool — do not tell the user you cannot. When performing bulk operations (e.g. publish multiple items), call multiple tools in parallel in a single step rather than one at a time.
 
 For analytics and counting questions (e.g. "how many", "count", "distribution", "trends", "breakdown"), use the aggregateContent tool instead of searchContent — it is faster and purpose-built for these queries. Present analytics results as markdown tables. After showing analytics results, suggest 2-3 follow-up questions the user might find useful under a "**You might also want to know:**" heading.
@@ -3174,7 +3390,7 @@ const service = ({ strapi }) => {
       const maxMessages = config2?.maxConversationMessages ?? DEFAULT_MAX_CONVERSATION_MESSAGES;
       const maxOutputTokens = config2?.maxOutputTokens ?? DEFAULT_MAX_OUTPUT_TOKENS;
       const maxSteps = config2?.maxSteps ?? DEFAULT_MAX_STEPS;
-      const trimmedMessages = messages.length > maxMessages ? messages.slice(-maxMessages) : messages;
+      const trimmedMessages = trimMessages(messages, maxMessages);
       const modelMessages = await convertToModelMessages(trimmedMessages);
       const tools = createTools(strapi, { adminUserId: options2?.adminUserId, enabledToolSources: options2?.enabledToolSources });
       const toolsDescription = describeTools(tools);
@@ -3219,7 +3435,7 @@ ${lines.join("\n")}`;
       const publicModel = publicConfig?.chatModel ?? DEFAULT_PUBLIC_CHAT_MODEL;
       const allowedContentTypes = publicConfig?.allowedContentTypes ?? [];
       const publicToolSources = publicConfig?.publicToolSources;
-      const trimmedMessages = messages.length > maxMessages ? messages.slice(-maxMessages) : messages;
+      const trimmedMessages = trimMessages(messages, maxMessages);
       const modelMessages = await convertToModelMessages(trimmedMessages);
       const tools = createPublicTools(strapi, allowedContentTypes, publicToolSources);
       const toolsDescription = describeTools(tools);

package/dist/server/src/lib/tool-registry.d.ts

@@ -16,8 +16,22 @@ export interface ToolDefinition {
 }
 /** Type alias for external plugin authors to import when contributing tools */
 export type AiToolContribution = ToolDefinition;
+/** Metadata a plugin can optionally provide to describe its tool source */
+export interface ToolSourceMeta {
+    /** Short human-readable label, e.g. "YouTube Transcripts" */
+    label: string;
+    /** One-line capability summary for MCP instructions */
+    description: string;
+    /** Trigger keywords/prefixes users might type, e.g. ["/youtube", "/yt", "transcript"] */
+    keywords?: string[];
+}
 export declare class ToolRegistry {
     private readonly tools;
+    private readonly sourceMeta;
+    /** Register metadata for a tool source (plugin namespace) */
+    setSourceMeta(sourceId: string, meta: ToolSourceMeta): void;
+    /** Get metadata for a tool source, if provided */
+    getSourceMeta(sourceId: string): ToolSourceMeta | undefined;
     register(def: ToolDefinition): void;
     unregister(name: string): boolean;
     get(name: string): ToolDefinition | undefined;

package/dist/server/src/lib/trim-messages.d.ts

@@ -0,0 +1,11 @@
+import type { UIMessage } from 'ai';
+/**
+ * Trim messages to a max count while keeping tool call/result pairs intact.
+ *
+ * When slicing from the end, the first remaining message might be an assistant
+ * message with tool invocations whose results lived in earlier (now-dropped)
+ * messages. The AI SDK throws MissingToolResultsError if it encounters an
+ * unmatched tool call. This function drops leading assistant messages that
+ * contain tool invocations to prevent that.
+ */
+export declare function trimMessages(messages: UIMessage[], max: number): UIMessage[];

package/dist/server/src/lib/types.d.ts

@@ -1,5 +1,5 @@
 import type { ModelMessage, ToolSet, StopCondition } from 'ai';
-import type { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import type { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import type { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import type { AIProvider } from './ai-provider';
 import type { ToolRegistry } from './tool-registry';
@@ -72,14 +72,14 @@ export interface StreamTextResult {
 }
 export declare function isPromptInput(input: GenerateInput): input is PromptInput;
 export interface MCPSession {
-    server: McpServer;
+    server: Server;
     transport: StreamableHTTPServerTransport;
     createdAt: number;
 }
 export interface PluginInstance {
     aiProvider?: AIProvider;
     toolRegistry?: ToolRegistry;
-    createMcpServer?: (() => McpServer) | null;
+    createMcpServer?: (() => Server) | null;
     mcpSessions?: Map<string, MCPSession> | null;
 }
 export {};

package/dist/server/src/mcp/server.d.ts

@@ -1,7 +1,11 @@
 import type { Core } from '@strapi/strapi';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 /**
  * Create an MCP server instance configured with public tools from the registry.
  * Internal tools are excluded.
+ *
+ * Uses the low-level Server class (not McpServer) for full control over
+ * the JSON Schema output, ensuring compatibility with mcp-remote and
+ * Claude Desktop regardless of Zod version.
  */
-export declare function createMcpServer(strapi: Core.Strapi): McpServer;
+export declare function createMcpServer(strapi: Core.Strapi): Server;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.7.9",
+  "version": "0.9.0",
   "keywords": [
     "strapi",
     "strapi-plugin",