fix(test): Stream simulator test execution progress

Emit a test-running stage when two-phase simulator execution moves from
build-for-testing to test-without-building so the CLI does not leave stale
build status visible while UI tests are running.

Keep static discovery observational, parse destination-suffixed XCTest
result lines, and handle multiline Swift Testing arguments so discovery and
final counts stay project-agnostic across Calculator and Weather.

Fixes #384
Co-Authored-By: OpenAI Codex <noreply@openai.com>

Author: cameroncooke

CHANGELOG.md

@@ -4,9 +4,12 @@
 
 ### Fixed
 
+- Fixed simulator test JSONL accuracy by keeping preflight discovery observational, preserving only user-supplied test selectors, discovering multiline parameterized Swift Testing tests, and parsing destination-suffixed xcodebuild test result lines.
 - Removed stale physical-device log session status and shutdown cleanup for deprecated standalone device log capture, and corrected the device build-and-run tool description.
+- Fixed mixed Swift Testing and XCTest summaries so simulator test text output no longer overcounts parameterized Swift Testing results or issue lines.
 - Fixed CLI test summaries showing false-positive compiler errors from xcodebuild NSError dump lines, and added compiler-error snapshot coverage for simulator, device, and macOS build-style flows ([#383](https://github.com/getsentry/XcodeBuildMCP/issues/383)).
 - Fixed simulator OSLog helper cleanup so server and daemon startup reconcile same-workspace orphaned log streams without stopping helpers owned by live sessions in other workspaces ([#382](https://github.com/getsentry/XcodeBuildMCP/issues/382)).
+- Fixed Weather example test discovery and made CLI test progress visible while tests are running instead of leaving the last build phase displayed.
 
 ## [2.5.0-beta.1]
 

example_projects/Weather/Weather.xcodeproj/xcshareddata/xcschemes/Weather.xcscheme

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1640"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8B9291402FA3FCC300B2E371"
+               BuildableName = "Weather.app"
+               BlueprintName = "Weather"
+               ReferencedContainer = "container:Weather.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8B92914D2FA3FCC400B2E371"
+               BuildableName = "WeatherTests.xctest"
+               BlueprintName = "WeatherTests"
+               ReferencedContainer = "container:Weather.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8B9291572FA3FCC400B2E371"
+               BuildableName = "WeatherUITests.xctest"
+               BlueprintName = "WeatherUITests"
+               ReferencedContainer = "container:Weather.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8B9291402FA3FCC300B2E371"
+            BuildableName = "Weather.app"
+            BlueprintName = "Weather"
+            ReferencedContainer = "container:Weather.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8B9291402FA3FCC300B2E371"
+            BuildableName = "Weather.app"
+            BlueprintName = "Weather"
+            ReferencedContainer = "container:Weather.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

src/utils/__tests__/simulator-test-execution.test.ts

@@ -0,0 +1,94 @@
+import { describe, expect, it } from 'vitest';
+import { createSimulatorTwoPhaseExecutionPlan } from '../simulator-test-execution.ts';
+import type { TestPreflightResult } from '../test-preflight.ts';
+
+function createPreflight(): TestPreflightResult {
+  return {
+    scheme: 'CalculatorApp',
+    configuration: 'Debug',
+    projectPath: '/tmp/CalculatorApp.xcodeproj',
+    destinationName: 'iPhone 17 Pro',
+    selectors: { onlyTesting: [], skipTesting: [] },
+    warnings: [],
+    completeness: 'complete',
+    totalTests: 2,
+    targets: [
+      {
+        name: 'CalculatorAppTests',
+        warnings: [],
+        files: [
+          {
+            path: '/tmp/CalculatorAppTests.swift',
+            tests: [
+              {
+                framework: 'xctest',
+                targetName: 'CalculatorAppTests',
+                typeName: 'CalculatorAppTests',
+                methodName: 'testAddition',
+                displayName: 'CalculatorAppTests/CalculatorAppTests/testAddition',
+                line: 10,
+                parameterized: false,
+              },
+              {
+                framework: 'swift-testing',
+                targetName: 'CalculatorAppTests',
+                typeName: 'ExpressionSuite',
+                methodName: 'evaluatesExpression',
+                displayName: 'CalculatorAppTests/ExpressionSuite/evaluatesExpression',
+                line: 20,
+                parameterized: true,
+              },
+            ],
+          },
+        ],
+      },
+    ],
+  };
+}
+
+describe('createSimulatorTwoPhaseExecutionPlan', () => {
+  it('keeps preflight discovery observational instead of synthesizing only-testing selectors', () => {
+    const plan = createSimulatorTwoPhaseExecutionPlan({
+      extraArgs: ['-parallel-testing-enabled', 'YES'],
+      preflight: createPreflight(),
+      resultBundlePath: '/tmp/Calculator.xcresult',
+    });
+
+    expect(plan.buildArgs).toEqual(['-parallel-testing-enabled', 'YES']);
+    expect(plan.testArgs).toEqual([
+      '-parallel-testing-enabled',
+      'YES',
+      '-resultBundlePath',
+      '/tmp/Calculator.xcresult',
+    ]);
+    expect(plan.usesExactSelectors).toBe(false);
+  });
+
+  it('preserves user-supplied selector arguments in both simulator test phases', () => {
+    const plan = createSimulatorTwoPhaseExecutionPlan({
+      extraArgs: [
+        '-only-testing:CalculatorAppTests/CalculatorAppTests/testAddition',
+        '-skip-testing',
+        'CalculatorAppTests/ExpressionSuite/evaluatesExpression',
+      ],
+      preflight: createPreflight(),
+    });
+
+    expect(plan.buildArgs).toEqual([
+      '-only-testing:CalculatorAppTests/CalculatorAppTests/testAddition',
+      '-skip-testing',
+      'CalculatorAppTests/ExpressionSuite/evaluatesExpression',
+    ]);
+    expect(plan.testArgs).toEqual(plan.buildArgs);
+    expect(plan.usesExactSelectors).toBe(true);
+  });
+
+  it('keeps resultBundlePath out of build-for-testing args and includes it for test-without-building', () => {
+    const plan = createSimulatorTwoPhaseExecutionPlan({
+      extraArgs: ['-resultBundlePath', '/tmp/UserProvided.xcresult'],
+    });
+
+    expect(plan.buildArgs).toEqual([]);
+    expect(plan.testArgs).toEqual(['-resultBundlePath', '/tmp/UserProvided.xcresult']);
+  });
+});

src/utils/__tests__/swift-test-discovery.test.ts

@@ -0,0 +1,54 @@
+import { describe, expect, it } from 'vitest';
+import { createMockFileSystemExecutor } from '../../test-utils/mock-executors.ts';
+import { discoverSwiftTestsInFiles } from '../swift-test-discovery.ts';
+
+describe('discoverSwiftTestsInFiles', () => {
+  it('discovers Swift Testing functions with multiline parameterized Test attributes', async () => {
+    const filePath = '/tmp/CalculatorServiceTests.swift';
+    const fileSystemExecutor = createMockFileSystemExecutor({
+      readFile: async () => `
+import Testing
+
+struct CalculatorServiceTests {
+  @Test(
+    "evaluates decimal operations",
+    arguments: [
+      ("1 + 1", "2"),
+      ("4 / 2", "2"),
+    ]
+  )
+  func evaluatesDecimalOperations(expression: String, expected: String) async throws {}
+
+  @Test(arguments: ["+", "-", "×"])
+  func evaluatesOperators(symbol: String) async throws {}
+}
+`,
+    });
+
+    const files = await discoverSwiftTestsInFiles(
+      'CalculatorAppFeatureTests',
+      [filePath],
+      fileSystemExecutor,
+    );
+
+    expect(files).toHaveLength(1);
+    expect(files[0].tests).toMatchObject([
+      {
+        framework: 'swift-testing',
+        targetName: 'CalculatorAppFeatureTests',
+        typeName: 'CalculatorServiceTests',
+        methodName: 'evaluatesDecimalOperations',
+        displayName: 'CalculatorAppFeatureTests/CalculatorServiceTests/evaluatesDecimalOperations',
+        parameterized: true,
+      },
+      {
+        framework: 'swift-testing',
+        targetName: 'CalculatorAppFeatureTests',
+        typeName: 'CalculatorServiceTests',
+        methodName: 'evaluatesOperators',
+        displayName: 'CalculatorAppFeatureTests/CalculatorServiceTests/evaluatesOperators',
+        parameterized: true,
+      },
+    ]);
+  });
+});

src/utils/__tests__/test-common.test.ts

@@ -1,5 +1,58 @@
 import { afterEach, describe, expect, it, vi } from 'vitest';
-import { resolveTestProgressEnabled } from '../test-common.ts';
+import type { ChildProcess } from 'node:child_process';
+import { createTestExecutor, resolveTestProgressEnabled } from '../test-common.ts';
+import type { CommandExecutor, CommandResponse } from '../command.ts';
+import { DefaultStreamingExecutionContext } from '../execution/index.ts';
+import type { AnyFragment } from '../../types/domain-fragments.ts';
+import type { TestPreflightResult } from '../test-preflight.ts';
+import { XcodePlatform } from '../xcode.ts';
+
+function createSuccessfulCommandResponse(): CommandResponse {
+  return {
+    success: true,
+    output: '',
+    process: { pid: 12345 } as ChildProcess,
+    exitCode: 0,
+  };
+}
+
+function createPreflight(): TestPreflightResult {
+  return {
+    scheme: 'Weather',
+    configuration: 'Debug',
+    projectPath: 'Weather.xcodeproj',
+    destinationName: 'iPhone 17 Pro',
+    selectors: {
+      onlyTesting: [],
+      skipTesting: [],
+    },
+    targets: [
+      {
+        name: 'WeatherTests',
+        files: [
+          {
+            path: 'WeatherTests/WeatherTests.swift',
+            tests: [
+              {
+                framework: 'swift-testing',
+                targetName: 'WeatherTests',
+                typeName: 'WeatherTests',
+                methodName: 'emptySearchReturnsNoResults',
+                displayName: 'WeatherTests/WeatherTests/emptySearchReturnsNoResults',
+                line: 12,
+                parameterized: false,
+              },
+            ],
+          },
+        ],
+        warnings: [],
+      },
+    ],
+    warnings: [],
+    totalTests: 1,
+    completeness: 'complete',
+  };
+}
 
 describe('resolveTestProgressEnabled', () => {
   const originalRuntime = process.env.XCODEBUILDMCP_RUNTIME;
@@ -39,3 +92,60 @@ describe('resolveTestProgressEnabled', () => {
     expect(resolveTestProgressEnabled(false)).toBe(false);
   });
 });
+
+describe('createTestExecutor', () => {
+  it('emits RUN_TESTS before test-without-building starts in two-phase simulator execution', async () => {
+    const emitted: AnyFragment[] = [];
+    const actions: string[] = [];
+    const executor: CommandExecutor = async (command, _logPrefix, _useShell, opts) => {
+      const action = command.at(-1);
+      if (action) {
+        actions.push(action);
+      }
+
+      if (action === 'build-for-testing') {
+        opts?.onStdout?.('Ld /tmp/Weather.build/Weather normal arm64\n');
+      }
+
+      return createSuccessfulCommandResponse();
+    };
+
+    const executeTest = createTestExecutor(executor, {
+      preflight: createPreflight(),
+      toolName: 'test_sim',
+      target: 'simulator',
+      request: {
+        scheme: 'Weather',
+        projectPath: 'Weather.xcodeproj',
+        configuration: 'Debug',
+        platform: XcodePlatform.iOSSimulator,
+      },
+    });
+
+    await executeTest(
+      {
+        projectPath: 'Weather.xcodeproj',
+        scheme: 'Weather',
+        configuration: 'Debug',
+        simulatorId: 'A2C64636-37E9-4B68-B872-E7F0A82A5670',
+        platform: XcodePlatform.iOSSimulator,
+      },
+      new DefaultStreamingExecutionContext({
+        onFragment: (fragment) => emitted.push(fragment),
+      }),
+    );
+
+    expect(actions).toEqual(['build-for-testing', 'test-without-building']);
+
+    const stageEvents = emitted.filter((event) => event.fragment === 'build-stage');
+    expect(stageEvents.map((event) => event.stage)).toEqual(['LINKING', 'RUN_TESTS']);
+
+    const runTestsIndex = emitted.findIndex(
+      (event) => event.fragment === 'build-stage' && event.stage === 'RUN_TESTS',
+    );
+    const finalSummaryIndex = emitted.findIndex((event) => event.fragment === 'build-summary');
+
+    expect(runTestsIndex).toBeGreaterThan(-1);
+    expect(finalSummaryIndex).toBeGreaterThan(runTestsIndex);
+  });
+});