fiveonecode
diff --git a/‎broker-core/index.mjs‎
Lines changed: 25 additions & 3 deletions b/‎broker-core/index.mjs‎
Lines changed: 25 additions & 3 deletions
diff --git a/‎broker-core/test/broker-core.test.mjs‎
Lines changed: 60 additions & 0 deletions b/‎broker-core/test/broker-core.test.mjs‎
Lines changed: 60 additions & 0 deletions
diff --git a/‎client/bin/simbroker.mjs‎
Lines changed: 32 additions & 20 deletions b/‎client/bin/simbroker.mjs‎
Lines changed: 32 additions & 20 deletions
diff --git a/‎spec/tasks/guided-simbroker-setup.md‎
Lines changed: 6 additions & 4 deletions b/‎spec/tasks/guided-simbroker-setup.md‎
Lines changed: 6 additions & 4 deletions
@@ -1488,14 +1488,33 @@ function sameStringArray(left, right) {
     && left.every((value, index) => value === right[index]);
 }
 
-function setupHostMatchesCommittedStarterPlan(hostConfig, devices) {
+function setupHostMatchesCommittedStarterPlan(hostConfig, devices, inventory) {
   if (hostConfig.pendingRetirements.length > 0 || hostConfig.aliases.length !== 6) {
     return false;
   }
   const iosVersion = hostConfig.aliases[0]?.iosVersion;
   if (!iosVersion || hostConfig.aliases.some((alias) => alias.iosVersion !== iosVersion)) {
     return false;
   }
+  const runtimeIdentifiers = new Set(devices.map((device) => device.runtimeIdentifier));
+  if (runtimeIdentifiers.size !== 1) {
+    return false;
+  }
+  const runtimeIdentifier = [...runtimeIdentifiers][0];
+  let runtime;
+  let setupDeviceTypes;
+  try {
+    runtime = selectRuntimeForSetup(inventory, iosVersion);
+    if (runtime.identifier !== runtimeIdentifier || runtime.version !== iosVersion) {
+      return false;
+    }
+    setupDeviceTypes = {
+      iPad: selectPreferredDeviceType(runtime, "iPad").identifier,
+      iPhone: selectPreferredDeviceType(runtime, "iPhone").identifier,
+    };
+  } catch {
+    return false;
+  }
   const { templates } = buildStarterAliasTemplates({ hostId: hostConfig.hostId, iosVersion });
   const aliasesById = new Map(hostConfig.aliases.map((alias) => [alias.alias, alias]));
   const devicesByAlias = new Map(devices.map((device) => [device.alias, device]));
@@ -1509,7 +1528,10 @@ function setupHostMatchesCommittedStarterPlan(hostConfig, devices) {
       && alias.resetPolicy === template.resetPolicy
       && sameStringArray(alias.capabilities, template.capabilities)
       && device.simulatorId === alias.simulatorId
-      && device.simulatorName === template.simulatorName;
+      && device.simulatorName === template.simulatorName
+      && device.runtimeIdentifier === runtime.identifier
+      && device.runtimeVersion === runtime.version
+      && device.deviceTypeIdentifier === setupDeviceTypes[template.deviceFamily];
   });
 }
 
@@ -1632,7 +1654,7 @@ function setupExistingHostState(paths, inventory, options = {}) {
   });
   if (registryMissing) {
     const canResumeRegistryInitialization = issues.length === 0
-      && setupHostMatchesCommittedStarterPlan(hostConfig, devices)
+      && setupHostMatchesCommittedStarterPlan(hostConfig, devices, inventory)
       && !setupStateContainsLeaseOrPinRecords(paths);
     registryInitializationRequired = canResumeRegistryInitialization;
     issues.push(canResumeRegistryInitialization
 
@@ -1061,12 +1061,20 @@ test("setup accepts major-only requirements but does not recreate an arbitrary m
     simctlAdapter: paths.simctl.adapter,
   });
   const hostConfig = readJson(paths.hostConfigPath);
+  const registry = readJson(resolvedPaths.registryPath);
   hostConfig.aliases = hostConfig.aliases.map((alias) => ({ ...alias, iosVersion: "18" }));
   writeJson(paths.hostConfigPath, hostConfig);
 
   const healthy = previewSetupBroker(resolvedPaths, { simctlAdapter: paths.simctl.adapter });
   assert.notEqual(healthy.status, "blocked");
 
+  fs.rmSync(resolvedPaths.registryPath);
+  const ambiguousMissingRegistry = previewSetupBroker(resolvedPaths, { simctlAdapter: paths.simctl.adapter });
+  assert.equal(ambiguousMissingRegistry.status, "blocked");
+  assert.ok(ambiguousMissingRegistry.prerequisites.some((issue) =>
+    issue.id === "registry" && issue.status === "blocked"));
+  writeJson(resolvedPaths.registryPath, registry);
+
   hostConfig.aliases[0].displayName = "Custom Manual iPhone";
   writeJson(paths.hostConfigPath, hostConfig);
   fs.rmSync(resolvedPaths.registryPath);
@@ -1081,6 +1089,58 @@ test("setup accepts major-only requirements but does not recreate an arbitrary m
   assert.equal(fs.existsSync(resolvedPaths.registryPath), false);
 });
 
+test("setup missing-registry recovery requires the selected runtime and device types", () => {
+  const paths = makePaths();
+  const resolvedPaths = brokerPaths(paths);
+  const preview = previewSetupBroker(resolvedPaths, {
+    hostId: "registry-identity",
+    simctlAdapter: paths.simctl.adapter,
+  });
+  applySetupBroker(resolvedPaths, {
+    confirmPlanId: preview.planId,
+    hostId: "registry-identity",
+    simctlAdapter: paths.simctl.adapter,
+  });
+  fs.rmSync(resolvedPaths.registryPath);
+
+  const state = readJson(paths.simctl.statePath);
+  const selectedRuntimeId = state.runtimes[0].identifier;
+  const alternateRuntimeId = `${selectedRuntimeId}-Alternate`;
+  state.runtimes.push({ ...state.runtimes[0], identifier: alternateRuntimeId });
+  state.devices = state.devices.map((device) => ({
+    ...device,
+    runtimeIdentifier: alternateRuntimeId,
+  }));
+  writeJson(paths.simctl.statePath, state);
+
+  const runtimeMismatch = previewSetupBroker(resolvedPaths, { simctlAdapter: paths.simctl.adapter });
+  assert.equal(runtimeMismatch.status, "blocked");
+  assert.ok(runtimeMismatch.prerequisites.some((issue) =>
+    issue.id === "registry" && issue.status === "blocked"));
+
+  const nonPreferredDeviceType = {
+    identifier: "com.apple.CoreSimulator.SimDeviceType.iPhone-SE-3rd-generation",
+    name: "iPhone SE (3rd generation)",
+    productFamily: "iPhone",
+  };
+  state.devicetypes.push(nonPreferredDeviceType);
+  state.runtimes[0].supportedDeviceTypes.push(nonPreferredDeviceType);
+  const configuredSimulatorId = readJson(paths.hostConfigPath).aliases[0].simulatorId;
+  state.devices = state.devices.map((device) => ({
+    ...device,
+    deviceTypeIdentifier: device.udid === configuredSimulatorId
+      ? nonPreferredDeviceType.identifier
+      : device.deviceTypeIdentifier,
+    runtimeIdentifier: selectedRuntimeId,
+  }));
+  writeJson(paths.simctl.statePath, state);
+
+  const deviceTypeMismatch = previewSetupBroker(resolvedPaths, { simctlAdapter: paths.simctl.adapter });
+  assert.equal(deviceTypeMismatch.status, "blocked");
+  assert.ok(deviceTypeMismatch.prerequisites.some((issue) =>
+    issue.id === "registry" && issue.status === "blocked"));
+});
+
 test("setup resumes registry initialization after a post-commit inventory failure", () => {
   const paths = makePaths();
   const resolvedPaths = brokerPaths(paths);
 
@@ -837,6 +837,29 @@ function setupInterruptedError(signalName, completedStages, hostCommitted, faile
   });
 }
 
+function assertSetupCommittedHostIdentity(snapshot, expectedHostIdentity) {
+  const expectedSimulatorIds = new Map(
+    (expectedHostIdentity?.simulators ?? []).map(({ alias, simulatorId }) => [alias, simulatorId]),
+  );
+  const actualSimulatorIds = new Map(
+    (snapshot.simulators ?? []).map(({ alias, simulatorId }) => [alias, simulatorId]),
+  );
+  const mismatchedSimulatorAliases = [...new Set([
+    ...expectedSimulatorIds.keys(),
+    ...actualSimulatorIds.keys(),
+  ])]
+    .filter((alias) => actualSimulatorIds.get(alias) !== expectedSimulatorIds.get(alias))
+    .sort();
+  if (snapshot.hostId !== expectedHostIdentity?.hostId || mismatchedSimulatorAliases.length > 0) {
+    throw new BrokerError("The refreshed snapshot no longer matches the host committed by setup.", {
+      actualHostId: snapshot.hostId ?? null,
+      expectedHostId: expectedHostIdentity?.hostId ?? null,
+      mismatchedSimulatorAliases,
+      reasonCode: "setup-committed-host-mismatch",
+    });
+  }
+}
+
 function decorateSetupFailure(error, stage, completedStages, hostCommitted, serviceRunning) {
   if (error instanceof BrokerError) {
     error.payload.command = "setup";
@@ -917,26 +940,7 @@ async function applySetup(paths, options, cancellation) {
       });
     }
     const expectedHostIdentity = coreResult.setupCommittedHostIdentity;
-    const expectedSimulatorIds = new Map(
-      (expectedHostIdentity?.simulators ?? []).map(({ alias, simulatorId }) => [alias, simulatorId]),
-    );
-    const actualSimulatorIds = new Map(
-      (snapshot.simulators ?? []).map(({ alias, simulatorId }) => [alias, simulatorId]),
-    );
-    const mismatchedSimulatorAliases = [...new Set([
-      ...expectedSimulatorIds.keys(),
-      ...actualSimulatorIds.keys(),
-    ])]
-      .filter((alias) => actualSimulatorIds.get(alias) !== expectedSimulatorIds.get(alias))
-      .sort();
-    if (snapshot.hostId !== expectedHostIdentity?.hostId || mismatchedSimulatorAliases.length > 0) {
-      throw new BrokerError("The refreshed snapshot no longer matches the host committed by setup.", {
-        actualHostId: snapshot.hostId ?? null,
-        expectedHostId: expectedHostIdentity?.hostId ?? null,
-        mismatchedSimulatorAliases,
-        reasonCode: "setup-committed-host-mismatch",
-      });
-    }
+    assertSetupCommittedHostIdentity(snapshot, expectedHostIdentity);
     completedStages.push("snapshot");
   } catch (error) {
     checkCancellation();
@@ -957,6 +961,14 @@ async function applySetup(paths, options, cancellation) {
       signal: cancellation.signal,
     });
     checkCancellation();
+    const postDoctorSnapshot = JSON.parse(fs.readFileSync(paths.appSnapshotPath, "utf8"));
+    if (path.resolve(postDoctorSnapshot.hostConfigPath) !== path.resolve(paths.hostConfigPath)
+      || path.resolve(postDoctorSnapshot.stateRoot) !== path.resolve(paths.stateRoot)) {
+      throw new BrokerError("The post-doctor snapshot belongs to different broker paths.", {
+        reasonCode: "service-identity-mismatch",
+      });
+    }
+    assertSetupCommittedHostIdentity(postDoctorSnapshot, coreResult.setupCommittedHostIdentity);
     const expectedAliases = new Set(["manual-1", "ui-1", "ui-2", "build-1", "build-2", "ipad-1"]);
     const snapshotAliases = new Set((snapshot.simulators ?? []).map((simulator) => simulator.alias));
     const missingExpectedAliases = coreResult.host.created
 
@@ -147,7 +147,7 @@ Apply performs, in order:
 6. `brokerd` start or identity validation
 7. fresh snapshot through the active service
 8. doctor through the active service
-9. verification of path identity, the exact committed host ID and
+9. post-doctor snapshot revalidation of path identity, the exact committed host ID and
    alias-to-Simulator-ID mapping, expected fresh aliases, matching available
    Simulator records, no `repair-needed`/`repairing`, and snapshot path identity
 10. `ready` completion
@@ -159,9 +159,10 @@ Apply performs, in order:
 - After host commit, preserve host and devices; rerun `simbroker setup`. When
   the host commit succeeded but initial registry persistence did not, setup
   previews registry initialization as safe finishing work only when the host is
-  attributable to the canonical starter shape and no lease, pin, or pending
-  retirement state exists, then reconstructs it from the committed host and
-  Simulator state during apply.
+  attributable to the canonical starter shape, every alias records the exact
+  runtime version used by its Simulator, every Simulator uses the setup-selected
+  runtime and device type, and no lease, pin, or pending retirement state exists,
+  then reconstructs it from the committed host and Simulator state during apply.
 - Service failure preserves host and reports log path and exact retry.
 - Health failure preserves host/service and reports doctor issues plus exact
   per-alias repair commands.
@@ -380,5 +381,6 @@ long-running plan/handoff/evaluation, and a passing `agent:complete`.
 
 | Version | Date | Author | Changes |
 |---|---|---|---|
+| 1.0.2 | 2026-08-23 | `spec-steward`, `ios-dev` | Required exact setup-selected runtime/device identity for registry recovery and post-doctor committed-host revalidation |
 | 1.0.1 | 2026-08-23 | `spec-steward`, `ios-dev` | Clarified registry recovery, concurrent setup waits, finishing-stage cancellation, schema rejection, and exact committed-host verification |
 | 1.0.0 | 2026-08-22 | `spec-steward`, `ios-dev` | Active guided setup implementation contract |