From e57bcbf0097a0eaf43f95dd7a3637890745633c5 Mon Sep 17 00:00:00 2001
From: finalerock44 <77282157+finalerock44@users.noreply.github.com>
Date: Tue, 15 Sep 2026 13:21:53 +0100
Subject: [PATCH] fix: honour the CLI exit code as the run verdict

The status block overwrote EXIT_CODE unconditionally, so a PASSED rollup
cleared the CLI's own exit 2 ("the run failed, or was cancelled") and the
step went green. CANCELLED also matched neither branch.

Now the CLI's code is kept in CLI_EXIT_CODE and the status block may only
add failures: PASSED clears the step only if the CLI agreed, CANCELLED
fails it, and a non-zero CLI code always fails it.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 step.sh | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/step.sh b/step.sh
index 758885b..c04a265 100644
--- a/step.sh
+++ b/step.sh
@@ -190,6 +190,12 @@ ${metadata_parsed} \
 "$app_file" "$workspace" 2>&1) || EXIT_CODE=$?
 echo "$OUTPUT"
 
+# The CLI's exit code is the primary verdict: it is computed by the process that
+# actually watched the run. 0 = every test passed, 1 = CLI/infra error, 2 = the
+# run itself failed (a failed test, or a cancelled one). Keep it: the status
+# block below may only add failures, never clear this one.
+CLI_EXIT_CODE=$EXIT_CODE
+
 # Extract upload ID from console URL
 UPLOAD_ID=$(echo "$OUTPUT" | grep -o 'upload=[a-zA-Z0-9-]*' | cut -d= -f2 | head -n1)
 
@@ -216,11 +222,17 @@ if [ -n "$UPLOAD_ID" ]; then
         envman add --key DEVICE_CLOUD_APP_BINARY_ID --value "$APP_BINARY_ID"
     fi
     
-    # Set exit code based on status
-    if [ "$TEST_STATUS" = "FAILED" ]; then
+    # Set exit code based on status. A bad status fails the step; a good one
+    # only clears the step if the CLI agreed. Clearing it unconditionally is
+    # what let a cancelled run (CLI exit 2) report green when the status
+    # rollup wrongly said PASSED.
+    if [ "$TEST_STATUS" = "FAILED" ] || [ "$TEST_STATUS" = "CANCELLED" ]; then
         EXIT_CODE=1
-    elif [ "$TEST_STATUS" = "PASSED" ]; then
+    elif [ "$TEST_STATUS" = "PASSED" ] && [ "$CLI_EXIT_CODE" -eq 0 ]; then
         EXIT_CODE=0
+    elif [ "$CLI_EXIT_CODE" -ne 0 ]; then
+        echo "dcd exited $CLI_EXIT_CODE; failing the step despite upload status '$TEST_STATUS'."
+        EXIT_CODE=1
     fi
 fi