# Merge remote-tracking branch 'origin/main' into t3/approval-command-visibility · pingdotgg/t3code

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

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

Visibility: public

Requested revision: 9246839e23edf16de9022869eae65e38a967c6d0

Requested commit: 9246839e23edf16de9022869eae65e38a967c6d0

Commit: 9246839e23edf16de9022869eae65e38a967c6d0

Tree: b23b803d0eecd5b0da536fbb12feb8267162ef2b

Author: maria-rcks

Committer: maria-rcks

## Message

```
Merge remote-tracking branch 'origin/main' into t3/approval-command-visibility

# Conflicts:
#	apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
#	packages/client-runtime/src/state/threadRequests.ts
#	packages/client-runtime/src/work-log/commandLabel.ts

```

## Parents

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

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

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