Merge main into dev after beta.11 release (#46)

hifi-phil · web-flow · commit c2e80ade7004 · 2026-04-10T08:19:59.000+01:00
* Release 17.0.0-beta.9 (#37)
diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
@@ -6,15 +6,15 @@
   },
   "metadata": {
     "description": "Claude Code plugins for the Umbraco MCP Toolkit - professional skills for building MCP servers, testing, and API integration",
-    "version": "17.0.0-beta.9",
+    "version": "17.0.0-beta.11",
     "homepage": "https://github.com/umbraco/Umbraco-MCP-Base"
   },
   "plugins": [
     {
       "name": "umbraco-mcp-skills",
       "source": "./plugins",
       "description": "Professional skills for building Umbraco MCP servers - tool creation, testing, API patterns, and eval testing",
-      "version": "17.0.0-beta.9",
+      "version": "17.0.0-beta.11",
       "category": "development",
       "author": {
         "name": "Phil W",
@@ -35,7 +35,7 @@
       "name": "umbraco-mcp-server",
       "source": "./plugins-server",
       "description": "Skills for CLI operation of Umbraco MCP servers - CLI setup, tool filtering, introspection, and runtime modes",
-      "version": "17.0.0-beta.9",
+      "version": "17.0.0-beta.11",
       "category": "operations",
       "author": {
         "name": "Phil W",
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -247,49 +247,51 @@ jobs:
         env:
           KEEP_E2E_ASSETS: 'true'
 
-      - name: Skill E2E (build tool + integration test)
-        if: >-
-          github.event.pull_request.base.ref == 'main' &&
-          startsWith(github.event.pull_request.head.ref, 'release/')
-        run: npm run test:e2e:skills -w packages/create-mcp-server
-        timeout-minutes: 10
-        env:
-          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-          CLAUDECODE: ''
+      # Temporarily disabled — API credit balance exhausted
+      # - name: Skill E2E (build tool + integration test)
+      #   if: >-
+      #     github.event.pull_request.base.ref == 'main' &&
+      #     startsWith(github.event.pull_request.head.ref, 'release/')
+      #   run: npm run test:e2e:skills -w packages/create-mcp-server
+      #   timeout-minutes: 10
+      #   env:
+      #     ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
+      #     CLAUDECODE: ''
 
       - name: Clean up E2E assets
         if: always()
         run: npm run test:e2e:cleanup -w packages/create-mcp-server || true
 
-  evals:
-    name: LLM Eval Tests
-    if: >-
-      github.event.pull_request.base.ref == 'main' &&
-      startsWith(github.event.pull_request.head.ref, 'release/')
-    runs-on: ubuntu-latest
-
-    env:
-      NODE_TLS_REJECT_UNAUTHORIZED: '0'
-      ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '22'
-          cache: 'npm'
-
-      - name: Install npm dependencies
-        run: npm ci
-
-      - name: Build SDK
-        run: npm run build
-
-      - name: Build template
-        run: npm run build -w template
-
-      - name: Run CLI eval tests
-        run: npm run test:cli:evals
+  # Temporarily disabled — API credit balance exhausted
+  # evals:
+  #   name: LLM Eval Tests
+  #   if: >-
+  #     github.event.pull_request.base.ref == 'main' &&
+  #     startsWith(github.event.pull_request.head.ref, 'release/')
+  #   runs-on: ubuntu-latest
+  #
+  #   env:
+  #     NODE_TLS_REJECT_UNAUTHORIZED: '0'
+  #     ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
+  #
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #
+  #     - name: Setup Node.js
+  #       uses: actions/setup-node@v4
+  #       with:
+  #         node-version: '22'
+  #         cache: 'npm'
+  #
+  #     - name: Install npm dependencies
+  #       run: npm ci
+  #
+  #     - name: Build SDK
+  #       run: npm run build
+  #
+  #     - name: Build template
+  #       run: npm run build -w template
+  #
+  #     - name: Run CLI eval tests
+  #       run: npm run test:cli:evals
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umbraco-mcp-server-sdk-monorepo",
-  "version": "17.0.0-beta.9",
+  "version": "17.0.0-beta.11",
   "private": true,
   "description": "Umbraco MCP Server SDK monorepo",
   "workspaces": [
diff --git a/packages/create-mcp-server/package.json b/packages/create-mcp-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umbraco-cms/create-umbraco-mcp-server",
-  "version": "17.0.0-beta.9",
+  "version": "17.0.0-beta.11",
   "type": "module",
   "description": "Create a new Umbraco MCP server project",
   "bin": {
diff --git a/packages/hosted-mcp/package.json b/packages/hosted-mcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umbraco-cms/mcp-hosted",
-  "version": "17.0.0-beta.9",
+  "version": "17.0.0-beta.11",
   "description": "Hosted MCP server infrastructure for Umbraco on Cloudflare Workers",
   "type": "module",
   "main": "dist/index.js",
diff --git a/packages/mcp-server-sdk/package.json b/packages/mcp-server-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umbraco-cms/mcp-server-sdk",
-  "version": "17.0.0-beta.9",
+  "version": "17.0.0-beta.11",
   "type": "module",
   "description": "Umbraco-specific MCP infrastructure and patterns for building MCP servers",
   "main": "dist/index.js",
diff --git a/packages/mcp-server-sdk/src/helpers/__tests__/cursor-pagination.test.ts b/packages/mcp-server-sdk/src/helpers/__tests__/cursor-pagination.test.ts
@@ -167,14 +167,33 @@ describe("withCursorPagination", () => {
   });
 
   describe("output schema transformation", () => {
-    it("should add nextCursor to output schema", () => {
+    it("should add nextCursor to output schema (raw shape)", () => {
       const tool = createMockTool();
       const result = withCursorPagination(tool);
 
       expect(result.outputSchema).toHaveProperty("nextCursor");
       expect(result.outputSchema).toHaveProperty("total");
       expect(result.outputSchema).toHaveProperty("items");
     });
+
+    it("should add nextCursor to output schema (ZodObject)", () => {
+      const tool = createMockTool({
+        outputSchema: z.object({
+          total: z.number(),
+          items: z.array(z.object({ id: z.string() })),
+        }),
+      });
+      const result = withCursorPagination(tool);
+
+      // Should be a ZodObject with nextCursor field
+      expect(result.outputSchema).toBeDefined();
+      const parsed = (result.outputSchema as z.ZodObject<any>).parse({
+        total: 10,
+        items: [],
+        nextCursor: "abc",
+      });
+      expect(parsed).toHaveProperty("nextCursor", "abc");
+    });
   });
 
   describe("handler", () => {
diff --git a/packages/mcp-server-sdk/src/helpers/cursor-pagination.ts b/packages/mcp-server-sdk/src/helpers/cursor-pagination.ts
@@ -13,6 +13,7 @@ import { z, type ZodRawShape, type ZodType } from "zod";
 import type { ToolDefinition } from "../types/tool-definition.js";
 import { createToolResultError } from "./tool-result.js";
 
+
 // ============================================================================
 // Cursor State
 // ============================================================================
@@ -145,7 +146,7 @@ export function withCursorPagination<
 >(
   tool: ToolDefinition<InputArgs, OutputArgs>,
   options?: CursorPaginationOptions
-): ToolDefinition<any, any> {
+): ToolDefinition<ZodRawShape, OutputArgs> {
   // Detection: only apply if inputSchema has both skip and take
   if (
     !tool.inputSchema ||
@@ -176,18 +177,28 @@ export function withCursorPagination<
   };
 
   // Build new output schema: add nextCursor
+  const nextCursorSchema = z
+    .string()
+    .nullish()
+    .describe(
+      "Cursor for the next page. Pass as the cursor parameter to fetch more results. Absent when on the last page."
+    );
+
   let newOutputSchema = tool.outputSchema;
-  if (tool.outputSchema && typeof tool.outputSchema === "object" && !("_def" in tool.outputSchema)) {
-    // It's a ZodRawShape (object shape), add nextCursor field
-    newOutputSchema = {
-      ...(tool.outputSchema as ZodRawShape),
-      nextCursor: z
-        .string()
-        .nullish()
-        .describe(
-          "Cursor for the next page. Pass as the cursor parameter to fetch more results. Absent when on the last page."
-        ),
-    } as any;
+  if (tool.outputSchema && typeof tool.outputSchema === "object") {
+    if ("_def" in tool.outputSchema) {
+      // It's a ZodType (e.g. z.object({...})) — extend it
+      const zodObj = tool.outputSchema as z.ZodObject<any>;
+      if (typeof zodObj.extend === "function") {
+        newOutputSchema = zodObj.extend({ nextCursor: nextCursorSchema }) as any;
+      }
+    } else {
+      // It's a ZodRawShape (plain object), add nextCursor field
+      newOutputSchema = {
+        ...(tool.outputSchema as ZodRawShape),
+        nextCursor: nextCursorSchema,
+      } as any;
+    }
   }
 
   return {
diff --git a/packages/mcp-server-sdk/src/helpers/index.ts b/packages/mcp-server-sdk/src/helpers/index.ts
@@ -95,6 +95,7 @@ export {
 // Chained result extraction
 export { extractChainedResult } from "./chained-result.js";
 
+
 // Cursor-based pagination
 export {
   withCursorPagination,
diff --git a/packages/mcp-server-sdk/src/testing/index.ts b/packages/mcp-server-sdk/src/testing/index.ts
@@ -28,3 +28,18 @@ export {
   setupElicitationMock,
   type ElicitationMock,
 } from "./elicitation-mock.js";
+
+/**
+ * Typed result from a cursor-paginated tool response.
+ * Cast validateToolResponse results to this when testing cursor-wrapped tools:
+ *
+ * ```typescript
+ * const data = validateToolResponse(cursorTool, result) as CursorPaginatedResult;
+ * expect(data.nextCursor).toBeDefined();
+ * ```
+ */
+export interface CursorPaginatedResult {
+  total: number;
+  items: unknown[];
+  nextCursor?: string;
+}
diff --git a/packages/mcp-server-sdk/src/testing/mock-handler.ts b/packages/mcp-server-sdk/src/testing/mock-handler.ts
@@ -104,10 +104,21 @@ export function validateErrorResult(result: CallToolResult): z.infer<typeof prob
 export function validateToolResponse<T extends z.ZodRawShape>(
   tool: { outputSchema?: T },
   result: CallToolResult
-): z.infer<z.ZodObject<T>> {
+): z.infer<z.ZodObject<T>>;
+export function validateToolResponse<T extends ZodType>(
+  tool: { outputSchema?: T },
+  result: CallToolResult
+): z.infer<T>;
+export function validateToolResponse(
+  tool: { outputSchema?: z.ZodRawShape | ZodType },
+  result: CallToolResult
+): unknown {
   if (!tool.outputSchema) {
     throw new Error("Tool does not define outputSchema - cannot validate response");
   }
-  const schema = z.object(tool.outputSchema);
+  // If outputSchema is already a ZodType (e.g. z.object({...})), use it directly
+  const schema = tool.outputSchema instanceof ZodType
+    ? tool.outputSchema
+    : z.object(tool.outputSchema);
   return schema.parse(result.structuredContent);
 }
diff --git a/plugins/.claude-plugin/plugin.json b/plugins/.claude-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
   "name": "umbraco-mcp-skills",
-  "version": "17.0.0-beta.9",
+  "version": "17.0.0-beta.11",
   "description": "Skills for building Umbraco MCP servers - tool creation, testing, API patterns, and eval testing",
   "author": {
     "name": "Phil W",
diff --git a/plugins/agents/integration-test-creator.md b/plugins/agents/integration-test-creator.md
@@ -120,13 +120,13 @@ Tools with `skip`/`take` in their input schema use cursor-based pagination at ru
 
 ```typescript
 import { withCursorPagination } from "@umbraco-cms/mcp-server-sdk";
-import { validateToolResponse } from "@umbraco-cms/mcp-server-sdk/testing";
+import { validateToolResponse, type CursorPaginatedResult } from "@umbraco-cms/mcp-server-sdk/testing";
 import listEntitiesTool from "../get/list-entities.js";
 
 it("should list entities", async () => {
   const cursorTool = withCursorPagination(listEntitiesTool);
   const result = await cursorTool.handler({}, createMockRequestHandlerExtra());
-  const data = validateToolResponse(cursorTool, result);
+  const data = validateToolResponse(cursorTool, result) as CursorPaginatedResult;
   expect(data.items.length).toBeGreaterThan(0);
 });
 ```
@@ -136,7 +136,7 @@ it("should list entities", async () => {
 - Wrap with `withCursorPagination(tool)` before calling handler
 - Pass `{}` for first page (no cursor = default page size)
 - Use `{ ...tool, pageSize: N }` to override page size
-- Use `validateToolResponse(cursorTool, result)` with the **cursor-wrapped** tool
+- Cast `validateToolResponse` results to `CursorPaginatedResult` from `@umbraco-cms/mcp-server-sdk/testing`
 - For cursor pagination test: use `nextCursor` from response to fetch page 2
 
 ## Sequential Workflow
diff --git a/plugins/package.json b/plugins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@umbraco-cms/mcp-skills",
-  "version": "17.0.0-beta.9",
+  "version": "17.0.0-beta.11",
   "private": true,
   "type": "module",
   "description": "Skills and agents for building Umbraco MCP servers",
diff --git a/plugins/skills/build-tools-tests/SKILL.md b/plugins/skills/build-tools-tests/SKILL.md
diff --git a/template/package.json b/template/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "umbraco-mcp-server-sdk-monorepo",`
`3`		`- "version": "17.0.0-beta.9",`
	`3`	`+ "version": "17.0.0-beta.11",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "Umbraco MCP Server SDK monorepo",`
`6`	`6`	`"workspaces": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@umbraco-cms/create-umbraco-mcp-server",`
`3`		`- "version": "17.0.0-beta.9",`
	`3`	`+ "version": "17.0.0-beta.11",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"description": "Create a new Umbraco MCP server project",`
`6`	`6`	`"bin": {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@umbraco-cms/mcp-hosted",`
`3`		`- "version": "17.0.0-beta.9",`
	`3`	`+ "version": "17.0.0-beta.11",`
`4`	`4`	`"description": "Hosted MCP server infrastructure for Umbraco on Cloudflare Workers",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"main": "dist/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@umbraco-cms/mcp-server-sdk",`
`3`		`- "version": "17.0.0-beta.9",`
	`3`	`+ "version": "17.0.0-beta.11",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"description": "Umbraco-specific MCP infrastructure and patterns for building MCP servers",`
`6`	`6`	`"main": "dist/index.js",`