# Merge branch 'main' into fix/subagent-settle-with-parent · pingdotgg/t3code

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

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

Visibility: public

Requested revision: 1ba181e4212606109d6dfe4ae22fd1aee5dea4a9

Requested commit: 1ba181e4212606109d6dfe4ae22fd1aee5dea4a9

Commit: 1ba181e4212606109d6dfe4ae22fd1aee5dea4a9

Tree: 67dbf24123a1a3887daa6e20ed6dbe6bcc89cdf1

Author: Michael Huo

Committer: GitHub

## Message

```
Merge branch 'main' into fix/subagent-settle-with-parent
```

## Parents

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

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

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