zeno-mobile-runner 0.1.2 → 0.1.8

package/schemas/discover-output.schema.json

@@ -0,0 +1,83 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://zmr.dev/schemas/discover-output.schema.json",
+  "title": "ZMR Discover Output",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "ok",
+    "mode",
+    "schemaVersion",
+    "runnerVersion",
+    "protocolVersion",
+    "out",
+    "traceDir",
+    "sourceSnapshot",
+    "name",
+    "appId",
+    "selectorCount",
+    "stepCount",
+    "replay",
+    "warnings",
+    "validated",
+    "validation",
+    "nextCommands"
+  ],
+  "properties": {
+    "ok": { "type": "boolean" },
+    "mode": { "const": "discover" },
+    "schemaVersion": { "const": 1 },
+    "runnerVersion": { "type": "string", "minLength": 1 },
+    "protocolVersion": { "type": "string", "minLength": 1 },
+    "out": { "type": "string", "minLength": 1 },
+    "traceDir": { "type": "string", "minLength": 1 },
+    "sourceSnapshot": { "type": "string", "minLength": 1 },
+    "name": { "type": "string", "minLength": 1 },
+    "appId": { "type": ["string", "null"] },
+    "selectorCount": { "type": "integer", "minimum": 0 },
+    "stepCount": { "type": "integer", "minimum": 2 },
+    "replay": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["enabled", "eventCount", "stepCount", "skippedEventCount"],
+      "properties": {
+        "enabled": { "type": "boolean" },
+        "eventCount": { "type": "integer", "minimum": 0 },
+        "stepCount": { "type": "integer", "minimum": 0 },
+        "skippedEventCount": { "type": "integer", "minimum": 0 }
+      }
+    },
+    "warnings": {
+      "type": "array",
+      "items": { "type": "string" }
+    },
+    "validated": { "type": "boolean" },
+    "validation": {
+      "anyOf": [
+        { "type": "null" },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "required": ["ok", "path"],
+          "properties": {
+            "ok": { "type": "boolean" },
+            "path": { "type": "string", "minLength": 1 },
+            "name": { "type": "string", "minLength": 1 },
+            "appId": { "type": ["string", "null"] },
+            "stepCount": { "type": "integer", "minimum": 0 },
+            "errorCode": { "type": "string", "minLength": 1 },
+            "message": { "type": "string", "minLength": 1 },
+            "fieldPath": { "type": "string", "minLength": 1 },
+            "line": { "type": "integer", "minimum": 1 },
+            "column": { "type": "integer", "minimum": 1 }
+          }
+        }
+      ]
+    },
+    "nextCommands": {
+      "type": "array",
+      "minItems": 1,
+      "items": { "type": "string", "minLength": 1 }
+    }
+  }
+}

package/schemas/draft-output.schema.json

@@ -0,0 +1,58 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://zmr.dev/schemas/draft-output.schema.json",
+  "title": "ZMR Draft Output",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "ok",
+    "mode",
+    "schemaVersion",
+    "runnerVersion",
+    "protocolVersion",
+    "out",
+    "traceDir",
+    "sourceSnapshot",
+    "name",
+    "appId",
+    "selectorCount",
+    "stepCount",
+    "replay",
+    "warnings",
+    "nextCommands"
+  ],
+  "properties": {
+    "ok": { "type": "boolean" },
+    "mode": { "const": "draft" },
+    "schemaVersion": { "const": 1 },
+    "runnerVersion": { "type": "string", "minLength": 1 },
+    "protocolVersion": { "type": "string", "minLength": 1 },
+    "out": { "type": "string", "minLength": 1 },
+    "traceDir": { "type": "string", "minLength": 1 },
+    "sourceSnapshot": { "type": "string", "minLength": 1 },
+    "name": { "type": "string", "minLength": 1 },
+    "appId": { "type": ["string", "null"] },
+    "selectorCount": { "type": "integer", "minimum": 0 },
+    "stepCount": { "type": "integer", "minimum": 2 },
+    "replay": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["enabled", "eventCount", "stepCount", "skippedEventCount"],
+      "properties": {
+        "enabled": { "type": "boolean" },
+        "eventCount": { "type": "integer", "minimum": 0 },
+        "stepCount": { "type": "integer", "minimum": 0 },
+        "skippedEventCount": { "type": "integer", "minimum": 0 }
+      }
+    },
+    "warnings": {
+      "type": "array",
+      "items": { "type": "string" }
+    },
+    "nextCommands": {
+      "type": "array",
+      "minItems": 1,
+      "items": { "type": "string", "minLength": 1 }
+    }
+  }
+}

package/schemas/explore-output.schema.json

@@ -0,0 +1,94 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://zmr.dev/schemas/explore-output.schema.json",
+  "title": "ZMR Explore Output",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "ok",
+    "mode",
+    "schemaVersion",
+    "runnerVersion",
+    "protocolVersion",
+    "autonomous",
+    "reviewRequired",
+    "guardrails",
+    "out",
+    "traceDir",
+    "sourceSnapshot",
+    "name",
+    "appId",
+    "selectorCount",
+    "stepCount",
+    "replay",
+    "warnings",
+    "validated",
+    "validation",
+    "nextCommands"
+  ],
+  "properties": {
+    "ok": { "type": "boolean" },
+    "mode": { "const": "explore" },
+    "schemaVersion": { "const": 1 },
+    "runnerVersion": { "type": "string", "minLength": 1 },
+    "protocolVersion": { "type": "string", "minLength": 1 },
+    "goal": { "type": "string", "minLength": 1 },
+    "autonomous": { "const": false },
+    "reviewRequired": { "const": true },
+    "guardrails": {
+      "type": "array",
+      "minItems": 1,
+      "items": { "type": "string", "minLength": 1 }
+    },
+    "out": { "type": "string", "minLength": 1 },
+    "traceDir": { "type": "string", "minLength": 1 },
+    "sourceSnapshot": { "type": "string", "minLength": 1 },
+    "name": { "type": "string", "minLength": 1 },
+    "appId": { "type": ["string", "null"] },
+    "selectorCount": { "type": "integer", "minimum": 0 },
+    "stepCount": { "type": "integer", "minimum": 2 },
+    "replay": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["enabled", "eventCount", "stepCount", "skippedEventCount"],
+      "properties": {
+        "enabled": { "type": "boolean" },
+        "eventCount": { "type": "integer", "minimum": 0 },
+        "stepCount": { "type": "integer", "minimum": 0 },
+        "skippedEventCount": { "type": "integer", "minimum": 0 }
+      }
+    },
+    "warnings": {
+      "type": "array",
+      "items": { "type": "string" }
+    },
+    "validated": { "type": "boolean" },
+    "validation": {
+      "anyOf": [
+        { "type": "null" },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "required": ["ok", "path"],
+          "properties": {
+            "ok": { "type": "boolean" },
+            "path": { "type": "string", "minLength": 1 },
+            "name": { "type": "string", "minLength": 1 },
+            "appId": { "type": ["string", "null"] },
+            "stepCount": { "type": "integer", "minimum": 0 },
+            "errorCode": { "type": "string", "minLength": 1 },
+            "message": { "type": "string", "minLength": 1 },
+            "fieldPath": { "type": "string", "minLength": 1 },
+            "line": { "type": "integer", "minimum": 1 },
+            "column": { "type": "integer", "minimum": 1 }
+          }
+        }
+      ]
+    },
+    "nextCommands": {
+      "type": "array",
+      "minItems": 1,
+      "items": { "type": "string", "minLength": 1 }
+    }
+  }
+}

package/schemas/inspect-output.schema.json

@@ -0,0 +1,88 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://zmr.dev/schemas/inspect-output.schema.json",
+  "title": "ZMR Inspect Output",
+  "type": "object",
+  "additionalProperties": false,
+  "required": [
+    "ok",
+    "status",
+    "schemaVersion",
+    "runnerVersion",
+    "protocolVersion",
+    "dir",
+    "configPath",
+    "configExists",
+    "agentInstructionsPath",
+    "agentInstructionsExists",
+    "platforms",
+    "recommendedCommands",
+    "claimsPolicy",
+    "limitations"
+  ],
+  "properties": {
+    "ok": { "type": "boolean" },
+    "status": { "enum": ["ready", "needs-setup"] },
+    "schemaVersion": { "const": 1 },
+    "runnerVersion": { "type": "string", "minLength": 1 },
+    "protocolVersion": { "type": "string", "minLength": 1 },
+    "dir": { "type": "string", "minLength": 1 },
+    "configPath": { "type": "string", "minLength": 1 },
+    "configExists": { "type": "boolean" },
+    "agentInstructionsPath": { "type": "string", "minLength": 1 },
+    "agentInstructionsExists": { "type": "boolean" },
+    "platforms": {
+      "type": "array",
+      "items": { "$ref": "#/$defs/platform" }
+    },
+    "recommendedCommands": {
+      "type": "array",
+      "items": { "type": "string", "minLength": 1 }
+    },
+    "claimsPolicy": {
+      "type": "array",
+      "items": { "type": "string", "minLength": 1 }
+    },
+    "limitations": {
+      "type": "array",
+      "items": { "type": "string", "minLength": 1 }
+    }
+  },
+  "$defs": {
+    "platform": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "name",
+        "enabled",
+        "defaultDevice",
+        "smokeScenario",
+        "smokeScenarioExists",
+        "traceDir"
+      ],
+      "properties": {
+        "name": { "enum": ["android", "ios"] },
+        "enabled": { "type": "boolean" },
+        "defaultDevice": {
+          "anyOf": [
+            { "type": "string", "minLength": 1 },
+            { "type": "null" }
+          ]
+        },
+        "smokeScenario": {
+          "anyOf": [
+            { "type": "string", "minLength": 1 },
+            { "type": "null" }
+          ]
+        },
+        "smokeScenarioExists": { "type": "boolean" },
+        "traceDir": {
+          "anyOf": [
+            { "type": "string", "minLength": 1 },
+            { "type": "null" }
+          ]
+        }
+      }
+    }
+  }
+}

package/schemas/run-output.schema.json

@@ -34,6 +34,8 @@
     "failedStepIndex": { "type": "integer", "minimum": 0 },
     "error": { "type": "string", "minLength": 1 },
     "reportPath": { "type": "string", "minLength": 1 },
+    "discovery": { "$ref": "https://zmr.dev/schemas/discover-output.schema.json" },
+    "discoveryError": { "type": "string", "minLength": 1 },
     "nextCommands": {
       "type": "array",
       "minItems": 1,

package/scripts/install-ios-shim.sh

@@ -167,6 +167,10 @@ mkdir -p "$APP_ROOT"
 APP_ROOT="$(cd "$APP_ROOT" && pwd)"
 mkdir -p "$APP_ROOT/.zmr" "$APP_ROOT/.zmr/shims/ios"
 rm -f "$APP_ROOT/.zmr/ios-shim-state/build-for-testing.ready"
+rm -f "$APP_ROOT/.zmr/ios-shim-state/destination.id"
+rm -f "$APP_ROOT/.zmr/ios-shim-state/xcodebuild.pid"
+rm -f "$APP_ROOT/.zmr/ios-shim-state/xcodebuild.log"
+rm -rf "$APP_ROOT/.zmr/ios-shim-state/server"
 cp "$ROOT/shims/ios/ZMRShim.swift" "$APP_ROOT/.zmr/shims/ios/ZMRShim.swift"
 cp "$ROOT/shims/ios/ZMRShimUITestCase.swift" "$APP_ROOT/.zmr/ZMRShimUITestCase.swift"
 cp "$ROOT/scripts/ensure-ios-shim-target.rb" "$APP_ROOT/.zmr/ensure-ios-shim-target.rb"
@@ -216,6 +220,7 @@ STATE_DIR="$APP_ROOT/.zmr/ios-shim-state"
 SERVER_DIR="\$STATE_DIR/server"
 PID_FILE="\$STATE_DIR/xcodebuild.pid"
 READY_FILE="\$SERVER_DIR/ready"
+DESTINATION_ID_FILE="\$STATE_DIR/destination.id"
 BUILD_READY_FILE="\$STATE_DIR/build-for-testing.ready"
 LOG_FILE="\$STATE_DIR/xcodebuild.log"
 STDIN_FILE="\$(mktemp)"
@@ -241,6 +246,52 @@ tail_log() {
   fi
 }
 
+tail_log_path() {
+  local log_file="\$1"
+  if [[ -f "\$log_file" ]]; then
+    tail -120 "\$log_file" >&2
+  fi
+}
+
+run_xcodebuild_with_timeout() {
+  local label="\$1"
+  local timeout_seconds="\$2"
+  local log_file="\$3"
+  shift 3
+
+  local pid started_at next_progress progress_seconds elapsed
+  progress_seconds="\${ZMR_IOS_SHIM_PROGRESS_SECONDS:-30}"
+  "\$@" >"\$log_file" 2>&1 &
+  pid="\$!"
+  started_at="\$SECONDS"
+  next_progress=\$((started_at + progress_seconds))
+
+  while kill -0 "\$pid" 2>/dev/null; do
+    elapsed=\$((SECONDS - started_at))
+    if (( elapsed >= timeout_seconds )); then
+      echo "timed out waiting for \$label after \${timeout_seconds}s" >&2
+      kill -TERM "\$pid" 2>/dev/null || true
+      sleep 2
+      if kill -0 "\$pid" 2>/dev/null; then
+        kill -KILL "\$pid" 2>/dev/null || true
+      fi
+      wait "\$pid" 2>/dev/null || true
+      tail_log_path "\$log_file"
+      exit 1
+    fi
+    if (( SECONDS >= next_progress )); then
+      echo "still waiting for \$label after \${elapsed}s; log: \$log_file" >&2
+      next_progress=\$((SECONDS + progress_seconds))
+    fi
+    sleep 1
+  done
+
+  if ! wait "\$pid"; then
+    tail_log_path "\$log_file"
+    exit 1
+  fi
+}
+
 resolve_destination() {
   local destination_id="$DEVICE"
   if [[ "\$destination_id" == "booted" ]]; then
@@ -248,7 +299,20 @@ resolve_destination() {
       echo "physical iOS shim requires an explicit --device id" >&2
       exit 2
     fi
+    if [[ -f "\$DESTINATION_ID_FILE" ]]; then
+      destination_id="\$(cat "\$DESTINATION_ID_FILE" 2>/dev/null || true)"
+      if [[ -n "\$destination_id" ]] && xcrun simctl list devices available | grep -F "\$destination_id" >/dev/null 2>&1; then
+        # Reuse the first resolved booted simulator so build-for-testing and
+        # test-without-building target the same simulator even if it shuts down
+        # while Xcode is compiling the shim target.
+        printf '%s' "\$destination_id"
+        return 0
+      fi
+    fi
     destination_id="\$(xcrun simctl list devices booted | sed -n 's/.*(\([0-9A-Fa-f-][0-9A-Fa-f-]*\)) (Booted).*/\1/p' | head -n 1)"
+    if [[ -n "\$destination_id" ]]; then
+      printf '%s' "\$destination_id" > "\$DESTINATION_ID_FILE"
+    fi
   fi
   if [[ -z "\$destination_id" ]]; then
     echo "no booted iOS simulator found" >&2
@@ -272,9 +336,13 @@ is_server_running() {
   if [[ ! -f "\$PID_FILE" ]]; then
     return 1
   fi
-  local pid
+  local pid command
   pid="\$(cat "\$PID_FILE" 2>/dev/null || true)"
-  [[ -n "\$pid" ]] && kill -0 "\$pid" 2>/dev/null
+  if [[ -z "\$pid" ]] || ! kill -0 "\$pid" 2>/dev/null; then
+    return 1
+  fi
+  command="\$(ps -p "\$pid" -o command= 2>/dev/null || true)"
+  [[ "\$command" == *xcodebuild* && "\$command" == *ZMRShimUITests* ]]
 }
 
 run_oneshot() {
@@ -332,18 +400,15 @@ build_for_testing() {
   destination_id="\$(destination_spec)"
   build_log="\$STATE_DIR/xcodebuild.build.log"
 
-  if ! xcodebuild build-for-testing \\
-    "\${XCODEBUILD_ARGS[@]}" \\
-    -scheme "$SCHEME" \\
-    -configuration "$CONFIGURATION" \\
-    -destination "\$destination_id" \\
-    ZMR_SHIM_MODE="server" \\
-    ZMR_SHIM_SERVER_DIR="\$SERVER_DIR" \\
-    ZMR_APP_BUNDLE_ID="$BUNDLE_ID" \\
-    >"\$build_log" 2>&1; then
-    tail -120 "\$build_log" >&2
-    exit 1
-  fi
+  run_xcodebuild_with_timeout "iOS shim build-for-testing" "\${ZMR_IOS_SHIM_BUILD_TIMEOUT_SECONDS:-5400}" "\$build_log" \\
+    xcodebuild build-for-testing \\
+      "\${XCODEBUILD_ARGS[@]}" \\
+      -scheme "$SCHEME" \\
+      -configuration "$CONFIGURATION" \\
+      -destination "\$destination_id" \\
+      ZMR_SHIM_MODE="server" \\
+      ZMR_SHIM_SERVER_DIR="\$SERVER_DIR" \\
+      ZMR_APP_BUNDLE_ID="$BUNDLE_ID"
 
   touch "\$BUILD_READY_FILE"
 }

package/scripts/release-readiness.py

@@ -423,6 +423,38 @@ def benchmark_threshold_reason(row):
     return "requires " + ", ".join(reasons)
 
 
+agent_workflow_fields = (
+    "agentWorkflow",
+    "mcp",
+    "jsonRpc",
+    "semanticSnapshot",
+    "typedActions",
+    "traceEvents",
+    "traceExplain",
+    "traceExplore",
+    "traceDiscover",
+    "scenarioValidation",
+    "redactedExport",
+)
+
+
+def agent_workflow_pass(row):
+    command = row.get("command")
+    if row.get("name") == "local release gate" and isinstance(command, str) and "release-gate.sh" in command:
+        return True
+    return all(row.get(field) is True for field in agent_workflow_fields)
+
+
+def agent_workflow_reason(row):
+    command = row.get("command")
+    if row.get("name") == "local release gate" and (not isinstance(command, str) or "release-gate.sh" not in command):
+        return "requires release-gate.sh or structured agentWorkflow evidence"
+    missing = [field for field in agent_workflow_fields if row.get(field) is not True]
+    if missing:
+        return "requires release-gate.sh or structured agentWorkflow evidence: " + ", ".join(missing)
+    return "requires release-gate.sh or structured agentWorkflow evidence"
+
+
 def row_satisfies(label, row):
     if row.get("status") != "passed":
         return False
@@ -436,6 +468,8 @@ def row_satisfies(label, row):
         return physical_ios_device_value(row) is not None
     if label == "competitive benchmark comparison":
         return benchmark_thresholds_pass(row)
+    if label == "agent workflow smoke":
+        return agent_workflow_pass(row)
     return True
 
 
@@ -485,6 +519,8 @@ def requirement_status(label, names):
                 reason = "requires concrete physical device identifier evidence"
             elif label == "competitive benchmark comparison":
                 reason = benchmark_threshold_reason(row)
+            elif label == "agent workflow smoke":
+                reason = agent_workflow_reason(row)
             return {
                 "name": label,
                 "status": "insufficient",
@@ -508,6 +544,7 @@ requirements = [
 
 if target in ("production", "market-claim"):
     requirements.extend([
+        ("agent workflow smoke", ("agent workflow smoke", "local release gate")),
         ("physical iOS readiness", "physical iOS readiness"),
         ("Android hardware pilot", "Android hardware pilot"),
         ("iOS simulator hardware pilot", "iOS simulator hardware pilot"),
@@ -582,6 +619,7 @@ next_step_commands = {
     "local release gate": ["./scripts/release-candidate.sh --mode local"],
     "public Android demo": ["zmr-demo-android --runs 5"],
     "public iOS simulator demo": ["zmr-demo-ios --runs 5"],
+    "agent workflow smoke": ["./scripts/release-gate.sh"],
     "physical iOS readiness": [physical_ios_pilot_command(default_pilot_evidence)],
     "Android hardware pilot": [grouped_simulator_pilot_command(default_pilot_evidence)],
     "iOS simulator hardware pilot": [grouped_simulator_pilot_command(default_pilot_evidence)],
@@ -690,6 +728,11 @@ def append_grouped_next_steps(blocked_items):
             append_next_step(next_steps, label, commands, present)
             handled.update(present)
 
+    maybe_group(
+        ["local release gate", "agent workflow smoke"],
+        "local release gate + agent workflow smoke",
+        ["./scripts/release-candidate.sh --mode local"],
+    )
     maybe_group(
         ["Android hardware pilot", "iOS simulator hardware pilot"],
         "Android hardware pilot + iOS simulator hardware pilot",

package/scripts/run-android-pilot.sh

@@ -171,6 +171,11 @@ run() {
   fi
 }
 
+run_zmr_report() {
+  local trace_dir="$1"
+  run "$ZMR_BIN" report "$trace_dir" --out "$trace_dir/report.html" --junit "$trace_dir/junit.xml"
+}
+
 capture() {
   if [[ "$DRY_RUN" -eq 1 ]]; then
     echo ""
@@ -505,7 +510,7 @@ if [[ "$RUNS" -eq 1 ]]; then
     SINGLE_TRACE="$TRACE_ROOT/scenario"
     run rm -rf "$SINGLE_TRACE"
     run_zmr_android_scenario "$SCENARIO" --device "$DEVICE" --app-id "$APP_ID" --trace-dir "$SINGLE_TRACE"
-    run "$ZMR_BIN" report "$SINGLE_TRACE" --out "$SINGLE_TRACE/report.html"
+    run_zmr_report "$SINGLE_TRACE"
     run "$ZMR_BIN" export "$SINGLE_TRACE" --out "$TRACE_ROOT/scenario.zmrtrace"
     run "$ZMR_BIN" export "$SINGLE_TRACE" --out "$TRACE_ROOT/scenario-redacted.zmrtrace" --redact
   else
@@ -513,11 +518,11 @@ if [[ "$RUNS" -eq 1 ]]; then
     LOGIN_TRACE="$TRACE_ROOT/login-smoke"
     run rm -rf "$AUTH_TRACE" "$LOGIN_TRACE"
     run_zmr_android_scenario examples/android-app-auth-probe.json --device "$DEVICE" --app-id "$APP_ID" --trace-dir "$AUTH_TRACE"
-    run "$ZMR_BIN" report "$AUTH_TRACE" --out "$AUTH_TRACE/report.html"
+    run_zmr_report "$AUTH_TRACE"
     run "$ZMR_BIN" export "$AUTH_TRACE" --out "$TRACE_ROOT/auth.zmrtrace"
     run "$ZMR_BIN" export "$AUTH_TRACE" --out "$TRACE_ROOT/auth-redacted.zmrtrace" --redact
     run_zmr_android_scenario examples/android-app-login-smoke.json --device "$DEVICE" --app-id "$APP_ID" --trace-dir "$LOGIN_TRACE"
-    run "$ZMR_BIN" report "$LOGIN_TRACE" --out "$LOGIN_TRACE/report.html"
+    run_zmr_report "$LOGIN_TRACE"
     run "$ZMR_BIN" export "$LOGIN_TRACE" --out "$TRACE_ROOT/login-smoke.zmrtrace"
     run "$ZMR_BIN" export "$LOGIN_TRACE" --out "$TRACE_ROOT/login-smoke-redacted.zmrtrace" --redact
   fi
@@ -531,12 +536,12 @@ else
   fi
   if [[ -n "$SCENARIO" ]]; then
     run_android_benchmark --zmr "$SCENARIO" --device "$DEVICE" --app-id "$APP_ID" --runs "$RUNS" --trace-root "$TRACE_ROOT/bench-scenario" "${benchmark_gate_args[@]}"
-    run "$ZMR_BIN" report "$TRACE_ROOT/bench-scenario" --out "$TRACE_ROOT/bench-scenario/report.html"
+    run_zmr_report "$TRACE_ROOT/bench-scenario"
   else
     run_android_benchmark --zmr examples/android-app-auth-probe.json --device "$DEVICE" --app-id "$APP_ID" --runs "$RUNS" --trace-root "$TRACE_ROOT/bench-auth" "${benchmark_gate_args[@]}"
-    run "$ZMR_BIN" report "$TRACE_ROOT/bench-auth" --out "$TRACE_ROOT/bench-auth/report.html"
+    run_zmr_report "$TRACE_ROOT/bench-auth"
     run_android_benchmark --zmr examples/android-app-login-smoke.json --device "$DEVICE" --app-id "$APP_ID" --runs "$RUNS" --trace-root "$TRACE_ROOT/bench-login-smoke" "${benchmark_gate_args[@]}"
-    run "$ZMR_BIN" report "$TRACE_ROOT/bench-login-smoke" --out "$TRACE_ROOT/bench-login-smoke/report.html"
+    run_zmr_report "$TRACE_ROOT/bench-login-smoke"
   fi
 fi
 
@@ -546,9 +551,30 @@ cat <<EOF
 
 Android pilot complete.
 Output directory: $TRACE_ROOT
-Shareable bundles:
-  $TRACE_ROOT/auth-redacted.zmrtrace
-  $TRACE_ROOT/login-smoke-redacted.zmrtrace
+EOF
+
+if [[ "$RUNS" -eq 1 ]]; then
+  echo "Shareable bundles:"
+  if [[ -n "$SCENARIO" ]]; then
+    echo "  $TRACE_ROOT/scenario-redacted.zmrtrace"
+  else
+    echo "  $TRACE_ROOT/auth-redacted.zmrtrace"
+    echo "  $TRACE_ROOT/login-smoke-redacted.zmrtrace"
+  fi
+else
+  echo "Benchmark reports:"
+  if [[ -n "$SCENARIO" ]]; then
+    echo "  $TRACE_ROOT/bench-scenario/report.html"
+    echo "  $TRACE_ROOT/bench-scenario/junit.xml"
+  else
+    echo "  $TRACE_ROOT/bench-auth/report.html"
+    echo "  $TRACE_ROOT/bench-auth/junit.xml"
+    echo "  $TRACE_ROOT/bench-login-smoke/report.html"
+    echo "  $TRACE_ROOT/bench-login-smoke/junit.xml"
+  fi
+fi
+
+cat <<EOF
 Viewer:
   $ROOT/viewer/index.html
 EOF