Skip to content

Run a virtual iPhone on an Apple Silicon Mac.

Swift

Offer iPadOS firmware when creating a machine

Jacky77d3406ae4a1
diff --git a/Documents/Guides/ipados.md b/Documents/Guides/ipados.md
index e62107ff..6c113915 100644
--- a/Documents/Guides/ipados.md
+++ b/Documents/Guides/ipados.md
@@ -31,7 +31,8 @@ is not supported.
Most iPad IPSWs cover several models — the iPad Air and iPad Pro IPSWs carry
both sizes. Without `--device`, `fw prepare` takes the first model the IPSW
lists (the 11-inch); pass `--device iPad17,3` to `fw prepare` or `vm create` for
-the 13-inch. Launchpad's New Machine takes the first model.
+the 13-inch. Launchpad's New Machine passes the model chosen under **Device**;
+with **Custom IPSWs** it takes the first.
Adding another iPad takes one line in `VPhoneGuestDevice`: its product type,
board and panel. Everything the device tree needs is read from the board's own
@@ -40,7 +41,10 @@ board and panel. Everything the device tree needs is read from the board's own
## Create one
Pass the iPad restore IPSW where the iPhone one would go. The cloudOS is the
-same one an iPhone guest of that release would use; `fw catalog` lists it.
+same one an iPhone guest of that release would use. `fw catalog` lists every
+supported iPad's iPadOS releases with that cloudOS, and `fw catalog --device
+iPad16,1` lists one iPad's. With `--device` and no sources, `vm create` offers
+that iPad's releases to choose from.
```sh
vphone-cli vm create ipad-mini \
@@ -56,9 +60,13 @@ vphone-cli vm create ipad-pro-13 --device iPad17,3 \
`fw prepare --device iPad16,1 --list` lists the iPad's downloadable IPSWs,
and `--device iPad16,1 --iphone-version 26.6.2` resolves one.
-In Launchpad, choose **New Machine**, set **Source** to **Custom IPSWs**, and
-put the iPad IPSW in the **iPhone IPSW** field and the cloudOS IPSW in the
-other. The Core Bundle in use must include iPad support.
+In Launchpad, choose **New Machine**, pick the iPad under **Device** and an
+iPadOS release under **iPadOS**; the recommended cloudOS comes with it. For an
+IPSW that is not in the catalog, set **Source** to **Custom IPSWs** and put the
+iPad IPSW in the **iPhone IPSW** field and the cloudOS IPSW in the other. The
+Core Bundle in use must include iPad support; the **Device** menu appears only
+with a Core Bundle whose catalog lists iPads. `vphone-launchpad-cli vm create
+<name> --device iPad16,1` does the same from a terminal.
The manual stages are the same as for an iPhone guest (`vm new`,
`fw prepare`, `fw patch`, DFU + `restore`, `cfw install`, `vm launch`).
diff --git a/Documents/Guides/launchpad-cli.md b/Documents/Guides/launchpad-cli.md
index 964ae48d..0fb46627 100644
--- a/Documents/Guides/launchpad-cli.md
+++ b/Documents/Guides/launchpad-cli.md
@@ -108,7 +108,7 @@ version while a machine is bound to it; rebind or delete those machines first.
| `vm list` | Machines in every library with run state, Core Bundle and log path |
| `vm start <name> [--headless] [--wait]` / `vm stop <name>` | Launch with the machine's bundle, or stop; `--wait` waits for vphoned |
| `vm wait <name>` / `vm log <name> [--kind create\|dfu\|patch]` | Wait for vphoned; read a console log |
-| `vm create <name> [--bundle <version>] [...] [--from <step>]` | The New Machine pipeline, bound to `--bundle` or the default; `--from` retries from a step |
+| `vm create <name> [--bundle <version>] [...] [--device <product-type>] [--from <step>]` | The New Machine pipeline, bound to `--bundle` or the default; `--device` makes an iPad guest, `--from` retries from a step |
| `vm set-bundle <name> <version> [--update-environment]` | Bind a machine to another installed version. `--update-environment` also redeploys that version's guest environment and needs a stopped machine |
| `cfw install <name>` | Install CFW into a stopped machine with its own bundle, through the helper |
| `cfw update-environment <name>` | Redeploy the machine's own bundle's guest resources (vphoned, hook dylibs) into it while stopped, through the helper; nothing else changes |
diff --git a/Skills/vphone-guest-control/references/machines.md b/Skills/vphone-guest-control/references/machines.md
index 34100373..9c2d3904 100644
--- a/Skills/vphone-guest-control/references/machines.md
+++ b/Skills/vphone-guest-control/references/machines.md
@@ -37,7 +37,7 @@ that the version you pass to `--bundle` passed its checks in `bundle list`).
```sh
vphone-launchpad-cli vm create myphone [--bundle <version>] \
- [--iphone-source <path-or-url>] [--cloudos-source <path-or-url>] \
+ [--iphone-source <path-or-url>] [--cloudos-source <path-or-url>] [--device <product-type>] \
[--cpu 8] [--memory 8192] [--disk-size 64] \
[--network nat|bridged|none] [--preset standard|experimental] \
[--keep-artifacts] [--no-wait]
@@ -50,6 +50,10 @@ vphone-launchpad-cli vm create myphone [--bundle <version>] \
Pass both explicitly to pin a pairing; verified pairings are listed in
`Documents/Guides/compatibility.md`. Local paths are read in place; URLs are
cached in `~/.vphone/ipsws/`.
+- **`--device`** makes an iPad guest: `iPad16,1`, `iPad15,7`, `iPad15,3`,
+ `iPad15,5`, `iPad16,3`, `iPad16,5`, `iPad17,1` or `iPad17,3`. Without sources
+ it takes that iPad's newest catalog pairing; with an iPad IPSW that covers
+ two sizes it picks the size. See `Documents/Guides/ipados.md`.
- **Units:** `--cpu` is a count, `--memory` is **MB**, `--disk-size` is **GB**.
Defaults 8, 8192, 64. All must be positive integers.
- **Name:** letters, digits, `.`, `-`, `_`. Keep it short: the machine path must
diff --git a/VPhoneExecutable/VPhoneCommand/VPhoneCommand/Firmware/VPhoneFirmwareCommand.swift b/VPhoneExecutable/VPhoneCommand/VPhoneCommand/Firmware/VPhoneFirmwareCommand.swift
index 52d53c67..c9473ea3 100644
--- a/VPhoneExecutable/VPhoneCommand/VPhoneCommand/Firmware/VPhoneFirmwareCommand.swift
+++ b/VPhoneExecutable/VPhoneCommand/VPhoneCommand/Firmware/VPhoneFirmwareCommand.swift
@@ -168,10 +168,12 @@ struct VPhoneFirmwareManifestCommand: ParsableCommand {
struct VPhoneFirmwareCatalogCommand: ParsableCommand {
static let configuration = CommandConfiguration(
commandName: "catalog",
- abstract: "Show the known iOS ↔ cloudOS firmware pairings (recommended per iOS build)",
+ abstract: "Show the known iOS/iPadOS ↔ cloudOS firmware pairings (recommended per build)",
)
@Flag(name: .shortAndLong, help: "Emit JSON") var json = false
+ @Option(help: ArgumentHelp("Show only this guest device's pairings, e.g. iPad16,1", valueName: "product-type"))
+ var device: String?
func run() throws {
let report = VPhoneFirmwareCatalog.report
@@ -179,13 +181,25 @@ struct VPhoneFirmwareCatalogCommand: ParsableCommand {
try print(String(decoding: JSONEncoder().encode(report), as: UTF8.self))
return
}
- print("Firmware catalog (\(report.device))")
- let width = report.pairings.map(\.ios.name.count).max() ?? 0
- let header = "iOS".padding(toLength: width, withPad: " ", startingAt: 0)
- print("\(header) recommended cloudOS")
- for e in report.pairings {
- let ios = e.ios.name.padding(toLength: width, withPad: " ", startingAt: 0)
- print("\(ios) \(e.recommendedCloudOS.name)")
+ var devices = report.devices
+ if let device {
+ guard let guest = VPhoneGuestDevice.named(device) else {
+ throw ValidationError("vphone runs \(VPhoneGuestDevice.known.map(\.productType).joined(separator: ", ")) guests, not \(device).")
+ }
+ devices = devices.filter { $0.productType == guest.productType }
+ }
+ for (index, entry) in devices.enumerated() {
+ if index > 0 {
+ print("")
+ }
+ print("Firmware catalog (\(entry.productType), \(entry.name))")
+ let os = entry.family == "iPad" ? "iPadOS" : "iOS"
+ let width = max(os.count, entry.pairings.map(\.ios.name.count).max() ?? 0)
+ print("\(os.padding(toLength: width, withPad: " ", startingAt: 0)) recommended cloudOS")
+ for e in entry.pairings {
+ let ios = e.ios.name.padding(toLength: width, withPad: " ", startingAt: 0)
+ print("\(ios) \(e.recommendedCloudOS.name)")
+ }
}
}
}
@@ -270,7 +284,7 @@ struct VPhoneFirmwarePrepareCommand: ParsableCommand {
}
}
- let selected = try VPhoneFirmwareSourceSelection.resolve(iphone: source, cloudos: cloudosSource)
+ let selected = try VPhoneFirmwareSourceSelection.resolve(iphone: source, cloudos: cloudosSource, device: chosenDevice)
guard let phone = selected.iphoneSource, let cloud = selected.cloudosSource else {
throw ValidationError("Specify both --iphone-source and --cloudos-source when running without a terminal.")
}
diff --git a/VPhoneExecutable/VPhoneCommand/VPhoneCommand/Firmware/VPhoneFirmwareSourceSelection.swift b/VPhoneExecutable/VPhoneCommand/VPhoneCommand/Firmware/VPhoneFirmwareSourceSelection.swift
index acf2aa10..23948d8b 100644
--- a/VPhoneExecutable/VPhoneCommand/VPhoneCommand/Firmware/VPhoneFirmwareSourceSelection.swift
+++ b/VPhoneExecutable/VPhoneCommand/VPhoneCommand/Firmware/VPhoneFirmwareSourceSelection.swift
@@ -11,12 +11,14 @@ enum VPhoneFirmwareSourceSelection {
}
/// Resolve `vm create`'s iPhone/cloudOS sources, prompting on a TTY for
- /// whichever component the user didn't pass. Non-interactive or fully
- /// specified → returns the inputs unchanged for caller validation.
- static func resolve(iphone: String?, cloudos: String?) throws -> VPhoneFirmwareSources {
+ /// whichever component the user didn't pass, from `device`'s builds (the
+ /// iPhone list when nil). Non-interactive or fully specified → returns the
+ /// inputs unchanged for caller validation.
+ static func resolve(iphone: String?, cloudos: String?, device: String? = nil) throws -> VPhoneFirmwareSources {
try VPhoneFirmwarePicker.resolve(
iphone: iphone,
cloudos: cloudos,
+ device: device,
isInteractive: isTTY,
read: { readLine(strippingNewline: true) },
write: { err($0) },
diff --git a/VPhoneExecutable/VPhoneCommand/VPhoneCommand/VirtualMachine/VPhoneVirtualMachineCreateCommand.swift b/VPhoneExecutable/VPhoneCommand/VPhoneCommand/VirtualMachine/VPhoneVirtualMachineCreateCommand.swift
index 0321aa2c..69ac09dd 100644
--- a/VPhoneExecutable/VPhoneCommand/VPhoneCommand/VirtualMachine/VPhoneVirtualMachineCreateCommand.swift
+++ b/VPhoneExecutable/VPhoneCommand/VPhoneCommand/VirtualMachine/VPhoneVirtualMachineCreateCommand.swift
@@ -43,8 +43,12 @@ struct VPhoneVirtualMachineCreateCommand: ParsableCommand {
// also where a missing vphone-vm should be reported — before any of the
// long-running download and patch work, not after it.
let launcher = try VPhoneGuestLaunchPlanner()
- // Prompt for any firmware component not supplied on the command line.
- let sources = try VPhoneFirmwareSourceSelection.resolve(iphone: iphoneSource, cloudos: cloudosSource)
+ if let device, VPhoneGuestDevice.named(device) == nil {
+ throw ValidationError("vphone runs \(VPhoneGuestDevice.known.map(\.productType).joined(separator: ", ")) guests, not \(device).")
+ }
+ // Prompt for any firmware component not supplied on the command line,
+ // from the guest device's builds.
+ let sources = try VPhoneFirmwareSourceSelection.resolve(iphone: iphoneSource, cloudos: cloudosSource, device: device)
guard sources.iphoneSource != nil, sources.cloudosSource != nil else {
throw ValidationError("Specify both --iphone-source and --cloudos-source when running without a terminal.")
}
diff --git a/VPhoneKit/VPhoneCoreKit/Firmware/VPhoneFirmwareCatalog.swift b/VPhoneKit/VPhoneCoreKit/Firmware/VPhoneFirmwareCatalog.swift
index a621f6ba..b71908a1 100644
--- a/VPhoneKit/VPhoneCoreKit/Firmware/VPhoneFirmwareCatalog.swift
+++ b/VPhoneKit/VPhoneCoreKit/Firmware/VPhoneFirmwareCatalog.swift
@@ -2,15 +2,25 @@ import Foundation
// MARK: - VPhoneFirmwarePairing
-/// A known iPhone-IPSW ↔ cloudOS pairing for iPhone17,3, with friendly names for
-/// prompts and the direct download URLs `fw prepare` consumes.
+/// A known restore-IPSW ↔ cloudOS pairing for one guest device, with friendly
+/// names for prompts and the direct download URLs `fw prepare` consumes.
public struct VPhoneFirmwarePairing: Sendable, Equatable {
+ /// The guest's product type: `iPhone17,3`, or the iPad model `fw prepare
+ /// --device` picks from an IPSW that covers several.
+ public let device: String
public let iosName: String
public let iosURL: String
public let cloudosName: String
public let cloudosURL: String
- public init(iosName: String, iosURL: String, cloudosName: String, cloudosURL: String) {
+ public init(
+ device: String = VPhoneFirmwareCatalog.device,
+ iosName: String,
+ iosURL: String,
+ cloudosName: String,
+ cloudosURL: String,
+ ) {
+ self.device = device
self.iosName = iosName
self.iosURL = iosURL
self.cloudosName = cloudosName
@@ -30,10 +40,11 @@ public struct VPhoneCloudOSOption: Sendable, Equatable {
// MARK: - VPhoneFirmwareCatalog
-/// The known downloadable iPhone/cloudOS pairings. Prompts show the friendly
-/// `iosName`/`cloudosName`; selection resolves to the URLs.
+/// The known downloadable restore/cloudOS pairings, per guest device. Prompts
+/// show the friendly `iosName`/`cloudosName`; selection resolves to the URLs.
public enum VPhoneFirmwareCatalog {
- /// The iPhone model every catalog IPSW targets.
+ /// The iPhone model every iPhone pairing targets, and the device a catalog
+ /// lookup without one means.
public static let device = "iPhone17,3"
// cloudOS images (one per major); referenced by multiple iPhone builds.
@@ -42,6 +53,8 @@ public enum VPhoneFirmwareCatalog {
static let cloud263 = "https://updates.cdn-apple.com/private-cloud-compute/edc92b58ab7e2f207a6407fd0a0e1a60f7d43bf9d93325bf6d3db3e154ee5525"
static let cloud264 = "https://updates.cdn-apple.com/private-cloud-compute/c0ecdb4b310cf5239ab2b248dd3098eec297dc5aa3bbe6ada27273262b0b8b64"
+ /// The iPhone17,3 pairings, oldest first. Launchpad offers the last one by
+ /// default, so the newest release stays last.
public static let pairings: [VPhoneFirmwarePairing] = [
.init(iosName: "iOS 18.6.2", iosURL: "https://updates.cdn-apple.com/2025SummerFCS/fullrestores/093-20738/98758B5A-311E-4538-B365-FEE3D8792CDF/iPhone17,3_18.6.2_22G100_Restore.ipsw", cloudosName: "cloudOS 26.1", cloudosURL: cloud261),
.init(iosName: "iOS 26.0", iosURL: "https://updates.cdn-apple.com/2025FallFCS/fullrestores/093-40775/B7282E74-76C1-4D0A-8FAE-CE97FC2330C2/iPhone17,3_26.0_23A341_Restore.ipsw", cloudosName: "cloudOS 26.1", cloudosURL: cloud261),
@@ -68,8 +81,145 @@ public enum VPhoneFirmwareCatalog {
.init(iosName: "iOS 27 beta 7", iosURL: "https://updates.cdn-apple.com/2026SpringSeed/ad5a4f9d-f005-466b-bbcf-3b466040074b/iPhone17,3_27.0_24A5424a_Restore.ipsw", cloudosName: "cloudOS 26.4", cloudosURL: cloud264),
.init(iosName: "iOS 27 beta 8", iosURL: "https://updates.cdn-apple.com/2026SpringSeed/2d03d580-843b-4b2a-b09d-976b31c10744/iPhone17,3_27.0_24A5430a_Restore.ipsw", cloudosName: "cloudOS 26.4", cloudosURL: cloud264),
.init(iosName: "iOS 27.0 RC", iosURL: "https://updates.cdn-apple.com/2026FallFCS/2d0cd01d-b4f9-4a20-a1e8-f3be54570da7/iPhone17,3_27.0_24A435_Restore.ipsw", cloudosName: "cloudOS 26.4", cloudosURL: cloud264),
+ .init(iosName: "iOS 27.0", iosURL: "https://updates.cdn-apple.com/2026FallFCS/5130b3f9-3b4e-469a-b60e-93f6b310cdd9/iPhone17,3_27.0_24A437_Restore.ipsw", cloudosName: "cloudOS 26.4", cloudosURL: cloud264),
+ .init(iosName: "iOS 27.0.1", iosURL: "https://updates.cdn-apple.com/2026FallFCS/38dca0ee-bb5d-4132-ad13-62d57bcd6d32/iPhone17,3_27.0.1_24A446_Restore.ipsw", cloudosName: "cloudOS 26.4", cloudosURL: cloud264),
]
+ /// iPadOS releases, one entry per iPad IPSW, oldest first. Each IPSW also
+ /// covers the cellular twins, which run as their Wi-Fi model
+ /// (`VPhoneGuestDevice.aliases`), so `devices` lists only the models a guest
+ /// can be. The URLs are AppleDB's; betas and release candidates are left out.
+ static let iPadReleases: [(devices: [String], releases: [(version: String, url: String)])] = [
+ // iPad mini (A17 Pro)
+ (devices: ["iPad16,1"], releases: [
+ ("26.0", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/093-40200/9E916D65-39EF-49BF-9246-0F1190E93B10/iPad16,1,iPad16,2_26.0_23A341_Restore.ipsw"),
+ ("26.0.1", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/093-44520/43068DEC-6704-4E42-9F06-DB0391F44D69/iPad16,1,iPad16,2_26.0.1_23A355_Restore.ipsw"),
+ ("26.1", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/089-12753/0AC11D64-550A-4C49-A257-7EC00EE9551A/iPad16,1,iPad16,2_26.1_23B85_Restore.ipsw"),
+ ("26.2", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/089-81716/33E631AB-9ADD-48EC-BA4B-344BA1740DB1/iPad16,1,iPad16,2_26.2_23C55_Restore.ipsw"),
+ ("26.2.1", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/047-34203/F9F7CE68-7EAD-4FD7-A8AC-25FC05F9E57E/iPad16,1,iPad16,2_26.2.1_23C71_Restore.ipsw"),
+ ("26.3", "https://updates.cdn-apple.com/2026WinterFCS/fullrestores/047-60060/B1928C4A-73EA-4118-B32C-8F5CB8DB5C37/iPad16,1,iPad16,2_26.3_23D127_Restore.ipsw"),
+ ("26.3.1", "https://updates.cdn-apple.com/2026WinterFCS/fullrestores/047-90322/BF9DA0EC-EA61-4F64-9726-386B5A9F5F6D/iPad16,1,iPad16,2_26.3.1_23D8133_Restore.ipsw"),
+ ("26.4", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-04123/1E3F7841-247B-4FB9-A6E5-555E7B37E905/iPad16,1,iPad16,2_26.4_23E246_Restore.ipsw"),
+ ("26.4.1", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-28463/D1829F98-B5E6-4CFF-BA6D-3944FB6F0169/iPad16,1,iPad16,2_26.4.1_23E254_Restore.ipsw"),
+ ("26.4.2", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-60229/671D5227-99FC-4400-8B87-759B124F3A25/iPad16,1,iPad16,2_26.4.2_23E261_Restore.ipsw"),
+ ("26.5", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-72606/1CDD78CE-0B50-471B-83B4-B1873BF12350/iPad16,1,iPad16,2_26.5_23F77_Restore.ipsw"),
+ ("26.5.2", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/140-26558/40877F89-3762-40A6-B87A-DCAE2D2A4640/iPad16,1,iPad16,2_26.5.2_23F84_Restore.ipsw"),
+ ("26.6", "https://updates.cdn-apple.com/2026SummerFCS/fullrestores/140-57473/555F9A51-FB16-4FDA-B60E-1AE599CB0E38/iPad16,1,iPad16,2_26.6_23G71_Restore.ipsw"),
+ ("26.6.1", "https://updates.cdn-apple.com/2026SummerFCS/fullrestores/140-93812/387AE60F-41A6-4EBD-A1BC-E3AF66434C9C/iPad16,1,iPad16,2_26.6.1_23G83_Restore.ipsw"),
+ ("26.6.2", "https://updates.cdn-apple.com/2026SummerFCS/cf7db64d-5866-4bf2-bfff-50a32f58bec3/iPad16,1,iPad16,2_26.6.2_23G90_Restore.ipsw"),
+ ("27.0", "https://updates.cdn-apple.com/2026FallFCS/e81c639f-1417-45aa-8a75-6f262083fe37/iPad16,1,iPad16,2_27.0_24A437_Restore.ipsw"),
+ ("27.0.1", "https://updates.cdn-apple.com/2026FallFCS/46399de6-53d0-47ec-baea-c203630bcee9/iPad16,1,iPad16,2_27.0.1_24A446_Restore.ipsw"),
+ ]),
+ // iPad (A16)
+ (devices: ["iPad15,7"], releases: [
+ ("26.0", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/093-40869/5E29D9F8-D82C-41AB-B999-30DB3E3AB67E/iPad15,7_26.0_23A341_Restore.ipsw"),
+ ("26.0.1", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/093-44823/3805B746-50BB-4226-AA51-A41218E4DC8B/iPad15,7_26.0.1_23A355_Restore.ipsw"),
+ ("26.1", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/089-13278/C93C2D8A-8BB5-4754-8BE8-BD894B8BD280/iPad15,7_26.1_23B85_Restore.ipsw"),
+ ("26.2", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/089-80977/82AABD09-DC93-460F-A1C6-D358527CB62D/iPad15,7_26.2_23C55_Restore.ipsw"),
+ ("26.2.1", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/047-34190/1727242B-9A24-44CA-AF0A-20F2CC10DC78/iPad15,7_26.2.1_23C71_Restore.ipsw"),
+ ("26.3", "https://updates.cdn-apple.com/2026WinterFCS/fullrestores/047-59864/C987B5A8-9A87-498B-9739-CCCA36759BF2/iPad15,7_26.3_23D127_Restore.ipsw"),
+ ("26.3.1", "https://updates.cdn-apple.com/2026WinterFCS/fullrestores/047-90330/70651A4E-5FDE-42E6-A757-11D0B10967D6/iPad15,7_26.3.1_23D8133_Restore.ipsw"),
+ ("26.4", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-01462/F6D80D95-3B54-47F0-8E8E-6DAA861A3615/iPad15,7_26.4_23E246_Restore.ipsw"),
+ ("26.4.1", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-28497/8533F29A-DB67-4CF3-A37F-D5C0AA8117BF/iPad15,7_26.4.1_23E254_Restore.ipsw"),
+ ("26.4.2", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-60819/F9C65878-32AC-438B-BA6E-ABD08D386E7E/iPad15,7_26.4.2_23E261_Restore.ipsw"),
+ ("26.5", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-36065/9064647F-C48C-4213-B5E6-7AA5E3377A7C/iPad15,7_26.5_23F77_Restore.ipsw"),
+ ("26.5.2", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/140-26993/CFCC3254-9102-428F-94FA-FC61C2CE0706/iPad15,7_26.5.2_23F84_Restore.ipsw"),
+ ("26.6", "https://updates.cdn-apple.com/2026SummerFCS/fullrestores/140-58697/CB8C4B63-F794-4EED-AD2F-15297E14B69E/iPad15,7_26.6_23G71_Restore.ipsw"),
+ ("26.6.1", "https://updates.cdn-apple.com/2026SummerFCS/fullrestores/140-73569/4627D405-B284-43D6-AA1E-FF775D807C89/iPad15,7_26.6.1_23G83_Restore.ipsw"),
+ ("26.6.2", "https://updates.cdn-apple.com/2026SummerFCS/ac34b338-5954-4440-acd7-eb623372b116/iPad15,7_26.6.2_23G90_Restore.ipsw"),
+ ("27.0", "https://updates.cdn-apple.com/2026FallFCS/cbdb3e7c-6078-4116-81f5-9ca857711975/iPad15,7_27.0_24A437_Restore.ipsw"),
+ ("27.0.1", "https://updates.cdn-apple.com/2026FallFCS/224ac70a-6dd1-4fd4-8d3a-45f3c4026600/iPad15,7_27.0.1_24A446_Restore.ipsw"),
+ ]),
+ // iPad Air (M3), 11- and 13-inch
+ (devices: ["iPad15,3", "iPad15,5"], releases: [
+ ("26.0", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/093-41910/8ED9149B-5FAA-46CA-BFF1-4F1AC5B70E05/iPad15,3,iPad15,4,iPad15,5,iPad15,6_26.0_23A341_Restore.ipsw"),
+ ("26.0.1", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/093-44466/6E2168C0-561F-40A5-84C0-1E71B0EED75D/iPad15,3,iPad15,4,iPad15,5,iPad15,6_26.0.1_23A355_Restore.ipsw"),
+ ("26.1", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/089-12827/9A6C58AA-2A00-4773-8A69-3CB0D7C21AF6/iPad15,3,iPad15,4,iPad15,5,iPad15,6_26.1_23B85_Restore.ipsw"),
+ ("26.2", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/089-79199/1F1CC2FD-45B0-4A5C-A69C-16DB618D0ADF/iPad15,3,iPad15,4,iPad15,5,iPad15,6_26.2_23C55_Restore.ipsw"),
+ ("26.2.1", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/047-34196/5C6B83F9-16A3-40E7-961F-6AE05572177E/iPad15,3,iPad15,4,iPad15,5,iPad15,6_26.2.1_23C71_Restore.ipsw"),
+ ("26.3", "https://updates.cdn-apple.com/2026WinterFCS/fullrestores/047-61590/387157F3-CEBD-4FF1-8E06-4E4F3EF185C1/iPad15,3,iPad15,4,iPad15,5,iPad15,6_26.3_23D127_Restore.ipsw"),
+ ("26.3.1", "https://updates.cdn-apple.com/2026WinterFCS/fullrestores/047-89616/C5FDAFB4-B15A-482B-963E-3E8807692007/iPad15,3,iPad15,4,iPad15,5,iPad15,6_26.3.1_23D8133_Restore.ipsw"),
+ ("26.4", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-07874/61C4FAFB-925D-4CE4-95C7-04E0DF9E7484/iPad15,3,iPad15,4,iPad15,5,iPad15,6_26.4_23E246_Restore.ipsw"),
+ ("26.4.1", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-28513/B7952EA1-2E7B-4B5A-9098-08C7FB0B3065/iPad15,3,iPad15,4,iPad15,5,iPad15,6_26.4.1_23E254_Restore.ipsw"),
+ ("26.4.2", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-60254/E881A5D5-8452-4196-964E-A8614FF16AA6/iPad15,3,iPad15,4,iPad15,5,iPad15,6_26.4.2_23E261_Restore.ipsw"),
+ ("26.5", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-70574/10C3FA3A-E70C-4A46-82AE-34C2320F8023/iPad15,3,iPad15,4,iPad15,5,iPad15,6_26.5_23F77_Restore.ipsw"),
+ ("26.5.2", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/140-26796/75B1A13D-F146-4198-A1A0-F71D4E58A07B/iPad15,3,iPad15,4,iPad15,5,iPad15,6_26.5.2_23F84_Restore.ipsw"),
+ ("26.6", "https://updates.cdn-apple.com/2026SummerFCS/fullrestores/140-57887/5713215E-7923-4102-8D3C-0B03DA847759/iPad15,3,iPad15,4,iPad15,5,iPad15,6_26.6_23G71_Restore.ipsw"),
+ ("26.6.1", "https://updates.cdn-apple.com/2026SummerFCS/fullrestores/140-93813/53D9BF7A-EC71-4F4B-B97A-ED3F8922CBEF/iPad15,3,iPad15,4,iPad15,5,iPad15,6_26.6.1_23G83_Restore.ipsw"),
+ ("26.6.2", "https://updates.cdn-apple.com/2026SummerFCS/3ddb0f1f-46ed-48f4-aaad-9837e83144fa/iPad15,3,iPad15,4,iPad15,5,iPad15,6_26.6.2_23G90_Restore.ipsw"),
+ ("27.0", "https://updates.cdn-apple.com/2026FallFCS/0b0970ac-f84c-4323-82ab-f153c69c89b7/iPad15,3,iPad15,4,iPad15,5,iPad15,6_27.0_24A437_Restore.ipsw"),
+ ("27.0.1", "https://updates.cdn-apple.com/2026FallFCS/7cabbf62-92ba-48e9-afaa-d8ec39313fa8/iPad15,3,iPad15,4,iPad15,5,iPad15,6_27.0.1_24A446_Restore.ipsw"),
+ ]),
+ // iPad Pro (M4), 11- and 13-inch
+ (devices: ["iPad16,3", "iPad16,5"], releases: [
+ ("26.0", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/093-40671/F76C0CC9-322F-4F2B-B2D9-5DA6F0F7C160/iPad_Pro_M4_26.0_23A341_Restore.ipsw"),
+ ("26.0.1", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/093-45848/6007892D-DB8F-4F7F-BC2A-DFE468C1FB89/iPad_Pro_M4_26.0.1_23A355_Restore.ipsw"),
+ ("26.1", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/089-12294/8B8B66E4-24AC-4D54-BBD3-F9D35832E74D/iPad_Pro_M4_26.1_23B85_Restore.ipsw"),
+ ("26.2", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/089-81719/ECE32135-FCBE-4096-92DE-E12D6C3F4160/iPad_Pro_M4_26.2_23C55_Restore.ipsw"),
+ ("26.2.1", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/047-21543/5EB13756-48DB-4A4E-A3F0-C36A1172C6D8/iPad_Pro_M4_26.2.1_23C71_Restore.ipsw"),
+ ("26.3", "https://updates.cdn-apple.com/2026WinterFCS/fullrestores/047-61663/76E85FB6-6A25-4844-A3DD-FB15EA9D1466/iPad_Pro_M4_26.3_23D127_Restore.ipsw"),
+ ("26.3.1", "https://updates.cdn-apple.com/2026WinterFCS/fullrestores/047-91004/34DCB1DE-C509-4AB2-96FC-A8FA83246209/iPad_Pro_M4_26.3.1_23D8133_Restore.ipsw"),
+ ("26.4", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-02774/55F8FBBE-EAD4-4FE9-B62F-3D75E28B8D3B/iPad_Pro_M4_26.4_23E246_Restore.ipsw"),
+ ("26.4.1", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-28530/6E00E32B-0B47-4F71-80CE-5380561EFE27/iPad_Pro_M4_26.4.1_23E254_Restore.ipsw"),
+ ("26.4.2", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-60853/499BEF59-2EC1-4E2D-AC10-B0122FF4B5DD/iPad_Pro_M4_26.4.2_23E261_Restore.ipsw"),
+ ("26.5", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-64200/E70453A1-F1E6-405E-A39A-267AED87CCC2/iPad_Pro_M4_26.5_23F77_Restore.ipsw"),
+ ("26.5.2", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/140-25404/3C9A5919-8296-4275-A2B7-E5D0C2162572/iPad_Pro_M4_26.5.2_23F84_Restore.ipsw"),
+ ("26.6", "https://updates.cdn-apple.com/2026SummerFCS/fullrestores/140-57655/D1CB1E3E-79BC-4304-8545-C667E82DF2AF/iPad_Pro_M4_26.6_23G71_Restore.ipsw"),
+ ("26.6.1", "https://updates.cdn-apple.com/2026SummerFCS/fullrestores/140-74906/D199C9EE-0CA2-4BAC-B39D-EAAE6F711136/iPad_Pro_M4_26.6.1_23G83_Restore.ipsw"),
+ ("26.6.2", "https://updates.cdn-apple.com/2026SummerFCS/9f44484a-c9ac-4a85-8240-435894b1464f/iPad_Pro_M4_26.6.2_23G90_Restore.ipsw"),
+ ("27.0", "https://updates.cdn-apple.com/2026FallFCS/459900f0-887c-4dee-a819-3395e7bf67b5/iPad_Pro_M4_27.0_24A437_Restore.ipsw"),
+ ("27.0.1", "https://updates.cdn-apple.com/2026FallFCS/7532c1a2-9d94-419d-ad88-bd0e3a0e2bbc/iPad_Pro_M4_27.0.1_24A446_Restore.ipsw"),
+ ]),
+ // iPad Pro (M5), 11- and 13-inch
+ (devices: ["iPad17,1", "iPad17,3"], releases: [
+ ("26.0.1", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/093-88260/57436729-3132-41A2-89D1-52AB75C7FD2C/iPad17,1,iPad17,2,iPad17,3,iPad17,4_26.0.1_23A8466_Restore.ipsw"),
+ ("26.1", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/089-13189/7F17B1CD-05CE-421A-AFEC-AD7F5ED4CF95/iPad17,1,iPad17,2,iPad17,3,iPad17,4_26.1_23B85_Restore.ipsw"),
+ ("26.2", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/089-79327/60AAF9BE-FCDB-4478-B5CF-A65E1177346F/iPad17,1,iPad17,2,iPad17,3,iPad17,4_26.2_23C55_Restore.ipsw"),
+ ("26.2.1", "https://updates.cdn-apple.com/2025FallFCS/fullrestores/047-34213/B71D7BDD-767E-4597-80E7-CBA54CA737E1/iPad17,1,iPad17,2,iPad17,3,iPad17,4_26.2.1_23C71_Restore.ipsw"),
+ ("26.3", "https://updates.cdn-apple.com/2026WinterFCS/fullrestores/047-61625/38C75A42-C0A5-49AB-8DB1-0D31618617E2/iPad17,1,iPad17,2,iPad17,3,iPad17,4_26.3_23D127_Restore.ipsw"),
+ ("26.3.1", "https://updates.cdn-apple.com/2026WinterFCS/fullrestores/047-90311/A91F8DEB-EF60-4571-8A16-81154C15F6F5/iPad17,1,iPad17,2,iPad17,3,iPad17,4_26.3.1_23D8133_Restore.ipsw"),
+ ("26.4", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-09212/2E89B1A1-1462-45AD-AB0F-301FCBC56358/iPad17,1,iPad17,2,iPad17,3,iPad17,4_26.4_23E246_Restore.ipsw"),
+ ("26.4.1", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-28528/40A1B358-2D66-4974-9441-0ED88BCC5628/iPad17,1,iPad17,2,iPad17,3,iPad17,4_26.4.1_23E254_Restore.ipsw"),
+ ("26.4.2", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-60809/BEBBE1E0-1A14-436B-8541-6F082F04DEB7/iPad17,1,iPad17,2,iPad17,3,iPad17,4_26.4.2_23E261_Restore.ipsw"),
+ ("26.5", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/122-39566/3DBC2822-E9B6-4D5B-9A74-A3B5E84315DF/iPad17,1,iPad17,2,iPad17,3,iPad17,4_26.5_23F77_Restore.ipsw"),
+ ("26.5.2", "https://updates.cdn-apple.com/2026SpringFCS/fullrestores/140-25976/000BB0A6-045B-47FF-AE4E-D8BF722E24FD/iPad17,1,iPad17,2,iPad17,3,iPad17,4_26.5.2_23F84_Restore.ipsw"),
+ ("26.6", "https://updates.cdn-apple.com/2026SummerFCS/fullrestores/140-57200/196D099E-2EA7-46E3-8BDA-A06BFBBB01C4/iPad17,1,iPad17,2,iPad17,3,iPad17,4_26.6_23G71_Restore.ipsw"),
+ ("26.6.1", "https://updates.cdn-apple.com/2026SummerFCS/fullrestores/140-74867/2D974F07-513F-4C4A-8B2D-816B22D03A24/iPad17,1,iPad17,2,iPad17,3,iPad17,4_26.6.1_23G83_Restore.ipsw"),
+ ("26.6.2", "https://updates.cdn-apple.com/2026SummerFCS/c92fa0b5-4f21-4e74-8980-2926c7320a78/iPad17,1,iPad17,2,iPad17,3,iPad17,4_26.6.2_23G90_Restore.ipsw"),
+ ("27.0", "https://updates.cdn-apple.com/2026FallFCS/3d6d90ea-e942-4a86-834f-939769d6e3f4/iPad17,1,iPad17,2,iPad17,3,iPad17,4_27.0_24A437_Restore.ipsw"),
+ ("27.0.1", "https://updates.cdn-apple.com/2026FallFCS/6074e110-d48d-40c2-b0e8-b611520941a3/iPad17,1,iPad17,2,iPad17,3,iPad17,4_27.0.1_24A446_Restore.ipsw"),
+ ]),
+ ]
+
+ /// The pairings for one guest device, oldest first: the iPhone list, or
+ /// the iPad's releases with the cloudOS an iPhone of that release uses.
+ /// A cellular iPad gets its Wi-Fi model's; an unknown device gets none.
+ public static func pairings(for device: String) -> [VPhoneFirmwarePairing] {
+ guard let guest = VPhoneGuestDevice.named(device) else { return [] }
+ guard guest.isPad else { return pairings }
+ let releases = iPadReleases.first { $0.devices.contains(guest.productType) }?.releases ?? []
+ return releases.map { release in
+ let cloudOS = recommendedCloudOS(forVersion: release.version)
+ return VPhoneFirmwarePairing(
+ device: guest.productType,
+ iosName: "iPadOS \(release.version)",
+ iosURL: release.url,
+ cloudosName: cloudOS.name,
+ cloudosURL: cloudOS.url,
+ )
+ }
+ }
+
+ /// The cloudOS the iPhone pairings give a release of this version.
+ static func recommendedCloudOS(forVersion version: String) -> VPhoneCloudOSOption {
+ switch version.split(separator: ".").prefix(2).joined(separator: ".") {
+ case "26.0", "26.1": VPhoneCloudOSOption(name: "cloudOS 26.1", url: cloud261)
+ case "26.2": VPhoneCloudOSOption(name: "cloudOS 26.2", url: cloud262)
+ case "26.3": VPhoneCloudOSOption(name: "cloudOS 26.3", url: cloud263)
+ default: VPhoneCloudOSOption(name: "cloudOS 26.4", url: cloud264)
+ }
+ }
+
/// Distinct cloudOS images (first-seen order) for the "choose the cloudOS" prompt.
public static var cloudOSOptions: [VPhoneCloudOSOption] {
var seen = Set<String>()
@@ -80,15 +230,29 @@ public enum VPhoneFirmwareCatalog {
return out
}
- /// JSON-friendly projection of the catalog: each iOS build with its recommended cloudOS.
+ /// JSON-friendly projection of the catalog: each build with its recommended
+ /// cloudOS, for the iPhone and then per guest device.
public static var report: VPhoneFirmwareCatalogReport {
- VPhoneFirmwareCatalogReport(
- device: device,
- pairings: pairings.map {
+ func entries(_ pairings: [VPhoneFirmwarePairing]) -> [VPhoneFirmwareCatalogReport.Entry] {
+ pairings.map {
.init(
ios: .init(name: $0.iosName, url: $0.iosURL),
recommendedCloudOS: .init(name: $0.cloudosName, url: $0.cloudosURL),
)
+ }
+ }
+ return VPhoneFirmwareCatalogReport(
+ device: device,
+ pairings: entries(pairings),
+ devices: VPhoneGuestDevice.known.compactMap { guest in
+ let pairings = pairings(for: guest.productType)
+ guard !pairings.isEmpty else { return nil }
+ return .init(
+ productType: guest.productType,
+ name: guest.productName,
+ family: guest.family.rawValue,
+ pairings: entries(pairings),
+ )
},
)
}
@@ -97,6 +261,9 @@ public enum VPhoneFirmwareCatalog {
// MARK: - VPhoneFirmwareCatalogReport
/// Codable view of the firmware catalog for `fw catalog --json`.
+///
+/// `device` and `pairings` are the iPhone17,3 list that Launchpad releases
+/// before iPad guests read; `devices` repeats it and adds every iPad.
public struct VPhoneFirmwareCatalogReport: Codable, Equatable, Sendable {
public struct Firmware: Codable, Equatable, Sendable {
public let name: String
@@ -115,11 +282,30 @@ public struct VPhoneFirmwareCatalogReport: Codable, Equatable, Sendable {
}
}
+ /// One guest device and its pairings, oldest first.
+ public struct Device: Codable, Equatable, Sendable {
+ /// The product type `fw prepare --device` takes.
+ public let productType: String
+ /// The marketing name, such as `iPad mini (A17 Pro)`.
+ public let name: String
+ /// `iPhone` or `iPad`.
+ public let family: String
+ public let pairings: [Entry]
+ public init(productType: String, name: String, family: String, pairings: [Entry]) {
+ self.productType = productType
+ self.name = name
+ self.family = family
+ self.pairings = pairings
+ }
+ }
+
public let device: String
public let pairings: [Entry]
+ public let devices: [Device]
- public init(device: String, pairings: [Entry]) {
+ public init(device: String, pairings: [Entry], devices: [Device]) {
self.device = device
self.pairings = pairings
+ self.devices = devices
}
}
diff --git a/VPhoneKit/VPhoneCoreKit/Firmware/VPhoneFirmwareMatrix.swift b/VPhoneKit/VPhoneCoreKit/Firmware/VPhoneFirmwareMatrix.swift
index 752998c5..7b5452d4 100644
--- a/VPhoneKit/VPhoneCoreKit/Firmware/VPhoneFirmwareMatrix.swift
+++ b/VPhoneKit/VPhoneCoreKit/Firmware/VPhoneFirmwareMatrix.swift
@@ -197,9 +197,14 @@ public enum VPhoneFirmwareMatrix {
/// so the surrounding CDN path — which differs per release and is sometimes
/// a bare UUID — is ignored. An IPSW shared by several models names them
/// all, comma-separated (`iPad16,1,iPad16,2_…`); `device` may be any of them.
+ /// A few IPSWs carry a family name instead (`iPad_Pro_M4_…`), which
+ /// `sharedIPSWNames` maps to its models.
public static func releases(downloadURLs: String, device: String) -> [VPhoneFirmwareRelease] {
- let pattern = "/((?:[^/_]*,)?" + NSRegularExpression.escapedPattern(for: device)
- + "(?:,[^/_]*)?_([^_]+)_([A-Za-z0-9]+)_Restore\\.ipsw)$"
+ var models = "(?:[^/_]*,)?" + NSRegularExpression.escapedPattern(for: device) + "(?:,[^/_]*)?"
+ for (name, devices) in sharedIPSWNames where devices.contains(device) {
+ models = "(?:\(models)|\(NSRegularExpression.escapedPattern(for: name)))"
+ }
+ let pattern = "/(\(models)_([^_]+)_([A-Za-z0-9]+)_Restore\\.ipsw)$"
guard let name = try? NSRegularExpression(pattern: pattern) else { return [] }
var seen: Set<VPhoneFirmwareRelease> = []
@@ -218,6 +223,12 @@ public enum VPhoneFirmwareMatrix {
return found
}
+ /// IPSW names that name a device family rather than its models, and the
+ /// models each covers.
+ static let sharedIPSWNames: [String: [String]] = [
+ "iPad_Pro_M4": ["iPad16,3", "iPad16,4", "iPad16,5", "iPad16,6"],
+ ]
+
/// The verdict for one release, given what the compatibility guide records.
public static func support(
of release: VPhoneFirmwareRelease,
diff --git a/VPhoneKit/VPhoneCoreKit/Firmware/VPhoneFirmwarePicker.swift b/VPhoneKit/VPhoneCoreKit/Firmware/VPhoneFirmwarePicker.swift
index 834969f3..f7219ae0 100644
--- a/VPhoneKit/VPhoneCoreKit/Firmware/VPhoneFirmwarePicker.swift
+++ b/VPhoneKit/VPhoneCoreKit/Firmware/VPhoneFirmwarePicker.swift
@@ -34,10 +34,13 @@ public enum VPhoneFirmwarePicker {
/// what's missing. Both given → passthrough. Non-interactive → passthrough
/// so the caller can report which source is missing. Neither given → pick a full pairing.
/// One given → prompt for just the other. Prompts show friendly names; the
- /// result carries URLs. I/O is injected so the logic is unit-testable.
+ /// result carries URLs. `device` chooses the builds on offer: an iPad's
+ /// iPadOS releases, or the iPhone list when nil. I/O is injected so the
+ /// logic is unit-testable.
public static func resolve(
iphone: String?,
cloudos: String?,
+ device: String? = nil,
isInteractive: Bool,
maxRetries: Int = 5,
read: () -> String?,
@@ -45,18 +48,20 @@ public enum VPhoneFirmwarePicker {
) throws -> VPhoneFirmwareSources {
let iphone = (iphone?.isEmpty == true) ? nil : iphone
let cloudos = (cloudos?.isEmpty == true) ? nil : cloudos
+ let pairings = VPhoneFirmwareCatalog.pairings(for: device ?? VPhoneFirmwareCatalog.device)
- // Nothing to prompt for: both supplied, or we can't prompt anyway.
- if (iphone != nil && cloudos != nil) || !isInteractive {
+ // Nothing to prompt for: both supplied, we can't prompt anyway, or the
+ // catalog has nothing for this device.
+ if (iphone != nil && cloudos != nil) || !isInteractive || (iphone == nil && pairings.isEmpty) {
return VPhoneFirmwareSources(iphoneSource: iphone, cloudosSource: cloudos)
}
if iphone == nil, cloudos == nil {
- let p = try pickPairing(maxRetries: maxRetries, read: read, write: write)
+ let p = try pickPairing(pairings, maxRetries: maxRetries, read: read, write: write)
return VPhoneFirmwareSources(iphoneSource: p.iosURL, cloudosSource: p.cloudosURL)
}
if iphone == nil { // cloudOS supplied, choose the iPhone build
- let p = try pickIPhone(maxRetries: maxRetries, read: read, write: write)
+ let p = try pickIPhone(pairings, maxRetries: maxRetries, read: read, write: write)
return VPhoneFirmwareSources(iphoneSource: p.iosURL, cloudosSource: cloudos)
}
// iPhone supplied, choose the cloudOS image
@@ -67,11 +72,11 @@ public enum VPhoneFirmwarePicker {
// MARK: - Prompts
static func pickPairing(
+ _ pairings: [VPhoneFirmwarePairing],
maxRetries: Int,
read: () -> String?,
write: (String) -> Void,
) throws -> VPhoneFirmwarePairing {
- let pairings = VPhoneFirmwareCatalog.pairings
let w = pairings.map(\.iosName.count).max() ?? 0
let idx = try choose(
"Select a firmware pairing to download:",
@@ -88,13 +93,14 @@ public enum VPhoneFirmwarePicker {
}
static func pickIPhone(
+ _ pairings: [VPhoneFirmwarePairing],
maxRetries: Int,
read: () -> String?,
write: (String) -> Void,
) throws -> VPhoneFirmwarePairing {
- let pairings = VPhoneFirmwareCatalog.pairings
+ let os = VPhoneGuestDevice.named(pairings.first?.device)?.isPad == true ? "iPadOS" : "iPhone"
let idx = try choose(
- "Select an iPhone firmware to download:",
+ "Select an \(os) firmware to download:",
pairings.map(\.iosName),
maxRetries: maxRetries,
read: read,
diff --git a/VPhoneKit/VPhoneCoreKitTests/Firmware/FirmwareCatalogReportTests.swift b/VPhoneKit/VPhoneCoreKitTests/Firmware/FirmwareCatalogReportTests.swift
index c75c922f..2566eb8d 100644
--- a/VPhoneKit/VPhoneCoreKitTests/Firmware/FirmwareCatalogReportTests.swift
+++ b/VPhoneKit/VPhoneCoreKitTests/Firmware/FirmwareCatalogReportTests.swift
@@ -16,6 +16,53 @@ struct FirmwareCatalogReportTests {
}
}
+ @Test func `lists every known guest device`() {
+ let report = VPhoneFirmwareCatalog.report
+ #expect(report.devices.map(\.productType) == VPhoneGuestDevice.known.map(\.productType))
+ #expect(report.devices.first?.pairings == report.pairings)
+ for device in report.devices.dropFirst() {
+ #expect(device.family == "iPad")
+ #expect(!device.pairings.isEmpty)
+ #expect(device.name == VPhoneGuestDevice.named(device.productType)?.productName)
+ }
+ }
+
+ @Test func `i pad pairings come from an IPSW that covers the device`() {
+ for guest in VPhoneGuestDevice.known where guest.isPad {
+ let pairings = VPhoneFirmwareCatalog.pairings(for: guest.productType)
+ #expect(pairings.map(\.iosName).first == "iPadOS 26.0" || guest.productType.hasPrefix("iPad17,"))
+ #expect(pairings.map(\.iosName).last == "iPadOS 27.0.1")
+ for p in pairings {
+ #expect(p.device == guest.productType)
+ #expect(p.iosURL.hasPrefix("https://updates.cdn-apple.com/"))
+ #expect(p.iosURL.hasSuffix("_Restore.ipsw"))
+ #expect(p.cloudosURL.contains("/private-cloud-compute/"))
+ // The iPad Pro (M4) IPSWs are named iPad_Pro_M4_…; the rest name their models.
+ let name = (p.iosURL as NSString).lastPathComponent
+ #expect(name.hasPrefix("iPad_Pro_M4_") || name.split(separator: "_")[0].split(separator: ",").count >= 2)
+ #expect(name.contains("_\(p.iosName.dropFirst("iPadOS ".count))_"))
+ }
+ }
+ }
+
+ @Test func `cellular i pad gets its wi fi model's pairings`() {
+ #expect(VPhoneFirmwareCatalog.pairings(for: "iPad17,4") == VPhoneFirmwareCatalog.pairings(for: "iPad17,3"))
+ #expect(VPhoneFirmwareCatalog.pairings(for: "iPad17,3").first?.device == "iPad17,3")
+ #expect(VPhoneFirmwareCatalog.pairings(for: "iPad15,8").isEmpty)
+ #expect(VPhoneFirmwareCatalog.pairings(for: "iPhone17,3") == VPhoneFirmwareCatalog.pairings)
+ }
+
+ @Test func `i pad cloud OS follows the i phone pairing of the same release`() {
+ let iPhone = Dictionary(
+ VPhoneFirmwareCatalog.pairings.map { ($0.iosName.replacingOccurrences(of: "iOS ", with: ""), $0.cloudosURL) },
+ uniquingKeysWith: { first, _ in first },
+ )
+ for p in VPhoneFirmwareCatalog.pairings(for: "iPad16,1") {
+ let version = p.iosName.replacingOccurrences(of: "iPadOS ", with: "")
+ #expect(iPhone[version] == p.cloudosURL, "\(version)")
+ }
+ }
+
@Test func `round trips JSON`() throws {
let report = VPhoneFirmwareCatalog.report
let back = try JSONDecoder().decode(VPhoneFirmwareCatalogReport.self, from: JSONEncoder().encode(report))
diff --git a/VPhoneKit/VPhoneCoreKitTests/Firmware/FirmwareMatrixTests.swift b/VPhoneKit/VPhoneCoreKitTests/Firmware/FirmwareMatrixTests.swift
index 41846daa..3f0af13e 100644
--- a/VPhoneKit/VPhoneCoreKitTests/Firmware/FirmwareMatrixTests.swift
+++ b/VPhoneKit/VPhoneCoreKitTests/Firmware/FirmwareMatrixTests.swift
@@ -733,4 +733,17 @@ struct FirmwareMatrixCommandLineTests {
// A longer model number is a different device.
#expect(VPhoneFirmwareMatrix.releases(downloadURLs: urls, device: "iPad16,11").count == 1)
}
+
+ @Test func `an IPSW named after its family matches the family's models`() {
+ let urls = """
+ https://updates.cdn-apple.com/2026FallFCS/7532c1a2-9d94-419d-ad88-bd0e3a0e2bbc/iPad_Pro_M4_27.0.1_24A446_Restore.ipsw
+ https://updates.cdn-apple.com/2026FallFCS/6074e110-d48d-40c2-b0e8-b611520941a3/iPad17,1,iPad17,2,iPad17,3,iPad17,4_27.0.1_24A446_Restore.ipsw
+ """
+ let pro = VPhoneFirmwareMatrix.releases(downloadURLs: urls, device: "iPad16,5")
+ #expect(pro.map(\.version) == ["27.0.1"])
+ #expect(pro.map(\.build) == ["24A446"])
+ #expect(pro.first?.url.hasSuffix("/iPad_Pro_M4_27.0.1_24A446_Restore.ipsw") == true)
+ #expect(VPhoneFirmwareMatrix.releases(downloadURLs: urls, device: "iPad17,1").count == 1)
+ #expect(VPhoneFirmwareMatrix.releases(downloadURLs: urls, device: "iPad16,1").isEmpty)
+ }
}
diff --git a/VPhoneKit/VPhoneCoreKitTests/Firmware/FirmwarePickerTests.swift b/VPhoneKit/VPhoneCoreKitTests/Firmware/FirmwarePickerTests.swift
index 1580337b..19b92bcb 100644
--- a/VPhoneKit/VPhoneCoreKitTests/Firmware/FirmwarePickerTests.swift
+++ b/VPhoneKit/VPhoneCoreKitTests/Firmware/FirmwarePickerTests.swift
@@ -10,8 +10,8 @@ struct FirmwarePickerTests {
// MARK: - Catalog integrity
- @Test func `catalog has twenty five pairings`() {
- #expect(VPhoneFirmwareCatalog.pairings.count == 25)
+ @Test func `catalog has twenty seven pairings`() {
+ #expect(VPhoneFirmwareCatalog.pairings.count == 27)
}
@Test func `every pairing is populated`() {
@@ -138,7 +138,7 @@ struct FirmwarePickerTests {
write: { lines.append($0) },
)
let menu = lines.filter { $0.hasPrefix(" [") }
- #expect(menu.count == 25)
+ #expect(menu.count == 27)
// Label text starts in one column regardless of 1- vs 2-digit index.
let labelStarts = Set(menu.map { $0.range(of: "] ")!.upperBound.utf16Offset(in: $0) })
#expect(labelStarts.count == 1)
@@ -147,6 +147,37 @@ struct FirmwarePickerTests {
#expect(arrowCols.count == 1)
}
+ // MARK: - iPad
+
+ @Test func `i pad device offers its i pad OS builds`() throws {
+ var lines: [String] = []
+ let pairings = VPhoneFirmwareCatalog.pairings(for: "iPad16,1")
+ let out = try VPhoneFirmwarePicker.resolve(
+ iphone: nil,
+ cloudos: "custom.dmg",
+ device: "iPad16,1",
+ isInteractive: true,
+ read: reader([String(pairings.count)]),
+ write: { lines.append($0) },
+ )
+ #expect(lines.first == "Select an iPadOS firmware to download:")
+ #expect(lines.filter { $0.hasPrefix(" [") }.count == pairings.count)
+ #expect(out.iphoneSource == pairings.last?.iosURL)
+ #expect(out.cloudosSource == "custom.dmg")
+ }
+
+ @Test func `unknown device passes through without prompting`() throws {
+ let out = try VPhoneFirmwarePicker.resolve(
+ iphone: nil,
+ cloudos: nil,
+ device: "iPad15,8",
+ isInteractive: true,
+ read: { Issue.record("prompted"); return nil },
+ write: { _ in },
+ )
+ #expect(out == VPhoneFirmwareSources(iphoneSource: nil, cloudosSource: nil))
+ }
+
// MARK: - Retry / abort semantics
@Test func `retries then succeeds`() throws {
diff --git a/VPhoneLaunchpad/VPhoneLaunchpad/Application/VPhoneLaunchpadPreview.swift b/VPhoneLaunchpad/VPhoneLaunchpad/Application/VPhoneLaunchpadPreview.swift
index 660128e4..d6592e6f 100644
--- a/VPhoneLaunchpad/VPhoneLaunchpad/Application/VPhoneLaunchpadPreview.swift
+++ b/VPhoneLaunchpad/VPhoneLaunchpad/Application/VPhoneLaunchpadPreview.swift
@@ -261,12 +261,24 @@
static let catalog: VPhoneLaunchpadFirmwareCatalog? = {
let base = "https://updates.cdn-apple.com/example"
- let json = """
- {"device":"iPhone17,3","pairings":[
+ let iPhone = """
+ [
{"ios":{"name":"iOS 26.4.2","url":"\(base)/iPhone17,3_26.4.2_23E261_Restore.ipsw"},"recommendedCloudOS":{"name":"cloudOS 26.4","url":"\(base)/cloudos-26.4"}},
{"ios":{"name":"iOS 26.5.2","url":"\(base)/iPhone17,3_26.5.2_23F84_Restore.ipsw"},"recommendedCloudOS":{"name":"cloudOS 26.4","url":"\(base)/cloudos-26.4"}},
{"ios":{"name":"iOS 26.6.2","url":"\(base)/iPhone17,3_26.6.2_23G90_Restore.ipsw"},"recommendedCloudOS":{"name":"cloudOS 26.4","url":"\(base)/cloudos-26.4"}},
{"ios":{"name":"iOS 27.0 RC","url":"\(base)/iPhone17,3_27.0_24A435_Restore.ipsw"},"recommendedCloudOS":{"name":"cloudOS 26.4","url":"\(base)/cloudos-26.4"}}
+ ]
+ """
+ let iPad = """
+ [
+ {"ios":{"name":"iPadOS 26.6.2","url":"\(base)/iPad16,1,iPad16,2_26.6.2_23G90_Restore.ipsw"},"recommendedCloudOS":{"name":"cloudOS 26.4","url":"\(base)/cloudos-26.4"}},
+ {"ios":{"name":"iPadOS 27.0.1","url":"\(base)/iPad16,1,iPad16,2_27.0.1_24A446_Restore.ipsw"},"recommendedCloudOS":{"name":"cloudOS 26.4","url":"\(base)/cloudos-26.4"}}
+ ]
+ """
+ let json = """
+ {"device":"iPhone17,3","pairings":\(iPhone),"devices":[
+ {"productType":"iPhone17,3","name":"iPhone 16","family":"iPhone","pairings":\(iPhone)},
+ {"productType":"iPad16,1","name":"iPad mini (A17 Pro)","family":"iPad","pairings":\(iPad)}
]}
"""
return try? JSONDecoder().decode(VPhoneLaunchpadFirmwareCatalog.self, from: Data(json.utf8))
diff --git a/VPhoneLaunchpad/VPhoneLaunchpad/Control/VPhoneLaunchpadControlCommands.swift b/VPhoneLaunchpad/VPhoneLaunchpad/Control/VPhoneLaunchpadControlCommands.swift
index bbebc8e4..47b1f276 100644
--- a/VPhoneLaunchpad/VPhoneLaunchpad/Control/VPhoneLaunchpadControlCommands.swift
+++ b/VPhoneLaunchpad/VPhoneLaunchpad/Control/VPhoneLaunchpadControlCommands.swift
@@ -521,11 +521,23 @@ struct VPhoneLaunchpadControlCommands {
var iphone = request.option("iphone-source")
var cloudOS = request.option("cloudos-source")
+ let device = request.option("device")
if iphone == nil || cloudOS == nil {
let result = try await commandLine.run(["fw", "catalog", "--json"], recordInHistory: false)
- guard result.succeeded, let data = result.jsonData,
- let pairing = try JSONDecoder().decode(VPhoneLaunchpadFirmwareCatalog.self, from: data).pairings.last
- else {
+ guard result.succeeded, let data = result.jsonData else {
+ throw VPhoneLaunchpadError("Unable to read the firmware catalog. Pass --iphone-source and --cloudos-source.", detail: result.tail)
+ }
+ let catalog = try JSONDecoder().decode(VPhoneLaunchpadFirmwareCatalog.self, from: data)
+ let guest = if let device {
+ catalog.guests.first { $0.productType == device }
+ } else {
+ catalog.guests.first
+ }
+ guard let guest else {
+ let known = catalog.guests.map(\.productType).joined(separator: ", ")
+ throw VPhoneLaunchpadError("The firmware catalog has no \(device ?? ""). Choose one of \(known), or pass --iphone-source and --cloudos-source.")
+ }
+ guard let pairing = guest.defaultPairing else {
throw VPhoneLaunchpadError("Unable to read the firmware catalog. Pass --iphone-source and --cloudos-source.", detail: result.tail)
}
iphone = iphone ?? pairing.ios.url
@@ -552,6 +564,7 @@ struct VPhoneLaunchpadControlCommands {
bundleVersion: version,
iphoneSource: iphone ?? "",
cloudOSSource: cloudOS ?? "",
+ device: device,
cpuCount: number("cpu", 8),
memoryMB: number("memory", 8192),
diskSizeGB: number("disk-size", 64),
diff --git a/VPhoneLaunchpad/VPhoneLaunchpad/Localizable.xcstrings b/VPhoneLaunchpad/VPhoneLaunchpad/Localizable.xcstrings
index ab9fb332..7baf190c 100644
--- a/VPhoneLaunchpad/VPhoneLaunchpad/Localizable.xcstrings
+++ b/VPhoneLaunchpad/VPhoneLaunchpad/Localizable.xcstrings
@@ -1,6 +1,40 @@
{
"sourceLanguage" : "en",
"strings" : {
+ "Device" : {
+ "localizations" : {
+ "en" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Device"
+ }
+ },
+ "ja" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "デバイス"
+ }
+ },
+ "ko" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "기기"
+ }
+ },
+ "vi" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "Thiết bị"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "设备"
+ }
+ }
+ }
+ },
"Tunnel" : {
"localizations" : {
"en" : {
diff --git a/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadCreationPipeline.swift b/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadCreationPipeline.swift
index 809b96a5..40d55429 100644
--- a/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadCreationPipeline.swift
+++ b/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadCreationPipeline.swift
@@ -23,6 +23,9 @@ final class VPhoneLaunchpadCreationPipeline {
var bundleVersion: String
var iphoneSource: String
var cloudOSSource: String
+ /// The model `fw prepare --device` picks from an IPSW that covers
+ /// several, such as the 13-inch iPad; nil takes the first.
+ var device: String? = nil
var cpuCount: Int
var memoryMB: Int
var diskSizeGB: Int
@@ -133,11 +136,15 @@ final class VPhoneLaunchpadCreationPipeline {
["fw", "patch", options.name] + options.patches.presetArguments
}
+ private var deviceArguments: [String] {
+ options.device.map { ["--device", $0] } ?? []
+ }
+
func command(for step: Step) -> String {
let name = options.name
return switch step {
case .create: "vm new \(name) --cpu \(options.cpuCount) --memory \(options.memoryMB) --disk-size \(options.diskSizeGB)"
- case .prepare: "fw prepare \(name)"
+ case .prepare: (["fw", "prepare", name] + deviceArguments).joined(separator: " ")
case .patch: patchArguments.joined(separator: " ")
case .bootDFU: "vm launch \(name) --dfu"
case .waitDFU: "recovery-probe --ecid …"
@@ -290,7 +297,7 @@ final class VPhoneLaunchpadCreationPipeline {
case .prepare:
try await run(["fw", "prepare", name, "--iphone-source", options.iphoneSource,
- "--cloudos-source", options.cloudOSSource] + library)
+ "--cloudos-source", options.cloudOSSource] + deviceArguments + library)
case .patch:
// The preset rides on `fw patch` itself; per-patch overrides are
diff --git a/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachine.swift b/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachine.swift
index 0cefd5b5..e3e1d194 100644
--- a/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachine.swift
+++ b/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadMachine.swift
@@ -167,13 +167,49 @@ nonisolated struct VPhoneLaunchpadFirmwareCatalog: Decodable, Sendable {
ios.url
}
- /// The build from an IPSW name such as `iPhone17,3_27.0_24A435_Restore.ipsw`.
+ /// The build from an IPSW name such as `iPhone17,3_27.0_24A435_Restore.ipsw`
+ /// or `iPad_Pro_M4_27.0.1_24A446_Restore.ipsw`: the field before `Restore`.
var build: String {
let fields = (ios.url as NSString).lastPathComponent.split(separator: "_")
- return fields.count >= 4 ? String(fields[2]) : ""
+ return fields.count >= 4 ? String(fields[fields.count - 2]) : ""
+ }
+
+ var isBeta: Bool {
+ ios.name.localizedCaseInsensitiveContains("beta")
+ }
+ }
+
+ /// One guest device and its pairings, oldest first.
+ struct Device: Decodable, Hashable, Identifiable, Sendable {
+ /// The product type `fw prepare --device` takes.
+ let productType: String
+ let name: String
+ /// `iPhone` or `iPad`.
+ let family: String
+ let pairings: [Pairing]
+
+ var id: String {
+ productType
+ }
+
+ var isPad: Bool {
+ family == "iPad"
+ }
+
+ /// The newest release, or the newest build when every one is a beta.
+ var defaultPairing: Pairing? {
+ pairings.last { !$0.isBeta } ?? pairings.last
}
}
+ /// The iPhone the `pairings` list is for.
let device: String
let pairings: [Pairing]
+ /// Every guest device, from a bundle with iPad guests; nil before.
+ let devices: [Device]?
+
+ /// The guest devices, or the iPhone alone from a bundle without `devices`.
+ var guests: [Device] {
+ devices ?? [Device(productType: device, name: device, family: "iPhone", pairings: pairings)]
+ }
}
diff --git a/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadNewMachineView.swift b/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadNewMachineView.swift
index 3d5d0f0e..08a1fa8c 100644
--- a/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadNewMachineView.swift
+++ b/VPhoneLaunchpad/VPhoneLaunchpad/Machines/VPhoneLaunchpadNewMachineView.swift
@@ -1,8 +1,9 @@
import AppKit
import SwiftUI
-/// Name, location, Core Bundle, firmware pairing from `fw catalog`, hardware
-/// and options. Create hands off to the pipeline sheet.
+/// Name, location, Core Bundle, guest device and firmware pairing from
+/// `fw catalog`, hardware and options.
+/// Create hands off to the pipeline sheet.
struct VPhoneLaunchpadNewMachineView: View {
let onCreate: (VPhoneLaunchpadMachinePath) -> Void
@Environment(VPhoneLaunchpadModel.self) private var model
@@ -17,6 +18,8 @@ struct VPhoneLaunchpadNewMachineView: View {
@State private var chosenLocation: String?
@State private var catalog: VPhoneLaunchpadFirmwareCatalog?
@State private var catalogError: String?
+ /// The guest device's product type.
+ @State private var guest: String?
@State private var pairing: String?
@State private var usesCustomSources = false
@State private var iphoneSource = ""
@@ -31,6 +34,10 @@ struct VPhoneLaunchpadNewMachineView: View {
@State private var showsAdvanced = false
@State private var keepArtifacts = false
+ private var selectedGuest: VPhoneLaunchpadFirmwareCatalog.Device? {
+ catalog?.guests.first { $0.id == guest }
+ }
+
/// The version every step of the creation runs with, and the one the
/// firmware and patch catalogs are read from.
private var bundleVersion: String? {
@@ -42,7 +49,7 @@ struct VPhoneLaunchpadNewMachineView: View {
}
private var selectedPairing: VPhoneLaunchpadFirmwareCatalog.Pairing? {
- catalog?.pairings.first { $0.id == pairing }
+ selectedGuest?.pairings.first { $0.id == pairing }
}
private var sources: (String, String)? {
@@ -316,8 +323,18 @@ struct VPhoneLaunchpadNewMachineView: View {
sourceField("iPhone IPSW", $iphoneSource)
sourceField("cloudOS IPSW", $cloudOSSource)
} else if let catalog {
- Picker("iOS", selection: $pairing) {
- ForEach(catalog.pairings.reversed()) { pairing in
+ if catalog.guests.count > 1 {
+ Picker("Device", selection: Binding(
+ get: { guest },
+ set: { choose($0) },
+ )) {
+ ForEach(catalog.guests) { guest in
+ Text(verbatim: guest.name).tag(Optional(guest.id))
+ }
+ }
+ }
+ Picker(selectedGuest?.isPad == true ? "iPadOS" : "iOS", selection: $pairing) {
+ ForEach((selectedGuest?.pairings ?? []).reversed()) { pairing in
Text(verbatim: "\(pairing.ios.name) (\(pairing.build))").tag(Optional(pairing.id))
}
}
@@ -334,8 +351,8 @@ struct VPhoneLaunchpadNewMachineView: View {
} header: {
Text("Firmware")
} footer: {
- if !usesCustomSources, let catalog {
- Text("Recommended firmware pairings for \(catalog.device).")
+ if !usesCustomSources, let selectedGuest {
+ Text("Recommended firmware pairings for \(selectedGuest.name).")
.foregroundStyle(.secondary)
}
}
@@ -394,7 +411,7 @@ struct VPhoneLaunchpadNewMachineView: View {
#if DEBUG
if VPhoneLaunchpadPreview.isActive {
catalog = VPhoneLaunchpadPreview.catalog
- pairing = catalog?.pairings.last?.id
+ choose(catalog?.guests.first?.id)
return
}
#endif
@@ -414,10 +431,12 @@ struct VPhoneLaunchpadNewMachineView: View {
}
let catalog = try JSONDecoder().decode(VPhoneLaunchpadFirmwareCatalog.self, from: data)
self.catalog = catalog
- // The pairing chosen under the previous version stays when this
- // one offers it too.
- if !catalog.pairings.contains(where: { $0.id == pairing }) {
- pairing = catalog.pairings.last?.id
+ // The guest and pairing chosen under the previous version stay
+ // when this one offers them too.
+ if !catalog.guests.contains(where: { $0.id == guest }) {
+ choose(catalog.guests.first?.id)
+ } else if selectedGuest?.pairings.contains(where: { $0.id == pairing }) != true {
+ pairing = selectedGuest?.defaultPairing?.id
}
} catch {
guard version == bundleVersion else {
@@ -427,6 +446,12 @@ struct VPhoneLaunchpadNewMachineView: View {
}
}
+ /// Select a guest device and its newest release.
+ private func choose(_ productType: String?) {
+ guest = productType
+ pairing = selectedGuest?.defaultPairing?.id
+ }
+
/// Read again whenever the preset or the version changes: `inPreset`, which
/// the note and the editor read the checkmarks against, is reported per
/// preset, and each version declares its own patches.
@@ -472,6 +497,8 @@ struct VPhoneLaunchpadNewMachineView: View {
bundleVersion: bundleVersion,
iphoneSource: iphone,
cloudOSSource: cloudOS,
+ // An iPad IPSW often covers two sizes; name the one chosen.
+ device: usesCustomSources ? nil : selectedGuest.flatMap { $0.isPad ? $0.productType : nil },
cpuCount: cpu,
memoryMB: memoryMB,
diskSizeGB: diskSizeGB,
diff --git a/VPhoneLaunchpad/VPhoneLaunchpadShared/VPhoneLaunchpadControl.swift b/VPhoneLaunchpad/VPhoneLaunchpadShared/VPhoneLaunchpadControl.swift
index 7298dd39..ee449d68 100644
--- a/VPhoneLaunchpad/VPhoneLaunchpadShared/VPhoneLaunchpadControl.swift
+++ b/VPhoneLaunchpad/VPhoneLaunchpadShared/VPhoneLaunchpadControl.swift
@@ -167,7 +167,7 @@ nonisolated struct VPhoneLaunchpadControlCommand: Sendable {
Self(name: "vm.log", arguments: ["name"], options: ["root", "lines", "kind"], flags: [],
summary: "The last lines of the console log (--kind create, dfu or patch for those logs)."),
Self(name: "vm.create", arguments: ["name"], options: [
- "root", "bundle", "iphone-source", "cloudos-source", "cpu", "memory", "disk-size", "network", "preset", "from",
+ "root", "bundle", "iphone-source", "cloudos-source", "device", "cpu", "memory", "disk-size", "network", "preset", "from",
], flags: ["keep-artifacts", "no-wait"],
summary: "Create a machine through every step, as New Machine does, bound to --bundle (default: the default bundle). --from <step> retries a failed creation from that step."),
Self(name: "vm.set-bundle", arguments: ["name", "version"], options: ["root"], flags: ["update-environment"],