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

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

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

Visibility: public

Requested revision: f4bb4658f15176b77344502627b79a427f2ebf5c

Requested commit: f4bb4658f15176b77344502627b79a427f2ebf5c

Commit: f4bb4658f15176b77344502627b79a427f2ebf5c

Tree: 8ffdb652257b279cc5890233c09c86fbfcc4a6cf

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

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

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