Skip to content

Commit f061ae9

Browse files
wpfleger96npub1mn7jgtj4w2pd0g0zeuhxsa6jy6p0rewxz4kujt98my82ahfmp72sxjexk7
andauthored
fix(desktop): fold baked build env into in-process model discovery (#1376)
Signed-off-by: Will Pfleger <[email protected]> Co-authored-by: npub1mn7jgtj4w2pd0g0zeuhxsa6jy6p0rewxz4kujt98my82ahfmp72sxjexk7 <dcfd242e557282d7a1e2cf2e6877522682f1e5c6156dc92ca7d90eaedd3b0f95@sprout-oss.stage.blox.sqprod.co>
1 parent aa1042b commit f061ae9

10 files changed

Lines changed: 1733 additions & 99 deletions

File tree

‎desktop/scripts/check-file-sizes.mjs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,15 @@ const overrides = new Map([
130130
// catalog module; agent_models.rs retains the thin wrapper (~50 lines).
131131
// File still exceeds 1000 due to OpenAI/Anthropic discovery + subprocess
132132
// fallback. Queued to split into dedicated discovery modules.
133-
["src-tauri/src/commands/agent_models.rs", 1066],
134133
// Kept activity-feed design fixture: realistic prompt context and tool-heavy
135134
// chatter for render-class test/reference coverage. Queued to split with the
136135
// rest of this list if it grows further.
136+
// +2: baked build env folded under merged_env in both get_agent_models and
137+
// discover_agent_models so in-process discovery sees baked provider config on
138+
// a GUI-launched DMG (the discovery_env_with_baked_floor fold).
139+
// +3: provider tri-state applied in update_managed_agent handler
140+
// (if let Some(provider_update) = input.provider { record.provider = provider_update; }).
141+
["src-tauri/src/commands/agent_models.rs", 1071],
137142
]);
138143

139144
await runFileSizeCheck({

‎desktop/src-tauri/src/commands/agent_models.rs‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ use crate::{
1111
app_state::AppState,
1212
managed_agents::{
1313
build_managed_agent_summary, current_instance_id, default_agent_workdir,
14-
find_managed_agent_mut, known_acp_runtime, load_managed_agents, load_personas,
15-
managed_agent_avatar_url, missing_command_message, normalize_agent_args, resolve_command,
16-
save_managed_agents, sync_managed_agent_processes, try_regenerate_nest, AgentModelInfo,
17-
AgentModelsResponse, UpdateManagedAgentRequest, UpdateManagedAgentResponse,
18-
DEFAULT_ACP_COMMAND,
14+
discovery_env_with_baked_floor, find_managed_agent_mut, known_acp_runtime,
15+
load_managed_agents, load_personas, managed_agent_avatar_url, missing_command_message,
16+
normalize_agent_args, resolve_command, save_managed_agents, sync_managed_agent_processes,
17+
try_regenerate_nest, AgentModelInfo, AgentModelsResponse, UpdateManagedAgentRequest,
18+
UpdateManagedAgentResponse, DEFAULT_ACP_COMMAND,
1919
},
2020
relay::{relay_ws_url_with_override, sync_managed_agent_profile},
2121
util::now_iso,
@@ -90,6 +90,7 @@ pub async fn get_agent_models(
9090
)
9191
}; // store lock released — subprocess runs without holding the lock
9292

93+
let merged_env = discovery_env_with_baked_floor(merged_env);
9394
if let Some(models) = discover_openai_compatible_models(
9495
&state.http_client,
9596
effective_provider.as_deref(),
@@ -222,6 +223,7 @@ pub async fn discover_agent_models(
222223
}
223224
}
224225
let merged_env = crate::managed_agents::merged_user_env(&derived_env, &input.env_vars);
226+
let merged_env = discovery_env_with_baked_floor(merged_env);
225227

226228
if let Some(models) = discover_openai_compatible_models(
227229
&state.http_client,
@@ -825,6 +827,9 @@ pub async fn update_managed_agent(
825827
if let Some(model_update) = input.model {
826828
record.model = model_update;
827829
}
830+
if let Some(provider_update) = input.provider {
831+
record.provider = provider_update;
832+
}
828833
if let Some(prompt_update) = input.system_prompt {
829834
record.system_prompt = prompt_update;
830835
}

‎desktop/src-tauri/src/managed_agents/agent_env.rs‎

Lines changed: 180 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,84 @@
44
//! binary via `BUZZ_BUILD_AGENT_ENV` (base64-encoded, newline-delimited).
55
//! OSS builds leave the compile-time var unset — nothing is injected.
66
7+
use std::collections::BTreeMap;
8+
79
use base64::Engine as _;
810

9-
/// Inject baked-in provider/model defaults and generic env pairs onto `cmd`.
11+
/// Return the baked-in build-time env pairs as a map.
1012
///
11-
/// Call this BEFORE writing record/persona metadata env vars so that the
12-
/// record's explicit choices (written after) override the baked defaults.
13-
/// User-supplied `record.env_vars` (written last) always win.
14-
pub(crate) fn build_buzz_agent_provider_defaults(cmd: &mut std::process::Command) {
15-
if let Some(provider) = option_env!("BUZZ_DESKTOP_BUILD_BUZZ_AGENT_PROVIDER") {
13+
/// Internal builds (buzz-releases) bake provider/model defaults and arbitrary
14+
/// `KEY=VALUE` pairs into the binary at compile time. This function returns
15+
/// those pairs as an owned map so callers can fold them into an in-process env
16+
/// at the **lowest** precedence layer — user/persona values layered on top
17+
/// override these baked defaults (last-write-wins, matching the existing
18+
/// subprocess ordering where user env is written last).
19+
///
20+
/// OSS builds leave all `option_env!` vars unset, so this returns an empty
21+
/// map — a safe no-op.
22+
pub(crate) fn baked_build_env() -> BTreeMap<String, String> {
23+
build_env_map(
24+
option_env!("BUZZ_DESKTOP_BUILD_BUZZ_AGENT_PROVIDER"),
25+
option_env!("BUZZ_DESKTOP_BUILD_BUZZ_AGENT_MODEL"),
26+
option_env!("BUZZ_DESKTOP_BUILD_AGENT_ENV"),
27+
)
28+
}
29+
30+
/// Assemble a build-time env map from optional raw bake-in values.
31+
///
32+
/// Separated from `baked_build_env` so the assembly logic can be exercised in
33+
/// unit tests without relying on compile-time `option_env!` values being set.
34+
fn build_env_map(
35+
raw_provider: Option<&str>,
36+
raw_model: Option<&str>,
37+
raw_agent_env: Option<&str>,
38+
) -> BTreeMap<String, String> {
39+
let mut map = BTreeMap::new();
40+
if let Some(provider) = raw_provider {
1641
if !provider.is_empty() {
17-
cmd.env("BUZZ_AGENT_PROVIDER", provider);
42+
map.insert("BUZZ_AGENT_PROVIDER".to_string(), provider.to_string());
1843
}
1944
}
20-
if let Some(model) = option_env!("BUZZ_DESKTOP_BUILD_BUZZ_AGENT_MODEL") {
45+
if let Some(model) = raw_model {
2146
if !model.is_empty() {
22-
cmd.env("BUZZ_AGENT_MODEL", model);
47+
map.insert("BUZZ_AGENT_MODEL".to_string(), model.to_string());
2348
}
2449
}
25-
if let Some(raw) = option_env!("BUZZ_DESKTOP_BUILD_AGENT_ENV") {
50+
if let Some(raw) = raw_agent_env {
2651
// The value was base64-encoded at build time so the single-line Cargo
2752
// output carries all KEY=VALUE pairs without truncation.
2853
if let Ok(decoded) = base64::engine::general_purpose::STANDARD.decode(raw.as_bytes()) {
2954
if let Ok(text) = std::str::from_utf8(&decoded) {
3055
for (key, value) in parse_agent_env_lines(text) {
31-
cmd.env(key, value);
56+
map.insert(key.to_string(), value.to_string());
3257
}
3358
}
3459
}
3560
}
61+
map
62+
}
63+
64+
/// Fold the baked build env under `merged_env` so user/persona values win.
65+
///
66+
/// Returns a new map with baked pairs as the floor and `merged_env` on top.
67+
/// OSS builds return `merged_env` unchanged (empty baked map → no-op).
68+
pub(crate) fn discovery_env_with_baked_floor(
69+
merged_env: std::collections::BTreeMap<String, String>,
70+
) -> std::collections::BTreeMap<String, String> {
71+
let mut env = baked_build_env();
72+
env.extend(merged_env);
73+
env
74+
}
75+
76+
/// Inject baked-in provider/model defaults and generic env pairs onto `cmd`.
77+
///
78+
/// Call this BEFORE writing record/persona metadata env vars so that the
79+
/// record's explicit choices (written after) override the baked defaults.
80+
/// User-supplied `record.env_vars` (written last) always win.
81+
pub(crate) fn build_buzz_agent_provider_defaults(cmd: &mut std::process::Command) {
82+
for (key, value) in baked_build_env() {
83+
cmd.env(key, value);
84+
}
3685
}
3786

3887
/// Parse newline-delimited `KEY=VALUE` lines from a baked env blob.
@@ -58,7 +107,10 @@ pub(crate) fn parse_agent_env_lines(raw: &str) -> Vec<(&str, &str)> {
58107

59108
#[cfg(test)]
60109
mod tests {
61-
use super::{build_buzz_agent_provider_defaults, parse_agent_env_lines};
110+
use super::{
111+
baked_build_env, build_buzz_agent_provider_defaults, build_env_map,
112+
discovery_env_with_baked_floor, parse_agent_env_lines,
113+
};
62114

63115
#[test]
64116
fn buzz_agent_provider_defaults_empty_in_oss_build() {
@@ -188,4 +240,120 @@ mod tests {
188240
"baked default must not survive when record provider is written after"
189241
);
190242
}
243+
244+
// ── baked_build_env / build_env_map tests ─────────────────────────────
245+
246+
#[test]
247+
fn baked_build_env_is_empty_in_oss_build() {
248+
// In OSS/test builds none of the BUZZ_DESKTOP_BUILD_* compile-time vars
249+
// are set, so baked_build_env() must return an empty map — no
250+
// accidental injection onto in-process discovery.
251+
assert!(
252+
baked_build_env().is_empty(),
253+
"baked_build_env must be empty in OSS builds (no option_env! vars set)"
254+
);
255+
}
256+
257+
#[test]
258+
fn build_env_map_none_inputs_returns_empty() {
259+
assert!(build_env_map(None, None, None).is_empty());
260+
}
261+
262+
#[test]
263+
fn build_env_map_provider_and_model_are_mapped() {
264+
let map = build_env_map(Some("databricks"), Some("my-model"), None);
265+
assert_eq!(
266+
map.get("BUZZ_AGENT_PROVIDER").map(String::as_str),
267+
Some("databricks")
268+
);
269+
assert_eq!(
270+
map.get("BUZZ_AGENT_MODEL").map(String::as_str),
271+
Some("my-model")
272+
);
273+
}
274+
275+
#[test]
276+
fn build_env_map_empty_provider_is_skipped() {
277+
let map = build_env_map(Some(""), Some("my-model"), None);
278+
assert!(
279+
!map.contains_key("BUZZ_AGENT_PROVIDER"),
280+
"empty provider must be skipped"
281+
);
282+
assert_eq!(
283+
map.get("BUZZ_AGENT_MODEL").map(String::as_str),
284+
Some("my-model")
285+
);
286+
}
287+
288+
#[test]
289+
fn build_env_map_agent_env_blob_is_decoded_and_folded() {
290+
use base64::Engine as _;
291+
let raw = "DATABRICKS_HOST=https://block-lakehouse-production.cloud.databricks.com/\nDATABRICKS_MODEL=goose-claude-opus-4-8";
292+
let blob = base64::engine::general_purpose::STANDARD.encode(raw.as_bytes());
293+
let map = build_env_map(None, None, Some(&blob));
294+
assert_eq!(
295+
map.get("DATABRICKS_HOST").map(String::as_str),
296+
Some("https://block-lakehouse-production.cloud.databricks.com/")
297+
);
298+
assert_eq!(
299+
map.get("DATABRICKS_MODEL").map(String::as_str),
300+
Some("goose-claude-opus-4-8")
301+
);
302+
}
303+
304+
#[test]
305+
fn build_env_map_user_env_overrides_baked_via_btreemap_extend() {
306+
// Validates the precedence fold used in agent_models.rs:
307+
// let mut discovery_env = baked_build_env(); // floor
308+
// discovery_env.extend(merged_env); // user wins
309+
use base64::Engine as _;
310+
let raw = "DATABRICKS_HOST=https://baked.example.com/";
311+
let blob = base64::engine::general_purpose::STANDARD.encode(raw.as_bytes());
312+
let mut discovery_env = build_env_map(None, None, Some(&blob));
313+
314+
// User-supplied env_vars override the baked value.
315+
let mut user_env = std::collections::BTreeMap::new();
316+
user_env.insert(
317+
"DATABRICKS_HOST".to_string(),
318+
"https://user.example.com/".to_string(),
319+
);
320+
discovery_env.extend(user_env);
321+
322+
assert_eq!(
323+
discovery_env.get("DATABRICKS_HOST").map(String::as_str),
324+
Some("https://user.example.com/"),
325+
"user env_vars must override baked DATABRICKS_HOST"
326+
);
327+
}
328+
329+
#[test]
330+
fn discovery_env_with_baked_floor_user_key_wins_over_baked() {
331+
use base64::Engine as _;
332+
let raw = "DATABRICKS_HOST=https://baked.example.com/";
333+
let blob = base64::engine::general_purpose::STANDARD.encode(raw.as_bytes());
334+
// Simulate what an internal build would produce via build_env_map.
335+
let _baked = build_env_map(None, None, Some(&blob));
336+
337+
// In OSS test builds baked_build_env() returns empty, so we exercise
338+
// the helper's merge logic directly via merged_env carrying the key.
339+
let mut merged = std::collections::BTreeMap::new();
340+
merged.insert(
341+
"DATABRICKS_HOST".to_string(),
342+
"https://user.example.com/".to_string(),
343+
);
344+
merged.insert("OTHER_KEY".to_string(), "other".to_string());
345+
346+
let result = discovery_env_with_baked_floor(merged);
347+
348+
assert_eq!(
349+
result.get("DATABRICKS_HOST").map(String::as_str),
350+
Some("https://user.example.com/"),
351+
"merged_env key must survive in discovery_env_with_baked_floor output"
352+
);
353+
assert_eq!(
354+
result.get("OTHER_KEY").map(String::as_str),
355+
Some("other"),
356+
"unrelated merged_env keys must pass through unchanged"
357+
);
358+
}
191359
}

‎desktop/src-tauri/src/managed_agents/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
mod agent_env;
22
pub(crate) mod agent_events;
3-
pub(crate) use agent_env::build_buzz_agent_provider_defaults;
3+
pub(crate) use agent_env::{build_buzz_agent_provider_defaults, discovery_env_with_baked_floor};
44
mod backend;
55
pub(crate) mod config_bridge;
66
mod discovery;

‎desktop/src-tauri/src/managed_agents/relay_mesh.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ mod tests {
8989
provider_binary_path: None,
9090
persona_team_dir: None,
9191
persona_name_in_team: None,
92+
persona_source_version: None,
93+
provider: None,
9294
created_at: "now".into(),
9395
updated_at: "now".into(),
9496
last_started_at: None,

‎desktop/src-tauri/src/managed_agents/types.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@ pub struct UpdateManagedAgentRequest {
506506
pub agent_args: Option<Vec<String>>,
507507
#[serde(default)]
508508
pub mcp_command: Option<String>,
509+
/// Absent = don't touch. null = clear to runtime default. "id" = set.
510+
#[serde(default, deserialize_with = "crate::util::double_option")]
511+
pub provider: Option<Option<String>>,
509512
/// Absent = don't touch. Present = set mode.
510513
#[serde(default)]
511514
pub respond_to: Option<RespondTo>,

‎desktop/src-tauri/src/managed_agents/types/tests.rs‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,46 @@ fn validate_respond_to_allowlist_accepts_empty() {
209209
assert!(result.is_empty());
210210
}
211211

212+
#[test]
213+
fn update_request_provider_tristate_absent_means_no_touch() {
214+
// A JSON payload with no "provider" key deserialized with `None` —
215+
// the backend must leave the record's existing provider unchanged.
216+
let request: super::UpdateManagedAgentRequest =
217+
serde_json::from_str(r#"{"pubkey": "abcd1234"}"#)
218+
.expect("minimal update request should deserialize");
219+
assert!(
220+
request.provider.is_none(),
221+
"absent provider must deserialize to None (don't touch)"
222+
);
223+
}
224+
225+
#[test]
226+
fn update_request_provider_tristate_null_means_clear() {
227+
// A JSON payload with `"provider": null` deserialized with `Some(None)` —
228+
// the backend must clear the record's provider back to the runtime default.
229+
let request: super::UpdateManagedAgentRequest =
230+
serde_json::from_str(r#"{"pubkey": "abcd1234", "provider": null}"#)
231+
.expect("null provider request should deserialize");
232+
assert_eq!(
233+
request.provider,
234+
Some(None),
235+
"explicit null must deserialize to Some(None) (clear)"
236+
);
237+
}
238+
239+
#[test]
240+
fn update_request_provider_tristate_value_means_set() {
241+
// A JSON payload with a provider string deserialized with `Some(Some(…))`.
242+
let request: super::UpdateManagedAgentRequest =
243+
serde_json::from_str(r#"{"pubkey": "abcd1234", "provider": "databricks_v2"}"#)
244+
.expect("provider value request should deserialize");
245+
assert_eq!(
246+
request.provider,
247+
Some(Some("databricks_v2".to_string())),
248+
"provider value must deserialize to Some(Some(value)) (set)"
249+
);
250+
}
251+
212252
use super::{CreateManagedAgentRequest, RelayMeshConfig};
213253

214254
/// Wire-shape test: the create request arrives from TS as camelCase

0 commit comments

Comments
 (0)