Skip to content

Commit 9cafe8f

Browse files
author
Eva
committed
Merge origin/main into benchmark/harness-accounting-and-solo
Brings the bench branch (forked from main at 3d7712c, Aug 1) up to current main (f53bbd1) as a merge commit — no rebase, no history rewrite — so the branch stops silently drifting behind agent and runtime fixes. Notably picks up: - #4896: recover from unsupported image input instead of poisoning the turn (the 'Poisoned Polaroid' that tainted 15 tb21 trials) - #5136: mention the orchestrator by pubkey when posting the task (the 'Register Grabber' that killed large-scale-text-editing) One conflict, container_runtime.py: the bench branch's solo-mode _wait_for_done changes vs #5136's _send mention plumbing. Resolved by keeping both (same resolution as the validated cherry-pick 2944a88). Originating Buzz thread: buzz://message?channel=c3252dd2-0142-4e01-88c7-a2183c3960a5&id=74a65a0990fd2197882b66b5ea2707169d4a3dbd2020d1610c45150fb99f140b Co-authored-by: Eva <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@buzz.block.builderlab.xyz> Signed-off-by: Eva <011987e296fd5006292d2f930b574be47c7801048d1983c46c425d3c95f0cffd@buzz.block.builderlab.xyz>
2 parents 1cf841a + f53bbd1 commit 9cafe8f

1,015 files changed

Lines changed: 118033 additions & 16202 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.

‎.env.example‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,10 @@ BUZZ_S3_ADDRESSING_STYLE=path
102102
# BUZZ_MEDIA_MAX_CONCURRENT_UPLOADS=8
103103
# BUZZ_MEDIA_MAX_CONCURRENT_UPLOADS_PER_PUBKEY=2
104104
# BUZZ_MEDIA_UPLOADS_PER_MINUTE=30
105-
# Require Blossom t=get auth and relay membership for GET/HEAD /media/*.
106-
# Keep off until desktop/mobile/CLI clients that attach media read auth are deployed.
107-
# BUZZ_REQUIRE_MEDIA_GET_AUTH=false
108-
# Legacy alias accepted by the relay while rollout docs catch up:
109-
# BUZZ_REQUIRE_MEDIA_READ_AUTH=false
105+
# GET/HEAD /media/* always require Blossom t=get auth and relay membership.
106+
# BUZZ_REQUIRE_MEDIA_GET_AUTH and BUZZ_REQUIRE_MEDIA_READ_AUTH are no longer
107+
# read; setting either (including to false) changes nothing and the relay warns
108+
# about it at startup.
110109

111110
# -----------------------------------------------------------------------------
112111
# Ephemeral Channels (TTL testing)

‎.github/workflows/auto-tag-on-release-pr-merge.yml‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
github.event.pull_request.head.repo.full_name == github.repository
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
48+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4949
with:
5050
ref: ${{ github.event.pull_request.merge_commit_sha }}
5151
fetch-depth: 0
@@ -91,7 +91,7 @@ jobs:
9191
echo "enabled=true"
9292
echo "tag=${TAG_PREFIX}${VERSION}"
9393
if [[ "$TAG_PREFIX" == desktop-v ]]; then
94-
echo "target_sha=${{ github.event.pull_request.merge_commit_sha }}"
94+
echo "target_sha=${{ github.event.pull_request.head.sha }}"
9595
echo "desktop=true"
9696
else
9797
echo "target_sha=$GITHUB_SHA"
@@ -112,6 +112,7 @@ jobs:
112112
PR_BASE_REF: ${{ github.event.pull_request.base.ref }}
113113
PR_HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }}
114114
MERGE_SHA: ${{ github.event.pull_request.merge_commit_sha }}
115+
MERGED_AT: ${{ github.event.pull_request.merged_at }}
115116
run: |
116117
VERSION="${VERSION#desktop-v}"
117118
export VERSION
@@ -146,7 +147,17 @@ jobs:
146147
exit 1
147148
fi
148149
fi
149-
gh api --method POST "repos/$GITHUB_REPOSITORY/git/refs" \
150+
if ! gh api --method POST "repos/$GITHUB_REPOSITORY/git/refs" \
150151
-f ref="refs/tags/$TAG" \
151152
-f sha="$TARGET_SHA" \
152-
--silent
153+
--silent; then
154+
# Ref creation is atomic. A concurrent retry may have won the race;
155+
# accept that only when it created the exact immutable ref.
156+
EXISTING_SHA="$(gh api "repos/$GITHUB_REPOSITORY/commits/$TAG" --jq .sha)"
157+
if [ "$EXISTING_SHA" = "$TARGET_SHA" ]; then
158+
echo "Tag $TAG was concurrently created at $TARGET_SHA"
159+
exit 0
160+
fi
161+
echo "::error::Tag creation failed and $TAG resolves to $EXISTING_SHA (expected $TARGET_SHA)"
162+
exit 1
163+
fi

‎.github/workflows/benchmark-harbor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
runs-on: ubuntu-latest
2121
timeout-minutes: 15
2222
steps:
23-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
23+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2424
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
2525
with:
2626
python-version: "3.12"

‎.github/workflows/ci.yml‎

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
web: ${{ steps.filter.outputs.web }}
2929
mobile: ${{ steps.filter.outputs.mobile }}
3030
steps:
31-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
31+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3232
with:
3333
fetch-depth: 2
3434
- uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
@@ -96,7 +96,7 @@ jobs:
9696
permissions:
9797
contents: read
9898
steps:
99-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
99+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
100100
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
101101
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
102102
with:
@@ -117,7 +117,7 @@ jobs:
117117
permissions:
118118
contents: read
119119
steps:
120-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
120+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
121121
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
122122
- uses: rui314/setup-mold@9c9c13bf4c3f1adef0cc596abc155580bcb04444 # v1
123123
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
@@ -139,7 +139,7 @@ jobs:
139139
permissions:
140140
contents: read
141141
steps:
142-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
142+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
143143
with:
144144
fetch-depth: 2
145145
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
@@ -235,7 +235,7 @@ jobs:
235235
permissions:
236236
contents: read
237237
steps:
238-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
238+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
239239
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
240240
- name: Get pnpm store directory
241241
id: pnpm-cache
@@ -318,7 +318,7 @@ jobs:
318318
permissions:
319319
contents: read
320320
steps:
321-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
321+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
322322
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
323323
# Reuse the relay binaries and backend test archive when none of their
324324
# inputs changed (desktop-only PRs hit this every time). The key covers
@@ -391,7 +391,7 @@ jobs:
391391
permissions:
392392
contents: read
393393
steps:
394-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
394+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
395395
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
396396
- name: Start integration services
397397
run: |
@@ -580,7 +580,7 @@ jobs:
580580
permissions:
581581
contents: read
582582
steps:
583-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
583+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
584584
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
585585
- name: Install cargo-nextest
586586
uses: taiki-e/install-action@0fd46367812ee04360509b4169d9f659d6892bb2 # v2.79.15
@@ -692,6 +692,18 @@ jobs:
692692
--run-ignored ignored-only
693693
env:
694694
DATABASE_URL: postgres://buzz:${{ env.BUZZ_TEST_POSTGRES_PASSWORD }}@localhost:5432/buzz
695+
- name: Workspace profile (kind:9033) gate tests
696+
# Call-site integration for the 9033 authorization gate: open relay
697+
# rosterless/steward transitions and the closed-relay admin/owner rule,
698+
# against real Postgres. #[ignore]d in the default suite, selected
699+
# explicitly here — see handlers::relay_admin::tests.
700+
run: |
701+
cargo nextest run \
702+
--archive-file target/ci/backend-integration-tests.tar.zst \
703+
-E 'package(buzz-relay) and test(/handlers::relay_admin::tests/)' \
704+
--run-ignored ignored-only
705+
env:
706+
DATABASE_URL: postgres://buzz:${{ env.BUZZ_TEST_POSTGRES_PASSWORD }}@localhost:5432/buzz
695707
- name: NIP-ER reminder e2e
696708
# Feature e2e for NIP-ER (Event Reminders, kind:30300): write-path
697709
# validation, author-only read filtering, and scheduler delivery against
@@ -732,7 +744,7 @@ jobs:
732744
permissions:
733745
contents: read
734746
steps:
735-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
747+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
736748
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
737749
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
738750
with:
@@ -756,6 +768,19 @@ jobs:
756768
env:
757769
RELAY_URL: ws://localhost:3000
758770
GIT_CREDENTIAL_NOSTR_BIN: ${{ github.workspace }}/target/ci/git-credential-nostr
771+
- name: Media read-auth e2e
772+
# Reads require kind:24242 `t=get` auth, so these binaries are the only
773+
# coverage that a real relay rejects bare reads and honours host- and
774+
# hash-scoped tokens. They were #[ignore]d and selected by no CI job, so
775+
# the lane never ran; select it here, where MinIO and the seeded
776+
# 'localhost:3000' community already exist.
777+
# --no-fail-fast: without it cargo stops after the first failing binary,
778+
# so one broken case hides every later binary's result.
779+
run: |
780+
cargo test -p buzz-test-client --no-fail-fast --test e2e_media --test e2e_media_extended --test e2e_media_video -- --ignored --nocapture
781+
env:
782+
RELAY_URL: ws://localhost:3000
783+
RELAY_HTTP_URL: http://localhost:3000
759784
- name: Upload relay logs
760785
if: failure()
761786
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
@@ -773,7 +798,7 @@ jobs:
773798
permissions:
774799
contents: read
775800
steps:
776-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
801+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
777802
with:
778803
fetch-depth: 2
779804
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
@@ -808,7 +833,7 @@ jobs:
808833
permissions:
809834
contents: read
810835
steps:
811-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
836+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
812837
with:
813838
fetch-depth: 2
814839
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
@@ -869,7 +894,7 @@ jobs:
869894
permissions:
870895
contents: read
871896
steps:
872-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
897+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
873898
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
874899
- name: Dependency policy
875900
run: cargo-deny check
@@ -881,7 +906,7 @@ jobs:
881906
permissions:
882907
contents: read
883908
steps:
884-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
909+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
885910
- name: Check for dead API token references in client code
886911
run: |
887912
# Fail if dead API token patterns reappear in desktop, mobile, docs, or config.
@@ -910,7 +935,7 @@ jobs:
910935
- x86_64-unknown-linux-musl
911936
- aarch64-unknown-linux-musl
912937
steps:
913-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
938+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
914939
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
915940
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
916941
with:
@@ -947,7 +972,7 @@ jobs:
947972
env:
948973
TARGET: x86_64-pc-windows-msvc
949974
steps:
950-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
975+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
951976
# MSVC needs windows.h (aws-lc-sys et al.), so this runs on a real Windows
952977
# runner — hermit, used by the Linux jobs, does not provide MSVC. The
953978
# toolchain (1.95.0 + clippy via profile = default) comes from the
@@ -1011,7 +1036,7 @@ jobs:
10111036
git log -1 --format=%s | grep -qx smoke
10121037
echo "Host bash resolved and functional; git commit round-trip passed"
10131038
- name: Check (Tauri crate)
1014-
run: cargo check --manifest-path desktop/src-tauri/Cargo.toml --target $env:TARGET
1039+
run: cargo check --manifest-path desktop/src-tauri/Cargo.toml --workspace --all-targets --target $env:TARGET
10151040
env:
10161041
CMAKE_POLICY_VERSION_MINIMUM: "3.5"
10171042
- name: Test (Tauri crate)
@@ -1028,7 +1053,7 @@ jobs:
10281053
permissions:
10291054
contents: read
10301055
steps:
1031-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
1056+
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
10321057
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1
10331058
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
10341059
with:
@@ -1042,6 +1067,7 @@ jobs:
10421067
mkdir -p desktop/src-tauri/binaries
10431068
touch "desktop/src-tauri/binaries/buzz-acp-$TARGET"
10441069
touch "desktop/src-tauri/binaries/buzz-agent-$TARGET"
1070+
touch "desktop/src-tauri/binaries/buzz-backend-kubernetes-$TARGET"
10451071
touch "desktop/src-tauri/binaries/buzz-dev-mcp-$TARGET"
10461072
touch "desktop/src-tauri/binaries/git-credential-nostr-$TARGET"
10471073
touch "desktop/src-tauri/binaries/buzz-$TARGET"

0 commit comments

Comments
 (0)