# Merge upstream main into upstream-pr/codex-429-retry · pingdotgg/t3code

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

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

Visibility: public

Requested revision: cd508e79b165eb042cb1797659054038de296cc8

Requested commit: cd508e79b165eb042cb1797659054038de296cc8

Commit: cd508e79b165eb042cb1797659054038de296cc8

Tree: 8191e3ec741d2d94761454cc628301ca204055a4

Author: Hong Liu

Committer: Hong Liu

## Message

```
Merge upstream main into upstream-pr/codex-429-retry

Resolve the CodexAdapterV2 turn finalization conflict by keeping the
permit-holding finalizer and carrying over the native subagent parent
wake from main.

```

## Parents

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

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

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