# chore: merge main into Claude agent steering PR · pingdotgg/t3code

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

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

Visibility: public

Requested revision: e3d8245cc8107393ee39f0cf4cfe7fd5f03d8f40

Requested commit: e3d8245cc8107393ee39f0cf4cfe7fd5f03d8f40

Commit: e3d8245cc8107393ee39f0cf4cfe7fd5f03d8f40

Tree: 10a5e9f1d2f8d3af0c0753ea5541f67840ec276e

Author: Alb11747

Committer: Alb11747

## Message

```
chore: merge main into Claude agent steering PR

Merge upstream main at 60b35a1ee0 without rewriting the existing PR commits.
Keep upstream tracing, held-queue behavior, and test cleanup while retaining
the PR's boundary delivery and cancellation coverage.

The user authorized this single conflict-resolution update after maintainer
takeover. Further maintenance remains subject to the takeover restriction.

Co-Authored-By: GPT-6.1 Sol at high effort <noreply@openai.com>
Co-Authored-By: GPT-6.1 Sol at high effort, implementation subagent for merge conflicts <noreply@openai.com>
Co-Authored-By: GPT-6.1 Sol at xhigh effort, independent merge review <noreply@openai.com>

```

## Parents

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

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

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