diff --git a/recipe_modules/adhoc_validation/examples/full.expected/mac.json b/recipe_modules/adhoc_validation/examples/full.expected/mac.json
index a646cd1..e5e678e 100644
--- a/recipe_modules/adhoc_validation/examples/full.expected/mac.json
+++ b/recipe_modules/adhoc_validation/examples/full.expected/mac.json
@@ -46,6 +46,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "env": {
@@ -132,7 +133,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "env": {
       "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
@@ -374,7 +376,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "env": {
       "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/mac.json b/recipe_modules/flutter_deps/examples/full.expected/mac.json
index 498346d..b1849e4 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/mac.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/mac.json
@@ -805,6 +805,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -851,7 +852,8 @@
       "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
@@ -948,7 +950,8 @@
       "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (2)"
@@ -984,6 +987,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -1043,7 +1047,8 @@
       "/opt/flutter/xcode/9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (3)"
@@ -1140,7 +1145,8 @@
       "/opt/flutter/xcode/9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (4)"
diff --git a/recipe_modules/flutter_deps/examples/full.expected/mac_old.json b/recipe_modules/flutter_deps/examples/full.expected/mac_old.json
index a71b5f3..84c4e6e 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/mac_old.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/mac_old.json
@@ -805,6 +805,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -851,7 +852,8 @@
       "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
@@ -948,7 +950,8 @@
       "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (2)"
@@ -984,6 +987,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -1043,7 +1047,8 @@
       "/opt/flutter/xcode/9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (3)"
@@ -1140,7 +1145,8 @@
       "/opt/flutter/xcode/9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (4)"
diff --git a/recipe_modules/osx_sdk/api.py b/recipe_modules/osx_sdk/api.py
index 417a6f8..5e25884 100644
--- a/recipe_modules/osx_sdk/api.py
+++ b/recipe_modules/osx_sdk/api.py
@@ -239,16 +239,26 @@
     """Installs xcode using mac_toolchain."""
     try:
       self._ensure_mac_toolchain(tool_dir)
+      if self.macos_13_or_later:
+        # TODO(vashworth): Remove macOS 13 specific install steps once
+        # https://github.com/flutter/flutter/issues/138238 is resolved.
+        self.m.step('Show tool_dir cache', ['ls', '-al', tool_dir])
       self.m.step(
           'install xcode',
           [
               tool_dir.join('mac_toolchain'), 'install', '-kind', kind,
               '-xcode-version', self._sdk_version, '-output-dir', app_dir,
               '-cipd-package-prefix', self._xcode_cipd_package_source,
-              '-with-runtime=%s' % (not bool(self._runtime_versions))
+              '-with-runtime=%s' % (not bool(self._runtime_versions)),
+              '-verbose',
           ],
       )
     except self.m.step.StepFailure:
+      if self.macos_13_or_later:
+        # TODO(vashworth): Remove macOS 13 specific install steps once
+        # https://github.com/flutter/flutter/issues/138238 is resolved.
+        self.m.step('Show tool_dir cache', ['ls', '-al', tool_dir])
+        self.m.step('Show app_dir cache', ['ls', '-al', app_dir], ok_ret='any')
       self._cleanup_cache = True
       self._clean_xcode_cache(devicelab)
       self.m.step.empty(
@@ -274,7 +284,8 @@
   def _show_xcode_cache(self):
     self.m.step(
         'Show xcode cache',
-        ['ls', self.m.path['cache'].join(_XCODE_CACHE_PATH)]
+        ['ls', '-al', self.m.path['cache'].join(_XCODE_CACHE_PATH)],
+        ok_ret='any',
     )
 
   def _install_runtimes(self, devicelab, app_dir, tool_dir, sdk_app, kind):
diff --git a/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json b/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json
index 757b371..5c0638e 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/ancient_version.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -48,7 +49,8 @@
       "[CACHE]/osx_sdk/xcode_9c40b/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
@@ -145,7 +147,8 @@
       "[CACHE]/osx_sdk/xcode_9c40b/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (2)"
@@ -206,6 +209,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -265,7 +269,8 @@
       "/opt/flutter/xcode/9c40b/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (3)"
@@ -362,7 +367,8 @@
       "/opt/flutter/xcode/9c40b/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (4)"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json b/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json
index f35eb5c..be39af3 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/automatic_version.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -48,7 +49,8 @@
       "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
@@ -145,7 +147,8 @@
       "[CACHE]/osx_sdk/xcode_12a7209/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (2)"
@@ -206,6 +209,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -265,7 +269,8 @@
       "/opt/flutter/xcode/12a7209/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (3)"
@@ -362,7 +367,8 @@
       "/opt/flutter/xcode/12a7209/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (4)"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json
index 9490b69..a90432e 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_invalid_runtime_version_with_mac_13.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -38,6 +39,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_ios-16-2"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache"
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_ios-16-2/mac_toolchain",
       "install",
       "-kind",
@@ -48,7 +58,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_ios-16-2/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=False"
+      "-with-runtime=False",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_package_source.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_package_source.json
index 136d198..0be2c63 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_package_source.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_package_source.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -61,7 +62,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "some/package",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
@@ -158,7 +160,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "some/package",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (2)"
@@ -219,6 +222,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -278,7 +282,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "some/package",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (3)"
@@ -375,7 +380,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "some/package",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (4)"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version.json
index 7116e18..eaa45cd 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_runtime_version.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -48,7 +49,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-14-0_ios-13-0/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=False"
+      "-with-runtime=False",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
@@ -211,6 +213,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -257,7 +260,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=False"
+      "-with-runtime=False",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (2)"
@@ -354,7 +358,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=False"
+      "-with-runtime=False",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (3)"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json b/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json
index 764a6db..efe1a61 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/explicit_version.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -61,7 +62,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
@@ -158,7 +160,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (2)"
@@ -219,6 +222,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -278,7 +282,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (3)"
@@ -375,7 +380,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (4)"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json
index 474bf40..da01aad 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stderr.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -47,6 +48,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache"
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18/mac_toolchain",
       "install",
       "-kind",
@@ -57,7 +67,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=False"
+      "-with-runtime=False",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json
index 02d9fa0..3ed6373 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/failed_to_delete_runtimes_err_in_stdout.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -47,6 +48,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache"
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18/mac_toolchain",
       "install",
       "-kind",
@@ -57,7 +67,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c_ios-16-2_14c18/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=False"
+      "-with-runtime=False",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac.json b/recipe_modules/osx_sdk/examples/full.expected/mac.json
index c0ba33a..2e04610 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -48,7 +49,8 @@
       "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
@@ -145,7 +147,8 @@
       "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (2)"
@@ -206,6 +209,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -265,7 +269,8 @@
       "/opt/flutter/xcode/9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (3)"
@@ -362,7 +367,8 @@
       "/opt/flutter/xcode/9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (4)"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_arm_host.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_arm_host.json
index f8d0016..a7bb723 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_arm_host.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_arm_host.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -38,6 +39,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache"
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -48,7 +58,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
@@ -131,6 +142,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (2)"
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -141,7 +161,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (2)"
@@ -228,6 +249,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -238,7 +271,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install runtimes.install xcode",
@@ -302,6 +336,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -351,6 +386,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (3)"
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -361,7 +405,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (3)"
@@ -448,6 +493,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -458,7 +515,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install runtimes (2).install xcode",
@@ -548,6 +606,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (4)"
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -558,7 +625,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (4)"
@@ -645,6 +713,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -655,7 +735,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install runtimes (3).install xcode",
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_cleanup_no_runtimes.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_cleanup_no_runtimes.json
index 4db7af5..2b28763 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_cleanup_no_runtimes.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_cleanup_no_runtimes.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -47,6 +48,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache"
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -57,7 +67,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
@@ -144,6 +155,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -154,7 +177,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install runtimes.install xcode",
@@ -240,6 +264,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (2)"
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -250,7 +283,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (2)"
@@ -337,6 +371,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -347,7 +393,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install runtimes (2).install xcode",
@@ -411,6 +458,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -460,6 +508,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (3)"
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -470,7 +527,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (3)"
@@ -557,6 +615,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -567,7 +637,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install runtimes (3).install xcode",
@@ -657,6 +728,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (4)"
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -667,7 +747,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (4)"
@@ -754,6 +835,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (4).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -764,7 +857,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install runtimes (4).install xcode",
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json
index 61eb792..6ef0e73 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_already_mounted.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -38,6 +39,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache"
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/mac_toolchain",
       "install",
       "-kind",
@@ -48,7 +58,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=False"
+      "-with-runtime=False",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
@@ -295,6 +306,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -331,6 +343,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (2)"
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -341,7 +362,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=False"
+      "-with-runtime=False",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (2)"
@@ -428,6 +450,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (3)"
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -438,7 +469,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=False"
+      "-with-runtime=False",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (3)"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json
index c74e4b2..b7a7489 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_build_verion_failure.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -38,6 +39,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache"
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/mac_toolchain",
       "install",
       "-kind",
@@ -48,7 +58,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=False"
+      "-with-runtime=False",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json
index 440126e..8161e51 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_clean.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -47,6 +48,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache"
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/mac_toolchain",
       "install",
       "-kind",
@@ -57,7 +67,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=False"
+      "-with-runtime=False",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
@@ -343,6 +354,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -392,6 +404,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (2)"
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -402,7 +423,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=False"
+      "-with-runtime=False",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (2)"
@@ -551,6 +573,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (3)"
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -561,7 +592,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=False"
+      "-with-runtime=False",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (3)"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json
index dae7958..0d27871 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_explicit_runtime_version_not_mounted.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -38,6 +39,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache"
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/mac_toolchain",
       "install",
       "-kind",
@@ -48,7 +58,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef_runtime_ios-16-4_14e300c/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=False"
+      "-with-runtime=False",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
@@ -308,6 +319,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -344,6 +356,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (2)"
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -354,7 +375,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=False"
+      "-with-runtime=False",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (2)"
@@ -441,6 +463,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (3)"
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -451,7 +482,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=False"
+      "-with-runtime=False",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (3)"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_x86_host.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_x86_host.json
index f615dd1..f0ba57d 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/mac_13_x86_host.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_x86_host.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -38,6 +39,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache"
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -48,7 +58,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
@@ -131,6 +142,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (2)"
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -141,7 +161,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (2)"
@@ -228,6 +249,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "install runtimes.Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
       "install",
       "-kind",
@@ -238,7 +271,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install runtimes.install xcode",
@@ -302,6 +336,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -351,6 +386,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (3)"
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -361,7 +405,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (3)"
@@ -448,6 +493,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_1/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (2).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_1/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -458,7 +515,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install runtimes (2).install xcode",
@@ -548,6 +606,15 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (4)"
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -558,7 +625,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (4)"
@@ -645,6 +713,18 @@
   },
   {
     "cmd": [
+      "ls",
+      "-al",
+      "[CLEANUP]/tmp_tmp_2/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "install runtimes (3).Show tool_dir cache",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
       "[CLEANUP]/tmp_tmp_2/osx_sdk/mac_toolchain",
       "install",
       "-kind",
@@ -655,7 +735,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "infra_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install runtimes (3).install xcode",
diff --git a/recipe_modules/osx_sdk/examples/full.expected/mac_13_xcode_install_fails.json b/recipe_modules/osx_sdk/examples/full.expected/mac_13_xcode_install_fails.json
new file mode 100644
index 0000000..a244fc2
--- /dev/null
+++ b/recipe_modules/osx_sdk/examples/full.expected/mac_13_xcode_install_fails.json
@@ -0,0 +1,212 @@
+[
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk"
+    ],
+    "infra_step": true,
+    "name": "Show xcode cache"
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CACHE]/osx_sdk/xcode_deadbeef",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "ensure_installed",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache"
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
+      "install",
+      "-kind",
+      "mac",
+      "-xcode-version",
+      "deadbeef",
+      "-output-dir",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install xcode",
+    "~followup_annotations": [
+      "@@@STEP_EXCEPTION@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (2)"
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Show app_dir cache"
+  },
+  {
+    "cmd": [
+      "rm",
+      "-rf",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up Xcode cache"
+  },
+  {
+    "cmd": [],
+    "name": "Failed to install Xcode",
+    "~followup_annotations": [
+      "@@@STEP_EXCEPTION@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "cipd",
+      "ensure",
+      "-root",
+      "[CACHE]/osx_sdk/xcode_deadbeef",
+      "-ensure-file",
+      "infra/tools/mac_toolchain/${platform} latest",
+      "-max-threads",
+      "0",
+      "-json-output",
+      "/path/to/tmp/json"
+    ],
+    "infra_step": true,
+    "name": "ensure_installed (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@      {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/mac_toolchain/resolved-platform\"@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    ]@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (3)"
+  },
+  {
+    "cmd": [
+      "[CACHE]/osx_sdk/xcode_deadbeef/mac_toolchain",
+      "install",
+      "-kind",
+      "mac",
+      "-xcode-version",
+      "deadbeef",
+      "-output-dir",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
+      "-cipd-package-prefix",
+      "infra_internal/ios/xcode",
+      "-with-runtime=True",
+      "-verbose"
+    ],
+    "infra_step": true,
+    "name": "install xcode (2)",
+    "~followup_annotations": [
+      "@@@STEP_EXCEPTION@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "Show tool_dir cache (4)"
+  },
+  {
+    "cmd": [
+      "ls",
+      "-al",
+      "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app"
+    ],
+    "infra_step": true,
+    "name": "Show app_dir cache (2)"
+  },
+  {
+    "cmd": [
+      "rm",
+      "-rf",
+      "[CACHE]/osx_sdk/xcode_deadbeef"
+    ],
+    "infra_step": true,
+    "name": "Cleaning up Xcode cache (2)"
+  },
+  {
+    "cmd": [],
+    "name": "Failed to install Xcode (2)",
+    "~followup_annotations": [
+      "@@@STEP_EXCEPTION@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "sudo",
+      "xcode-select",
+      "--reset"
+    ],
+    "infra_step": true,
+    "name": "reset XCode"
+  },
+  {
+    "failure": {
+      "humanReason": "Infra Failure: Step('Failed to install Xcode (2)') (retcode: 0)"
+    },
+    "name": "$result"
+  }
+]
\ No newline at end of file
diff --git a/recipe_modules/osx_sdk/examples/full.expected/no_runtime_version.json b/recipe_modules/osx_sdk/examples/full.expected/no_runtime_version.json
index bcf80a5..4611673 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/no_runtime_version.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/no_runtime_version.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -48,7 +49,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode"
@@ -145,7 +147,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (2)"
@@ -206,6 +209,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -265,7 +269,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (3)"
@@ -362,7 +367,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (4)"
diff --git a/recipe_modules/osx_sdk/examples/full.expected/xcode_install_fails.json b/recipe_modules/osx_sdk/examples/full.expected/xcode_install_fails.json
index 4ad9723..80122f4 100644
--- a/recipe_modules/osx_sdk/examples/full.expected/xcode_install_fails.json
+++ b/recipe_modules/osx_sdk/examples/full.expected/xcode_install_fails.json
@@ -2,6 +2,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -48,7 +49,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode",
@@ -117,7 +119,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "name": "install xcode (2)",
diff --git a/recipe_modules/osx_sdk/examples/full.py b/recipe_modules/osx_sdk/examples/full.py
index aca7a3a..efd2b0b 100644
--- a/recipe_modules/osx_sdk/examples/full.py
+++ b/recipe_modules/osx_sdk/examples/full.py
@@ -419,3 +419,13 @@
       api.step_data('install xcode (2)', retcode=1),
       status='INFRA_FAILURE'
   )
+
+  yield api.test(
+      'mac_13_xcode_install_fails',
+      api.platform.name('mac'),
+      api.platform.mac_release('13.5.1'),
+      api.properties(**{'$flutter/osx_sdk': {'sdk_version': 'deadbeef',}}),
+      api.step_data('install xcode', retcode=1),
+      api.step_data('install xcode (2)', retcode=1),
+      status='INFRA_FAILURE'
+  )
diff --git a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
index 43139fe..309be5f 100644
--- a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
@@ -543,6 +543,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
@@ -657,7 +658,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
@@ -992,7 +994,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
index 5fb84d3..51e6843 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
@@ -543,6 +543,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
@@ -657,7 +658,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
@@ -992,7 +994,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
index 6e060f6..cf2de1e 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab-timeout.json
@@ -543,6 +543,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
@@ -657,7 +658,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
@@ -992,7 +994,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
index 3bafb07..8233684 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
@@ -543,6 +543,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
@@ -657,7 +658,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
@@ -992,7 +994,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
diff --git a/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json b/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
index c8a7903..d8d3521 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/xcode-mac.json
@@ -460,6 +460,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
@@ -572,7 +573,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
@@ -900,7 +902,8 @@
       "[CACHE]/osx_sdk/xcode_deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
diff --git a/recipes/devicelab/devicelab_test_drone.expected/mac.json b/recipes/devicelab/devicelab_test_drone.expected/mac.json
index 5daa99a..73bdedb 100644
--- a/recipes/devicelab/devicelab_test_drone.expected/mac.json
+++ b/recipes/devicelab/devicelab_test_drone.expected/mac.json
@@ -567,6 +567,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
@@ -679,7 +680,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
@@ -1007,7 +1009,8 @@
       "/opt/flutter/xcode/deadbeef/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json
index e08f3bc..c2f0a47 100644
--- a/recipes/engine_v2/builder.expected/mac.json
+++ b/recipes/engine_v2/builder.expected/mac.json
@@ -359,6 +359,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -429,7 +430,8 @@
       "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "luci_context": {
@@ -610,7 +612,8 @@
       "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "luci_context": {
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac.json b/recipes/engine_v2/engine_v2.expected/basic_mac.json
index d1a78b1..f7e3e02 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac.json
@@ -620,6 +620,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -694,7 +695,8 @@
       "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "luci_context": {
@@ -894,7 +896,8 @@
       "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "luci_context": {
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
index 14f02af..10d56af 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
@@ -673,6 +673,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -747,7 +748,8 @@
       "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "luci_context": {
@@ -947,7 +949,8 @@
       "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "luci_context": {
diff --git a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
index 41dd06b..85f23c9 100644
--- a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
+++ b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
@@ -1094,6 +1094,7 @@
   {
     "cmd": [
       "ls",
+      "-al",
       "[CACHE]/osx_sdk"
     ],
     "infra_step": true,
@@ -1168,7 +1169,8 @@
       "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1368,7 +1370,8 @@
       "[CACHE]/osx_sdk/xcode_9f2000/XCode.app",
       "-cipd-package-prefix",
       "flutter_internal/ios/xcode",
-      "-with-runtime=True"
+      "-with-runtime=True",
+      "-verbose"
     ],
     "infra_step": true,
     "luci_context": {