# Merge main into fix/mail-links-ui-review · screen/aggregate-mail

[View on GitCafe](https://git.cafe/screen/aggregate-mail/commit/b43db2ee6722891b804ca9859856c148553659a8)

Repository: [screen/aggregate-mail](https://git.cafe/screen/aggregate-mail)

Visibility: public

Requested revision: b43db2ee6722891b804ca9859856c148553659a8

Requested commit: b43db2ee6722891b804ca9859856c148553659a8

Commit: b43db2ee6722891b804ca9859856c148553659a8

Tree: f0adc21ba229b14b3b3459d2d43b7541e8aa91ab

Author: Screen

Committer: Screen

## Message

```
Merge main into fix/mail-links-ui-review

Resolve conflicts with the CI and logo work now on main:
- package.json and CONTRIBUTING: run scripts/*.test.mjs and
  src/*.test.tsx together.
- CHANGELOG and KB: keep both sides' 0.1.3 entries and sections.
- Renumber the task-worktrees ADR to 0005; 0002 is the CI ADR.
- Guard drawsWindowControls so App.tsx still loads under Node for the
  message-body renderer tests.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

```

## Parents

- [5078cd8c96d227268394288e3eb4d4b97c1e815d](https://git.cafe/screen/aggregate-mail/commit/5078cd8c96d227268394288e3eb4d4b97c1e815d?format=markdown)

- [0e1948f2f7317b78487e296fc5cc427d9ec32d57](https://git.cafe/screen/aggregate-mail/commit/0e1948f2f7317b78487e296fc5cc427d9ec32d57?format=markdown)

[Source at this commit](https://git.cafe/screen/aggregate-mail/tree/b43db2ee6722891b804ca9859856c148553659a8?format=markdown)