# Merge remote-tracking branch 'origin/main' into capy/preview-coverage · screen/col

[View on GitCafe](https://git.cafe/screen/col/commit/f69e77937587b8a0bf159e9bc66ebe61cf9eb861)

Repository: [screen/col](https://git.cafe/screen/col)

Visibility: public

Requested revision: f69e77937587b8a0bf159e9bc66ebe61cf9eb861

Requested commit: f69e77937587b8a0bf159e9bc66ebe61cf9eb861

Commit: f69e77937587b8a0bf159e9bc66ebe61cf9eb861

Tree: e47f005c27d04c134dc6a4b2640e9722f86cf8f9

Author: FayequeP

Committer: FayequeP

## Message

```
Merge remote-tracking branch 'origin/main' into capy/preview-coverage

Co-authored-by: capy-ai[bot] <230910855+capy-ai[bot]@users.noreply.github.com>

# Conflicts:
#	components/SiteNotice.tsx
#	lib/mcp-tools.test.mjs
#	lib/mcp-tools.ts

```

## Parents

- [877d27a6e8174ba9c6561d227eab9cdbe8273c89](https://git.cafe/screen/col/commit/877d27a6e8174ba9c6561d227eab9cdbe8273c89?format=markdown)

- [69fb62d64838418945518001e78e2a230d149fcc](https://git.cafe/screen/col/commit/69fb62d64838418945518001e78e2a230d149fcc?format=markdown)

[Source at this commit](https://git.cafe/screen/col/tree/f69e77937587b8a0bf159e9bc66ebe61cf9eb861?format=markdown)