# Merge origin/main into fix/issue-13239 · pingdotgg/t3code

[View on GitCafe](https://git.cafe/pingdotgg/t3code/commit/b14d9c2f6ac92db4775655611b1b9f79fc60a295)

Repository: [pingdotgg/t3code](https://git.cafe/pingdotgg/t3code)

Visibility: public

Requested revision: b14d9c2f6ac92db4775655611b1b9f79fc60a295

Requested commit: b14d9c2f6ac92db4775655611b1b9f79fc60a295

Commit: b14d9c2f6ac92db4775655611b1b9f79fc60a295

Tree: b177c38b50d5f50407a0d84db0e456b060112315

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
Merge origin/main into fix/issue-13239

Resolve servicePreflight.test.ts: keep main's narrowed legacy protocol
set ([1]) with this branch's exact-recovery-step assertions.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

```

## Parents

- [dd9793b9dca694d5303dbc35ed90a146af4d9272](https://git.cafe/pingdotgg/t3code/commit/dd9793b9dca694d5303dbc35ed90a146af4d9272?format=markdown)

- [51a7118b700b19191fa0614785e0149a6d8a6e72](https://git.cafe/pingdotgg/t3code/commit/51a7118b700b19191fa0614785e0149a6d8a6e72?format=markdown)

[Source at this commit](https://git.cafe/pingdotgg/t3code/tree/b14d9c2f6ac92db4775655611b1b9f79fc60a295?format=markdown)