Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ jobs:
BUZZ_RATE_LIMIT_HUMAN_API_CALLS_PER_MIN=100000 \
BUZZ_RATE_LIMIT_HUMAN_WS_EVENTS_PER_SEC=10000 \
BUZZ_GIT_PROBE_WRITERS=8 \
SPROUT_REMINDER_SCHEDULER_INTERVAL_SECS=1 \
BUZZ_REMINDER_SCHEDULER_INTERVAL_SECS=1 \
./target/ci/buzz-relay > /tmp/buzz-relay.log 2>&1 &
echo $! > /tmp/buzz-relay.pid
for attempt in $(seq 1 60); do
Expand Down Expand Up @@ -640,7 +640,7 @@ jobs:
BUZZ_REQUIRE_AUTH_TOKEN=false \
BUZZ_RECONCILE_CHANNELS=true \
BUZZ_GIT_PROBE_WRITERS=8 \
SPROUT_REMINDER_SCHEDULER_INTERVAL_SECS=1 \
BUZZ_REMINDER_SCHEDULER_INTERVAL_SECS=1 \
./target/ci/buzz-relay > /tmp/buzz-relay.log 2>&1 &
echo $! > /tmp/buzz-relay.pid
for attempt in $(seq 1 60); do
Expand Down
2 changes: 1 addition & 1 deletion crates/buzz-acp/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1536,7 +1536,7 @@ mod tests {

#[test]
fn codex_network_env_wss_url() {
let result = codex_network_env("codex-acp", "wss://sprout-oss.stage.blox.sqprod.co");
let result = codex_network_env("codex-acp", "wss://relay.example.com");
assert_eq!(
result,
Some(("CODEX_CONFIG".to_string(), CODEX_CONFIG_JSON.to_string()))
Expand Down
2 changes: 1 addition & 1 deletion crates/buzz-agent/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ pub const MAX_TOOL_RESULT_BYTES: usize = 8 * 1024 * 1024;
/// Default cap on the *text* portion of a single tool result. Oversized text
/// is middle-elided before it enters history; without this, one fat `cat`
/// burns the context window and forces a lossy handoff. 50 KiB matches the
/// shell-output caps in sprout-dev-mcp, goose, and pi; codex defaults to
/// shell-output caps in buzz-dev-mcp, goose, and pi; codex defaults to
/// 10 KB. Tunable via `BUZZ_AGENT_MAX_TOOL_RESULT_TEXT_BYTES`.
pub const DEFAULT_TOOL_RESULT_TEXT_BYTES: usize = 50 * 1024;
pub const MAX_TOOL_CALLS_PER_TURN: usize = 64;
Expand Down
6 changes: 4 additions & 2 deletions crates/buzz-relay/src/handlers/ingest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1295,8 +1295,10 @@ fn validate_event_reminder(event: &Event) -> Result<(), &'static str> {
// omit it. The ordering check only applies when both are present.
if let Some(nb) = not_before {
// Reject reminders scheduled beyond the configured horizon. The same
// SPROUT_MAX_NOT_BEFORE_DELTA env var is advertised in NIP-11.
let max_delta: u64 = std::env::var("SPROUT_MAX_NOT_BEFORE_DELTA")
// BUZZ_MAX_NOT_BEFORE_DELTA env var is advertised in NIP-11 (legacy
// SPROUT_-prefixed name still accepted, matching nip11.rs).
let max_delta: u64 = std::env::var("BUZZ_MAX_NOT_BEFORE_DELTA")
.or_else(|_| std::env::var("SPROUT_MAX_NOT_BEFORE_DELTA"))
.ok()
.and_then(|v| v.parse().ok())
.unwrap_or(31_536_000); // 1 year default
Expand Down
2 changes: 1 addition & 1 deletion crates/buzz-relay/src/handlers/side_effects.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2058,7 +2058,7 @@ async fn handle_a_tag_deletion(
// separate concern) takes precedence. For every other addressable
// kind, including kind:30023 (NIP-23 long-form), we soft-delete the
// live row matching `(kind, pubkey, d_tag)` so REQs stop returning it.
// See https://github.com/block/sprout/issues/714.
// See https://github.com/block/buzz/issues/714.
k if is_parameterized_replaceable(k) => {
let pubkey_bytes = match hex::decode(pubkey_hex) {
Ok(b) => b,
Expand Down
9 changes: 7 additions & 2 deletions crates/buzz-relay/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -698,11 +698,16 @@ async fn main() -> anyhow::Result<()> {
// column: only the pod that wins the atomic claim publishes.
{
let scheduler_state = Arc::clone(&state);
let scheduler_interval_secs: u64 = std::env::var("SPROUT_REMINDER_SCHEDULER_INTERVAL_SECS")
// Legacy SPROUT_-prefixed names still accepted so existing
// deployments keep their scheduler tuning across the sprout→buzz
// rename.
let scheduler_interval_secs: u64 = std::env::var("BUZZ_REMINDER_SCHEDULER_INTERVAL_SECS")
.or_else(|_| std::env::var("SPROUT_REMINDER_SCHEDULER_INTERVAL_SECS"))
.ok()
.and_then(|v| v.parse().ok())
.unwrap_or(10);
let scheduler_batch_limit: i64 = std::env::var("SPROUT_REMINDER_SCHEDULER_BATCH_LIMIT")
let scheduler_batch_limit: i64 = std::env::var("BUZZ_REMINDER_SCHEDULER_BATCH_LIMIT")
.or_else(|_| std::env::var("SPROUT_REMINDER_SCHEDULER_BATCH_LIMIT"))
.ok()
.and_then(|v| v.parse().ok())
.unwrap_or(100);
Expand Down
5 changes: 4 additions & 1 deletion crates/buzz-relay/src/nip11.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,10 @@ pub struct RelayLimitation {
/// `AuthState::Authenticated`. This is independent of the REST API token
/// toggle (`config.require_auth_token`).
fn relay_limitation(max_message_length: usize) -> RelayLimitation {
let max_not_before_delta: u64 = std::env::var("SPROUT_MAX_NOT_BEFORE_DELTA")
// Legacy SPROUT_-prefixed name still accepted so existing deployments
// keep their configured horizon across the sprout→buzz rename.
let max_not_before_delta: u64 = std::env::var("BUZZ_MAX_NOT_BEFORE_DELTA")
.or_else(|_| std::env::var("SPROUT_MAX_NOT_BEFORE_DELTA"))
.ok()
.and_then(|v| v.parse().ok())
.unwrap_or(31_536_000); // 1 year default
Expand Down
2 changes: 1 addition & 1 deletion crates/buzz-test-client/tests/e2e_event_reminder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,7 @@ async fn await_scheduler_push(
/// fan-out.
///
/// Requires a low scheduler interval; run the relay with
/// `SPROUT_REMINDER_SCHEDULER_INTERVAL_SECS=1`.
/// `BUZZ_REMINDER_SCHEDULER_INTERVAL_SECS=1`.
#[tokio::test]
#[ignore]
async fn test_scheduler_delivers_due_reminder_to_author_subscription() {
Expand Down
2 changes: 1 addition & 1 deletion docs/nips/NIP-AO.md
Original file line number Diff line number Diff line change
Expand Up @@ -297,4 +297,4 @@ of decrypted payloads and MUST NOT log it at INFO level or above.

## Reference Implementation

[block/sprout PR #421](https://github.com/block/sprout/pull/421)
[block/buzz PR #421](https://github.com/block/buzz/pull/421)