Skip to content

Commit 0b71418

Browse files
SanHsienclaude
andcommitted
Merge upstream block/buzz 24a3706 into the fork
Co-Authored-By: Claude Opus 5.5 <[email protected]>
2 parents 39076ad + 24a3706 commit 0b71418

201 files changed

Lines changed: 12143 additions & 1485 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-clients.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ jobs:
149149
test/features/onboarding/hosted_journeys_test.dart
150150
test/features/onboarding/hosted_communities_test.dart
151151
test/features/pairing/pairing_hosted_handoff_test.dart
152+
test/shared/agents/remote_agents_test.dart
153+
test/features/agents
152154
- name: Test mobile without push configuration
153155
if: matrix.lane == 'checks'
154156
run: cd mobile && flutter test test/shared/push/push_unconfigured_build_test.dart

‎.github/workflows/_ci-rust.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
123123
# MSVC needs windows.h (aws-lc-sys et al.), so this runs on a real Windows
124124
# runner — hermit, used by the Linux jobs, does not provide MSVC. The
125-
# toolchain (1.95.0 + clippy via profile = default) comes from the
125+
# toolchain (1.98.1 + clippy via profile = default) comes from the
126126
# repo-root rust-toolchain.toml, which the runner's preinstalled rustup
127127
# honors on demand; the host triple already is x86_64-pc-windows-msvc.
128128
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ jobs:
676676
shell: bash
677677
run: scripts/verify-release-ref.sh desktop-v "$VERSION"
678678

679-
- uses: dtolnay/rust-toolchain@e081816240890017053eacbb1bdf337761dc5582 # 1.95.0
679+
- uses: dtolnay/rust-toolchain@18f0487477426dce244608110aa2660c2893deb7 # 1.98.1
680680
with:
681681
targets: ${{ env.TARGET }}
682682

‎.github/workflows/windows-canary.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
persist-credentials: false
4040

4141
# The Windows runner ships with rustup preinstalled; rust-toolchain.toml
42-
# in the repo root pins the channel (1.95.0) automatically. We only need
42+
# in the repo root pins the channel (1.98.1) automatically. We only need
4343
# to ensure the cross-compile target is registered; on windows-latest the
4444
# host IS x86_64-pc-windows-msvc so this is typically a no-op.
4545
- name: Add Rust target

‎ARCHITECTURE.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,8 @@ shape is an explicit transition, not a flag day:
504504
never spans communities. Serving leases use the same application admission.
505505
Startup and deletion catalog validation tolerate the universal fence objects
506506
being absent; inventories still record live fences for older executors.
507+
Desired-state bootstraps install only explicitly declared legacy fences.
508+
New tenant-owned tables rely on application admission, without a fence trigger.
507509
- **Replica floor (transition foundation):** runtime now provides a shared
508510
replica-floor lock helper for compliant channel-event writers, and the writer
509511
probe handshake takes the exclusive counterpart before sampling `S`, scanning

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Public Buzz relay image — published as ghcr.io/block/buzz:<tag>.
44
#
5-
# Builds the `buzz-relay` binary (Rust 1.95) and the `buzz-web` static bundle
5+
# Builds the `buzz-relay` binary (Rust 1.98) and the `buzz-web` static bundle
66
# (pnpm + vite), then assembles them into a small debian-slim runtime with
77
# `git` available (the relay shells out to git for repo hydrate / receive-pack
88
# / upload-pack — see crates/buzz-relay/src/api/git).
@@ -11,7 +11,7 @@
1111
# native arm64 runners (see .github/workflows/docker.yml). The Dockerfile
1212
# itself is platform-agnostic; do not add --platform pins.
1313

14-
ARG RUST_VERSION=1.95
14+
ARG RUST_VERSION=1.98
1515
ARG NODE_VERSION=24
1616
ARG DEBIAN_VERSION=bookworm
1717

‎Dockerfile.push-gateway‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1.7
2-
ARG RUST_VERSION=1.95
2+
ARG RUST_VERSION=1.98
33
ARG DEBIAN_VERSION=bookworm
44

55
FROM rust:${RUST_VERSION}-${DEBIAN_VERSION} AS chef

‎Dockerfile.sprig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Multi-arch is produced by building this file on native amd64 and arm64 runners.
33
# Keep both bases pinned to manifest-list digests so either architecture resolves
44
# to immutable source bytes.
5-
FROM rust:1.95-alpine3.22@sha256:064dfc925d68d1a63f4fd2871bd7dc6e6ea56692989a487185855d62885d90aa AS builder
5+
FROM rust:1.98-alpine3.22@sha256:a1796ca6fa216d6727b5f61c69e4c665b120b1a4dcb969639e2f25f1ed309456 AS builder
66

77
RUN apk add --no-cache \
88
build-base \

‎benchmarks/harbor-buzz-orchestra/scripts/benchmark.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
FORWARDER_SOURCE = PACKAGE_ROOT / "forwarder" / "relay_forwarder.rs"
7676
FORWARDER_BINARY = "relay-forwarder"
7777
LINUX_TARGET_DIR = STATE_DIR / "linux-target"
78-
RUST_IMAGE = "rust:1.95-alpine"
78+
RUST_IMAGE = "rust:1.98-alpine"
7979

8080

8181
@dataclass(frozen=True)

‎crates/buzz-acp/src/queue.rs‎

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -558,28 +558,24 @@ impl EventQueue {
558558
.keys()
559559
.find(|scope| !self.in_flight_scopes.contains(scope))
560560
.cloned();
561-
match cancelled_scope {
562-
Some(scope) => {
563-
// Move cancelled events into the regular events slot.
564-
// No new events to merge — re-dispatch the original batch.
565-
let cancelled = self.cancelled_batches.remove(&scope).unwrap_or_default();
566-
let cancel_reason = self.cancel_reasons.remove(&scope);
567-
self.in_flight_scopes.insert(scope.clone());
568-
self.in_flight_deadlines
569-
.insert(scope.clone(), now + self.in_flight_deadline);
570-
self.in_flight_batch_sizes
571-
.insert(scope.clone(), cancelled.len());
572-
self.record_in_flight_reply_route(&scope, &cancelled);
573-
return Some(FlushBatch {
574-
channel_id: scope.channel_id(),
575-
scope,
576-
events: cancelled,
577-
cancelled_events: vec![],
578-
cancel_reason,
579-
});
580-
}
581-
None => return None,
582-
}
561+
let scope = cancelled_scope?;
562+
// Move cancelled events into the regular events slot.
563+
// No new events to merge — re-dispatch the original batch.
564+
let cancelled = self.cancelled_batches.remove(&scope).unwrap_or_default();
565+
let cancel_reason = self.cancel_reasons.remove(&scope);
566+
self.in_flight_scopes.insert(scope.clone());
567+
self.in_flight_deadlines
568+
.insert(scope.clone(), now + self.in_flight_deadline);
569+
self.in_flight_batch_sizes
570+
.insert(scope.clone(), cancelled.len());
571+
self.record_in_flight_reply_route(&scope, &cancelled);
572+
return Some(FlushBatch {
573+
channel_id: scope.channel_id(),
574+
scope,
575+
events: cancelled,
576+
cancelled_events: vec![],
577+
cancel_reason,
578+
});
583579
}
584580
};
585581
let channel_id = scope.channel_id();
@@ -1465,10 +1461,8 @@ pub fn extract_slash_command(content: &str, known_names: &[&str]) -> Option<Stri
14651461
.unwrap_or(after_at.len());
14661462
(len > 0).then_some(len)
14671463
});
1468-
match name_len {
1469-
Some(len) => rest = after_at[len..].trim_start(),
1470-
None => return None, // bare '@' — not a mention
1471-
}
1464+
let len = name_len?; // bare '@' — not a mention
1465+
rest = after_at[len..].trim_start();
14721466
} else {
14731467
break;
14741468
}

0 commit comments

Comments
 (0)