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

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

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

Visibility: public

Requested revision: 796e2a3343b2b8f73a5d6508d907aca7fed27ca7

Requested commit: 796e2a3343b2b8f73a5d6508d907aca7fed27ca7

Commit: 796e2a3343b2b8f73a5d6508d907aca7fed27ca7

Tree: 422e551b1aa0764f2b7f24718d88bbb8a91ec0b3

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

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

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