jerry/buzz
1
0
Fork 0
mirror of https://github.com/block/buzz.git synced 2026-10-29 13:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(desktop): keep runtime.rs under the file-size ratchet

Browse Source 
The inherited-provider fix pushed runtime.rs from 996 to 1008 lines,
past the 1000-line limit, failing Desktop Core.

Move the clearing step into agent_env.rs as
clear_inherited_provider_model_env, next to
build_buzz_agent_provider_defaults which it pairs with, and next to the
test that covers it. runtime.rs drops to 991; no behaviour change.

Signed-off-by: Michael Neale <michael.neale@gmail.com>
Co-authored-by: Michael Neale <michael.neale@gmail.com>
This commit is contained in:
Michael Neale
2026-08-12 15:08:45 +10:00
parent 15f6fd57f8
commit ff44cf405c
2 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
desktop/src-tauri/src/managed_agents/agent_env.rs
View File

@@ -97,6 +97,29 @@ pub(crate) fn build_buzz_agent_provider_defaults(cmd: &mut std::process::Command
}
}
/// Drop inherited provider/model env before an agent's own is derived.
///
/// `DERIVED_PROVIDER_MODEL_ENV_KEYS` are refused at save time so a stale
/// override cannot shadow the record's structured provider/model fields. That
/// guard only covers env we *persist*: the spawned child still inherits this
/// process's environment, and Desktop inherits the user's login shell. A
/// developer with goose installed exports `GOOSE_PROVIDER` there, and it
/// reached the agent as if it were configuration — an agent set to OpenAI sent
/// its OpenAI model to Anthropic and 404'd every turn while its settings still
/// read "OpenAI" in the UI.
///
/// Clearing them makes the record the only source: whatever
/// `runtime_metadata_env_vars` writes afterwards is what the child sees, and an
/// agent with no configured provider gets none rather than the developer's.
///
/// Call AFTER `build_buzz_agent_provider_defaults` and BEFORE the record's own
/// provider/model env.
pub(crate) fn clear_inherited_provider_model_env(cmd: &mut std::process::Command) {
for key in super::env_vars::DERIVED_PROVIDER_MODEL_ENV_KEYS {
cmd.env_remove(key);
}
}
/// Parse newline-delimited `KEY=VALUE` lines from a baked env blob.
/// Blank lines are skipped. Each non-blank line must contain `=`; the key
/// is everything before the first `=`, the value is everything after (values
@@ -122,7 +145,7 @@ pub(crate) fn parse_agent_env_lines(raw: &str) -> Vec<(&str, &str)> {
mod tests {
use super::{
baked_build_env, build_buzz_agent_provider_defaults, build_env_map,
discovery_env_with_baked_floor, parse_agent_env_lines,
clear_inherited_provider_model_env, discovery_env_with_baked_floor, parse_agent_env_lines,
};
#[test]
@@ -167,10 +190,8 @@ mod tests {
cmd.env(key, "inherited-from-login-shell");
}
// The clearing step under test, mirrored from `spawn_agent_child`.
for key in super::super::env_vars::DERIVED_PROVIDER_MODEL_ENV_KEYS {
cmd.env_remove(key);
}
// The clearing step under test, as `spawn_agent_child` calls it.
clear_inherited_provider_model_env(&mut cmd);
// Then the record's own values, as `runtime_metadata_env_vars` writes.
cmd.env("BUZZ_AGENT_PROVIDER", "openai");
cmd.env("BUZZ_AGENT_MODEL", "gpt-5.6-sol");

28
desktop/src-tauri/src/managed_agents/runtime.rs
View File

@@ -2,14 +2,14 @@ use std::collections::HashMap;
use tauri::AppHandle;
use super::agent_env::build_buzz_agent_provider_defaults;
use super::agent_env::{build_buzz_agent_provider_defaults, clear_inherited_provider_model_env};
use crate::{
managed_agents::{
append_log_marker, env_vars::DERIVED_PROVIDER_MODEL_ENV_KEYS, known_acp_runtime,
login_shell_path, managed_agent_log_path, missing_command_message, normalize_agent_args,
open_log_file, resolve_command, spawn_key_refusal, KnownAcpRuntime,
ManagedAgentPairRuntime, ManagedAgentRecord, ManagedAgentRuntimeKey, ManagedAgentSummary,
append_log_marker, known_acp_runtime, login_shell_path, managed_agent_log_path,
missing_command_message, normalize_agent_args, open_log_file, resolve_command,
spawn_key_refusal, KnownAcpRuntime, ManagedAgentPairRuntime, ManagedAgentRecord,
ManagedAgentRuntimeKey, ManagedAgentSummary,
},
util::now_iso,
};
@@ -740,23 +740,7 @@ pub fn spawn_agent_child(
resolve_session_title(record.display_name.as_deref(), &record.name),
);
build_buzz_agent_provider_defaults(&mut command);
// Clear inherited provider/model keys before deriving this agent's own.
//
// `DERIVED_PROVIDER_MODEL_ENV_KEYS` are refused at save time so a stale
// override cannot shadow the record's structured provider/model fields.
// That guard only covers env we *persist*: the child still inherits this
// process's environment, and Desktop inherits the user's login shell.
// A developer with goose installed exports `GOOSE_PROVIDER` there, and it
// reached the agent as if it were configuration — an agent set to OpenAI
// sent its OpenAI model to Anthropic and 404'd every turn while its
// settings still read "OpenAI" in the UI.
//
// Removing them here makes the record the only source: whatever
// `runtime_metadata_env_vars` derives below is what the child sees, and an
// agent with no configured provider gets none rather than the developer's.
for key in DERIVED_PROVIDER_MODEL_ENV_KEYS {
command.env_remove(key);
}
clear_inherited_provider_model_env(&mut command);
if let Some(meta) = runtime_meta {
for (key, value) in runtime_metadata_env_vars(
meta.model_env_var,