Skip to content

Merge main into dev after 17.0.0-beta.12 release#51

Merged
hifi-phil merged 5 commits intodevfrom
chore/merge-main-to-dev-beta12
Apr 21, 2026
Merged

Merge main into dev after 17.0.0-beta.12 release#51
hifi-phil merged 5 commits intodevfrom
chore/merge-main-to-dev-beta12

Conversation

@hifi-phil
Copy link
Copy Markdown
Contributor

Summary

  • Syncs dev with main after the beta.9, beta.10, beta.11, and beta.12 releases
  • Resolves version conflicts by taking main's side (beta.12) across all package.json, plugin.json, and marketplace.json files

Test plan

  • CI green
  • No stale version strings: grep -r "beta.11\|beta.10\|beta.9" package.json packages/*/package.json template/package.json plugins/package.json plugins/.claude-plugin/plugin.json .claude-plugin/marketplace.json returns nothing

🤖 Generated with Claude Code

Add GitHub Actions test workflow, fix consent CSRF (#35)

 ## CI/CD — GitHub Actions test workflow                                                                                                                                                                                                                                                                         
  - 3 jobs: Test Suite, CLI Scaffolding E2E, LLM Eval Tests                                                                                                                                                                                                                                                       
  - Test Suite (every PR): unit tests (449 SDK + 191 hosted + 121 CLI + 24 template), integration tests (21 CLI + 20 Wrangler + 18 chained), Playwright E2E (15 hosted + 12 chained) — 891 tests                                                                                                                  
  - CLI Scaffolding E2E (every PR): scaffold → init → Umbraco start → discover → generate → compile → unit tests → hosted worker — 19 tests with SQL Server in Docker                                                                                                                                             
  - Skill E2E (release PRs): build tools + integration tests via Claude Agent SDK against real Umbraco — 2 tests                                                                                                                                                                                                  
  - LLM Eval Tests (release PRs): CLI knowledge + tool-calling evals — 20 tests                                                                                                                                                                                                                                   
                                                                                                                                                                                                                                                                                                                  
  ## SDK Helpers                                                                                                                                                                                                                                                                                                  
  - server-ref: module-scoped Server reference for elicitation in stdio and hosted modes                                                                                                                                                                                                                          
  - confirmAction(extra, message): one-liner for elicitation confirmation pattern                                                                                                                                                                                                                                 
  - extractChainedResult(result): normalise chained MCP tool call results                                                                                                                                                                                                                                         
  - setupElicitationMock test helper from @umbraco-cms/mcp-server-sdk/testing                                                                                                                                                                                                                                     
  - CfWorkerJsonSchemaValidator in createPerRequestServer (Ajv blocked in Workers)                                                                                                                                                                                                                                
                                                                                                                                                                                                                                                                                                                  
  ## CLI Improvements                                                                                                                                                                                                                                                                                             
  - Umbraco version picker in init flow — fetches stable + RC versions from NuGet                                                                                                                                                                                                                                 
  - --template-version passthrough to PSW CLI                                                                                                                                                                                                                                                                     
  - Version derived from package.json (auto-updates on major bumps)                                                                                                                                                                                                                                               
  - Shared nuget-versions.ts module                                                                                                                                                                                                                                                                               
  - Restart hint in discover when API user creation fails on fresh install                                                                                                                                                                                                                                        
                                                                                                                                                                                                                                                                                                                  
  ## Security                                                                                                                                                                                                                                                                                                     
  - Consent form CSRF: validate state token on POST                                                                                                                                                                                                                                                               
  - Separate OAuth client IDs: umbraco-back-office-hosted-mcp (authorization_code) vs umbraco-back-office-mcp (client_credentials)
feat: add cursor-based pagination decorator for MCP tools (feat: add cursor-based pagination decorator for MCP tools #40)
fix(hosted-mcp): use exact text matching in callTool helper (fix(hosted-mcp): use exact text matching in callTool helper #41)
Fix: restore generic return types on validateToolResponse (function overloads)
Feat: add CursorPaginatedResult test helper type in testing module
Updated skills and agents with CursorPaginatedResult pattern
Adds withCursorPagination to withStandardDecorators — all hosts get cursor pagination automatically
Exports CursorPaginatedArgs<Args> type for correct TypeScript inference after decoration
Updates template tests to use cursor-based pagination
Re-enables Skill E2E and LLM Eval CI jobs
Adds PR CI monitoring guidance to CLAUDE.md
…ev-beta12

# Conflicts:
#	.claude-plugin/marketplace.json
#	package-lock.json
#	package.json
#	packages/create-mcp-server/package.json
#	packages/hosted-mcp/package.json
#	packages/mcp-server-sdk/package.json
#	plugins/.claude-plugin/plugin.json
#	plugins/package.json
#	template/package.json
@hifi-phil hifi-phil merged commit 5982f1c into dev Apr 21, 2026
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant