Add Apple Watch chrome and HID support

Author: DjDeveloperr

AGENTS.md

@@ -78,7 +78,7 @@ Private simulator behavior is implemented locally in:
 - Accessibility bridge: `cli/XCWAccessibilityBridge.*`
 
 The current repo uses the private boot path, private display bridge, and private accessibility translation bridge directly. The browser streams frames from that bridge, injects touch and keyboard events through the same native session layer, inspects accessibility through `AccessibilityPlatformTranslation`, and renders device chrome from `cli/XCWChromeRenderer.*`.
-Physical chrome button support uses DeviceKit `chrome.json` input geometry for browser hit targets. Volume, action, and mute buttons dispatch through `IndigoHIDMessageForHIDArbitrary` with consumer/telephony HID usage pairs from the device chrome metadata; home, lock, and app-switcher remain on the existing SimulatorKit button paths.
+Physical chrome button support uses DeviceKit `chrome.json` input geometry for browser hit targets. Volume, action, mute, Apple Watch digital crown, Watch side button, and Watch left-side button dispatch through `IndigoHIDMessageForHIDArbitrary` with consumer/telephony/vendor HID usage pairs from the device chrome metadata; home, lock, and app-switcher remain on the existing SimulatorKit button paths.
 WebKit inspection uses the simulator `webinspectord` Unix socket named `com.apple.webinspectord_sim.socket` and WebKit's binary-plist Remote Inspector selectors. It lists only WebKit content that the runtime exposes as inspectable. For app-owned `WKWebView` on iOS 16.4 and newer, the app must set `isInspectable = true`.
 
 ## Build and Run

README.md

@@ -147,6 +147,8 @@ simdeck type <udid> --file message.txt
 simdeck button <udid> lock --duration-ms 1000
 simdeck button <udid> volume-up
 simdeck button <udid> action --duration-ms 1000
+simdeck button <udid> digital-crown
+simdeck button <udid> left-side-button
 simdeck batch <udid> --step "tap --label Continue" --step "type 'hello'" --step "wait-for --label hello"
 simdeck dismiss-keyboard <udid>
 simdeck home <udid>

cli/DFPrivateSimulatorDisplayBridge.m

@@ -3415,6 +3415,9 @@ - (BOOL)sendHardwareButtonNamed:(NSString *)buttonName
             @"volume-down": @[ @(DFConsumerControlUsagePage), @234 ],
             @"action": @[ @(0x0b), @45 ],
             @"mute": @[ @(0x0b), @46 ],
+            @"digital-crown": @[ @(DFConsumerControlUsagePage), @64 ],
+            @"side-button": @[ @(DFConsumerControlUsagePage), @149 ],
+            @"left-side-button": @[ @(0xff01), @512 ],
         };
     });
 

cli/XCWChromeRenderer.m

@@ -12,6 +12,7 @@ @interface XCWChromeRenderer ()
 + (nullable NSDictionary *)inputNamed:(NSString *)buttonName
                          chromeInfo:(NSDictionary *)chromeInfo
                               error:(NSError * _Nullable __autoreleasing *)error;
++ (NSEdgeInsets)devicePaddingForChromeInfo:(NSDictionary *)chromeInfo;
 @end
 
 @implementation XCWChromeRenderer
@@ -665,6 +666,14 @@ + (BOOL)drawInputImagesForChromeInfo:(NSDictionary *)chromeInfo
 
 + (CGRect)fullFrameForChromeInfo:(NSDictionary *)chromeInfo
                        chromeSize:(CGSize)chromeSize {
+    NSEdgeInsets padding = [self devicePaddingForChromeInfo:chromeInfo];
+    if (padding.top != 0.0 || padding.left != 0.0 || padding.bottom != 0.0 || padding.right != 0.0) {
+        return CGRectMake(-padding.left,
+                          -padding.top,
+                          chromeSize.width + padding.left + padding.right,
+                          chromeSize.height + padding.top + padding.bottom);
+    }
+
     CGRect bounds = CGRectMake(0.0, 0.0, chromeSize.width, chromeSize.height);
     NSDictionary *json = chromeInfo[@"json"];
     NSString *chromePath = chromeInfo[@"chromePath"];
@@ -712,55 +721,85 @@ + (CGRect)inputFrameForInput:(NSDictionary *)input
                       inSize:(CGSize)size
                   offsetName:(NSString *)offsetName {
     NSDictionary *offsets = [input[@"offsets"] isKindOfClass:[NSDictionary class]] ? input[@"offsets"] : @{};
-    NSDictionary *requestedOffset = [offsets[offsetName] isKindOfClass:[NSDictionary class]] ? offsets[offsetName] : nil;
     NSDictionary *normalOffset = [offsets[@"normal"] isKindOfClass:[NSDictionary class]] ? offsets[@"normal"] : nil;
     NSDictionary *rolloverOffset = [offsets[@"rollover"] isKindOfClass:[NSDictionary class]] ? offsets[@"rollover"] : nil;
-    NSDictionary *offset = requestedOffset ?: rolloverOffset ?: normalOffset ?: @{};
-    CGFloat offsetX = [self numberValue:offset[@"x"]];
-    CGFloat offsetY = [self numberValue:offset[@"y"]];
+    NSDictionary *requestedOffset = [offsets[offsetName] isKindOfClass:[NSDictionary class]] ? offsets[offsetName] : nil;
+    NSDictionary *primaryOffset = normalOffset ?: rolloverOffset ?: requestedOffset ?: @{};
+    NSDictionary *secondaryOffset = rolloverOffset ?: normalOffset ?: requestedOffset ?: @{};
+    CGFloat normalX = [self numberValue:primaryOffset[@"x"]];
+    CGFloat normalY = [self numberValue:primaryOffset[@"y"]];
+    CGFloat rolloverX = [self numberValue:secondaryOffset[@"x"]];
+    CGFloat rolloverY = [self numberValue:secondaryOffset[@"y"]];
+    CGFloat restX = normalX;
+    CGFloat restY = normalY;
     NSString *anchor = [input[@"anchor"] isKindOfClass:[NSString class]] ? input[@"anchor"] : @"";
     NSString *align = [input[@"align"] isKindOfClass:[NSString class]] ? input[@"align"] : @"";
 
-    CGFloat x = offsetX - (assetSize.width / 2.0);
-    CGFloat y = offsetY;
+    if ([offsetName isEqualToString:@"rollover"]) {
+        restX = rolloverX;
+        restY = rolloverY;
+    } else if ([anchor isEqualToString:@"left"]) {
+        restX = rolloverX;
+        restY = rolloverY;
+    } else if ([anchor isEqualToString:@"right"] ||
+               [anchor isEqualToString:@"top"] ||
+               [anchor isEqualToString:@"bottom"]) {
+        restX = (2.0 * normalX) - rolloverX;
+        restY = (2.0 * normalY) - rolloverY;
+    }
+
+    CGFloat x = restX - (assetSize.width / 2.0);
+    CGFloat y = restY;
     if ([anchor isEqualToString:@"left"]) {
-        x = offsetX - (assetSize.width / 2.0);
+        x = restX - (assetSize.width / 2.0);
     } else if ([anchor isEqualToString:@"right"]) {
-        x = size.width + offsetX - (assetSize.width / 2.0);
+        x = size.width + restX;
+        y = restY;
     } else if ([anchor isEqualToString:@"top"]) {
-        y = offsetY;
+        if ([align isEqualToString:@"trailing"]) {
+            x = size.width + restX - assetSize.width;
+        } else {
+            x = restX;
+        }
+        y = restY - assetSize.height;
     } else if ([anchor isEqualToString:@"bottom"]) {
-        y = size.height + offsetY;
+        if ([align isEqualToString:@"trailing"]) {
+            x = size.width + restX - assetSize.width;
+        } else {
+            x = restX;
+        }
+        y = size.height + restY;
     }
 
     if ([anchor isEqualToString:@"left"] || [anchor isEqualToString:@"right"]) {
         if ([align isEqualToString:@"center"]) {
-            y = (size.height - assetSize.height) / 2.0 + offsetY;
+            y = (size.height - assetSize.height) / 2.0 + restY;
         } else if ([align isEqualToString:@"trailing"]) {
-            y = size.height - assetSize.height + offsetY;
+            y = size.height - assetSize.height + restY;
         }
     } else if ([anchor isEqualToString:@"top"] || [anchor isEqualToString:@"bottom"]) {
-        CGFloat baseX = 0.0;
         if ([align isEqualToString:@"center"]) {
-            baseX = size.width / 2.0;
-        } else if ([align isEqualToString:@"trailing"]) {
-            baseX = size.width;
-        }
-        x = baseX + offsetX - (assetSize.width / 2.0);
-        if ([align isEqualToString:@"center"]) {
-            x = (size.width / 2.0) + offsetX - (assetSize.width / 2.0);
-        } else if ([align isEqualToString:@"trailing"]) {
-            x = size.width + offsetX - (assetSize.width / 2.0);
+            x = (size.width / 2.0) + restX - (assetSize.width / 2.0);
         }
     } else if ([align isEqualToString:@"center"]) {
-        x = (size.width - assetSize.width) / 2.0 + offsetX;
+        x = (size.width - assetSize.width) / 2.0 + restX;
     } else if ([align isEqualToString:@"trailing"]) {
-        x = size.width - assetSize.width + offsetX;
+        x = size.width - assetSize.width + restX;
     }
 
     return CGRectMake(x, y, assetSize.width, assetSize.height);
 }
 
++ (NSEdgeInsets)devicePaddingForChromeInfo:(NSDictionary *)chromeInfo {
+    NSDictionary *json = chromeInfo[@"json"];
+    NSDictionary *images = [json[@"images"] isKindOfClass:[NSDictionary class]] ? json[@"images"] : @{};
+    NSDictionary *padding = [images[@"devicePadding"] isKindOfClass:[NSDictionary class]] ? images[@"devicePadding"] : @{};
+    return NSEdgeInsetsMake([self numberValue:padding[@"top"]],
+                            [self numberValue:padding[@"left"]],
+                            [self numberValue:padding[@"bottom"]],
+                            [self numberValue:padding[@"right"]]);
+}
+
 + (NSArray<NSDictionary<NSString *, id> *> *)buttonProfilesForChromeInfo:(NSDictionary *)chromeInfo
                                                                chromeSize:(CGSize)chromeSize
                                                              chromeOffset:(CGPoint)chromeOffset {

client/src/features/viewport/DeviceChrome.tsx

@@ -197,11 +197,13 @@ export function DeviceChrome({
 
 const CHROME_BUTTON_WIRE_NAMES: Record<string, string> = {
   action: "action",
+  "digital-crown": "digital-crown",
   home: "home",
+  "left-side-button": "left-side-button",
   lock: "power",
   mute: "mute",
   power: "power",
-  "side-button": "power",
+  "side-button": "side-button",
   "volume-down": "volume-down",
   "volume-up": "volume-up",
 };
@@ -299,16 +301,20 @@ function ChromeButtonHitTarget({
     left: `${(button.x / totalWidth) * 100}%`,
     top: `${(button.y / totalHeight) * 100}%`,
     width: `${(button.width / totalWidth) * 100}%`,
-    "--button-rest-x": `${(rolloverDelta.x / Math.max(button.width, 1)) * 100}%`,
-    "--button-rest-y": `${(rolloverDelta.y / Math.max(button.height, 1)) * 100}%`,
-    "--button-hover-x": `${((rolloverDelta.x * 2) / Math.max(button.width, 1)) * 100}%`,
-    "--button-hover-y": `${((rolloverDelta.y * 2) / Math.max(button.height, 1)) * 100}%`,
+    "--button-rest-x": "0%",
+    "--button-rest-y": "0%",
+    "--button-hover-x": `${(rolloverDelta.x / Math.max(button.width, 1)) * 100}%`,
+    "--button-hover-y": `${(rolloverDelta.y / Math.max(button.height, 1)) * 100}%`,
+    "--button-pressed-x": `${((-rolloverDelta.x) / Math.max(button.width, 1)) * 100}%`,
+    "--button-pressed-y": `${((-rolloverDelta.y) / Math.max(button.height, 1)) * 100}%`,
   } as CSSProperties &
     Record<
       | "--button-rest-x"
       | "--button-rest-y"
       | "--button-hover-x"
-      | "--button-hover-y",
+      | "--button-hover-y"
+      | "--button-pressed-x"
+      | "--button-pressed-y",
       string
     >;
 

client/src/styles/components.css

@@ -1569,7 +1569,11 @@
 
 .device-chrome-button:active,
 .device-chrome-button.is-pressed {
-  transform: translate3d(var(--button-rest-x, 0), var(--button-rest-y, 0), 0);
+  transform: translate3d(
+    var(--button-pressed-x, var(--button-rest-x, 0)),
+    var(--button-pressed-y, var(--button-rest-y, 0)),
+    0
+  );
 }
 
 .pan-enabled .device-bezel,

docs/api/rest.md

@@ -348,8 +348,8 @@ Content-Type: application/json
 
 Supported button names match the CLI and chrome controls: `home`, `lock`,
 `power`, `side-button`, `volume-up`, `volume-down`, `action`, `mute`,
-`app-switcher`, `siri`, and `apple-pay`. `durationMs` defaults to `0` and is
-used for press-and-hold interactions.
+`digital-crown`, `left-side-button`, `app-switcher`, `siri`, and `apple-pay`.
+`durationMs` defaults to `0` and is used for press-and-hold interactions.
 
 For live chrome interactions, send explicit button edges instead of a completed
 press:

docs/cli/commands.md

@@ -232,6 +232,8 @@ simdeck type <udid> --file message.txt
 simdeck button <udid> lock --duration-ms 1000
 simdeck button <udid> volume-up
 simdeck button <udid> action --duration-ms 1000
+simdeck button <udid> digital-crown
+simdeck button <udid> left-side-button
 simdeck dismiss-keyboard <udid>
 simdeck home <udid>
 simdeck app-switcher <udid>

skills/simdeck/SKILL.md

@@ -136,6 +136,8 @@ simdeck button <UDID> volume-up
 simdeck button <UDID> volume-down
 simdeck button <UDID> action --duration-ms 1000
 simdeck button <UDID> mute
+simdeck button <UDID> digital-crown
+simdeck button <UDID> left-side-button
 simdeck button <UDID> siri
 simdeck button <UDID> apple-pay
 simdeck home <UDID>