v1.2-dev: sync with dev - #513

Merged

frankkilcommins merged 7 commits into

v1.2-dev-sync-with-dev

Jul 8, 2026

Commits on Jul 8, 2026

chore(deps-dev): bump vitest from 4.1.7 to 4.1.10 in the vitest group
dependabot[bot]
authored
Merge pull request #508 from OAI/dependabot/npm_and_yarn/vitest-bc9680511c
frankkilcommins
authored
fix(workflows): use -X theirs to resolve sync merge conflicts
frankkilcommins
committed
Merge pull request #509 from frankkilcommins/update-sync-actions
frankkilcommins
authored
Merge main into dev-sync-with-main
github-actions[bot]
committed
Merge pull request #510 from OAI/dev-sync-with-main
frankkilcommins
authored
Merge dev into v1.2-dev-sync-with-dev
github-actions[bot]
committed