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

[View on GitCafe](https://git.cafe/stienswout/t3code/commit/a1dd676ea7e0053e1650c8d6c7c3fb18ae9e2dfd)

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

Visibility: public

Requested revision: a1dd676ea7e0053e1650c8d6c7c3fb18ae9e2dfd

Requested commit: a1dd676ea7e0053e1650c8d6c7c3fb18ae9e2dfd

Commit: a1dd676ea7e0053e1650c8d6c7c3fb18ae9e2dfd

Tree: 7ff391687983f5c0f90039e940a5097c31c496ed

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

- [3b1e2cd2573ccda46ef2e3a8c1e3b2604b7acbe1](https://git.cafe/stienswout/t3code/commit/3b1e2cd2573ccda46ef2e3a8c1e3b2604b7acbe1?format=markdown)

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