Skip to content

Commit e295cf4

Browse files
author
Eva
committed
Merge origin/main into bench/gepa-loop (picks up block#5423 ACP context reduction)
* origin/main: (27 commits) fix(link-preview): reliably render previews sent right after they resolve (block#5245) fix(link-preview): restore Buzz entity link cards (block#5494) chore(release): release Buzz Desktop version 0.5.9 (block#5521) feat(cli): add --visibility flag to channels update (block#5119) Polish desktop onboarding flow (block#5310) fix(desktop): quiesce renderer polling while hidden (block#3677) (block#5490) fix(channels): restore member invitations to private channels (block#5493) perf(ci): experiment with sccache for relay builds (block#5224) fix(desktop): bound nine unbounded localStorage stores (block#5454) feat(desktop): time-based sweep for stale localStorage caches (block#5453) ci(release): gate OSS desktop auto-update promotion (block#5398) fix(release): pin desktop PR operations to block/buzz (block#5212) fix(search): surface exact short profile names (block#5480) Reduce repeated ACP session context (block#5423) feat(desktop): NIP-AM agent-usage backend — P2 emission/transport/archive + P4a aggregation/D6 (block#4000) fix(desktop): resolve overlapping member mentions (block#5225) chore(deps): update react monorepo (block#4441) ci(security): allow retired relay pool advisory (block#5404) chore(deps): update dependency @tanstack/react-virtual to v3.14.9 (block#4439) chore(deps): update all non-major dependencies (block#3049) ... Signed-off-by: Eva <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@buzz.block.builderlab.xyz> Co-authored-by: Eva <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@buzz.block.builderlab.xyz> Signed-off-by: Eva <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@buzz.block.builderlab.xyz>
2 parents 328218e + be48ce9 commit e295cf4

173 files changed

Lines changed: 17695 additions & 2121 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3232
with:
3333
fetch-depth: 2
34-
- uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
34+
- uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3
3535
id: filter
3636
with:
3737
token: ''
@@ -78,6 +78,10 @@ jobs:
7878
run: scripts/test-release-ref-contract.sh
7979
- name: Desktop release candidate contract
8080
run: scripts/test-desktop-release-candidate.sh
81+
- name: OSS desktop promotion contract
82+
run: |
83+
scripts/test-oss-desktop-promotion.sh
84+
scripts/test-oss-desktop-promotion-behavior.sh
8185
- name: Mobile release contract
8286
run: |
8387
scripts/test-mobile-release-contract.sh
@@ -317,6 +321,9 @@ jobs:
317321
if: github.event_name == 'push' || needs.changes.outputs.desktop == 'true' || needs.changes.outputs.desktop-rust == 'true' || needs.changes.outputs.rust == 'true'
318322
permissions:
319323
contents: read
324+
env:
325+
SCCACHE_GHA_ENABLED: "true"
326+
SCCACHE_GHA_RW_MODE: ${{ (github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.number == 5224)) && 'READ_WRITE' || 'READ_ONLY' }}
320327
steps:
321328
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
322329
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
@@ -341,13 +348,22 @@ jobs:
341348
.
342349
desktop/src-tauri
343350
save-if: ${{ github.event_name != 'pull_request' }}
351+
# Cache rustc outputs for unchanged workspace crates. Trusted pushes write;
352+
# the bounded PR 5224 trial writes only to its isolated merge-ref scope.
353+
- name: Set up sccache
354+
if: steps.relay-artifacts-cache.outputs.cache-hit != 'true'
355+
uses: Mozilla-Actions/sccache-action@fc920bf0ec8de6ee65d409111f7ec508035751ba # v0.0.11 # zizmor: ignore[cache-poisoning] Bounded trial: only PR 5224 writes to its isolated merge-ref scope; trusted pushes retain production writes.
356+
with:
357+
version: v0.16.0
344358
- name: Install cargo-nextest
345359
if: steps.relay-artifacts-cache.outputs.cache-hit != 'true'
346360
uses: taiki-e/install-action@0fd46367812ee04360509b4169d9f659d6892bb2 # v2.79.15
347361
with:
348362
349363
- name: Build relay artifacts
350364
if: steps.relay-artifacts-cache.outputs.cache-hit != 'true'
365+
env:
366+
RUSTC_WRAPPER: sccache
351367
run: |
352368
cargo build --profile ci -p buzz-relay -p git-credential-nostr
353369
cargo nextest archive \
@@ -359,7 +375,9 @@ jobs:
359375
--test e2e_event_reminder \
360376
--archive-file target/ci/backend-integration-tests.tar.zst
361377
- name: Save relay artifacts cache
362-
if: steps.relay-artifacts-cache.outputs.cache-hit != 'true'
378+
# PR-scoped exact-source entries cannot warm main or other PRs and churn
379+
# the shared cache pool. sccache provides read-only PR reuse instead.
380+
if: steps.relay-artifacts-cache.outputs.cache-hit != 'true' && github.event_name == 'push'
363381
uses: actions/cache/save@caa296126883cff596d87d8935842f9db880ef25 # v5
364382
with:
365383
path: |
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Promote OSS Desktop Auto-Update
2+
run-name: Promote desktop-v${{ inputs.version }} to auto-update
3+
4+
on:
5+
workflow_dispatch:
6+
inputs:
7+
version:
8+
description: Stable desktop version to promote (X.Y.Z)
9+
required: true
10+
type: string
11+
12+
concurrency:
13+
group: oss-desktop-auto-update-promotion
14+
cancel-in-progress: false
15+
16+
permissions:
17+
contents: read
18+
19+
jobs:
20+
promote:
21+
if: github.repository == 'block/buzz'
22+
runs-on: ubuntu-latest
23+
timeout-minutes: 10
24+
permissions:
25+
contents: write
26+
steps:
27+
- name: Require the reviewed workflow from main
28+
env:
29+
DISPATCH_REF: ${{ github.ref }}
30+
run: |
31+
if [ "$DISPATCH_REF" != "refs/heads/main" ]; then
32+
echo "::error::OSS desktop promotion must be dispatched from main, not $DISPATCH_REF"
33+
exit 1
34+
fi
35+
36+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
37+
with:
38+
ref: ${{ github.sha }}
39+
persist-credentials: false
40+
41+
- name: Validate and promote exact release manifest
42+
env:
43+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44+
VERSION: ${{ inputs.version }}
45+
run: scripts/promote-oss-desktop-release.sh "$VERSION"

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -907,6 +907,7 @@ jobs:
907907
[ "${#TRIPLES[@]}" -ge 3 ] || { echo "::error::too few platforms (${#TRIPLES[@]})"; exit 1; }
908908
bash desktop/scripts/generate-oss-latest-json.sh "$VERSION" "${TRIPLES[@]}" > latest.json
909909
cat latest.json
910+
cp latest.json staged/updater-manifest.json
910911
911912
- name: Create or verify versioned draft
912913
run: |
@@ -946,7 +947,3 @@ jobs:
946947
- name: Publish complete versioned release
947948
if: env.already_published != 'true'
948949
run: gh release edit "desktop-v${VERSION}" --draft=false
949-
950-
- name: Upload latest.json to rolling release last
951-
if: ${{ !contains(needs.setup.outputs.version, '-') }}
952-
run: gh release upload buzz-desktop-latest latest.json --clobber

‎.release/desktop-candidate.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"schema": 2,
3-
"version": "0.5.8",
4-
"base_sha": "6a17d035f79ad582ca3f4f3cdc38d376f2c4087f",
5-
"previous_tag": "desktop-v0.5.7",
6-
"previous_base_sha": "74b913cff8512c015dc6f1a7473b253fa803f954",
7-
"previous_merge_sha": "13c9e900c84cac1e2c8eeb7551bd1510ecb544d3",
8-
"tag": "desktop-v0.5.8",
9-
"commit_count": 4
3+
"version": "0.5.9",
4+
"base_sha": "f8f2ef0440e7a074223ec04dc3b32d817b8b9d9b",
5+
"previous_tag": "desktop-v0.5.8",
6+
"previous_base_sha": "6a17d035f79ad582ca3f4f3cdc38d376f2c4087f",
7+
"previous_merge_sha": "c815a9c6e1a1d1818a0547f60f894e4a5388761a",
8+
"tag": "desktop-v0.5.9",
9+
"commit_count": 29
1010
}

‎CHANGELOG.md‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,44 @@
11
# Changelog
22

3+
## v0.5.9
4+
5+
### Desktop and shared changes
6+
7+
- Polish desktop onboarding flow ([#5310](https://github.com/block/buzz/pull/5310)) ([`3f2f32641f4093d087fd9506bfac1fa0329e8b2e`](https://github.com/block/buzz/commit/3f2f32641f4093d087fd9506bfac1fa0329e8b2e))
8+
- fix(desktop): quiesce renderer polling while hidden (#3677) ([#5490](https://github.com/block/buzz/pull/5490)) ([`07a3c768d619db31fee3f0590f9433cdd1213e8f`](https://github.com/block/buzz/commit/07a3c768d619db31fee3f0590f9433cdd1213e8f))
9+
- fix(channels): restore member invitations to private channels ([#5493](https://github.com/block/buzz/pull/5493)) ([`2777189d960fa5b1d863166f36d6e37ff8ce0819`](https://github.com/block/buzz/commit/2777189d960fa5b1d863166f36d6e37ff8ce0819))
10+
- fix(desktop): bound nine unbounded localStorage stores ([#5454](https://github.com/block/buzz/pull/5454)) ([`9c074bb89b290721f839bbc84fdf4701269e43a0`](https://github.com/block/buzz/commit/9c074bb89b290721f839bbc84fdf4701269e43a0))
11+
- feat(desktop): time-based sweep for stale localStorage caches ([#5453](https://github.com/block/buzz/pull/5453)) ([`bb9aae1065d4a77ae3dcb36b7b4a4e7ac8e68ead`](https://github.com/block/buzz/commit/bb9aae1065d4a77ae3dcb36b7b4a4e7ac8e68ead))
12+
- feat(desktop): NIP-AM agent-usage backend — P2 emission/transport/archive + P4a aggregation/D6 ([#4000](https://github.com/block/buzz/pull/4000)) ([`5e4c05f90b062898e1827ba45cb826c6ff913741`](https://github.com/block/buzz/commit/5e4c05f90b062898e1827ba45cb826c6ff913741))
13+
- fix(desktop): resolve overlapping member mentions ([#5225](https://github.com/block/buzz/pull/5225)) ([`44456e200e3ca6a5d2882b58b447b80474041347`](https://github.com/block/buzz/commit/44456e200e3ca6a5d2882b58b447b80474041347))
14+
- chore(deps): update rust crate anyhow to v1.0.104 ([#4447](https://github.com/block/buzz/pull/4447)) ([`e1ff91ecc1269682a50c17da2c0708d1448b336f`](https://github.com/block/buzz/commit/e1ff91ecc1269682a50c17da2c0708d1448b336f))
15+
- fix(desktop): preserve Welcome banner dismissal ([#5406](https://github.com/block/buzz/pull/5406)) ([`97aa9e31856edb9d8abcdcb33c472027f5588890`](https://github.com/block/buzz/commit/97aa9e31856edb9d8abcdcb33c472027f5588890))
16+
- fix(agent): retry LLM completion on malformed 2xx JSON body ([#5351](https://github.com/block/buzz/pull/5351)) ([`5bf78671f45178f8de02ba18d3d321cbbf19cd1f`](https://github.com/block/buzz/commit/5bf78671f45178f8de02ba18d3d321cbbf19cd1f))
17+
- fix(desktop): welcome banner overlap and missing dismiss control ([#5330](https://github.com/block/buzz/pull/5330)) ([`f029deafae6ad3b63e13c29104f3be76122cb1df`](https://github.com/block/buzz/commit/f029deafae6ad3b63e13c29104f3be76122cb1df))
18+
- fix(desktop): prevent horizontal clipping in Prompt Context modal ([#5324](https://github.com/block/buzz/pull/5324)) ([`fbf89e3bed9adebc033a26b7c43362c004e816a2`](https://github.com/block/buzz/commit/fbf89e3bed9adebc033a26b7c43362c004e816a2))
19+
- fix(buzz-agent): recover from 400-shaped image rejections; unbound benchmark agent rounds ([#5318](https://github.com/block/buzz/pull/5318)) ([`261c46076166c6de5bb9a71fb4a0fd0b70aa1efa`](https://github.com/block/buzz/commit/261c46076166c6de5bb9a71fb4a0fd0b70aa1efa))
20+
21+
### Other repository changes
22+
23+
- feat(cli): add --visibility flag to channels update ([#5119](https://github.com/block/buzz/pull/5119)) ([`f8f2ef0440e7a074223ec04dc3b32d817b8b9d9b`](https://github.com/block/buzz/commit/f8f2ef0440e7a074223ec04dc3b32d817b8b9d9b))
24+
- perf(ci): experiment with sccache for relay builds ([#5224](https://github.com/block/buzz/pull/5224)) ([`5a3b3d23226474f835a1cf41d2ecc5f53cacb070`](https://github.com/block/buzz/commit/5a3b3d23226474f835a1cf41d2ecc5f53cacb070))
25+
- ci(release): gate OSS desktop auto-update promotion ([#5398](https://github.com/block/buzz/pull/5398)) ([`43573d114b5bfaf7cefa75eee7e219dc05cf1cd1`](https://github.com/block/buzz/commit/43573d114b5bfaf7cefa75eee7e219dc05cf1cd1))
26+
- fix(release): pin desktop PR operations to block/buzz ([#5212](https://github.com/block/buzz/pull/5212)) ([`c1e20a814bf694db2af959adacb375ced27af023`](https://github.com/block/buzz/commit/c1e20a814bf694db2af959adacb375ced27af023))
27+
- fix(search): surface exact short profile names ([#5480](https://github.com/block/buzz/pull/5480)) ([`3c76f682c3c2dfe2cd296c277c5e63799d3424f9`](https://github.com/block/buzz/commit/3c76f682c3c2dfe2cd296c277c5e63799d3424f9))
28+
- Reduce repeated ACP session context ([#5423](https://github.com/block/buzz/pull/5423)) ([`563e4346da37d0fb2e9ec1c95e7f1eba79f83040`](https://github.com/block/buzz/commit/563e4346da37d0fb2e9ec1c95e7f1eba79f83040))
29+
- chore(deps): update react monorepo ([#4441](https://github.com/block/buzz/pull/4441)) ([`119a84897f225c1e3213a09cd149abb37dcb3abc`](https://github.com/block/buzz/commit/119a84897f225c1e3213a09cd149abb37dcb3abc))
30+
- ci(security): allow retired relay pool advisory ([#5404](https://github.com/block/buzz/pull/5404)) ([`d2ebaa95a7d2565fb217fdfae56bafb9509be444`](https://github.com/block/buzz/commit/d2ebaa95a7d2565fb217fdfae56bafb9509be444))
31+
- chore(deps): update dependency @tanstack/react-virtual to v3.14.9 ([#4439](https://github.com/block/buzz/pull/4439)) ([`c923e89a4b6d43ae0c507dbb5e58f2bdd9ab7888`](https://github.com/block/buzz/commit/c923e89a4b6d43ae0c507dbb5e58f2bdd9ab7888))
32+
- chore(deps): update all non-major dependencies ([#3049](https://github.com/block/buzz/pull/3049)) ([`856cdb848b0a849e33620887b145b7e598dfd95c`](https://github.com/block/buzz/commit/856cdb848b0a849e33620887b145b7e598dfd95c))
33+
- chore(deps): update rust crate arc-swap to v1.9.2 ([#4448](https://github.com/block/buzz/pull/4448)) ([`08de85c592106ea2ffe22ba16e3a0fc10687db54`](https://github.com/block/buzz/commit/08de85c592106ea2ffe22ba16e3a0fc10687db54))
34+
- chore(deps): update rust crate async-trait to v0.1.91 ([#4458](https://github.com/block/buzz/pull/4458)) ([`12b1f566480d4feddc171739097f9359d3f255c1`](https://github.com/block/buzz/commit/12b1f566480d4feddc171739097f9359d3f255c1))
35+
- chore(deps): update rust crate diffy to v0.5.1 ([#4466](https://github.com/block/buzz/pull/4466)) ([`d7cc724fa5391b23e7fac99fc65dc28b79e4c5c4`](https://github.com/block/buzz/commit/d7cc724fa5391b23e7fac99fc65dc28b79e4c5c4))
36+
- chore(deps): update rust crate async-compression to v0.4.43 ([#4456](https://github.com/block/buzz/pull/4456)) ([`7dd8791d0765e9f15fed3299b6948e2babbfd763`](https://github.com/block/buzz/commit/7dd8791d0765e9f15fed3299b6948e2babbfd763))
37+
- chore(deps): update rust crate clap to v4.6.6 ([#4465](https://github.com/block/buzz/pull/4465)) ([`e668c6bb4913e36e58d7f947dbaf982e704e9132`](https://github.com/block/buzz/commit/e668c6bb4913e36e58d7f947dbaf982e704e9132))
38+
- chore(release): release Buzz Relay version 0.2.1 ([#2856](https://github.com/block/buzz/pull/2856)) ([`6e5c462ac524de60d7edb46c66130fd779cc9006`](https://github.com/block/buzz/commit/6e5c462ac524de60d7edb46c66130fd779cc9006))
39+
40+
[Compare desktop-v0.5.8...desktop-v0.5.9](https://github.com/block/buzz/compare/desktop-v0.5.8...desktop-v0.5.9)
41+
342
## v0.5.8
443

544
### Desktop and shared changes

0 commit comments

Comments
 (0)