diff --git a/.sps/pr/pipeline-config-autoprofile.yaml b/.sps/pr/pipeline-config-autoprofile.yaml
index 709e9498c4..b3eb26dc46 100644
--- a/.sps/pr/pipeline-config-autoprofile.yaml
+++ b/.sps/pr/pipeline-config-autoprofile.yaml
@@ -101,7 +101,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -112,7 +112,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for autoprofile" \
+              && echo "Uploaded test coverage for autoprofile → test-results/$GIT_COMMIT/autoprofile.txt" \
               || echo "WARNING: Failed to upload test coverage for autoprofile (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
diff --git a/.sps/pr/pipeline-config-cloud.yaml b/.sps/pr/pipeline-config-cloud.yaml
index 34f9d49cf7..60bd355701 100644
--- a/.sps/pr/pipeline-config-cloud.yaml
+++ b/.sps/pr/pipeline-config-cloud.yaml
@@ -126,7 +126,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -137,7 +137,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for aws-lambda" \
+              && echo "Uploaded test coverage for aws-lambda → test-results/$GIT_COMMIT/aws-lambda.txt" \
               || echo "WARNING: Failed to upload test coverage for aws-lambda (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -202,7 +202,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -213,7 +213,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for aws-fargate" \
+              && echo "Uploaded test coverage for aws-fargate → test-results/$GIT_COMMIT/aws-fargate.txt" \
               || echo "WARNING: Failed to upload test coverage for aws-fargate (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -278,7 +278,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -289,7 +289,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for azure-container-services" \
+              && echo "Uploaded test coverage for azure-container-services → test-results/$GIT_COMMIT/azure-container-services.txt" \
               || echo "WARNING: Failed to upload test coverage for azure-container-services (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -354,7 +354,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -365,7 +365,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for google-cloud-run" \
+              && echo "Uploaded test coverage for google-cloud-run → test-results/$GIT_COMMIT/google-cloud-run.txt" \
               || echo "WARNING: Failed to upload test coverage for google-cloud-run (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
diff --git a/.sps/pr/pipeline-config-collector-currencies-async.yaml b/.sps/pr/pipeline-config-collector-currencies-async.yaml
index a60886dc20..59148b5506 100644
--- a/.sps/pr/pipeline-config-collector-currencies-async.yaml
+++ b/.sps/pr/pipeline-config-collector-currencies-async.yaml
@@ -110,7 +110,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -121,7 +121,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-async-await" \
+              && echo "Uploaded test coverage for collector-async-await → test-results/$GIT_COMMIT/collector-async-await.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-async-await (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -198,7 +198,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -209,7 +209,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-async-bluebird" \
+              && echo "Uploaded test coverage for collector-async-bluebird → test-results/$GIT_COMMIT/collector-async-bluebird.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-async-bluebird (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -286,7 +286,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -297,7 +297,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-async-native-promise" \
+              && echo "Uploaded test coverage for collector-async-native-promise → test-results/$GIT_COMMIT/collector-async-native-promise.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-async-native-promise (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
diff --git a/.sps/pr/pipeline-config-collector-currencies-cloud.yaml b/.sps/pr/pipeline-config-collector-currencies-cloud.yaml
index 7a9e53cf56..092eaf3189 100644
--- a/.sps/pr/pipeline-config-collector-currencies-cloud.yaml
+++ b/.sps/pr/pipeline-config-collector-currencies-cloud.yaml
@@ -138,7 +138,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -149,7 +149,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-cloud-client-dynamodb" \
+              && echo "Uploaded test coverage for collector-cloud-client-dynamodb → test-results/$GIT_COMMIT/collector-cloud-client-dynamodb.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-cloud-client-dynamodb (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -254,7 +254,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -265,7 +265,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-cloud-client-kinesis" \
+              && echo "Uploaded test coverage for collector-cloud-client-kinesis → test-results/$GIT_COMMIT/collector-cloud-client-kinesis.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-cloud-client-kinesis (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -370,7 +370,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -381,7 +381,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-cloud-client-lambda" \
+              && echo "Uploaded test coverage for collector-cloud-client-lambda → test-results/$GIT_COMMIT/collector-cloud-client-lambda.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-cloud-client-lambda (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -486,7 +486,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -497,7 +497,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-cloud-client-s3" \
+              && echo "Uploaded test coverage for collector-cloud-client-s3 → test-results/$GIT_COMMIT/collector-cloud-client-s3.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-cloud-client-s3 (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -602,7 +602,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -613,7 +613,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-cloud-client-sns" \
+              && echo "Uploaded test coverage for collector-cloud-client-sns → test-results/$GIT_COMMIT/collector-cloud-client-sns.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-cloud-client-sns (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -718,7 +718,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -729,7 +729,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-cloud-client-sqs" \
+              && echo "Uploaded test coverage for collector-cloud-client-sqs → test-results/$GIT_COMMIT/collector-cloud-client-sqs.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-cloud-client-sqs (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -836,7 +836,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -847,7 +847,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-cloud-storage-blob" \
+              && echo "Uploaded test coverage for collector-cloud-storage-blob → test-results/$GIT_COMMIT/collector-cloud-storage-blob.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-cloud-storage-blob (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -953,7 +953,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -964,7 +964,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-cloud-pubsub" \
+              && echo "Uploaded test coverage for collector-cloud-pubsub → test-results/$GIT_COMMIT/collector-cloud-pubsub.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-cloud-pubsub (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1070,7 +1070,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1081,7 +1081,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-cloud-storage" \
+              && echo "Uploaded test coverage for collector-cloud-storage → test-results/$GIT_COMMIT/collector-cloud-storage.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-cloud-storage (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1186,7 +1186,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1197,7 +1197,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-cloud-aws-sdk" \
+              && echo "Uploaded test coverage for collector-cloud-aws-sdk → test-results/$GIT_COMMIT/collector-cloud-aws-sdk.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-cloud-aws-sdk (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
diff --git a/.sps/pr/pipeline-config-collector-currencies-core.yaml b/.sps/pr/pipeline-config-collector-currencies-core.yaml
index 07b108fe32..07213feb3e 100644
--- a/.sps/pr/pipeline-config-collector-currencies-core.yaml
+++ b/.sps/pr/pipeline-config-collector-currencies-core.yaml
@@ -110,7 +110,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -121,7 +121,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-core-fs" \
+              && echo "Uploaded test coverage for collector-core-fs → test-results/$GIT_COMMIT/collector-core-fs.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-core-fs (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
diff --git a/.sps/pr/pipeline-config-collector-currencies-databases.yaml b/.sps/pr/pipeline-config-collector-currencies-databases.yaml
index fdf68c7dc4..bf4e71050c 100644
--- a/.sps/pr/pipeline-config-collector-currencies-databases.yaml
+++ b/.sps/pr/pipeline-config-collector-currencies-databases.yaml
@@ -143,7 +143,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -154,7 +154,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-elasticsearch" \
+              && echo "Uploaded test coverage for collector-databases-elasticsearch → test-results/$GIT_COMMIT/collector-databases-elasticsearch.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-elasticsearch (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -280,7 +280,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -291,7 +291,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-client" \
+              && echo "Uploaded test coverage for collector-databases-client → test-results/$GIT_COMMIT/collector-databases-client.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-client (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -400,7 +400,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -411,7 +411,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-couchbase" \
+              && echo "Uploaded test coverage for collector-databases-couchbase → test-results/$GIT_COMMIT/collector-databases-couchbase.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-couchbase (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -532,7 +532,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -543,7 +543,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-ibm-db" \
+              && echo "Uploaded test coverage for collector-databases-ibm-db → test-results/$GIT_COMMIT/collector-databases-ibm-db.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-ibm-db (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -669,7 +669,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -680,7 +680,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-ioredis" \
+              && echo "Uploaded test coverage for collector-databases-ioredis → test-results/$GIT_COMMIT/collector-databases-ioredis.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-ioredis (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -782,7 +782,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -793,7 +793,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-memcached" \
+              && echo "Uploaded test coverage for collector-databases-memcached → test-results/$GIT_COMMIT/collector-databases-memcached.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-memcached (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -896,7 +896,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -907,7 +907,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-mongodb" \
+              && echo "Uploaded test coverage for collector-databases-mongodb → test-results/$GIT_COMMIT/collector-databases-mongodb.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-mongodb (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1010,7 +1010,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1021,7 +1021,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-mongoose" \
+              && echo "Uploaded test coverage for collector-databases-mongoose → test-results/$GIT_COMMIT/collector-databases-mongoose.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-mongoose (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1125,7 +1125,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1136,7 +1136,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-mssql" \
+              && echo "Uploaded test coverage for collector-databases-mssql → test-results/$GIT_COMMIT/collector-databases-mssql.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-mssql (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1244,7 +1244,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1255,7 +1255,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-mysql" \
+              && echo "Uploaded test coverage for collector-databases-mysql → test-results/$GIT_COMMIT/collector-databases-mysql.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-mysql (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1363,7 +1363,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1374,7 +1374,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-mysql2" \
+              && echo "Uploaded test coverage for collector-databases-mysql2 → test-results/$GIT_COMMIT/collector-databases-mysql2.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-mysql2 (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1482,7 +1482,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1493,7 +1493,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-oracledb" \
+              && echo "Uploaded test coverage for collector-databases-oracledb → test-results/$GIT_COMMIT/collector-databases-oracledb.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-oracledb (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1599,7 +1599,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1610,7 +1610,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-pg" \
+              && echo "Uploaded test coverage for collector-databases-pg → test-results/$GIT_COMMIT/collector-databases-pg.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-pg (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1716,7 +1716,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1727,7 +1727,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-pg-native" \
+              && echo "Uploaded test coverage for collector-databases-pg-native → test-results/$GIT_COMMIT/collector-databases-pg-native.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-pg-native (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1846,7 +1846,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1857,7 +1857,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-prisma" \
+              && echo "Uploaded test coverage for collector-databases-prisma → test-results/$GIT_COMMIT/collector-databases-prisma.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-prisma (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1983,7 +1983,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1994,7 +1994,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-redis" \
+              && echo "Uploaded test coverage for collector-databases-redis → test-results/$GIT_COMMIT/collector-databases-redis.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-redis (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -2100,7 +2100,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -2111,7 +2111,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-sequelize" \
+              && echo "Uploaded test coverage for collector-databases-sequelize → test-results/$GIT_COMMIT/collector-databases-sequelize.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-sequelize (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -2215,7 +2215,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -2226,7 +2226,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-databases-tedious" \
+              && echo "Uploaded test coverage for collector-databases-tedious → test-results/$GIT_COMMIT/collector-databases-tedious.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-databases-tedious (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
diff --git a/.sps/pr/pipeline-config-collector-currencies-frameworks.yaml b/.sps/pr/pipeline-config-collector-currencies-frameworks.yaml
index b16fae3c2b..5a6f96d9fb 100644
--- a/.sps/pr/pipeline-config-collector-currencies-frameworks.yaml
+++ b/.sps/pr/pipeline-config-collector-currencies-frameworks.yaml
@@ -110,7 +110,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -121,7 +121,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-frameworks-hapi" \
+              && echo "Uploaded test coverage for collector-frameworks-hapi → test-results/$GIT_COMMIT/collector-frameworks-hapi.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-frameworks-hapi (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -198,7 +198,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -209,7 +209,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-frameworks-router" \
+              && echo "Uploaded test coverage for collector-frameworks-router → test-results/$GIT_COMMIT/collector-frameworks-router.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-frameworks-router (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -286,7 +286,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -297,7 +297,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-frameworks-express" \
+              && echo "Uploaded test coverage for collector-frameworks-express → test-results/$GIT_COMMIT/collector-frameworks-express.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-frameworks-express (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -374,7 +374,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -385,7 +385,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-frameworks-fastify" \
+              && echo "Uploaded test coverage for collector-frameworks-fastify → test-results/$GIT_COMMIT/collector-frameworks-fastify.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-frameworks-fastify (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -462,7 +462,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -473,7 +473,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-frameworks-got" \
+              && echo "Uploaded test coverage for collector-frameworks-got → test-results/$GIT_COMMIT/collector-frameworks-got.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-frameworks-got (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -550,7 +550,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -561,7 +561,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-frameworks-restify" \
+              && echo "Uploaded test coverage for collector-frameworks-restify → test-results/$GIT_COMMIT/collector-frameworks-restify.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-frameworks-restify (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -667,7 +667,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -678,7 +678,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-frameworks-sequelize" \
+              && echo "Uploaded test coverage for collector-frameworks-sequelize → test-results/$GIT_COMMIT/collector-frameworks-sequelize.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-frameworks-sequelize (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -755,7 +755,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -766,7 +766,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-frameworks-tsoa" \
+              && echo "Uploaded test coverage for collector-frameworks-tsoa → test-results/$GIT_COMMIT/collector-frameworks-tsoa.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-frameworks-tsoa (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -872,7 +872,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -883,7 +883,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-frameworks-typeorm" \
+              && echo "Uploaded test coverage for collector-frameworks-typeorm → test-results/$GIT_COMMIT/collector-frameworks-typeorm.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-frameworks-typeorm (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
diff --git a/.sps/pr/pipeline-config-collector-currencies-logging.yaml b/.sps/pr/pipeline-config-collector-currencies-logging.yaml
index 7050436ac7..edf7046a24 100644
--- a/.sps/pr/pipeline-config-collector-currencies-logging.yaml
+++ b/.sps/pr/pipeline-config-collector-currencies-logging.yaml
@@ -110,7 +110,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -121,7 +121,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-logging-bunyan" \
+              && echo "Uploaded test coverage for collector-logging-bunyan → test-results/$GIT_COMMIT/collector-logging-bunyan.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-logging-bunyan (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -198,7 +198,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -209,7 +209,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-logging-console" \
+              && echo "Uploaded test coverage for collector-logging-console → test-results/$GIT_COMMIT/collector-logging-console.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-logging-console (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -286,7 +286,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -297,7 +297,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-logging-express-winston" \
+              && echo "Uploaded test coverage for collector-logging-express-winston → test-results/$GIT_COMMIT/collector-logging-express-winston.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-logging-express-winston (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -374,7 +374,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -385,7 +385,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-logging-log4js" \
+              && echo "Uploaded test coverage for collector-logging-log4js → test-results/$GIT_COMMIT/collector-logging-log4js.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-logging-log4js (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -462,7 +462,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -473,7 +473,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-logging-pino" \
+              && echo "Uploaded test coverage for collector-logging-pino → test-results/$GIT_COMMIT/collector-logging-pino.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-logging-pino (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -550,7 +550,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -561,7 +561,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-logging-winston" \
+              && echo "Uploaded test coverage for collector-logging-winston → test-results/$GIT_COMMIT/collector-logging-winston.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-logging-winston (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
diff --git a/.sps/pr/pipeline-config-collector-currencies-messaging.yaml b/.sps/pr/pipeline-config-collector-currencies-messaging.yaml
index 52f6edf945..4a875a97bf 100644
--- a/.sps/pr/pipeline-config-collector-currencies-messaging.yaml
+++ b/.sps/pr/pipeline-config-collector-currencies-messaging.yaml
@@ -159,7 +159,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -170,7 +170,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-messaging-kafka-javascript" \
+              && echo "Uploaded test coverage for collector-messaging-kafka-javascript → test-results/$GIT_COMMIT/collector-messaging-kafka-javascript.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-messaging-kafka-javascript (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -274,7 +274,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -285,7 +285,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-messaging-amqplib" \
+              && echo "Uploaded test coverage for collector-messaging-amqplib → test-results/$GIT_COMMIT/collector-messaging-amqplib.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-messaging-amqplib (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -388,7 +388,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -399,7 +399,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-messaging-bull" \
+              && echo "Uploaded test coverage for collector-messaging-bull → test-results/$GIT_COMMIT/collector-messaging-bull.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-messaging-bull (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -525,7 +525,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -536,7 +536,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-messaging-kafka-node" \
+              && echo "Uploaded test coverage for collector-messaging-kafka-node → test-results/$GIT_COMMIT/collector-messaging-kafka-node.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-messaging-kafka-node (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -662,7 +662,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -673,7 +673,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-messaging-kafkajs" \
+              && echo "Uploaded test coverage for collector-messaging-kafkajs → test-results/$GIT_COMMIT/collector-messaging-kafkajs.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-messaging-kafkajs (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -777,7 +777,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -788,7 +788,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-messaging-nats" \
+              && echo "Uploaded test coverage for collector-messaging-nats → test-results/$GIT_COMMIT/collector-messaging-nats.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-messaging-nats (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -901,7 +901,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -912,7 +912,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-messaging-node-nats-streaming" \
+              && echo "Uploaded test coverage for collector-messaging-node-nats-streaming → test-results/$GIT_COMMIT/collector-messaging-node-nats-streaming.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-messaging-node-nats-streaming (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1038,7 +1038,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1049,7 +1049,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-messaging-node-rdkafka-1" \
+              && echo "Uploaded test coverage for collector-messaging-node-rdkafka-1 → test-results/$GIT_COMMIT/collector-messaging-node-rdkafka-1.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-messaging-node-rdkafka-1 (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1175,7 +1175,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1186,7 +1186,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-messaging-node-rdkafka-2" \
+              && echo "Uploaded test coverage for collector-messaging-node-rdkafka-2 → test-results/$GIT_COMMIT/collector-messaging-node-rdkafka-2.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-messaging-node-rdkafka-2 (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1312,7 +1312,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1323,7 +1323,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-messaging-node-rdkafka-3" \
+              && echo "Uploaded test coverage for collector-messaging-node-rdkafka-3 → test-results/$GIT_COMMIT/collector-messaging-node-rdkafka-3.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-messaging-node-rdkafka-3 (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1449,7 +1449,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1460,7 +1460,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-messaging-node-rdkafka-4" \
+              && echo "Uploaded test coverage for collector-messaging-node-rdkafka-4 → test-results/$GIT_COMMIT/collector-messaging-node-rdkafka-4.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-messaging-node-rdkafka-4 (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1586,7 +1586,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1597,7 +1597,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-messaging-node-rdkafka-5" \
+              && echo "Uploaded test coverage for collector-messaging-node-rdkafka-5 → test-results/$GIT_COMMIT/collector-messaging-node-rdkafka-5.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-messaging-node-rdkafka-5 (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -1674,7 +1674,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -1685,7 +1685,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-messaging-socket-io" \
+              && echo "Uploaded test coverage for collector-messaging-socket-io → test-results/$GIT_COMMIT/collector-messaging-socket-io.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-messaging-socket-io (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
diff --git a/.sps/pr/pipeline-config-collector-currencies-protocols.yaml b/.sps/pr/pipeline-config-collector-currencies-protocols.yaml
index 40869ebccc..0f7610ecdd 100644
--- a/.sps/pr/pipeline-config-collector-currencies-protocols.yaml
+++ b/.sps/pr/pipeline-config-collector-currencies-protocols.yaml
@@ -110,7 +110,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -121,7 +121,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-protocols-server" \
+              && echo "Uploaded test coverage for collector-protocols-server → test-results/$GIT_COMMIT/collector-protocols-server.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-protocols-server (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -198,7 +198,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -209,7 +209,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-protocols-subgraph" \
+              && echo "Uploaded test coverage for collector-protocols-subgraph → test-results/$GIT_COMMIT/collector-protocols-subgraph.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-protocols-subgraph (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -286,7 +286,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -297,7 +297,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-protocols-grpc-js" \
+              && echo "Uploaded test coverage for collector-protocols-grpc-js → test-results/$GIT_COMMIT/collector-protocols-grpc-js.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-protocols-grpc-js (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -401,7 +401,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -412,7 +412,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-protocols-graphql" \
+              && echo "Uploaded test coverage for collector-protocols-graphql → test-results/$GIT_COMMIT/collector-protocols-graphql.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-protocols-graphql (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -489,7 +489,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -500,7 +500,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-protocols-graphql-subscriptions" \
+              && echo "Uploaded test coverage for collector-protocols-graphql-subscriptions → test-results/$GIT_COMMIT/collector-protocols-graphql-subscriptions.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-protocols-graphql-subscriptions (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -577,7 +577,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -588,7 +588,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-protocols-http" \
+              && echo "Uploaded test coverage for collector-protocols-http → test-results/$GIT_COMMIT/collector-protocols-http.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-protocols-http (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -665,7 +665,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -676,7 +676,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-protocols-http2" \
+              && echo "Uploaded test coverage for collector-protocols-http2 → test-results/$GIT_COMMIT/collector-protocols-http2.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-protocols-http2 (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
diff --git a/.sps/pr/pipeline-config-collector-metrics.yaml b/.sps/pr/pipeline-config-collector-metrics.yaml
index 75685e7c48..70ec188cdf 100644
--- a/.sps/pr/pipeline-config-collector-metrics.yaml
+++ b/.sps/pr/pipeline-config-collector-metrics.yaml
@@ -110,7 +110,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -121,7 +121,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for collector-metrics" \
+              && echo "Uploaded test coverage for collector-metrics → test-results/$GIT_COMMIT/collector-metrics.txt" \
               || echo "WARNING: Failed to upload test coverage for collector-metrics (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
diff --git a/.sps/pr/pipeline-config-collector-misc.yaml b/.sps/pr/pipeline-config-collector-misc.yaml
index 2a4fc684f2..cdf8f71b9d 100644
--- a/.sps/pr/pipeline-config-collector-misc.yaml
+++ b/.sps/pr/pipeline-config-collector-misc.yaml
@@ -121,7 +121,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -132,7 +132,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for misc-1" \
+              && echo "Uploaded test coverage for misc-1 → test-results/$GIT_COMMIT/misc-1.txt" \
               || echo "WARNING: Failed to upload test coverage for misc-1 (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -220,7 +220,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -231,7 +231,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for misc-2" \
+              && echo "Uploaded test coverage for misc-2 → test-results/$GIT_COMMIT/misc-2.txt" \
               || echo "WARNING: Failed to upload test coverage for misc-2 (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -317,7 +317,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -328,7 +328,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for misc-3" \
+              && echo "Uploaded test coverage for misc-3 → test-results/$GIT_COMMIT/misc-3.txt" \
               || echo "WARNING: Failed to upload test coverage for misc-3 (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -431,7 +431,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -442,7 +442,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for misc-dind" \
+              && echo "Uploaded test coverage for misc-dind → test-results/$GIT_COMMIT/misc-dind.txt" \
               || echo "WARNING: Failed to upload test coverage for misc-dind (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
diff --git a/.sps/pr/pipeline-config-core-group.yaml b/.sps/pr/pipeline-config-core-group.yaml
index c6f8ae5616..225d9eba2b 100644
--- a/.sps/pr/pipeline-config-core-group.yaml
+++ b/.sps/pr/pipeline-config-core-group.yaml
@@ -98,7 +98,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -109,7 +109,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for core" \
+              && echo "Uploaded test coverage for core → test-results/$GIT_COMMIT/core.txt" \
               || echo "WARNING: Failed to upload test coverage for core (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -174,7 +174,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -185,7 +185,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for metrics-util" \
+              && echo "Uploaded test coverage for metrics-util → test-results/$GIT_COMMIT/metrics-util.txt" \
               || echo "WARNING: Failed to upload test coverage for metrics-util (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -250,7 +250,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -261,7 +261,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for serverless" \
+              && echo "Uploaded test coverage for serverless → test-results/$GIT_COMMIT/serverless.txt" \
               || echo "WARNING: Failed to upload test coverage for serverless (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -326,7 +326,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -337,7 +337,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for serverless-collector" \
+              && echo "Uploaded test coverage for serverless-collector → test-results/$GIT_COMMIT/serverless-collector.txt" \
               || echo "WARNING: Failed to upload test coverage for serverless-collector (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -402,7 +402,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -413,7 +413,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for shared-metrics" \
+              && echo "Uploaded test coverage for shared-metrics → test-results/$GIT_COMMIT/shared-metrics.txt" \
               || echo "WARNING: Failed to upload test coverage for shared-metrics (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
diff --git a/.sps/pr/pipeline-config-opentelemetry.yaml b/.sps/pr/pipeline-config-opentelemetry.yaml
index 92fdfda70d..d3ea5c4d58 100644
--- a/.sps/pr/pipeline-config-opentelemetry.yaml
+++ b/.sps/pr/pipeline-config-opentelemetry.yaml
@@ -98,7 +98,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -109,7 +109,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for opentelemetry-exporter" \
+              && echo "Uploaded test coverage for opentelemetry-exporter → test-results/$GIT_COMMIT/opentelemetry-exporter.txt" \
               || echo "WARNING: Failed to upload test coverage for opentelemetry-exporter (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
@@ -174,7 +174,7 @@ tasks:
 
           # upload executed test files to COS for coverage verification
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then
             IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \
               -H "Content-Type: application/x-www-form-urlencoded" \
@@ -185,7 +185,7 @@ tasks:
               -H "Authorization: Bearer $IAM_TOKEN" \
               -H "Content-Type: text/plain" \
               --data-binary "$(echo "$TEST_FILES" | tr ' ' '\n' | sort)" \
-              && echo "Uploaded test coverage for opentelemetry-sampler" \
+              && echo "Uploaded test coverage for opentelemetry-sampler → test-results/$GIT_COMMIT/opentelemetry-sampler.txt" \
               || echo "WARNING: Failed to upload test coverage for opentelemetry-sampler (non-fatal)"
           else
             echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"
diff --git a/.sps/pr/pipeline-config-pr-verify.yaml b/.sps/pr/pipeline-config-pr-verify.yaml
index fb38ac1c68..ad982e9f46 100644
--- a/.sps/pr/pipeline-config-pr-verify.yaml
+++ b/.sps/pr/pipeline-config-pr-verify.yaml
@@ -41,7 +41,7 @@ tasks:
 
           GH_TOKEN="$(get_secret gh-public-token)"
           COS_API_KEY="$(get_secret ibm-object-storage-api-key)"
-          GIT_COMMIT="$(get_env GIT_COMMIT "")"
+          GIT_COMMIT="$(get_env HEAD_SHA "")"
           REPO="instana/nodejs"
 
           if [ -z "$GH_TOKEN" ] || [ -z "$COS_API_KEY" ] || [ -z "$GIT_COMMIT" ]; then
@@ -66,12 +66,16 @@ tasks:
           DOWNLOADED_FILE="$TMPDIR/downloaded.txt"   # tracks task slugs already fetched from COS
           touch "$CLAIMED_FILE" "$DOWNLOADED_FILE"
 
-          # Helper: download the COS result file for a single completed check-run name.
+          # Helper: download the COS result file for a single completed status context.
+          # Context format: "tekton/pr-code-checks-<slug>/code-unit-tests"
           # Skips silently if already downloaded or if COS has no file for it.
           download_cos_result() {
-            local check_name="$1"
-            # Derive the task slug: strip leading "pr-code-checks-" if present
-            local slug="${check_name#pr-code-checks-}"
+            local context="$1"
+            # Only handle collector task contexts (must have a slug after "pr-code-checks-")
+            [[ "$context" != tekton/pr-code-checks-*/* ]] && return 0
+            # Derive slug: strip "tekton/pr-code-checks-" prefix and "/code-unit-tests" suffix
+            local slug="${context#tekton/pr-code-checks-}"
+            slug="${slug%/code-unit-tests}"
             grep -qxF "$slug" "$DOWNLOADED_FILE" && return 0
             local key="test-results/$GIT_COMMIT/${slug}.txt"
             local RESPONSE HTTP_CODE BODY
@@ -85,25 +89,52 @@ tasks:
               echo "$BODY" >> "$CLAIMED_FILE"
               echo "" >> "$CLAIMED_FILE"
             elif [ "$HTTP_CODE" = "404" ]; then
-              echo "  – $slug (no COS file — not a collector task)"
+              echo "  – $slug (no COS file found yet)"
             else
               echo "  ✘ $slug HTTP $HTTP_CODE"
             fi
             echo "$slug" >> "$DOWNLOADED_FILE"
           }
 
+          # Helper: fetch all commit statuses (handles pagination)
+          fetch_statuses() {
+            local page=1
+            local accfile pagefile
+            accfile=$(mktemp)
+            pagefile=$(mktemp)
+            echo "[]" > "$accfile"
+            while true; do
+              curl -sf \
+                -H "Authorization: Bearer $GH_TOKEN" \
+                -H "Accept: application/vnd.github+json" \
+                "https://api.github.com/repos/$REPO/commits/$GIT_COMMIT/statuses?per_page=100&page=$page" > "$pagefile"
+              local count
+              count=$(python3 -c "import sys,json; print(len(json.load(open(sys.argv[1]))))" "$pagefile" 2>/dev/null || echo 0)
+              # Append this page to accumulated results
+              python3 - "$accfile" "$pagefile" <<'PYEOF'
+          import sys, json
+          acc = json.load(open(sys.argv[1]))
+          page = json.load(open(sys.argv[2]))
+          acc.extend(page)
+          json.dump(acc, open(sys.argv[1], "w"))
+          PYEOF
+              [ "$count" -lt 100 ] && break
+              page=$((page + 1))
+            done
+            cat "$accfile"
+            rm -f "$accfile" "$pagefile"
+          }
+
           # ── Phase 1: wait until all EXPECTED_CHECKS are registered ──────────────
-          echo "Waiting for all 89 expected checks to be registered on commit $GIT_COMMIT..."
+          echo "Waiting for all 88 expected checks to be registered on commit $GIT_COMMIT..."
           MAX_WAIT=3600
           POLL_INTERVAL=30
           ELAPSED=0
-          EXPECTED_CHECKS=89
+          EXPECTED_CHECKS=88
           while true; do
-            STATUSES=$(curl -sf \
-              -H "Authorization: Bearer $GH_TOKEN" \
-              -H "Accept: application/vnd.github+json" \
-              "https://api.github.com/repos/$REPO/commits/$GIT_COMMIT/check-runs?per_page=100")
-            OTHERS=$(echo "$STATUSES" | python3 -c "import sys,json; d=json.load(sys.stdin); print(sum(1 for r in d.get('check_runs',[]) if r['name']!='pr-verify'))")
+            STATUSES=$(fetch_statuses)
+            # Count unique contexts (deduplicate — statuses API returns history, latest first)
+            OTHERS=$(echo "$STATUSES" | python3 -c "import sys,json; d=json.load(sys.stdin); print(len(set(r['context'] for r in d if r['context'].startswith('tekton/pr-code-checks-') and not r['context'].startswith('tekton/pr-code-checks-verify'))))")
             echo "  $OTHERS / $EXPECTED_CHECKS checks registered (${ELAPSED}s elapsed)"
             if [ "$OTHERS" -ge "$EXPECTED_CHECKS" ]; then
               echo "All expected checks are now registered."
@@ -122,15 +153,19 @@ tasks:
           echo ""
           echo "=== Tests that ran ==="
           while true; do
-            STATUSES=$(curl -sf \
-              -H "Authorization: Bearer $GH_TOKEN" \
-              -H "Accept: application/vnd.github+json" \
-              "https://api.github.com/repos/$REPO/commits/$GIT_COMMIT/check-runs?per_page=100")
-            # Download COS file for every check that just became completed
-            while IFS= read -r check_name; do
-              download_cos_result "$check_name"
-            done < <(echo "$STATUSES" | python3 -c 'import sys,json; d=json.load(sys.stdin); [print(r["name"]) for r in d.get("check_runs",[]) if r["status"]=="completed" and r["name"]!="pr-verify"]')
-            PENDING=$(echo "$STATUSES" | python3 -c "import sys,json; d=json.load(sys.stdin); print(sum(1 for r in d.get('check_runs',[]) if r['status']!='completed' and r['name']!='pr-verify'))")
+            STATUSES=$(fetch_statuses)
+            # Download COS file for every completed (success/failure) code-unit-tests status
+            while IFS= read -r context; do
+              download_cos_result "$context"
+            done < <(echo "$STATUSES" | python3 -c "import sys,json; d=json.load(sys.stdin); seen=set(); [print(r['context']) or seen.add(r['context']) for r in d if r['context'].endswith('/code-unit-tests') and r['context'] not in seen and r['state'] in ('success','failure') and not r['context'].startswith('tekton/pr-code-checks-verify')]")
+            PENDING=$(echo "$STATUSES" | python3 -c "import sys,json; d=json.load(sys.stdin); seen=set(); pending=0
+          for r in d:
+              c=r['context']
+              if not c.endswith('/code-unit-tests') or c.startswith('tekton/pr-code-checks-verify'): continue
+              if c in seen: continue
+              seen.add(c)
+              if r['state']=='pending': pending+=1
+          print(pending)")
             echo "  $PENDING checks still pending (${ELAPSED}s elapsed)"
             if [ "$PENDING" -eq 0 ]; then
               echo "All checks completed."
@@ -146,11 +181,11 @@ tasks:
 
           # ── Phase 3: compare against all test files in repo ──────────────────────
           REPO_PATH="$WORKSPACE/$(load_repo app-repo path)"
-          ALL_TESTS=$(find "$REPO_PATH/packages/collector/test/integration" \
+          ALL_TESTS=$(find "$REPO_PATH/packages" \
             -name "*.test.js" \
             -not -path "*/node_modules/*" \
             -not -path "*/long_*/*" \
-            | sed "s|.*/packages/collector/||" | sort)
+            | sed "s|$REPO_PATH/packages/[^/]*/||" | sort)
 
           UNCOVERED_LIST=""
           MISSING=0
diff --git a/.sps/pr/pipeline-config-sonar.yaml b/.sps/pr/pipeline-config-sonar.yaml
index a18304cbeb..11882be2ed 100644
--- a/.sps/pr/pipeline-config-sonar.yaml
+++ b/.sps/pr/pipeline-config-sonar.yaml
@@ -58,6 +58,12 @@ tasks:
       - name: compliance-checks
         when: 'false'
       - name: unit-test
+        when: 'false'
+      - name: sign-artifact
+        when: 'false'
+      - name: build-artifact
+        when: 'false'
+      - name: scan-artifact
         displayName: sonar-analysis
         image: mirror.gcr.io/library/node:24
         script: |-
@@ -99,9 +105,3 @@ tasks:
             echo "No PR context found — running branch analysis..."
             sonar -Dsonar.token="$SONAR_TOKEN"
           fi
-      - name: sign-artifact
-        when: 'false'
-      - name: build-artifact
-        when: 'false'
-      - name: scan-artifact
-        when: 'false'
diff --git a/.sps/scripts/generate-pipeline-configs.js b/.sps/scripts/generate-pipeline-configs.js
index 500fdde6a0..f79c2c5544 100755
--- a/.sps/scripts/generate-pipeline-configs.js
+++ b/.sps/scripts/generate-pipeline-configs.js
@@ -423,7 +423,7 @@ function uploadTestFilesLines(taskSlug) {
     '',
     '# upload executed test files to COS for coverage verification',
     'COS_API_KEY="$(get_secret ibm-object-storage-api-key)"',
-    'GIT_COMMIT="$(get_env GIT_COMMIT "")"',
+    'GIT_COMMIT="$(get_env HEAD_SHA "")"',
     'if [ -n "$COS_API_KEY" ] && [ -n "$GIT_COMMIT" ]; then',
     '  IAM_TOKEN=$(curl -sf -X POST "https://iam.cloud.ibm.com/identity/token" \\',
     '    -H "Content-Type: application/x-www-form-urlencoded" \\',
@@ -434,7 +434,7 @@ function uploadTestFilesLines(taskSlug) {
     '    -H "Authorization: Bearer $IAM_TOKEN" \\',
     '    -H "Content-Type: text/plain" \\',
     '    --data-binary "$(echo "$TEST_FILES" | tr \' \' \'\\n\' | sort)" \\',
-    '    && echo "Uploaded test coverage for ' + taskSlug + '" \\',
+    `    && echo "Uploaded test coverage for ${taskSlug} → test-results/\$GIT_COMMIT/${taskSlug}.txt" \\`,
     '    || echo "WARNING: Failed to upload test coverage for ' + taskSlug + ' (non-fatal)"',
     'else',
     '  echo "WARNING: COS credentials or git commit unavailable — skipping coverage upload"',
@@ -681,10 +681,10 @@ function buildSonarTask(rootTask = 'pr-code-checks') {
       { name: 'peer-review', when: 'false' },
       { name: 'detect-secrets', when: 'false' },
       { name: 'compliance-checks', when: 'false' },
-      { name: 'unit-test', displayName: 'sonar-analysis', image: NODE_IMAGE, script },
+      { name: 'unit-test', when: 'false' },
       { name: 'sign-artifact', when: 'false' },
       { name: 'build-artifact', when: 'false' },
-      { name: 'scan-artifact', when: 'false' }
+      { name: 'scan-artifact', displayName: 'sonar-analysis', image: NODE_IMAGE, script }
     ]
   };
 }
@@ -1072,7 +1072,7 @@ function generateOne(t) {
       '',
       'GH_TOKEN="$(get_secret gh-public-token)"',
       'COS_API_KEY="$(get_secret ibm-object-storage-api-key)"',
-      'GIT_COMMIT="$(get_env GIT_COMMIT "")"',
+      'GIT_COMMIT="$(get_env HEAD_SHA "")"',
       'REPO="instana/nodejs"',
       '',
       'if [ -z "$GH_TOKEN" ] || [ -z "$COS_API_KEY" ] || [ -z "$GIT_COMMIT" ]; then',
@@ -1097,15 +1097,19 @@ function generateOne(t) {
       'DOWNLOADED_FILE="$TMPDIR/downloaded.txt"   # tracks task slugs already fetched from COS',
       'touch "$CLAIMED_FILE" "$DOWNLOADED_FILE"',
       '',
-      '# Helper: download the COS result file for a single completed check-run name.',
+      '# Helper: download the COS result file for a single completed status context.',
+      '# Context format: "tekton/pr-code-checks-<slug>/code-unit-tests"',
       '# Skips silently if already downloaded or if COS has no file for it.',
       'download_cos_result() {',
-      '  local check_name="$1"',
-      '  # Derive the task slug: strip leading "pr-code-checks-" if present',
-      '  local slug="${check_name#pr-code-checks-}"',
+      '  local context="$1"',
+      '  # Only handle collector task contexts (must have a slug after "pr-code-checks-")',
+      '  [[ "$context" != tekton/pr-code-checks-*/* ]] && return 0',
+      '  # Derive slug: strip "tekton/pr-code-checks-" prefix and "/code-unit-tests" suffix',
+      '  local slug="${context#tekton/pr-code-checks-}"',
+      '  slug="${slug%/code-unit-tests}"',
       '  grep -qxF "$slug" "$DOWNLOADED_FILE" && return 0',
       '  local key="test-results/$GIT_COMMIT/${slug}.txt"',
-      `  local RESPONSE HTTP_CODE BODY`,
+      '  local RESPONSE HTTP_CODE BODY',
       `  RESPONSE=$(curl -s -w "\\n%{http_code}" \\`,
       `    "https://s3.eu-de.cloud-object-storage.appdomain.cloud/${COS_BUCKET}/$key" \\`,
       '    -H "Authorization: Bearer $IAM_TOKEN")',
@@ -1116,13 +1120,42 @@ function generateOne(t) {
       '    echo "$BODY" >> "$CLAIMED_FILE"',
       '    echo "" >> "$CLAIMED_FILE"',
       '  elif [ "$HTTP_CODE" = "404" ]; then',
-      '    echo "  – $slug (no COS file — not a collector task)"',
+      '    echo "  – $slug (no COS file found yet)"',
       '  else',
       '    echo "  ✘ $slug HTTP $HTTP_CODE"',
       '  fi',
       '  echo "$slug" >> "$DOWNLOADED_FILE"',
       '}',
       '',
+      '# Helper: fetch all commit statuses (handles pagination)',
+      'fetch_statuses() {',
+      '  local page=1',
+      '  local accfile pagefile',
+      '  accfile=$(mktemp)',
+      '  pagefile=$(mktemp)',
+      '  echo "[]" > "$accfile"',
+      '  while true; do',
+      '    curl -sf \\',
+      '      -H "Authorization: Bearer $GH_TOKEN" \\',
+      '      -H "Accept: application/vnd.github+json" \\',
+      '      "https://api.github.com/repos/$REPO/commits/$GIT_COMMIT/statuses?per_page=100&page=$page" > "$pagefile"',
+      '    local count',
+      '    count=$(python3 -c "import sys,json; print(len(json.load(open(sys.argv[1]))))" "$pagefile" 2>/dev/null || echo 0)',
+      '    # Append this page to accumulated results',
+      '    python3 - "$accfile" "$pagefile" <<\'PYEOF\'',
+      'import sys, json',
+      'acc = json.load(open(sys.argv[1]))',
+      'page = json.load(open(sys.argv[2]))',
+      'acc.extend(page)',
+      'json.dump(acc, open(sys.argv[1], "w"))',
+      'PYEOF',
+      '    [ "$count" -lt 100 ] && break',
+      '    page=$((page + 1))',
+      '  done',
+      '  cat "$accfile"',
+      '  rm -f "$accfile" "$pagefile"',
+      '}',
+      '',
       '# ── Phase 1: wait until all EXPECTED_CHECKS are registered ──────────────',
       `echo "Waiting for all ${expectedChecks} expected checks to be registered on commit $GIT_COMMIT..."`,
       'MAX_WAIT=3600',
@@ -1130,11 +1163,9 @@ function generateOne(t) {
       'ELAPSED=0',
       `EXPECTED_CHECKS=${expectedChecks}`,
       'while true; do',
-      '  STATUSES=$(curl -sf \\',
-      '    -H "Authorization: Bearer $GH_TOKEN" \\',
-      '    -H "Accept: application/vnd.github+json" \\',
-      '    "https://api.github.com/repos/$REPO/commits/$GIT_COMMIT/check-runs?per_page=100")',
-      '  OTHERS=$(echo "$STATUSES" | python3 -c "import sys,json; d=json.load(sys.stdin); print(sum(1 for r in d.get(\'check_runs\',[]) if r[\'name\']!=\'pr-verify\'))")',
+      '  STATUSES=$(fetch_statuses)',
+      '  # Count unique contexts (deduplicate — statuses API returns history, latest first)',
+      '  OTHERS=$(echo "$STATUSES" | python3 -c "import sys,json; d=json.load(sys.stdin); print(len(set(r[\'context\'] for r in d if r[\'context\'].startswith(\'tekton/pr-code-checks-\') and not r[\'context\'].startswith(\'tekton/pr-code-checks-verify\'))))")',
       '  echo "  $OTHERS / $EXPECTED_CHECKS checks registered (${ELAPSED}s elapsed)"',
       '  if [ "$OTHERS" -ge "$EXPECTED_CHECKS" ]; then',
       '    echo "All expected checks are now registered."',
@@ -1153,15 +1184,19 @@ function generateOne(t) {
       'echo ""',
       'echo "=== Tests that ran ==="',
       'while true; do',
-      '  STATUSES=$(curl -sf \\',
-      '    -H "Authorization: Bearer $GH_TOKEN" \\',
-      '    -H "Accept: application/vnd.github+json" \\',
-      '    "https://api.github.com/repos/$REPO/commits/$GIT_COMMIT/check-runs?per_page=100")',
-      '  # Download COS file for every check that just became completed',
-      '  while IFS= read -r check_name; do',
-      '    download_cos_result "$check_name"',
-      "  done < <(echo \"$STATUSES\" | python3 -c 'import sys,json; d=json.load(sys.stdin); [print(r[\"name\"]) for r in d.get(\"check_runs\",[]) if r[\"status\"]==\"completed\" and r[\"name\"]!=\"pr-verify\"]')",
-      '  PENDING=$(echo "$STATUSES" | python3 -c "import sys,json; d=json.load(sys.stdin); print(sum(1 for r in d.get(\'check_runs\',[]) if r[\'status\']!=\'completed\' and r[\'name\']!=\'pr-verify\'))")',
+      '  STATUSES=$(fetch_statuses)',
+      '  # Download COS file for every completed (success/failure) code-unit-tests status',
+      '  while IFS= read -r context; do',
+      '    download_cos_result "$context"',
+      "  done < <(echo \"$STATUSES\" | python3 -c \"import sys,json; d=json.load(sys.stdin); seen=set(); [print(r['context']) or seen.add(r['context']) for r in d if r['context'].endswith('/code-unit-tests') and r['context'] not in seen and r['state'] in ('success','failure') and not r['context'].startswith('tekton/pr-code-checks-verify')]\")",
+      '  PENDING=$(echo "$STATUSES" | python3 -c "import sys,json; d=json.load(sys.stdin); seen=set(); pending=0',
+      'for r in d:',
+      '    c=r[\'context\']',
+      '    if not c.endswith(\'/code-unit-tests\') or c.startswith(\'tekton/pr-code-checks-verify\'): continue',
+      '    if c in seen: continue',
+      '    seen.add(c)',
+      '    if r[\'state\']==\'pending\': pending+=1',
+      'print(pending)")',
       '  echo "  $PENDING checks still pending (${ELAPSED}s elapsed)"',
       '  if [ "$PENDING" -eq 0 ]; then',
       '    echo "All checks completed."',
@@ -1177,11 +1212,11 @@ function generateOne(t) {
       '',
       '# ── Phase 3: compare against all test files in repo ──────────────────────',
       'REPO_PATH="$WORKSPACE/$(load_repo app-repo path)"',
-      'ALL_TESTS=$(find "$REPO_PATH/packages/collector/test/integration" \\',
+      'ALL_TESTS=$(find "$REPO_PATH/packages" \\',
       '  -name "*.test.js" \\',
       '  -not -path "*/node_modules/*" \\',
       '  -not -path "*/long_*/*" \\',
-      `  | sed "s|.*/packages/collector/||" | sort)`,
+      `  | sed "s|$REPO_PATH/packages/[^/]*/||" | sort)`,
       '',
       'UNCOVERED_LIST=""',
       'MISSING=0',