fix: resolve dev/main conflicts blocking PR #427

[mpaulosky]

Resolves merge conflicts that block #427 (dev -> main).\n\nIncludes:\n- Conflict resolution from main into dev\n- Required formatting fix to satisfy pre-push gate\n\nValidation run locally via pre-push gate:\n- markdownlint\n- dotnet format verify\n- Release build\n- Architecture/Domain/Web/Web.Bunit tests\n- Integration tests (Web + AppHost)\n\nOnce merged into dev, PR #427 should become mergeable.\n\nRefs #427

[github-actions]

🏗️ PR Added to Squad Triage Queue

This PR has been labeled with squad and added to the triage queue.

Next steps:

• The squad Lead will review and assign to an appropriate team member
• A squad:member label will be added after triage

If you know which squad member should handle this, you can add the appropriate squad:member label yourself.

[Copilot]

Pull request overview

Resolves merge conflicts between dev and main that were blocking PR #427, including a small formatting correction needed to satisfy the repo’s pre-push validation gates.

Changes:

• Fixes a formatting/indentation issue in AspireManager to satisfy dotnet format verify.
• Resolves merge-conflict artifacts and reconciles the resulting dependency lock state in src/Web/package-lock.json.

Reviewed changes

Copilot reviewed 2 out of 4 changed files in this pull request and generated no comments.

File	Description
tests/AppHost.Tests/Infrastructure/AspireManager.cs	Corrects formatting in the Aspire test builder configuration block.
src/Web/package-lock.json	Removes merge-conflict remnants and reconciles the resolved lockfile contents.

Files not reviewed (1)

• src/Web/package-lock.json: Generated file

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 76.73%. Comparing base (bcd1aae) to head (ce338a2).
⚠️ Report is 15 commits behind head on dev.

Additional details and impacted files

@@             Coverage Diff             @@
##              dev     #428       +/-   ##
===========================================
- Coverage   87.49%   76.73%   -10.77%     
===========================================
  Files          71       71               
  Lines        1775     1775               
  Branches      214      214               
===========================================
- Hits         1553     1362      -191     
- Misses        145      336      +191     
  Partials       77       77               

see 1 file with indirect coverage changes

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.