Skip to content

Merge main into dev (pre-beta.9)#42

Merged
hifi-phil merged 2 commits intodevfrom
chore/merge-main-to-dev-beta9
Apr 8, 2026
Merged

Merge main into dev (pre-beta.9)#42
hifi-phil merged 2 commits intodevfrom
chore/merge-main-to-dev-beta9

Conversation

@hifi-phil
Copy link
Copy Markdown
Contributor

Summary

  • Merge main into dev to bring in changes from beta.8 release
  • Resolved 4 merge conflicts:
    • .github/workflows/test.yml — added hosted-mcp build step in CLI E2E job
    • src/helpers/index.ts + src/index.ts — kept cursor-pagination exports from dev
    • skill-e2e.test.ts — took tsconfig.e2e.json compile logic from main

🤖 Generated with Claude Code

hifi-phil and others added 2 commits April 7, 2026 15:37
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)
…ev-beta9

Resolve conflicts: keep cursor-pagination exports from dev, take
hosted-mcp build step and tsconfig.e2e.json compile logic from main.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@hifi-phil hifi-phil merged commit 4c7b772 into dev Apr 8, 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