openjd-cli 0.1.2

Open Job Description CLI — validate, summarize, and run job templates
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// Copyright by contributors to this project.
// SPDX-License-Identifier: (Apache-2.0 OR MIT)

//! `openjd run` command — run a job template locally.

mod params;
mod result;

pub use params::parse_cli_parameters;

use clap::Args;
use openjd_model::parse::{self, DocumentType};
use openjd_model::StepDependencyGraph;
use openjd_sessions::action::ActionState;
use openjd_sessions::session::Session;
use std::collections::HashMap;
use std::path::PathBuf;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc;
use std::time::Instant;
use tokio_util::sync::CancellationToken;

use params::*;
use result::RunResult;

/// Strip the `\\?\` extended-length path prefix that Rust's `canonicalize()` and
/// `current_dir()` add on Windows. Most tools (bash, Python, etc.) don't understand it.
pub fn strip_extended_prefix(path: &std::path::Path) -> PathBuf {
    let s = path.to_string_lossy();
    if let Some(stripped) = s.strip_prefix(r"\\?\") {
        PathBuf::from(stripped)
    } else {
        path.to_path_buf()
    }
}

#[derive(Args)]
pub struct RunArgs {
    /// Path to the job template file
    pub path: PathBuf,

    /// The name of the Step to run (if omitted, runs all steps; auto-selects if only one step)
    #[arg(long)]
    pub step: Option<String>,

    /// Job parameters (Key=Value, file://path, or inline JSON '{"Key": "Value"}')
    #[arg(short = 'p', long = "job-param", alias = "parameter")]
    pub parameters: Vec<String>,

    /// Run a single task with explicit parameter values (PARAM=VALUE, repeatable).
    /// Mutually exclusive with --tasks and --maximum-tasks.
    #[arg(long = "task-param", short = 't', action = clap::ArgAction::Append, conflicts_with_all = ["tasks", "maximum_tasks"])]
    pub task_params: Vec<String>,

    /// Run specific tasks from a JSON/YAML file (file://path) or inline JSON array.
    /// Mutually exclusive with --task-param and --maximum-tasks.
    #[arg(long = "tasks", conflicts_with_all = ["task_params", "maximum_tasks"])]
    pub tasks: Option<String>,

    /// Environment template files
    #[arg(long = "environment", alias = "env")]
    pub environments: Vec<PathBuf>,

    /// Path mapping rules (file://path or inline JSON). Must have version 'pathmapping-1.0'.
    #[arg(long = "path-mapping-rules")]
    pub path_mapping_rules: Option<String>,

    /// Run dependency steps before the target step
    #[arg(long = "run-dependencies")]
    pub run_dependencies: bool,

    /// Do not run dependency steps (default)
    #[arg(long = "no-run-dependencies")]
    pub no_run_dependencies: bool,

    /// Maximum number of tasks to run (-1 for all).
    /// Mutually exclusive with --task-param and --tasks.
    #[arg(long = "maximum-tasks", default_value = "-1")]
    pub maximum_tasks: i64,

    /// Extensions to support (comma-separated or repeated). Empty string disables all.
    #[arg(long = "extensions")]
    pub extensions: Option<String>,

    /// Preserve session working directory after completion
    #[arg(long)]
    pub preserve: bool,

    /// Enable verbose logging while running the Session
    #[arg(long)]
    pub verbose: bool,

    /// How to format log output timestamps
    #[arg(long = "timestamp-format", value_parser = ["relative", "local", "utc"], default_value = "relative")]
    pub timestamp_format: String,

    /// How to format the command's output
    #[arg(long = "output", value_parser = ["human-readable", "json", "yaml"], default_value = "human-readable")]
    pub output: String,
}

pub async fn execute(args: RunArgs) -> Result<(), Box<dyn std::error::Error>> {
    let path = &args.path;

    // Verbose logging
    if args.verbose {
        log::set_max_level(log::LevelFilter::Debug);
    }

    let session_start = Instant::now();
    // Initialize global timestamp state for the logger
    let _ = crate::SESSION_START.set(session_start);
    let _ = crate::TIMESTAMP_FORMAT.set(args.timestamp_format.clone());
    let ts_format = args.timestamp_format.clone();
    let fmt_elapsed = move |start: &Instant| -> String {
        match ts_format.as_str() {
            "local" => chrono::Local::now()
                .format("%Y-%m-%dT%H:%M:%S%.3f")
                .to_string(),
            "utc" => chrono::Utc::now()
                .format("%Y-%m-%dT%H:%M:%S%.3fZ")
                .to_string(),
            _ => {
                let d = start.elapsed();
                let total_secs = d.as_secs();
                let h = total_secs / 3600;
                let m = (total_secs % 3600) / 60;
                let s = total_secs % 60;
                let ms = d.subsec_millis();
                format!("{h}:{m:02}:{s:02}.{ms:03}")
            }
        }
    };

    // Parse templates
    let content = crate::common::read_input_file(path)?;
    let doc_type = if path.extension().and_then(|e| e.to_str()) == Some("json") {
        DocumentType::Json
    } else {
        DocumentType::Yaml
    };
    let template_value = parse::document_string_to_object(
        &content,
        doc_type,
        &openjd_model::CallerLimits::default(),
    )?;
    let exts = crate::common::parse_extensions(&args.extensions)?;
    let supported_exts: Vec<&str> = exts.iter().map(|s| s.as_str()).collect();
    let job_template = parse::decode_job_template(
        template_value,
        Some(&supported_exts),
        &openjd_model::CallerLimits::default(),
    )?;

    let mut env_templates = Vec::new();
    for env_path in &args.environments {
        let env_content = std::fs::read_to_string(env_path)?;
        let env_doc_type = if env_path.extension().and_then(|e| e.to_str()) == Some("json") {
            DocumentType::Json
        } else {
            DocumentType::Yaml
        };
        let env_value = parse::document_string_to_object(
            &env_content,
            env_doc_type,
            &openjd_model::CallerLimits::default(),
        )?;
        env_templates.push(parse::decode_environment_template(
            env_value,
            Some(&supported_exts),
        )?);
    }

    // Preprocess parameters (model API)
    let input_values = parse_cli_parameters(&args.parameters)?;
    let path_rules = load_path_mapping_rules(&args.path_mapping_rules)?;
    let job_template_dir = strip_extended_prefix(
        std::fs::canonicalize(path)?
            .parent()
            .unwrap_or_else(|| std::path::Path::new(".")),
    );
    let current_working_dir = strip_extended_prefix(&std::env::current_dir()?);
    let param_values = match openjd_model::preprocess_job_parameters(
        &job_template,
        &input_values,
        &env_templates,
        &openjd_model::PathParameterOptions {
            job_template_dir: job_template_dir.to_str().unwrap_or("."),
            current_working_dir: current_working_dir.to_str().unwrap_or("."),
            path_format: openjd_expr::path_mapping::PathFormat::host(),
            allow_template_dir_walk_up: false,
            allow_uri_path_values: true,
        },
    ) {
        Ok(v) => v,
        Err(e) => {
            let help = crate::help::format_help(&job_template, path);
            return Err(format!("{e}\n\n{help}").into());
        }
    };

    // Build the model profile from the template's declared extensions.
    // The profile drives which extensions are enabled when validating
    // and instantiating the job; it's reused verbatim when configuring
    // the session's derived function library.
    let revision_profile = {
        let mut exts = std::collections::HashSet::new();
        if let Some(ext_list) = &job_template.extensions {
            exts.extend(ext_list.iter().filter_map(|e| {
                e.as_str()
                    .parse::<openjd_model::types::ModelExtension>()
                    .ok()
            }));
        }
        openjd_model::ModelProfile::new(openjd_model::types::SpecificationRevision::V2023_09)
            .with_extensions(exts)
    };
    // create_job takes the full ValidationContext (profile + caller
    // limits). The CLI has no custom caller limits, so we wrap the
    // profile with defaults.
    let revision_ctx =
        openjd_model::types::ValidationContext::from_profile(revision_profile.clone());

    // Create instantiated job
    let job = match openjd_model::create_job(&job_template, &param_values, &revision_ctx) {
        Ok(j) => j,
        Err(e) => {
            let help = crate::help::format_help(&job_template, path);
            return Err(format!("{e}\n\n{help}").into());
        }
    };

    let cancel_token = CancellationToken::new();
    let session_config = openjd_sessions::session::SessionConfig {
        session_id: format!("cli-{}", std::process::id()),
        job_parameter_values: param_values.clone(),
        path_mapping_rules: if path_rules.is_empty() {
            None
        } else {
            Some(path_rules.clone())
        },
        retain_working_dir: args.preserve,
        callback: None,
        os_env_vars: None,
        session_root_directory: None,
        user: None,
        // Session derives its function library from this profile +
        // the path-mapping rules above; no need to pass a library
        // separately.
        profile: Some(revision_profile),
        cancel_token: Some(cancel_token.clone()),
        sticky_bit_policy: Default::default(),
        debug_collect_stdout: false,
        echo_openjd_directives: true,
    };
    let mut session = Session::with_config(session_config)
        .map_err(|e| format!("Failed to create session: {e}"))?;

    let working_dir = session.working_directory().to_path_buf();

    // Install signal handler for graceful cancellation.
    let interrupted = Arc::new(AtomicBool::new(false));
    {
        let interrupted = interrupted.clone();
        let token = cancel_token.clone();
        tokio::spawn(async move {
            #[cfg(unix)]
            {
                let mut sigint =
                    tokio::signal::unix::signal(tokio::signal::unix::SignalKind::interrupt())
                        .unwrap();
                let mut sigterm =
                    tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())
                        .unwrap();
                tokio::select! {
                    _ = sigint.recv() => {}
                    _ = sigterm.recv() => {}
                }
            }
            #[cfg(not(unix))]
            {
                let _ = tokio::signal::ctrl_c().await;
            }
            interrupted.store(true, Ordering::SeqCst);
            token.cancel();
        });
    }

    println!("{}\tSession start", fmt_elapsed(&session_start));
    println!(
        "{}\tRunning job '{}'",
        fmt_elapsed(&session_start),
        job.name
    );

    // Enter environment template environments
    for et in &env_templates {
        println!("{}\t", fmt_elapsed(&session_start));
        println!(
            "{}\t==============================================",
            fmt_elapsed(&session_start)
        );
        println!(
            "{}\t--------- Entering Environment: {}",
            fmt_elapsed(&session_start),
            et.environment.name
        );
        println!(
            "{}\t==============================================",
            fmt_elapsed(&session_start)
        );
        let job_env = openjd_model::convert_environment(&et.environment);
        let _out = session
            .enter_environment(&job_env, None, None, None)
            .await
            .map_err(|e| format!("Environment template setup failed: {e}"))?;
    }
    // Enter job environments
    if let Some(job_envs) = &job.job_environments {
        for env in job_envs {
            println!("{}\t", fmt_elapsed(&session_start));
            println!(
                "{}\t==============================================",
                fmt_elapsed(&session_start)
            );
            println!(
                "{}\t--------- Entering Environment: {}",
                fmt_elapsed(&session_start),
                env.name
            );
            println!(
                "{}\t==============================================",
                fmt_elapsed(&session_start)
            );
            let _out = session
                .enter_environment(env, None, None, None)
                .await
                .map_err(|e| format!("Environment setup failed: {e}"))?;
        }
    }

    let mut tasks_run: usize = 0;
    let mut session_failed = false;

    // Resolve selected step
    let selected_step_idx: Option<usize> = if let Some(step_name) = &args.step {
        let idx = job
            .steps
            .iter()
            .position(|s| s.name == *step_name)
            .ok_or_else(|| {
                format!(
                    "No Step with name '{}' is defined in the given Job Template.",
                    step_name
                )
            })?;
        Some(idx)
    } else if job.steps.len() == 1 {
        Some(0)
    } else {
        if !args.task_params.is_empty() || args.tasks.is_some() {
            return Err(format!(
                "Providing task parameters requires a specified step or a job with a single step.\n{} steps: {:?}.",
                job.steps.len(), job.steps.iter().map(|s| &s.name).collect::<Vec<_>>()
            ).into());
        }
        None
    };

    // Parse explicit task parameter sets
    let explicit_task_params: Option<Vec<HashMap<String, String>>> = if !args.task_params.is_empty()
    {
        Some(vec![parse_task_params(&args.task_params)?])
    } else if let Some(ref tasks_arg) = args.tasks {
        Some(parse_tasks_arg(tasks_arg)?)
    } else {
        None
    };

    // Determine which steps to run
    let steps_to_run: Vec<usize> = if let Some(sel_idx) = selected_step_idx {
        if args.run_dependencies {
            resolve_step_dependencies(&job, sel_idx)
        } else {
            vec![sel_idx]
        }
    } else {
        StepDependencyGraph::new(&job)?.topo_sorted()?
    };

    // Execute steps
    for &step_idx in &steps_to_run {
        if session_failed || interrupted.load(Ordering::SeqCst) {
            break;
        }

        let step = &job.steps[step_idx];
        println!(
            "{}\tRunning step '{}'",
            fmt_elapsed(&session_start),
            step.name
        );

        let step_symtab = step.resolved_symtab.as_ref();

        // Enter step environments
        if let Some(step_envs) = &step.step_environments {
            for env in step_envs {
                let _out = session
                    .enter_environment(env, step_symtab, None, None)
                    .await
                    .map_err(|e| format!("Step environment setup failed: {e}"))?;
            }
        }

        // Build iterator
        let has_params;
        let is_adaptive;
        let mut iter = if let Some(ps) = &step.parameter_space {
            let it = openjd_model::StepParameterSpaceIterator::new(ps)?;
            has_params = true;
            is_adaptive = it.chunks_adaptive();
            Some(it)
        } else {
            has_params = false;
            is_adaptive = false;
            None
        };

        // Adaptive chunking state
        let chunks_param_name = iter
            .as_ref()
            .and_then(|it| it.chunks_parameter_name().map(String::from));
        let mut completed_task_count: usize = 0;
        let mut completed_task_duration: f64 = 0.0;

        let target_runtime_seconds: f64 = if is_adaptive {
            step.parameter_space
                .as_ref()
                .and_then(|ps| {
                    ps.task_parameter_definitions
                        .values()
                        .find_map(|d| match d {
                            openjd_model::job::TaskParameter::ChunkInt { chunks, .. } => {
                                chunks.target_runtime_seconds.map(|t| t as f64)
                            }
                            _ => None,
                        })
                })
                .unwrap_or(0.0)
        } else {
            0.0
        };

        if !has_params {
            // No parameter space — run a single task
            println!(
                "{}\t==============================================",
                fmt_elapsed(&session_start)
            );
            println!("{}\t--------- Running Task", fmt_elapsed(&session_start));
            println!(
                "{}\t==============================================",
                fmt_elapsed(&session_start)
            );
            let result = session
                .run_task(&step.script, None, step_symtab, None)
                .await
                .map_err(|e| format!("Step '{}': {e}", step.name))?;
            println!(
                "{}\tProcess exited with code: {}",
                fmt_elapsed(&session_start),
                result.exit_code.unwrap_or(-1)
            );
            tasks_run += 1;
            if result.state != ActionState::Success {
                session_failed = true;
            }
            if interrupted.load(Ordering::SeqCst) {
                println!(
                    "{}\tInterruption signal received.",
                    fmt_elapsed(&session_start)
                );
                session_failed = true;
            }
        } else {
            let is_selected = selected_step_idx == Some(step_idx);
            let use_explicit = is_selected && explicit_task_params.is_some();

            if use_explicit {
                let task_param_sets = explicit_task_params.as_ref().unwrap();
                let typed_sets = if let Some(ref space) = step.parameter_space {
                    let mut sets = Vec::new();
                    for ps in task_param_sets {
                        sets.push(coerce_task_params(ps, space)?);
                    }
                    if let Some(ref it) = iter {
                        for (i, ts) in sets.iter().enumerate() {
                            if let Err(e) = it.validate_containment(ts) {
                                return Err(format!("Task parameter set {i}: {e}").into());
                            }
                        }
                    }
                    sets
                } else {
                    task_param_sets
                        .iter()
                        .map(|ps| {
                            ps.iter()
                                .map(|(k, v)| {
                                    (
                                        k.clone(),
                                        openjd_model::types::TaskParameterValue {
                                            param_type:
                                                openjd_model::types::TaskParameterType::String,
                                            value: openjd_expr::ExprValue::String(v.clone()),
                                        },
                                    )
                                })
                                .collect()
                        })
                        .collect()
                };

                for (task_param_set, task_values) in task_param_sets.iter().zip(typed_sets.iter()) {
                    if session_failed || interrupted.load(Ordering::SeqCst) {
                        break;
                    }
                    println!(
                        "{}\t==============================================",
                        fmt_elapsed(&session_start)
                    );
                    println!("{}\t--------- Running Task", fmt_elapsed(&session_start));
                    println!(
                        "{}\t==============================================",
                        fmt_elapsed(&session_start)
                    );
                    println!("{}\tParameter values:", fmt_elapsed(&session_start));
                    for (name, value) in task_param_set {
                        println!("{}\t{} = {}", fmt_elapsed(&session_start), name, value);
                    }
                    let result = session
                        .run_task(&step.script, Some(task_values), step_symtab, None)
                        .await
                        .map_err(|e| format!("Step '{}': {e}", step.name))?;
                    println!(
                        "{}\tProcess exited with code: {}",
                        fmt_elapsed(&session_start),
                        result.exit_code.unwrap_or(-1)
                    );
                    tasks_run += 1;
                    if result.state != ActionState::Success {
                        session_failed = true;
                    }
                }
            } else {
                // Lazy iteration over parameter space
                let mut remaining_tasks = if args.maximum_tasks > 0 {
                    args.maximum_tasks
                } else {
                    i64::MAX
                };
                let it = iter.as_mut().unwrap();
                while remaining_tasks > 0 && !session_failed && !interrupted.load(Ordering::SeqCst)
                {
                    let Some(task_params) = it.next() else { break };

                    println!(
                        "{}\t==============================================",
                        fmt_elapsed(&session_start)
                    );
                    println!("{}\t--------- Running Task", fmt_elapsed(&session_start));
                    println!(
                        "{}\t==============================================",
                        fmt_elapsed(&session_start)
                    );
                    println!("{}\tParameter values:", fmt_elapsed(&session_start));
                    for (name, tv) in &task_params {
                        println!(
                            "{}\t{}({}) = {}",
                            fmt_elapsed(&session_start),
                            name,
                            tv.param_type.as_spec_str(),
                            tv.value.to_display_string()
                        );
                    }
                    let task_values: openjd_model::types::TaskParameterSet = task_params
                        .iter()
                        .map(|(name, tv)| (name.clone(), tv.clone()))
                        .collect();

                    let task_start = Instant::now();
                    let result = session
                        .run_task(&step.script, Some(&task_values), step_symtab, None)
                        .await
                        .map_err(|e| format!("Step '{}': {e}", step.name))?;
                    let task_duration = task_start.elapsed().as_secs_f64();

                    println!(
                        "{}\tProcess exited with code: {}",
                        fmt_elapsed(&session_start),
                        result.exit_code.unwrap_or(-1)
                    );
                    tasks_run += 1;
                    remaining_tasks -= 1;
                    if result.state != ActionState::Success {
                        session_failed = true;
                        break;
                    }
                    if interrupted.load(Ordering::SeqCst) {
                        println!(
                            "{}\tInterruption signal received.",
                            fmt_elapsed(&session_start)
                        );
                        session_failed = true;
                        break;
                    }

                    // Adaptive chunking: measure and adjust chunk size
                    if is_adaptive {
                        let chunk_items = chunks_param_name
                            .as_ref()
                            .and_then(|cpn| task_params.get(cpn))
                            .map(|tv| match &tv.value {
                                openjd_expr::ExprValue::RangeExpr(r) => r.len(),
                                _ => 1,
                            })
                            .unwrap_or(1);

                        completed_task_count += chunk_items;
                        completed_task_duration += task_duration;

                        let duration_per_task =
                            completed_task_duration / completed_task_count as f64;
                        let mut adaptive_chunk_size = target_runtime_seconds / duration_per_task;

                        if completed_task_count < 10 {
                            let current = it.chunks_default_task_count().unwrap_or(1) as f64;
                            if adaptive_chunk_size > current {
                                adaptive_chunk_size = 0.75 * current + 0.25 * adaptive_chunk_size;
                            }
                        }

                        let adaptive_chunk_size = (adaptive_chunk_size as usize).max(1);
                        if Some(adaptive_chunk_size) != it.chunks_default_task_count() {
                            println!(
                                "{}\tAdjusting chunk size to {adaptive_chunk_size}",
                                fmt_elapsed(&session_start)
                            );
                            it.set_chunks_default_task_count(adaptive_chunk_size);
                        }
                    }
                }
            }
        }

        // Exit step environments in reverse
        if let Some(step_envs) = &step.step_environments {
            for _env in step_envs.iter().rev() {
                if let Some(id) = session.environments_entered().last().cloned() {
                    if let Ok(_out) = session.exit_environment(&id, step_symtab, true, None).await {
                    }
                }
            }
        }
    }

    // Exit job environments in reverse
    if let Some(job_envs) = &job.job_environments {
        for env in job_envs.iter().rev() {
            println!("{}\t", fmt_elapsed(&session_start));
            println!(
                "{}\t==============================================",
                fmt_elapsed(&session_start)
            );
            println!(
                "{}\t--------- Exiting Environment: {}",
                fmt_elapsed(&session_start),
                env.name
            );
            println!(
                "{}\t==============================================",
                fmt_elapsed(&session_start)
            );
            if let Some(id) = session.environments_entered().last().cloned() {
                if let Ok(_out) = session.exit_environment(&id, None, true, None).await {}
            }
        }
    }
    for et in env_templates.iter().rev() {
        println!("{}\t", fmt_elapsed(&session_start));
        println!(
            "{}\t==============================================",
            fmt_elapsed(&session_start)
        );
        println!(
            "{}\t--------- Exiting Environment: {}",
            fmt_elapsed(&session_start),
            et.environment.name
        );
        println!(
            "{}\t==============================================",
            fmt_elapsed(&session_start)
        );
        if let Some(id) = session.environments_entered().last().cloned() {
            if let Ok(_out) = session.exit_environment(&id, None, true, None).await {}
        }
    }

    println!("{}\t", fmt_elapsed(&session_start));
    if session_failed {
        println!(
            "{}\tSession ended with errors.",
            fmt_elapsed(&session_start)
        );
    } else {
        println!(
            "{}\tAll actions completed successfully!",
            fmt_elapsed(&session_start)
        );
    }
    println!("{}\tLocal session ended.", fmt_elapsed(&session_start));

    let duration = session_start.elapsed().as_secs_f64();
    let step_name = args.step.clone();
    let preserved_msg = if args.preserve {
        format!(
            "\nWorking directory preserved at: {}",
            working_dir.display()
        )
    } else {
        session.cleanup();
        String::new()
    };

    let status = if session_failed { "error" } else { "success" };
    let message = if session_failed {
        format!("Session ended with errors; see Task logs for details{preserved_msg}")
    } else {
        format!("Session ended successfully{preserved_msg}")
    };

    let result = RunResult {
        status: status.to_string(),
        message,
        job_name: job.name.clone(),
        step_name: step_name.clone(),
        duration,
        chunks_run: tasks_run,
    };
    crate::common::print_cli_result(&result, &args.output);

    if session_failed {
        std::process::exit(1);
    }
    Ok(())
}

/// Resolve step dependencies transitively, returning indices in execution order.
fn resolve_step_dependencies(job: &openjd_model::job::Job, target_idx: usize) -> Vec<usize> {
    let step_name_to_idx: HashMap<String, usize> = job
        .steps
        .iter()
        .enumerate()
        .map(|(i, s)| (s.name.clone(), i))
        .collect();
    let mut visited = std::collections::HashSet::new();
    let mut order = Vec::new();
    fn visit(
        job: &openjd_model::job::Job,
        idx: usize,
        name_to_idx: &HashMap<String, usize>,
        visited: &mut std::collections::HashSet<usize>,
        order: &mut Vec<usize>,
    ) {
        if !visited.insert(idx) {
            return;
        }
        if let Some(deps) = &job.steps[idx].dependencies {
            for dep in deps {
                if let Some(&dep_idx) = name_to_idx.get(&dep.depends_on) {
                    visit(job, dep_idx, name_to_idx, visited, order);
                }
            }
        }
        order.push(idx);
    }
    visit(job, target_idx, &step_name_to_idx, &mut visited, &mut order);
    order
}