Skip to content

Commit e1b8bbf

Browse files
committed
Merge remote-tracking branch 'origin/main' into kennylopez-agent-harness-defaults
2 parents 622d6ed + e341b09 commit e1b8bbf

82 files changed

Lines changed: 4823 additions & 425 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/auto-tag-on-release-pr-merge.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Auto-tag on Release PR Merge
22

3-
# Five release lanes share this one workflow. Four use an explicit branch
3+
# Four PR-driven release lanes share this workflow. Each uses an explicit branch
44
# prefix; the main chart lane also auto-detects a Chart.yaml version bump so
55
# a chart feature PR can publish its own new version when merged:
66
#
@@ -10,18 +10,20 @@ name: Auto-tag on Release PR Merge
1010
# push-chart-release/<v> → tag push-chart-v<v> → push-gateway-helm-chart.yml
1111
# any internal PR that bumps deploy/charts/buzz/Chart.yaml `version`
1212
# → tag chart-v<v> → helm-chart.yml (helm chart)
13-
# mobile-release/<v> → tag mobile-v<v> → (manual sprout_ref for buzz-releases build — see below)
13+
#
14+
# Mobile candidate tags do not come from merged PRs. Operators create immutable
15+
# mobile-v<v>-rc.N tags directly from remote main with scripts/mobile-release.sh,
16+
# then hand the exact tag to buzz-releases.
1417
#
1518
# Release tags are created with a short-lived token from the dedicated
1619
# buzz-release-bot GitHub App. GitHub attributes the ref creation to that
1720
# App, so the consumer's `on.push.tags` trigger runs normally. The workflow's
1821
# default GITHUB_TOKEN remains read-only and is never used to create a tag.
1922
#
20-
# The mobile lane is push-only by infosec necessity: OSS `block/buzz` CI must
21-
# not trigger CI in the private `buzz-releases` repo, so auto-dispatch across
22-
# that boundary is deliberately disallowed. The mobile-v* tag is consumed
23-
# manually instead — a human feeds it as the `sprout_ref` input to the
24-
# `buzz-releases` Buildkite pipeline, which builds and ships mobile.
23+
# Mobile is manual-only by infosec necessity: OSS `block/buzz` CI must
24+
# not trigger CI in the private `buzz-releases` repo. A human feeds the exact
25+
# mobile candidate tag to the private Buildkite pipeline, which builds and
26+
# ships mobile.
2527

2628
on:
2729
pull_request:
@@ -65,9 +67,6 @@ jobs:
6567
push-chart-release/*)
6668
VERSION="${BRANCH#push-chart-release/}"
6769
TAG_PREFIX="push-chart-v" ;;
68-
mobile-release/*)
69-
VERSION="${BRANCH#mobile-release/}"
70-
TAG_PREFIX="mobile-v" ;;
7170
*)
7271
parent_sha="$(git rev-parse HEAD^)"
7372
old_version="$(git show "${parent_sha}:deploy/charts/buzz/Chart.yaml" 2>/dev/null | awk '/^version:/ {print $2}')"

‎.github/workflows/ci.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,19 @@ jobs:
5858
- 'pnpm-lock.yaml'
5959
mobile:
6060
- 'mobile/**'
61+
- 'scripts/mobile-release.sh'
62+
- 'scripts/publish-mobile-release-candidate.sh'
63+
- 'scripts/release-rulesets.sh'
64+
- 'scripts/test-mobile-release-contract.sh'
65+
- 'scripts/test-mobile-release-candidate-publisher.sh'
66+
- '.github/workflows/mobile-release-candidate.yml'
6167
- '.github/workflows/ci.yml'
6268
- name: Release workflow source contract
6369
run: scripts/test-release-ref-contract.sh
70+
- name: Mobile release contract
71+
run: |
72+
scripts/test-mobile-release-contract.sh
73+
scripts/test-mobile-release-candidate-publisher.sh
6474
6575
rust-lint:
6676
name: Rust Lint
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: Publish Mobile Release Candidate
2+
run-name: Publish mobile-v${{ inputs.version }}-rc.${{ inputs.candidate_number }}
3+
4+
on:
5+
workflow_dispatch:
6+
inputs:
7+
version:
8+
description: Mobile marketing version (X.Y.Z)
9+
required: true
10+
type: string
11+
candidate_number:
12+
description: Expected next release-candidate number
13+
required: true
14+
type: string
15+
target_sha:
16+
description: Exact current block/buzz main commit
17+
required: true
18+
type: string
19+
20+
concurrency:
21+
group: mobile-release-candidate-${{ inputs.version }}
22+
cancel-in-progress: false
23+
24+
permissions:
25+
contents: read
26+
27+
jobs:
28+
publish:
29+
runs-on: ubuntu-latest
30+
timeout-minutes: 5
31+
steps:
32+
- name: Require the reviewed workflow from main
33+
env:
34+
DISPATCH_REF: ${{ github.ref }}
35+
run: |
36+
if [ "$DISPATCH_REF" != "refs/heads/main" ]; then
37+
echo "::error::Mobile candidates must be dispatched from main, not $DISPATCH_REF"
38+
exit 1
39+
fi
40+
41+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
42+
with:
43+
ref: ${{ github.sha }}
44+
persist-credentials: false
45+
46+
- name: Require canonical repository
47+
env:
48+
REPOSITORY: ${{ github.repository }}
49+
run: |
50+
if [ "$REPOSITORY" != "block/buzz" ]; then
51+
echo "::error::Mobile candidate publication is restricted to block/buzz"
52+
exit 1
53+
fi
54+
55+
- name: Create release tagger token
56+
id: release-tagger
57+
uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
58+
with:
59+
client-id: ${{ vars.BUZZ_RELEASE_TAGGER_CLIENT_ID }}
60+
private-key: ${{ secrets.BUZZ_RELEASE_TAGGER_PRIVATE_KEY }}
61+
permission-contents: write
62+
63+
- name: Publish annotated candidate tag
64+
env:
65+
GH_TOKEN: ${{ steps.release-tagger.outputs.token }}
66+
MOBILE_VERSION: ${{ inputs.version }}
67+
CANDIDATE_NUMBER: ${{ inputs.candidate_number }}
68+
TARGET_SHA: ${{ inputs.target_sha }}
69+
run: scripts/publish-mobile-release-candidate.sh "$MOBILE_VERSION" "$CANDIDATE_NUMBER" "$TARGET_SHA"

‎AGENTS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,5 +569,5 @@ just mobile-dev
569569
- [CONTRIBUTING.md](CONTRIBUTING.md) — setup, code style, PR process, how to add event kinds / CLI subcommands / HTTP endpoints
570570
- [TESTING.md](TESTING.md) — multi-agent E2E test guide
571571
- [ARCHITECTURE.md](ARCHITECTURE.md) — system design and component relationships
572-
- [RELEASING.md](RELEASING.md) — release process: `release-desktop`, `release-relay`, `release-mobile`, auto-tag, internal builds
572+
- [RELEASING.md](RELEASING.md) — release process: `release-desktop`, `release-relay`, `scripts/mobile-release.sh`, candidate tags, internal builds
573573
- [README.md](README.md) — project overview and quick start

‎CHANGELOG.md‎

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

3+
## v0.4.24
4+
5+
- fix(desktop): suppress Windows console flashes and reject WSL bash alias ([#2587](https://github.com/block/buzz/pull/2587)) ([`5afa16157`](https://github.com/block/buzz/commit/5afa16157a63c71f2cd8a80aa7276de28ce1c54c))
6+
- fix(desktop): fix Windows PATH clobber and .cmd shim EINVAL ([#2563](https://github.com/block/buzz/pull/2563)) ([`cca16635d`](https://github.com/block/buzz/commit/cca16635d69dc8bea5406013095d25f3b0e287d3))
7+
- Gate default relay auto-connect behind release flag ([#2589](https://github.com/block/buzz/pull/2589)) ([`e67303f60`](https://github.com/block/buzz/commit/e67303f60334d6cd4224216080bd4b851fc5ee4d))
8+
- fix(desktop): fast-track relay restart reconnects ([#2579](https://github.com/block/buzz/pull/2579)) ([`f3f7688c3`](https://github.com/block/buzz/commit/f3f7688c3a4ecb0405ca8b26e0b6ee815e0f11e6))
9+
- fix(sharing): preserve agent/team snapshot tEXt chunks through media sanitization ([#2438](https://github.com/block/buzz/pull/2438)) ([`b096b0a15`](https://github.com/block/buzz/commit/b096b0a15af4c4566365c5b1efe7f39b700222ed))
10+
- test(desktop): live relay kill/restart reconnect gate ([#2583](https://github.com/block/buzz/pull/2583)) ([`6a56c8bda`](https://github.com/block/buzz/commit/6a56c8bdac6d115a0d6d48b24a2a04dc46b336c5))
11+
- fix(desktop): retry failed initial relay dials ([#2564](https://github.com/block/buzz/pull/2564)) ([`9ec52cfed`](https://github.com/block/buzz/commit/9ec52cfedf579d2ccb2021c216abd4c821a15165))
12+
- Refine channel lifecycle settings ([#2427](https://github.com/block/buzz/pull/2427)) ([`daeaf7c33`](https://github.com/block/buzz/commit/daeaf7c33d5415199a33cbc3dab00244fad5c219))
13+
- Fix avatar upload lifecycle edge cases ([#2277](https://github.com/block/buzz/pull/2277)) ([`80244f823`](https://github.com/block/buzz/commit/80244f82318c85f931d1055e419456945c5eca99))
14+
- fix(observer): eager archive hydration on panel open + 200-frame pages ([#2574](https://github.com/block/buzz/pull/2574)) ([`8cb05028b`](https://github.com/block/buzz/commit/8cb05028be84829501a4f87f8db4ee7034fb786f))
15+
- chore: Omit the Model control when an optional-model harness has nothing to select ([#2262](https://github.com/block/buzz/pull/2262)) ([`9cf953904`](https://github.com/block/buzz/commit/9cf9539040aee9774cf8d12b651348a2806c05c0))
16+
- fix(media): sanitize animated image uploads ([#2524](https://github.com/block/buzz/pull/2524)) ([`8f8f5fa5a`](https://github.com/block/buzz/commit/8f8f5fa5a4b2463cdc6c2a527acb7086150cdaae))
17+
- fix(desktop): populate team instructions when opening the edit team dialog ([#2565](https://github.com/block/buzz/pull/2565)) ([`55c921124`](https://github.com/block/buzz/commit/55c9211241fcfb92a36ed5d6935cb4d2b3ae0702))
18+
- feat(desktop): add drag-to-reorder for community rail ([#2549](https://github.com/block/buzz/pull/2549)) ([`1e68c6c05`](https://github.com/block/buzz/commit/1e68c6c05021ef2fc93ed0a02a84009ce94cdda5))
19+
- fix(channels): strip leading hash prefixes from names ([#2250](https://github.com/block/buzz/pull/2250)) ([`d0ab3fdb0`](https://github.com/block/buzz/commit/d0ab3fdb054e0cfedbf21e4c5143ad6c671c10cc))
20+
- fix(desktop): allow skipping harness setup onboarding ([#2360](https://github.com/block/buzz/pull/2360)) ([`06e3d82b0`](https://github.com/block/buzz/commit/06e3d82b04ab326a36694264ffb4b9dd94ec5661))
21+
22+
323
## v0.4.23
424

525
- fix(desktop): strip GIF metadata extensions before upload ([#2425](https://github.com/block/buzz/pull/2425)) ([`47d7eb698`](https://github.com/block/buzz/commit/47d7eb6982900920bcdbe7a2f5013baca37daeeb))

‎Justfile‎

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,19 @@ desktop-tauri-test-compiled-flags: _ensure-sidecar-stubs
211211
cd desktop/src-tauri
212212
echo "=== Clean build (no flag) → expect false ==="
213213
env -u BUZZ_BUILD_OBSERVER_ARCHIVE_DEFAULT \
214+
-u BUZZ_BUILD_AUTO_CONNECT_DEFAULT_RELAY \
214215
BUZZ_TEST_EXPECTED_OBSERVER_ARCHIVE_DEFAULT=false \
215216
cargo test observer_archive_default_enabled_matches_expected -- --ignored --nocapture
216-
echo "=== Internal build (flag set) → expect true ==="
217+
env -u BUZZ_BUILD_AUTO_CONNECT_DEFAULT_RELAY \
218+
BUZZ_TEST_EXPECTED_AUTO_CONNECT_DEFAULT_RELAY=false \
219+
cargo test compiled_flag_matches_expected -- --ignored --nocapture
220+
echo "=== Internal build (flags set) → expect true ==="
217221
BUZZ_BUILD_OBSERVER_ARCHIVE_DEFAULT=1 \
218222
BUZZ_TEST_EXPECTED_OBSERVER_ARCHIVE_DEFAULT=true \
219223
cargo test observer_archive_default_enabled_matches_expected -- --ignored --nocapture
224+
BUZZ_BUILD_AUTO_CONNECT_DEFAULT_RELAY=1 \
225+
BUZZ_TEST_EXPECTED_AUTO_CONNECT_DEFAULT_RELAY=true \
226+
cargo test compiled_flag_matches_expected -- --ignored --nocapture
220227
echo "Both compiled states verified."
221228
222229
# Build the full desktop Tauri app locally (unsigned, for testing)
@@ -667,14 +674,6 @@ get-next-patch-version:
667674
get-next-relay-patch-version:
668675
@python3 -c "v='$(just get-current-relay-version)'.split('.'); print(f'{v[0]}.{v[1]}.{int(v[2])+1}')"
669676

670-
# Read the current mobile version from pubspec.yaml (strips the +build suffix)
671-
get-current-mobile-version:
672-
@grep -m1 '^version: ' mobile/pubspec.yaml | sed -E 's/version: ([^+]*).*/\1/'
673-
674-
# Compute next mobile patch version (e.g., 0.3.0 → 0.3.1)
675-
get-next-mobile-patch-version:
676-
@python3 -c "v='$(just get-current-mobile-version)'.split('.'); print(f'{v[0]}.{v[1]}.{int(v[2])+1}')"
677-
678677
# Update version in desktop package manifests and regenerate lockfiles
679678
bump-desktop-version version:
680679
#!/usr/bin/env bash
@@ -714,16 +713,6 @@ bump-relay-version version:
714713
cargo update -p buzz-relay
715714
echo "Bumped buzz-relay to {{ version }} and regenerated Cargo.lock"
716715
717-
# Bump the mobile pubspec version and regenerate the lockfile
718-
bump-mobile-version version:
719-
#!/usr/bin/env bash
720-
set -euo pipefail
721-
# pubspec carries a `version: X.Y.Z+build`; preserve the `+build` convention
722-
# (a literal `+1`, matching the desktop lane's prior behavior).
723-
perl -i -pe 's/^version: .*/version: {{ version }}+1/' mobile/pubspec.yaml
724-
(unset GIT_DIR GIT_WORK_TREE; cd mobile && flutter pub get)
725-
echo "Bumped mobile to {{ version }} and regenerated pubspec.lock"
726-
727716
# Open or update the desktop release PR (signed desktop app)
728717
release-desktop *ARGS:
729718
#!/usr/bin/env bash
@@ -748,22 +737,8 @@ release-relay *ARGS:
748737
fi
749738
just _release-pr relay "$VERSION"
750739
751-
# Open or update the mobile release PR (Buzz mobile app)
752-
release-mobile *ARGS:
753-
#!/usr/bin/env bash
754-
set -euo pipefail
755-
ARG="{{ ARGS }}"
756-
if [[ -z "$ARG" || "$ARG" == "patch" ]]; then
757-
VERSION=$(just get-next-mobile-patch-version)
758-
else
759-
VERSION="$ARG"
760-
fi
761-
just _release-pr mobile "$VERSION"
762-
763-
# Shared release-PR engine. One body, three lanes — the only lane-specific steps
764-
# are the version-bump command and the file/tag/changelog identifiers selected
765-
# in the `case` below. Everything else (git preflight, branch reset, changelog
766-
# generation, commit, push, PR open/edit) is identical across lanes.
740+
# Shared release-PR engine for desktop and relay. Mobile publishes immutable
741+
# candidate tags directly from remote main instead of using metadata-only PRs.
767742
_release-pr lane version:
768743
#!/usr/bin/env bash
769744
set -euo pipefail
@@ -794,16 +769,6 @@ _release-pr lane version:
794769
ADD_FILES=(crates/buzz-relay/Cargo.toml Cargo.lock crates/buzz-relay/CHANGELOG.md)
795770
LOG_PATHS=(crates/buzz-relay/ crates/buzz-core/ crates/buzz-db/ crates/buzz-auth/ crates/buzz-pubsub/ crates/buzz-search/ crates/buzz-audit/ crates/buzz-media/ crates/buzz-sdk/ crates/buzz-workflow/ crates/buzz-conformance/ migrations/)
796771
ARTIFACT="Buzz Relay" ;;
797-
mobile)
798-
BRANCH_PREFIX="mobile-release"
799-
TAG_FETCH='mobile-v*'
800-
TAG_MATCH='mobile-v[0-9]*'
801-
TAG_EXCLUDE='mobile-v*-*'
802-
TAG_PREFIX="mobile-v"
803-
CHANGELOG="mobile/CHANGELOG.md"
804-
ADD_FILES=(mobile/pubspec.yaml mobile/pubspec.lock mobile/CHANGELOG.md)
805-
LOG_PATHS=(mobile/)
806-
ARTIFACT="Buzz Mobile" ;;
807772
*)
808773
echo "Error: unknown release lane '{{ lane }}'"
809774
exit 1 ;;
@@ -844,7 +809,6 @@ _release-pr lane version:
844809
case "{{ lane }}" in
845810
desktop) just bump-desktop-version "$VERSION" ;;
846811
relay) just bump-relay-version "$VERSION" ;;
847-
mobile) just bump-mobile-version "$VERSION" ;;
848812
esac
849813
# Generate the changelog from commits since this lane's last release tag.
850814
LAST_TAG=$(git describe --tags --abbrev=0 --match "$TAG_MATCH" --exclude "$TAG_EXCLUDE" 2>/dev/null || echo "")

0 commit comments

Comments
 (0)