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+
79use 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) ]
60109mod 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/\n DATABRICKS_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}
0 commit comments