@@ -1275,6 +1275,10 @@ enum SandboxCommands {
12751275 #[ arg( long = "label" ) ]
12761276 labels : Vec < String > ,
12771277
1278+ /// Environment variables to inject into the sandbox (KEY=VALUE format, repeatable).
1279+ #[ arg( long = "env" , value_name = "KEY=VALUE" ) ]
1280+ envs : Vec < String > ,
1281+
12781282 /// Approval mode for agent-authored policy proposals.
12791283 ///
12801284 /// `manual` (default): every proposal lands in the draft inbox for
@@ -1381,6 +1385,10 @@ enum SandboxCommands {
13811385 #[ arg( long, overrides_with = "tty" ) ]
13821386 no_tty : bool ,
13831387
1388+ /// Environment variables to set for the command (KEY=VALUE format, repeatable).
1389+ #[ arg( long = "env" , value_name = "KEY=VALUE" ) ]
1390+ envs : Vec < String > ,
1391+
13841392 /// Command and arguments to execute.
13851393 #[ arg( required = true , trailing_var_arg = true , allow_hyphen_values = true ) ]
13861394 command : Vec < String > ,
@@ -2558,6 +2566,7 @@ async fn main() -> Result<()> {
25582566 auto_providers,
25592567 no_auto_providers,
25602568 labels,
2569+ envs,
25612570 approval_mode,
25622571 command,
25632572 } => {
@@ -2592,6 +2601,9 @@ async fn main() -> Result<()> {
25922601 labels_map. insert ( parts[ 0 ] . to_string ( ) , parts[ 1 ] . to_string ( ) ) ;
25932602 }
25942603
2604+ // Parse --env flags into a HashMap<String, String>.
2605+ let env_map = run:: parse_env_pairs ( & envs) ?;
2606+
25952607 // Parse --upload specs into [(local_path, sandbox_path, git_ignore)].
25962608 let upload_specs: Vec < ( String , Option < String > , bool ) > = upload
25972609 . iter ( )
@@ -2639,6 +2651,7 @@ async fn main() -> Result<()> {
26392651 tty_override,
26402652 auto_providers_override,
26412653 & labels_map,
2654+ & env_map,
26422655 & approval_mode,
26432656 & tls,
26442657 ) )
@@ -2664,20 +2677,26 @@ async fn main() -> Result<()> {
26642677 let dest_display = sandbox_dest. unwrap_or ( "~" ) ;
26652678 eprintln ! ( "Uploading {} -> sandbox:{}" , local. display( ) , dest_display) ;
26662679 if !no_git_ignore && let Ok ( ( base_dir, files) ) = run:: git_sync_files ( local) {
2667- run:: sandbox_sync_up_files (
2668- & ctx. endpoint ,
2669- & name,
2670- & base_dir,
2671- & files,
2672- local,
2673- sandbox_dest,
2674- & tls,
2675- )
2676- . await ?;
2677- eprintln ! ( "{} Upload complete" , "✓" . green( ) . bold( ) ) ;
2678- return Ok ( ( ) ) ;
2680+ if !files. is_empty ( ) {
2681+ run:: sandbox_sync_up_files (
2682+ & ctx. endpoint ,
2683+ & name,
2684+ & base_dir,
2685+ & files,
2686+ local,
2687+ sandbox_dest,
2688+ & tls,
2689+ )
2690+ . await ?;
2691+ eprintln ! ( "{} Upload complete" , "✓" . green( ) . bold( ) ) ;
2692+ return Ok ( ( ) ) ;
2693+ }
2694+ eprintln ! (
2695+ "{} .gitignore filtering excluded all files in {}; uploading unfiltered" ,
2696+ "⚠" . yellow( ) . bold( ) ,
2697+ local. display( ) ,
2698+ ) ;
26792699 }
2680- // Fallback: upload without git filtering
26812700 run:: sandbox_sync_up ( & ctx. endpoint , & name, local, sandbox_dest, & tls) . await ?;
26822701 eprintln ! ( "{} Upload complete" , "✓" . green( ) . bold( ) ) ;
26832702 }
@@ -2751,6 +2770,7 @@ async fn main() -> Result<()> {
27512770 timeout,
27522771 tty,
27532772 no_tty,
2773+ envs,
27542774 command,
27552775 } => {
27562776 let name = resolve_sandbox_name ( name, & ctx. name ) ?;
@@ -2762,13 +2782,15 @@ async fn main() -> Result<()> {
27622782 } else {
27632783 None // auto-detect
27642784 } ;
2785+ let env_map = run:: parse_env_pairs ( & envs) ?;
27652786 let exit_code = run:: sandbox_exec_grpc (
27662787 endpoint,
27672788 & name,
27682789 & command,
27692790 workdir. as_deref ( ) ,
27702791 timeout,
27712792 tty_override,
2793+ & env_map,
27722794 & tls,
27732795 )
27742796 . await ?;
0 commit comments