Merge main into sync/upstream-step4 to resolve PR #18 merge state

main gained the merge commits for PR #16 (feat/output-token-budget) and
PR #17 (feat/legacy-mcp-block-warning). sync/upstream-step4 already
contains both feature tips (9a962d1, 8ae1000) through the step-2 line.
The two branches therefore have two merge bases, and GitHub reported the
PR as conflicting. The ort merge resolves cleanly with no content
conflicts; this commit only records main as an ancestor.

Author: ngallodev