getsentry · cameroncooke · Jul 16, 2026 · Jul 16, 2026 · Jul 16, 2026 · Jul 16, 2026
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@
 
 - Added `xcodebuildmcp purge` to report and explicitly clean XcodeBuildMCP-managed workspace storage, including opt-in DerivedData cleanup with dry-run and confirmation safeguards.
 - Added `extraArgs` as a first-class session-default value. Repo config or runtime defaults can now carry common `xcodebuild` flags (for example `-skipPackagePluginValidation` or `-disableAutomaticPackageResolution`) so they don't need repeating on every build or test call. Per-call `extraArgs` replace matching configured flags or build settings and append after non-matching defaults, while an explicit empty array (`extraArgs: []`) clears the defaults for a single call. The session management tools show, set, sync, and clear `extraArgs` alongside the other defaults.
+- Added reusable test preparation to the existing simulator, device, and macOS build tools. Builds can now return a portable `.xctestproducts` artifact, and test tools can run that artifact—or an advanced `.xctestrun` input—without rebuilding before producing a new `.xcresult` ([#450](https://github.com/getsentry/XcodeBuildMCP/issues/450)).
+
+### Changed
+
+- Tool manifests can now conditionally expose static next steps using handler-activated condition keys, while runtime-generated parameters continue to flow through the existing next-step parameter contract.
 
 ### Fixed
 
@@ -692,5 +697,3 @@ Please note that the UI automation features are an early preview and currently i
 ## [v1.0.1] - 2025-04-02
 - Initial release of XcodeBuildMCP
 - Basic support for building iOS and macOS applications
-
-
diff --git a/README.md b/README.md
@@ -85,6 +85,12 @@ xcodebuildmcp tools
 
 # Build for simulator
 xcodebuildmcp simulator build --scheme MyApp --project-path ./MyApp.xcodeproj
+
+# Prepare portable test products without running tests
+xcodebuildmcp simulator build --scheme MyApp --project-path ./MyApp.xcodeproj --simulator-name "iPhone 17" --build-for-testing --test-products-path ./MyApp.xctestproducts
+
+# Run previously prepared test products
+xcodebuildmcp simulator test --test-products-path ./MyApp.xctestproducts --simulator-name "iPhone 17"
 ```
 
 Check for updates and upgrade in place:

diff --git a/manifests/tools/batch.yaml b/manifests/tools/batch.yaml
@@ -15,3 +15,8 @@ annotations:
   readOnlyHint: true
   destructiveHint: false
   openWorldHint: false
+nextSteps:
+  - label: Refresh after UI action
+    toolId: snapshot_ui
+    when: success
+    condition: ui_action_needs_refresh
diff --git a/manifests/tools/build_device.yaml b/manifests/tools/build_device.yaml
@@ -6,7 +6,7 @@ names:
 description: Build for device.
 outputSchema:
   schema: xcodebuildmcp.output.build-result
-  version: "2"
+  version: '3'
 predicates:
   - hideWhenXcodeAgentMode
 annotations:
@@ -19,3 +19,8 @@ nextSteps:
     toolId: get_device_app_path
     priority: 1
     when: success
+    condition: app_build_succeeded
+  - label: Run prepared tests
+    toolId: test_device
+    when: success
+    condition: prepared_tests_available
diff --git a/manifests/tools/build_macos.yaml b/manifests/tools/build_macos.yaml
@@ -6,7 +6,7 @@ names:
 description: Build macOS app.
 outputSchema:
   schema: xcodebuildmcp.output.build-result
-  version: "2"
+  version: '3'
 predicates:
   - hideWhenXcodeAgentMode
 annotations:
@@ -19,3 +19,8 @@ nextSteps:
     toolId: get_mac_app_path
     priority: 1
     when: success
+    condition: app_build_succeeded
+  - label: Run prepared tests
+    toolId: test_macos
+    when: success
+    condition: prepared_tests_available
diff --git a/manifests/tools/build_sim.yaml b/manifests/tools/build_sim.yaml
@@ -6,7 +6,7 @@ names:
 description: Build for iOS sim (compile-only, no launch).
 outputSchema:
   schema: xcodebuildmcp.output.build-result
-  version: "2"
+  version: '3'
 predicates:
   - hideWhenXcodeAgentMode
 annotations:
@@ -19,3 +19,8 @@ nextSteps:
     toolId: get_sim_app_path
     priority: 1
     when: success
+    condition: app_build_succeeded
+  - label: Run prepared tests
+    toolId: test_sim
+    when: success
+    condition: prepared_tests_available
diff --git a/manifests/tools/button.yaml b/manifests/tools/button.yaml
@@ -14,3 +14,8 @@ annotations:
   readOnlyHint: true
   destructiveHint: false
   openWorldHint: false
+nextSteps:
+  - label: Refresh after UI action
+    toolId: snapshot_ui
+    when: success
+    condition: ui_action_needs_refresh
diff --git a/manifests/tools/drag.yaml b/manifests/tools/drag.yaml
@@ -15,3 +15,8 @@ annotations:
   readOnlyHint: true
   destructiveHint: false
   openWorldHint: false
+nextSteps:
+  - label: Refresh after UI action
+    toolId: snapshot_ui
+    when: success
+    condition: ui_action_needs_refresh
diff --git a/manifests/tools/gesture.yaml b/manifests/tools/gesture.yaml
@@ -14,3 +14,8 @@ annotations:
   readOnlyHint: true
   destructiveHint: false
   openWorldHint: false
+nextSteps:
+  - label: Refresh after UI action
+    toolId: snapshot_ui
+    when: success
+    condition: ui_action_needs_refresh
diff --git a/manifests/tools/key_press.yaml b/manifests/tools/key_press.yaml
@@ -14,3 +14,8 @@ annotations:
   readOnlyHint: true
   destructiveHint: false
   openWorldHint: false
+nextSteps:
+  - label: Refresh after UI action
+    toolId: snapshot_ui
+    when: success
+    condition: ui_action_needs_refresh
diff --git a/manifests/tools/key_sequence.yaml b/manifests/tools/key_sequence.yaml
@@ -14,3 +14,8 @@ annotations:
   readOnlyHint: true
   destructiveHint: false
   openWorldHint: false
+nextSteps:
+  - label: Refresh after UI action
+    toolId: snapshot_ui
+    when: success
+    condition: ui_action_needs_refresh
diff --git a/manifests/tools/long_press.yaml b/manifests/tools/long_press.yaml
@@ -14,3 +14,8 @@ annotations:
   readOnlyHint: true
   destructiveHint: false
   openWorldHint: false
+nextSteps:
+  - label: Refresh after UI action
+    toolId: snapshot_ui
+    when: success
+    condition: ui_action_needs_refresh
diff --git a/manifests/tools/swipe.yaml b/manifests/tools/swipe.yaml
@@ -18,3 +18,8 @@ annotations:
   readOnlyHint: true
   destructiveHint: false
   openWorldHint: false
+nextSteps:
+  - label: Refresh after UI action
+    toolId: snapshot_ui
+    when: success
+    condition: ui_action_needs_refresh
diff --git a/manifests/tools/tap.yaml b/manifests/tools/tap.yaml
@@ -15,3 +15,8 @@ annotations:
   readOnlyHint: true
   destructiveHint: false
   openWorldHint: false
+nextSteps:
+  - label: Refresh after UI action
+    toolId: snapshot_ui
+    when: success
+    condition: ui_action_needs_refresh
diff --git a/manifests/tools/test_device.yaml b/manifests/tools/test_device.yaml
@@ -6,7 +6,7 @@ names:
 description: Test on device.
 outputSchema:
   schema: xcodebuildmcp.output.test-result
-  version: "2"
+  version: "3"
 predicates:
   - hideWhenXcodeAgentMode
 annotations:

diff --git a/manifests/tools/test_macos.yaml b/manifests/tools/test_macos.yaml
@@ -6,7 +6,7 @@ names:
 description: Test macOS target.
 outputSchema:
   schema: xcodebuildmcp.output.test-result
-  version: "2"
+  version: "3"
 predicates:
   - hideWhenXcodeAgentMode
 annotations:

diff --git a/manifests/tools/test_sim.yaml b/manifests/tools/test_sim.yaml
@@ -6,7 +6,7 @@ names:
 description: Test on iOS sim.
 outputSchema:
   schema: xcodebuildmcp.output.test-result
-  version: "2"
+  version: "3"
 predicates:
   - hideWhenXcodeAgentMode
 annotations:

diff --git a/manifests/tools/touch.yaml b/manifests/tools/touch.yaml
@@ -14,3 +14,8 @@ annotations:
   readOnlyHint: true
   destructiveHint: false
   openWorldHint: false
+nextSteps:
+  - label: Refresh after UI action
+    toolId: snapshot_ui
+    when: success
+    condition: ui_action_needs_refresh
diff --git a/manifests/tools/type_text.yaml b/manifests/tools/type_text.yaml
@@ -15,3 +15,8 @@ annotations:
   readOnlyHint: true
   destructiveHint: false
   openWorldHint: false
+nextSteps:
+  - label: Refresh after UI action
+    toolId: snapshot_ui
+    when: success
+    condition: ui_action_needs_refresh
diff --git a/schemas/structured-output/xcodebuildmcp.output.build-result/3.schema.json b/schemas/structured-output/xcodebuildmcp.output.build-result/3.schema.json
@@ -0,0 +1,122 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://xcodebuildmcp.com/schemas/structured-output/xcodebuildmcp.output.build-result/3.schema.json",
+  "type": "object",
+  "additionalProperties": false,
+  "allOf": [
+    {
+      "$ref": "https://xcodebuildmcp.com/schemas/structured-output/_defs/common.schema.json#/$defs/errorConsistency"
+    }
+  ],
+  "$defs": {
+    "buildInvocationRequest": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "buildForTesting": { "type": "boolean" },
+        "scheme": { "type": "string" },
+        "workspacePath": { "type": "string" },
+        "projectPath": { "type": "string" },
+        "packagePath": { "type": "string" },
+        "targetName": { "type": "string" },
+        "configuration": { "type": "string" },
+        "platform": { "type": "string" },
+        "target": {
+          "enum": ["simulator", "device", "macos", "swift-package"]
+        },
+        "simulatorName": { "type": "string" },
+        "simulatorId": { "type": "string" },
+        "deviceId": { "type": "string" },
+        "executableName": { "type": "string" },
+        "arch": { "type": "string" },
+        "derivedDataPath": { "type": "string" },
+        "testProductsPath": { "type": "string" },
+        "xctestrunPath": { "type": "string" },
+        "onlyTesting": {
+          "type": "array",
+          "items": { "type": "string" }
+        },
+        "skipTesting": {
+          "type": "array",
+          "items": { "type": "string" }
+        }
+      }
+    }
+  },
+  "properties": {
+    "schema": {
+      "const": "xcodebuildmcp.output.build-result"
+    },
+    "schemaVersion": {
+      "const": "3"
+    },
+    "didError": {
+      "type": "boolean"
+    },
+    "error": {
+      "type": ["string", "null"]
+    },
+    "data": {
+      "anyOf": [
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "request": {
+              "$ref": "#/$defs/buildInvocationRequest"
+            },
+            "summary": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "status": {
+                  "enum": ["SUCCEEDED", "FAILED"]
+                },
+                "durationMs": {
+                  "type": "integer",
+                  "minimum": 0
+                },
+                "target": {
+                  "enum": ["simulator", "device", "macos", "swift-package"]
+                }
+              },
+              "required": ["status"]
+            },
+            "artifacts": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "appPath": { "type": "string" },
+                "bundleId": { "type": "string" },
+                "buildLogPath": { "type": "string" },
+                "packagePath": { "type": "string" },
+                "workspacePath": { "type": "string" },
+                "scheme": { "type": "string" },
+                "configuration": { "type": "string" },
+                "platform": { "type": "string" },
+                "testProductsPath": { "type": "string" },
+                "xctestrunPaths": {
+                  "type": "array",
+                  "items": { "type": "string" }
+                }
+              },
+              "required": [],
+              "minProperties": 1
+            },
+            "diagnostics": {
+              "$ref": "https://xcodebuildmcp.com/schemas/structured-output/_defs/common.schema.json#/$defs/basicDiagnostics"
+            }
+          },
+          "required": ["summary", "artifacts", "diagnostics"]
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
+    "nextSteps": {
+      "$ref": "https://xcodebuildmcp.com/schemas/structured-output/_defs/common.schema.json#/$defs/nextSteps"
+    }
+  },
+  "required": ["schema", "schemaVersion", "didError", "error", "data"]
+}