# fix: reconcile main's round-6 features after the rebase · pingdotgg/t3code

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

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

Visibility: public

Requested revision: 05732a5b21a521b62fbbc1956aa8abbe67e29498

Requested commit: 05732a5b21a521b62fbbc1956aa8abbe67e29498

Commit: 05732a5b21a521b62fbbc1956aa8abbe67e29498

Tree: ecbd5d1a5155e062f3275ceb0269ace67bef70ce

Author: Julius Marminge

Committer: Julius Marminge

## Message

```
fix: reconcile main's round-6 features after the rebase

- ChatView: #5880 auto-settle-on-merge setting flows into effectiveSettled,
  #5644 browser favicon project registration effect, activeProjectRef memo,
  desktopByTabId on both RightPanelTabs mounts
- server: provide ServerSecretStore to the McpSessionRegistry's
  ServerEnvironment layer (#6325 reads publish opt-in per descriptor)
- mobile: 3-way merged main's deltas into the v2 thread screens
  (NewTaskDraftScreen keeps the branch title seed + main's environmentId,
  threadListV2 keeps both new test suites, queries imports deduped)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

```

## Parents

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

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