From cdfaa5262f2678217f0e0e6cc4d25abec086f086 Mon Sep 17 00:00:00 2001
From: Julie Yaunches <jyaunches@nvidia.com>
Date: Wed, 20 May 2026 16:49:16 -0400
Subject: [PATCH] fix(e2e): use sandbox subcommands in suites

---
 test/e2e/scenario-framework-tests/e2e-lib-helpers.test.ts | 2 +-
 test/e2e/validation_suites/lib/baseline_onboarding.sh     | 4 ++--
 test/e2e/validation_suites/lib/sandbox_lifecycle.sh       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/e2e/scenario-framework-tests/e2e-lib-helpers.test.ts b/test/e2e/scenario-framework-tests/e2e-lib-helpers.test.ts
index cd61d1bff0f..ff139f93082 100644
--- a/test/e2e/scenario-framework-tests/e2e-lib-helpers.test.ts
+++ b/test/e2e/scenario-framework-tests/e2e-lib-helpers.test.ts
@@ -705,7 +705,7 @@ describe("sandbox lifecycle validation helper", () => {
     try {
       const bin = path.join(tmp, "bin"); fs.mkdirSync(bin);
       fs.writeFileSync(path.join(bin, "nemoclaw"), `#!/usr/bin/env bash
-case "$1" in list) echo sb1;; status) echo 'status running gateway healthy sandbox running';; logs) echo logline;; esac
+if [[ "$1 $2" == "sandbox status" ]]; then echo 'status running gateway healthy sandbox running'; elif [[ "$1 $2" == "sandbox logs" ]]; then echo logline; elif [[ "$1" == "list" ]]; then echo sb1; fi
 `, { mode: 0o755 });
       fs.writeFileSync(path.join(bin, "openshell"), `#!/usr/bin/env bash
 echo lifecycle-ok
diff --git a/test/e2e/validation_suites/lib/baseline_onboarding.sh b/test/e2e/validation_suites/lib/baseline_onboarding.sh
index 231962a3102..06ff5f543fd 100755
--- a/test/e2e/validation_suites/lib/baseline_onboarding.sh
+++ b/test/e2e/validation_suites/lib/baseline_onboarding.sh
@@ -53,7 +53,7 @@ baseline_assert_sandbox_list_contains_context_sandbox() {
 
 baseline_assert_sandbox_status_exits_zero() {
   local out
-  if out=$(nemoclaw status "$E2E_SANDBOX_NAME" 2>&1); then
+  if out=$(nemoclaw sandbox status "$E2E_SANDBOX_NAME" 2>&1); then
     baseline_onboarding_pass validation.baseline_onboarding.sandbox_status "$E2E_SANDBOX_NAME status ok"
   else
     baseline_onboarding_fail validation.baseline_onboarding.sandbox_status "status failed: ${out:0:200}"
@@ -62,7 +62,7 @@ baseline_assert_sandbox_status_exits_zero() {
 
 baseline_assert_logs_produce_output() {
   local out
-  if out=$(nemoclaw logs "$E2E_SANDBOX_NAME" 2>&1) && [[ -n "$out" ]]; then
+  if out=$(nemoclaw sandbox logs "$E2E_SANDBOX_NAME" 2>&1) && [[ -n "$out" ]]; then
     baseline_onboarding_pass validation.baseline_onboarding.logs_available "logs available"
   else
     baseline_onboarding_fail validation.baseline_onboarding.logs_available "logs unavailable"
diff --git a/test/e2e/validation_suites/lib/sandbox_lifecycle.sh b/test/e2e/validation_suites/lib/sandbox_lifecycle.sh
index 00b8ce244cb..ef872f278fa 100755
--- a/test/e2e/validation_suites/lib/sandbox_lifecycle.sh
+++ b/test/e2e/validation_suites/lib/sandbox_lifecycle.sh
@@ -73,7 +73,7 @@ sandbox_lifecycle_assert_nemoclaw_list_contains_sandbox() {
 
 sandbox_lifecycle_assert_status_fields_present() {
   local id="validation.sandbox_operations.status_fields_present"
-  sandbox_lifecycle_run_with_timeout 20 nemoclaw status "${E2E_SANDBOX_NAME}" >/dev/null || {
+  sandbox_lifecycle_run_with_timeout 20 nemoclaw sandbox status "${E2E_SANDBOX_NAME}" >/dev/null || {
     sandbox_lifecycle_fail "${id}" "nemoclaw status failed"
     return 1
   }
@@ -90,7 +90,7 @@ sandbox_lifecycle_assert_status_fields_present() {
 
 sandbox_lifecycle_assert_logs_available() {
   local id="validation.sandbox_operations.logs_available"
-  sandbox_lifecycle_run_with_timeout 20 nemoclaw logs "${E2E_SANDBOX_NAME}" >/dev/null || {
+  sandbox_lifecycle_run_with_timeout 20 nemoclaw sandbox logs "${E2E_SANDBOX_NAME}" >/dev/null || {
     sandbox_lifecycle_fail "${id}" "nemoclaw logs failed"
     return 1
   }