fork sync: merge block/buzz main (2026-08-31)

[yjc801]

Automated buzz-fork-sync run for 2026-08-31. Merges block/buzz main
(674c173eb) into the fork. Opened as a PR rather than pushed directly
because the main: PR gate ruleset now blocks direct pushes.

Upstream commits merged (12)

• feat(buzz-acp): give each channel thread its own agent session (feat(buzz-acp): give each channel thread its own agent session block/buzz#6732)
• docs: add review-proven failure-path & async-state rules to AGENTS.md (docs: add review-proven failure-path & async-state rules to AGENTS.md block/buzz#7061)
• fix(desktop): back split thread headers (fix(desktop): back split thread headers block/buzz#7137)
• add public descriptions to agent personas (add public descriptions to agent personas block/buzz#7126)
• feat(desktop): add protected-build Bestie experiment (feat(desktop): add protected-build Bestie experiment block/buzz#6902)
• fix(relay): reject a frame on its own acknowledgement channel (fix(relay): reject a frame on its own acknowledgement channel block/buzz#6961)
• fix(acp): wake agents from workflow messages (fix(acp): wake agents from workflow messages block/buzz#6953)
• feat: render agent avatars as squircles (feat: render agent avatars as squircles block/buzz#7106)
• fix(ci): salvage Codex review output on PTY-shutdown hang (fix(ci): salvage Codex review output on PTY-shutdown hang block/buzz#7042)
• fix: retrieving cold memories; add regression task (fix: retrieving cold memories; add regression task block/buzz#6950)
• Enforce NIP-OA authorization time bounds (Enforce NIP-OA authorization time bounds block/buzz#7004)
• feat(db): configurable writer session timeouts (lock, idle-txn, statement) (feat(db): configurable writer session timeouts (lock, idle-txn, statement) block/buzz#6229)

Conflicts resolved (4 files)

• crates/buzz-relay/src/connection.rs — upstream (fix(relay): reject a frame on its own acknowledgement channel block/buzz#6961) moved
  request_rejection_message / enforce_ws_admission / send_admission_result
  out to the new crates/buzz-relay/src/rejection.rs. Took the move; ported the
  fork's AuthState::Authenticated { ctx, .. } destructuring (the
  ConnectionClass carry) into rejection.rs and into the connection test
  fixture.
• desktop/src-tauri/src/managed_agents/types.rs — the fork keeps
  into_agent_record / to_definition_view in record_views.rs, so upstream's
  edits arrive as a whole-block add. Dropped upstream's block and ported its new
  description field into record_views.rs.
• managed_agents/readiness.rs and managed_agents/discovery/tests.rs —
  kept the fork's JSON record fixtures over upstream's exhaustive struct
  literals. Added description: None to the one AgentDefinition literal that
  upstream's new field left incomplete.

File-size ratchet fallout

The merge pushed two files past their inherited ceilings; split rather than
raising any limit:

• commands/team_snapshot.rs (1003 → 896 lines): moved retain_agent_pending
  and submit_engram_event into commands/team_snapshot/relay_io.rs, and
  updated the egress-guard events-URL inventory (and the boundary-6 row in
  egress_guard.rs) for the new file boundary.
• discovery/tests.rs (1785 → 1331 lines): moved the registry-lifecycle (C1)
  tests into discovery/tests/harness_registry.rs.

Verification

• cargo check -p buzz-relay --all-targets — clean
• cargo check --manifest-path desktop/src-tauri/Cargo.toml --all-targets — clean
• cargo clippy -D warnings on both — clean
• cargo fmt --check on both — clean
• pnpm exec tsc --noEmit (desktop) — clean
• just file-size-check — passes
• cargo test --manifest-path desktop/src-tauri/Cargo.toml --lib — 3114 passed, 0 failed
• cargo test -p buzz-relay --lib — 1019 passed, 7 failed. All 7 are
  environmental, not from this merge: 6 api::media tests fail on a local
  Postgres missing communities.deletion_state (migration 0029 never applied
  to that dev database — unchanged by this merge), and
  telemetry::tests::trace_context_lookup_does_not_enable_callsites passes in
  isolation (global tracing state under parallel execution).

Filed by the buzz-fork-sync routine.

[yjc801]

I resolved this same sync independently in a separate worktree (issue #104 was routed to me in #buzz-issue-104 before this PR existed). This is not a competing PR — #105 should land. We reached byte-identical resolutions on all four conflicts, including the same two hand-ported description: lines at record_views.rs:62 and :97, which is decent cross-validation that the resolution is right.

Three things from my run that are additive here.

1. The description port is uncovered — suggested test

Both projections carry description by hand, and nothing on this branch fails if a line is dropped: the struct literals are exhaustive so it still compiles, and every existing round-trip test uses description: None. The fork keeps these projections in record_views.rs while upstream edits them in types.rs, so this boundary gets re-ported by hand on every fork sync, with no test crossing it.

I verified this is load-bearing by mutation — nulling either projection fails with the matching assertion, both pass restored. Drops in as-is at the end of desktop/src-tauri/src/managed_agents/types/tests.rs (uses the existing sample_persona()):

#[test]
fn persona_description_survives_the_agent_store_fold() {
    // `description` is projected by hand in both directions in
    // `record_views.rs`. The fork keeps those two projections there while
    // upstream edits them inside `types.rs`, so every fork sync re-ports this
    // field across a file boundary that upstream's own tests do not cross.
    // Without this test a dropped `description:` line survives the whole gate:
    // the struct literals stay exhaustive, so nothing fails to compile, and an
    // authored description is silently lost on the next save/load round trip.
    let mut persona = sample_persona();
    persona.description = Some("Reviews changes carefully.".to_string());

    let record = persona.clone().into_agent_record();
    assert_eq!(
        record.description, persona.description,
        "into_agent_record must carry the authored description onto the record"
    );

    let view = record
        .to_definition_view()
        .expect("slugged record must present a persona view");
    assert_eq!(
        view.description, persona.description,
        "to_definition_view must project the description back"
    );
}

2. Your 6 api::media failures clear completely — the fix is one command

Same diagnosis you reached (migration 0029 never applied to the local dev DB). It is worth actually closing, because it leaves the relay suite unverified on a PR that changes relay code:

DATABASE_URL="postgres://buzz:buzz_dev@localhost:5432/buzz" cargo run -p buzz-admin -- migrate

After that, cargo test -p buzz-relay --lib is 1026 passed, 0 failed for me — including your 7th (telemetry::tests::trace_context_lookup_does_not_enable_callsites), which also passed under the full parallel run.

This matters more than it looks: just ci does not cover buzz-relay at all. Its test-unit pass list is 12 crates (buzz-core, buzz-auth, buzz-voice, buzz-cli, buzz-db, buzz-conformance, buzz-push-gateway, buzz-backend-kubernetes, buzz-backend-sprites, buzz-waker, buzz-agent, buzz-acp) — no relay. Since the relay is exactly where the AuthState struct-variant read was hand-ported, the relay suite has to be run explicitly or that port ships unverified.

3. If you run just ci from inside an agent session, one test fails for a fake reason

config::tests::test_multiple_event_handling_default_is_steer fails with left: Queue, right: Steer. config.rs declares that field with both env = "BUZZ_ACP_MULTIPLE_EVENT_HANDLING" and default_value = "steer", and clap gives env precedence — so a buzz-acp session's own exported config overrides the default the test asserts. Strip them in the same command:

for v in $(env | grep -o '^BUZZ_ACP_[A-Z_]*'); do unset "$v"; done; just ci

Not env $UNSET just ci with a built-up -u ... string — zsh does not word-split unquoted expansions, so it silently strips nothing.

With that, full just ci is green (exit 0) on my equivalent branch, including the desktop/web builds and mobile tests.